Refactor and add reinstall command

Author: andywhite37

.gitignore

@@ -1,30 +1,9 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+# Node
 node_modules
 
+# Haxe
+.haxelib
+
 # Project files
+bin/
 hmm.zip

build.hxml

@@ -1,3 +1,15 @@
 -cp src
+-lib thx.core
+
+--each
+
 -main hmm.Hmm
 -neko run.n
+
+--next
+
+-lib utest
+-cp test
+-main TestAll
+-neko bin/test-all.n
+-cmd neko bin/test-all.n

haxelib.json

@@ -8,5 +8,8 @@
   "classPath": "src/",
   "releasenote": "Add check command to check install status of libs",
   "contributors": ["andywhite37"],
-  "dependencies": {}
+  "dependencies": {
+    "utest": "1.5.0",
+    "thx.core": "0.42.1"
+  }
 }

hmm.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": [
+    {
+      "type": "haxelib",
+      "name": "utest",
+      "version": "1.5.0"
+    },
+    {
+      "type": "haxelib",
+      "name": "thx.core",
+      "version": "0.42.1"
+    }
+  ]
+}

run.n

@@ -1,70 +1,93 @@
 package hmm;
 
+using Lambda;
+
+using thx.Functions;
+
 import hmm.commands.*;
+import hmm.errors.*;
 import hmm.utils.Log;
 import hmm.utils.Shell;
-using Lambda;
 
 class Hmm {
   public static var commands(default, null) : Array<ICommand>;
 
   public static function main() {
-    commands = [
-      new HelpCommand(),
-      new VersionCommand(),
-      new SetupCommand(),
-      new InitCommand(),
-      new FromHxmlCommand(),
-      new ToHxmlCommand(),
-      new InstallCommand(),
-      new HaxelibCommand(),
-      new GitCommand(),
-      new HgCommand(),
-      new UpdateCommand(),
-      new RemoveCommand(),
-      new CheckCommand(),
-      new CleanCommand(),
-      new HmmUpdateCommand(),
-      new HmmRemoveCommand(),
-    ];
+    try {
+      commands = [
+        new HelpCommand(),
+        new VersionCommand(),
+        new SetupCommand(),
+        new InitCommand(),
+        new FromHxmlCommand(),
+        new ToHxmlCommand(),
+        new InstallCommand(),
+        new ReinstallCommand(),
+        new HaxelibCommand(),
+        new GitCommand(),
+        new HgCommand(),
+        new UpdateCommand(),
+        new RemoveCommand(),
+        new CheckCommand(),
+        new CleanCommand(),
+        new HmmUpdateCommand(),
+        new HmmRemoveCommand(),
+      ];
 
-    var args = Sys.args();
+      var args = Sys.args().copy();
 
-    Shell.init({
-      hmmDirectory: Sys.getCwd(),
-      workingDirectory: args.pop()
-    });
+      Shell.init({
+        hmmDirectory: Sys.getCwd(),
+        workingDirectory: args.pop()
+      });
 
-    var commandType = args.shift();
+      var commandType = args.shift();
+      if (commandType == null) {
+        throw new ValidationError('no command given', 1);
+      }
 
-    var command = commands.find(function(command) {
-      return command.type == commandType;
-    });
+      var command = commands.find(function(command) {
+        return command.type == commandType;
+      });
 
-    if (command == null) {
-      Log.error('invalid command: $commandType');
-      printUsageAndExit();
-      Sys.exit(1);
-    }
+      if (command == null) {
+        throw new ValidationError('unrecognized command: $commandType', 1);
+      }
 
-    //Log.info("hmm");
-    //Log.info('working directory:  ${Shell.workingDirectory}');
-    //Log.info('hmm directory:      ${Shell.hmmDirectory}');
-    //Log.info('command:            $commandType');
+      command.run(args);
+    } catch (e : ValidationError) {
+      die('Validation error: ${e.message}', e.statusCode);
+    } catch (e : SystemError) {
+      die('Execution error: ${e.message}', e.statusCode);
+    } catch (e : Dynamic) {
+      die('Unexpected error: $e', 1);
+    }
+  }
 
-    command.run(args);
+  static function die(message : String, statusCode : Int) : Void {
+    Log.error(message);
+    Log.println('Use "hmm help" to see usage');
+    Sys.exit(statusCode);
   }
 
-  public static function printUsageAndExit() {
+  public static function printUsageAndExit(statusCode : Int) : Void {
     Log.println("Usage: hmm <command> [options]");
     Log.println("");
     Log.println("commands:");
     Log.println("");
-    for (command in commands) {
+    printUsagesAndExit(commands.map.fn(_.type), statusCode);
+  }
+
+  public static function printUsagesAndExit(types : Array<String>, statusCode : Int) : Void {
+    for (type in types) {
+      var command = commands.find.fn(_.type == type);
+      if (command == null) {
+        throw new ValidationError('invalid command: $type', 1);
+      }
       Log.println('    ${command.type} - ${command.getUsage()}');
       Log.println("");
     }
-    Sys.exit(1);
+    Sys.exit(statusCode);
   }
 }