From 3757f74794a0ec0ca01a89088001bdaef0a658a5 Mon Sep 17 00:00:00 2001
From: Cyril Schumacher <cyril_schumacher@live.fr>
Date: Fri, 27 Jan 2017 19:09:38 +0100
Subject: [PATCH] Fix tslint errors.

---
 shipit-utils/index.d.ts            | 22 ++++++----------
 shipit-utils/shipit-utils-tests.ts |  2 +-
 shipit/index.d.ts                  | 40 ++++++++++++++++--------------
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/shipit-utils/index.d.ts b/shipit-utils/index.d.ts
index fa29e53609..aec379f5f2 100644
--- a/shipit-utils/index.d.ts
+++ b/shipit-utils/index.d.ts
@@ -3,19 +3,13 @@
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="shipit"/>
+import shipit = require("shipit");
 
-declare module "shipit-utils" {
-    import shipit = require("shipit");
+type GruntOrShipit = typeof shipit | {};
+type EmptyCallback = () => void;
 
-    type GruntOrShipit = typeof shipit | {};
-
-    export function equalValues(value: any[]): void;
-
-    export function getShipit(gruntOrShipit: GruntOrShipit): typeof shipit;
-    export function getShipit(gruntOrShipit: GruntOrShipit): typeof shipit;
-
-    export function registerTask(gruntOrShipit: GruntOrShipit, name: string, dependenciesOrTask: string[]|Function): typeof shipit;
-
-    export function runTask(gruntOrShipit: {}): void;
-}
+export function equalValues(value: any[]): void;
+export function getShipit(gruntOrShipit: GruntOrShipit): typeof shipit;
+export function getShipit(gruntOrShipit: GruntOrShipit): typeof shipit;
+export function registerTask(gruntOrShipit: GruntOrShipit, name: string, dependenciesOrTask: string[] | EmptyCallback): typeof shipit;
+export function runTask(gruntOrShipit: {}): void;
diff --git a/shipit-utils/shipit-utils-tests.ts b/shipit-utils/shipit-utils-tests.ts
index 15f0d5547b..81cb741054 100644
--- a/shipit-utils/shipit-utils-tests.ts
+++ b/shipit-utils/shipit-utils-tests.ts
@@ -1,4 +1,4 @@
-import shipit = require("shipit-cli");
+import shipit = require("shipit");
 import utils = require("shipit-utils");
 
 var originalShipit = utils.getShipit(shipit);
diff --git a/shipit/index.d.ts b/shipit/index.d.ts
index f0c00d8d2d..8c614f1627 100644
--- a/shipit/index.d.ts
+++ b/shipit/index.d.ts
@@ -36,26 +36,28 @@ declare namespace shipit {
         name: string;
     }
 
-    function blTask(name: string, depsOrFn: string[] | EmptyCallback, fn?: () => void): any;
-    function emit(name: string): any;
-    function initConfig(config: {}): typeof shipit;
-    function local(command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
-    function log(log: any): void;
-    function log(...log: any[]): void;
-    function on(name: string, callback: (e: any) => void): any;
-    function remote(command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
-    function remoteCopy(src: string, dest: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
-    function start(tasks: string | string[]): typeof shipit;
-    function start(...tasks: string[]): typeof shipit;
-    function task(name: string, depsOrFn: string[] | EmptyCallback, fn?: () => void): typeof shipit;
+    export function blTask(name: string, depsOrFn: string[] | EmptyCallback, fn?: () => void): any;
+    export function emit(name: string): any;
+    export function initConfig(config: {}): typeof shipit;
+    export function local(command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
+    export function log(log: any): void;
+    export function log(...log: any[]): void;
+    export function on(name: string, callback: (e: any) => void): any;
+    export function remote(command: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
+    export function remoteCopy(src: string, dest: string, options?: child_process.ExecOptions, callback?: (error: Error, stdout: string, stderr: string) => void): PromiseLike<ShipitLocal>;
+    export function start(tasks: string | string[]): typeof shipit;
+    export function start(...tasks: string[]): typeof shipit;
+    export function task(name: string, depsOrFn: string[] | EmptyCallback, fn?: () => void): typeof shipit;
 
-    var config: {};
-    var domain: any;
-    var doneCallback: any;
-    var environment: string;
-    var seq: any[];
-    var tasks: Tasks;
-    var isRunning: boolean;
+    export var config: {};
+    export var domain: any;
+    export var doneCallback: any;
+    export var environment: string;
+    export var seq: any[];
+    export var tasks: Tasks;
+    export var isRunning: boolean;
 }
 
+//tslint:disable-next-line:export-just-namespace
 export = shipit;
+export as namespace shipit;