js2 0.3.0.pre5 → 0.3.0.pre6

data/lib/js2/js2.js

@@ -841,7 +841,11 @@ function mainFunction (arg) {
 
     toString: function() {
       var v = this.validate(/(curry)(\s*)(Braces)?(\s*)(with)?(\s*)(Braces)?(\s*)(Block)/);
-      var ret = [ '(function(){return function' ];
+
+      var scopeOuter = (v[5] ? v[7].toString() : "()");
+      var scopeInner = scopeOuter.replace(/\bthis\b/, '$this');
+
+      var ret = [ '(function' + scopeInner + '{return function' ];
 
       // args
       ret.push(v[3] ? v[3].toString() : '($1,$2,$3)');
@@ -853,7 +857,7 @@ function mainFunction (arg) {
       ret.push("})");
 
       // scope
-      ret.push(v[5] ? v[7].toString() : "()");
+      ret.push(scopeOuter);
 
       if (this.addSemiColon) ret.push(';');
 
@@ -1102,6 +1106,68 @@ JS2.Class.extend('Updater', {
 });
 
 
+JS2.Class.extend('Config', {
+  "CLI_REGEX":/^-(r|i|f)(:?=(\w+))$/,
+  "optsLookup":{ 
+    'n': 'non-recursive',
+    'i': 'interval',
+    'f': 'format'
+  },
+
+  initialize:function (fs, argv) {
+    this.format    = 'browser';
+    this.recursive = true;
+    this.interval  = 2;
+    this.sourceDir = './app/js2';
+    this.outDir    = './public/javascripts';
+    this.args      = [];
+
+    this.fs = fs;
+
+    if (! this.loadConfigFile('./config/js2.json')) {
+      this.loadConfigFile('./js2.json');
+    }
+
+    if (argv) {
+      while (argv.length) {
+        var opt = argv.shift(); 
+        var m = opt.match(this.CLI_REGEX);
+        if (m) {
+          this[this.optsLookup[m[0]]] = m[1] || true; 
+        } else if (! this.command) {
+          this.command = opt;
+        } else {
+          this.args.push(opt);
+        }
+      }
+    }
+
+    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, ''));
+
+        this.format    = config.format    || this.format;
+        this.recursive = config['non-recursive'] ? false : this.recursive;
+        this.interval  = config['interval'] ? config['interval'] : this.interval;
+        this.sourceDir = config['source-dir'] || this.sourceDir;
+        this.outDir    = config['out-dir'] || this.outDir;
+
+        return true;
+      } catch(e) {
+        console.log(e.toString());
+      }
+    }
+    return false;
+  }
+
+});
+
+
 JS2.Class.extend('Commander', {
   "BANNER":"js2 <command> [options] <arguments>\n" +
     "Commands:\n" +
@@ -1109,12 +1175,12 @@ JS2.Class.extend('Commander', {
     "  * render <file>             -- Shows JS2 compiled output\n" +
     "  * compile <inDir> [outDir]  -- Compiles a directory and puts js files into outDir.  If outDir is not specified, inDir will be used\n" + 
     "    Options:\n" +
-    "      -r                      -- Traverse directories recursively\n" +
-    "      -m=<mode>               -- Compile for different modes: node, ringo, or browser\n" +
+    "      -n                      -- Do NOT traverse directories recursively\n" +
+    "      -f=<format>             -- Compile for different formats: node, ringo, or browser\n" +
     "  * compile <file>            -- Compiles a single js2 file into js\n" +
     "  * watch <inDir> <outDir>    -- Similar to compile, but update will keep looping while watching for modifications\n" +
     "    Options:\n" +
-    "      -r                      -- Traverse directories recursively\n" +
+    "      -n                      -- Do NOT traverse directories recursively\n" +
     "      -i=<seconds>            -- Interval time in seconds between loops\n",
 
   "DEFAULT_CONFIG":{
@@ -1123,99 +1189,52 @@ JS2.Class.extend('Commander', {
   },
 
   initialize:function (argv) {
-    this.argv = argv;
-    this.command = this.argv.shift();
     this.fs      = JS2.fs;
-    this.parseOpts(argv);
+    this.config  = new JS2.Config(this.fs, argv);
+    this.command = this.config.command;
   },
 
   cli:function () {
     if (this[this.command]) {
-      if (this.argv.length == 0) {
-        this.loadArgvFromConfig();
-      }
-
-      this[this.command](this.argv);
+      this[this.command]();
     } else {
       this.showBanner();
     }
   },
 
-  loadArgvFromConfig:function () {
-  },
-
-  render:function (argv) {
-    console.log(js2.render(this.fs.read(argv[0])));
+  render:function () {
+    console.log(js2.render(this.fs.read(this.config.args[0])));
   },
 
-  run:function (argv) {
+  run:function () {
     var file;
     var i = 0;
-    while (file = argv[i++]) {
+    while (file = this.config.args[i++]) {
       eval(js2.render(this.fs.read(file))); 
     }
   },
 
-  "options":{
-    'r': 'recursive',
-    'i': 'interval',
-    'm': 'mode'
-  },
-
-  parseOpts:function (argv) {
-    this.opts = { main: [] };
-    var opts = this.opts;
-
-    for (var i=0; i<argv.length; i++) {
-      var arg = argv[i];
-      var m   = arg.match(/^-(\w)(=(\w+))?$/);
-      if (m) {
-        var key = this.options[m[1]];
-        if (! key) console.log('Invalid option: ' + m[1]);
-        opts[key] = m[3] || true;
-      } else {
-        opts.main.push(arg); 
-      }
-    }
-
-    switch(opts['mode']) {
-      case 'ringo': JS2.DECORATOR = new JS2.Decorator.Ringo(); break;
-      case 'node': JS2.DECORATOR  = new JS2.Decorator.Node(); break;
-      default: JS2.DECORATOR      = new JS2.Decorator.Browser(); break;
-    }
-  },
-
   compile:function () {
-    var inDir = this.opts.main[0];
     var self = this;
-
-    this.getUpdater().update(true, function($1,$2,$3){ return JS2.DECORATOR.file((self.handleSource($1))); });
-  },
-
-  handleSource:function (code) {
-    if (this.opts.browsers) {
-      return code; 
-    } else {
-      return code;
-    }
+    this.getUpdater().update(true, function($1,$2,$3){ return JS2.DECORATOR.file($1); });
   },
 
   getUpdater:function () {
-    var inDir  = this.opts.main[0] || '.';
-    var outDir = this.opts.main[1] || inDir;
-    return new JS2.Updater(this.fs, inDir, outDir, this.opts.recursive);
+    var inDir  = this.config.args[0] || '.';
+    var outDir = this.config.args[1] || inDir;
+    return new JS2.Updater(this.fs, inDir, outDir, this.config.recursive);
   },
 
   watch:function () {
     var updater = this.getUpdater();
     var self = this;
-    var interval = this.opts.interval || 2;
+    var interval = this.config.interval || 2;
     console.log('Input Directory:' + updater.inDir + ' -> Output Directory:' + updater.outDir);
     if (updater.recursive) console.log('RECURSIVE');
 
     // HACK to get this integrated with ruby
     updater.update();
-    setInterval(function($1,$2,$3){ console.log('updating'); updater.update() }, interval * 1000);
+    setInterval(function($1,$2,$3){ console.log('updating'); updater.update(true, function($1,$2,$3){ return JS2.DECORATOR.file($1); }); }, interval * 1000);
   },
 
   showBanner:function () {

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 3
-  - 0
-  - pre5
-  version: 0.3.0.pre5
+  prerelease: 6
+  version: 0.3.0.pre6
 platform: ruby
 authors: 
 - Jeff Su
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -08:00
+date: 2011-03-08 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -43,11 +36,11 @@ extra_rdoc_files: []
 files: 
 - bin/js2
 - bin/js2-ruby
-- lib/js2/command.rb
+- lib/js2.rb
 - lib/js2/context.rb
-- lib/js2/fs.rb
 - lib/js2/rack.rb
-- lib/js2.rb
+- lib/js2/command.rb
+- lib/js2/fs.rb
 - lib/js2/js2.js
 has_rdoc: true
 homepage: http://jeffsu.github.com
@@ -63,23 +56,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Javascript Syntactic Sugar