js2 0.3.7 → 0.3.8

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.3.8
+  * fied "render"
+  * fixed comment block bug
+	* using target-dir instead of out-dir
+
 0.3.7
   * fixed foreach counter
 

data/lib/js2/browser.js

@@ -19,7 +19,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
-  js2.VERSION = "0.3.7";
+  js2.VERSION = "0.3.8";
 
   JS2.ROOT = JS2;
 

data/lib/js2/js2.js

@@ -14,7 +14,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
-  js2.VERSION = "0.3.7";
+  js2.VERSION = "0.3.8";
 
   JS2.ROOT = JS2;
   
@@ -433,9 +433,9 @@ function mainFunction (arg) {
       var mode = 0;
       for (var i=0; i<str.length; i++) {
         if (str.charAt(i) == '*') {
-          mode++;
+          mode = 1;
         } else if (str.charAt(i) == '/' && mode == 1) {
-          mode++;
+          mode = 2;
         } else {
           mode = 0;
         }
@@ -1262,7 +1262,7 @@ JS2.Class.extend('Config', function(KLASS, OO){
     this.recursive = true;
     this.interval  = 2;
     this.sourceDir = './app/js2';
-    this.outDir    = './public/javascripts';
+    this.targetDir = './public/javascripts';
     this.args      = [];
 
     this.fs = fs;
@@ -1294,10 +1294,15 @@ JS2.Class.extend('Config', function(KLASS, OO){
       try {
         var config = JSON.parse(this.fs.read(file).replace(/\n\r?/g, ''));
 
+        if (config['out-dir']) {
+          config['target-dir'] = config['target-dir'] || config['out-dir'];
+          console.log("Please use target-dir instead of out-dir");
+        }
+
         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.targetDir = config['target-dir'] || this.targetDir;
         this.verbose   = ('verbose' in config) ? config['verbose'] : false;
 
         this['non-recursive'] = config['non-recursive'];
@@ -1318,20 +1323,20 @@ JS2.Class.extend('Commander', function(KLASS, OO){
   OO.addMember("BANNER","js2 <command> [options] <arguments>\n" +
     "VERSION: " + JS2.VERSION + "\n" +
     "Commands:\n" +
-    "  * run <file>                -- Executes file\n" +
-    "  * 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" +
-    "      -n                      -- Do NOT traverse directories recursively\n" +
-    "      -v                      -- Verbose \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" +
+    "  * run <file>                         -- Executes file\n" +
+    "  * render <file>                      -- Shows JS2 compiled output\n" +
+    "  * compile <source dir> [target dir]  -- Compiles a directory and puts js files into target dir.  If target dir is not specified, source dir will be used\n" + 
     "    Options:\n" +
-    "      -n                      -- Do NOT traverse directories recursively\n" +
-    "      -f=<format>             -- Compile for different formats: node, ringo, or browser\n" +
-    "      -v                      -- Verbose \n" +
-    "      -i=<seconds>            -- Interval time in seconds between loops\n");
+    "      -n                               -- Do NOT traverse directories recursively\n" +
+    "      -v                               -- Verbose \n" +
+    "      -f=<format>                      -- Compile for different formats: node, ringo, or browser\n" +
+    "  * compile <file>                     -- Compiles a single js2 file into js\n" +
+    "  * watch <source dir> <target dir>    -- Similar to compile, but update will keep looping while watching for modifications\n" +
+    "    Options:\n" +                      
+    "      -n                               -- Do NOT traverse directories recursively\n" +
+    "      -f=<format>                      -- Compile for different formats: node, ringo, or browser\n" +
+    "      -v                               -- Verbose \n" +
+    "      -i=<seconds>                     -- Interval time in seconds between loops\n");
 
   OO.addMember("initialize",function (argv) {
     this.fs      = JS2.fs;
@@ -1358,7 +1363,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){
   });
 
   OO.addMember("render",function () {
-    JS2.LOGGER.info(js2.render(this.fs.read(this.config.args[0])));
+    console.log(js2.render(this.fs.read(this.config.args[0])));
   });
 
   OO.addMember("run",function () {
@@ -1376,16 +1381,16 @@ JS2.Class.extend('Commander', function(KLASS, OO){
   });
 
   OO.addMember("getUpdater",function () {
-    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);
+    var inDir     = this.config.args[0] || this.config.sourceDir || '.';
+    var targetDir = this.config.args[1] || this.config.outDir || inDir;
+    return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
   });
 
   OO.addMember("watch",function () {
     var updater = this.getUpdater();
     var self = this;
     var interval = this.config.interval || 2;
-    JS2.LOGGER.info('Input Directory:' + updater.inDir + ' -> Output Directory:' + updater.outDir);
+    JS2.LOGGER.info('Source Directory:' + updater.inDir + ' -> Target Directory:' + updater.targetDir);
     if (updater.recursive) JS2.LOGGER.info('RECURSIVE');
 
     // HACK to get this integrated with ruby

data/lib/js2/rack.rb

@@ -7,7 +7,7 @@ module JS2
 
     DEFAULT_CONFIG = {
       'source_dir'  => "#{ROOT}/app/js2",
-      'out_dir'     => "#{ROOT}/public/javascripts",
+      'target_dir'  => "#{ROOT}/public/javascripts",
       'bin'         => (`which js2`.chomp rescue nil),
       'copy_js2'    => true
     }
@@ -18,11 +18,11 @@ module JS2
       config = YAML.load_file(ROOT + '/config/js2.yml') rescue DEFAULT_CONFIG
 
       @source_dir = config['source_dir'] || './app/js2'
-      @out_dir    = config['out_dir'] || './public/javascripts'
+      @target_dir = config['target_dir'] || './public/javascripts'
       @bin        = config['bin'] || 'js2'
       @copy_js2   = config.has_key?('copy_js2') ? config['copy_js2'] : true
 
-      @valid = @source_dir && @out_dir && !@bin.blank?
+      @valid = @source_dir && @target_dir && !@bin.blank?
 
       unless @valid
         puts "JS2 is not configured properly"
@@ -38,7 +38,7 @@ module JS2
         end
       end
 
-      `#{@bin} compile -f=browser -m #{@source_dir} #{@out_dir}` if @valid
+      `#{@bin} compile -f=browser -m #{@source_dir} #{@target_dir}` if @valid
       @app.call(env)
     end
   end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.7
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +08:00
+date: 2011-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -36,11 +42,11 @@ extra_rdoc_files: []
 files: 
 - bin/js2
 - bin/js2-ruby
-- lib/js2.rb
-- lib/js2/context.rb
-- lib/js2/rack.rb
 - lib/js2/command.rb
+- lib/js2/context.rb
 - lib/js2/fs.rb
+- lib/js2/rack.rb
+- lib/js2.rb
 - lib/js2/browser.js
 - lib/js2/js2.js
 - CHANGELOG
@@ -58,17 +64,21 @@ 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: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Javascript Syntactic Sugar