js2 0.3.1 → 0.3.2

data/lib/js2/fs.rb

@@ -9,7 +9,6 @@ class JS2::FS
     return Dir["#{lookup}/*.#{ext}"].collect { |f| File.expand_path(f) }.reject { |f| f.match(/^\./) }
   end
 
-
   def expandPath(file)
     return File.expand_path(file)
   end
@@ -27,9 +26,8 @@ class JS2::FS
   end
 
 
-  def mkdir(file)
-    dir = File.dirname(file)
-    FileUtils.mkdir(dir) unless File.directory?(dir)
+  def mkdir(dir)
+    FileUtils.mkdir(dir) unless File.exists?(dir)
   end
 
   def isFile(dir)

data/lib/js2/js2.js

@@ -1107,7 +1107,7 @@ JS2.Class.extend('Updater', {
 
 
 JS2.Class.extend('Config', {
-  "CLI_REGEX":/^-(r|i|f)(:?=(\w+))$/,
+  "CLI_REGEX":/^-(r|i|f)(=(\w+))$/,
   "optsLookup":{ 
     'n': 'non-recursive',
     'i': 'interval',
@@ -1133,7 +1133,7 @@ JS2.Class.extend('Config', {
         var opt = argv.shift(); 
         var m = opt.match(this.CLI_REGEX);
         if (m) {
-          this[this.optsLookup[m[0]]] = m[1] || true; 
+          this[this.optsLookup[m[1]]] = m[3] || true; 
         } else if (! this.command) {
           this.command = opt;
         } else {
@@ -1142,21 +1142,22 @@ JS2.Class.extend('Config', {
       }
     }
 
+    this.recursive = !this['non-recursive'];
     this.interval = parseInt(this.interval);
-
   },
 
   loadConfigFile:function (file) {
     if (this.fs.isFile(file)) {
       try {
-        var config = JSON.parse(this.fs.read(file).replace(/\n/g, ''));
+        var config = JSON.parse(this.fs.read(file).replace(/\n\r?/g, ''));
 
-        this.format    = config.format    || this.format;
-        this.recursive = config['non-recursive'] ? false : this.recursive;
+        this.format    = config.format || this.format;
         this.interval  = config['interval'] ? config['interval'] : this.interval;
         this.sourceDir = config['source-dir'] || this.sourceDir;
         this.outDir    = config['out-dir'] || this.outDir;
 
+        this['non-recursive'] = config['non-recursive'];
+
         return true;
       } catch(e) {
         console.log(e.toString());
@@ -1193,6 +1194,12 @@ JS2.Class.extend('Commander', {
     this.fs      = JS2.fs;
     this.config  = new JS2.Config(this.fs, argv);
     this.command = this.config.command;
+
+    switch(this.config.format) {
+      case 'ringo':    JS2.DECORATOR = new JS2.RingoDecorator(); break;
+      case 'node':     JS2.DECORATOR = new JS2.NodeDecorator(); break;
+      default:  JS2.DECORATOR = new JS2.BrowserDecorator(); break;
+    }
   },
 
   cli:function () {
@@ -1221,7 +1228,7 @@ JS2.Class.extend('Commander', {
   },
 
   getUpdater:function () {
-    var inDir  = this.config.args[0] || this.config.inDir || '.';
+    var inDir  = this.config.args[0] || this.config.sourceDir || '.';
     var outDir = this.config.args[1] || this.config.outDir || inDir;
     return new JS2.Updater(this.fs, inDir, outDir, this.config.recursive);
   },
@@ -1245,7 +1252,7 @@ JS2.Class.extend('Commander', {
 
 
 
-JS2.Class.extend('Decorator.Browser', {
+JS2.Class.extend('BrowserDecorator', {
   file:function (code) {
     return code;
   },
@@ -1255,7 +1262,7 @@ JS2.Class.extend('Decorator.Browser', {
   }
 });
 
-JS2.Class.extend('Decorator.Node', {
+JS2.Class.extend('NodeDecorator', {
   file:function (code) {
     return "var js2 = require('js2').js2;\nvar JS2 = js2;\n" + code;
   },
@@ -1265,7 +1272,7 @@ JS2.Class.extend('Decorator.Node', {
   }
 });
 
-JS2.Class.extend('Decorator.Ringo', {
+JS2.Class.extend('RingoDecorator', {
   file:function (code) {
     return "var js2 = require('js2').js2;\nvar JS2 = js2;\n" + code;
   },
@@ -1275,10 +1282,12 @@ JS2.Class.extend('Decorator.Ringo', {
   }
 });
 
+JS2.DECORATOR = JS2.DECORATOR || new JS2.BrowserDecorator();
+
 
 
   JS2.fs = new JS2.FileSystem(JS2_RUBY_FILE_ADAPTER);
-  js2.DECORATOR = new JS2.Decorator.Browser();
+  js2.DECORATOR = new JS2.BrowserDecorator();
   js2.ROOT = root;
 
   return JS2;

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jeff Su