distil 0.10.1 → 0.10.3

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.3

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.10.1"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-04-25}
   s.default_executable = %q{distil}
   s.description = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
   s.executables = ["distil"]
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "lib/tasks/test-task.rb",
      "lib/test/HtmlTestReporter.js",
      "lib/test/Test.js",
+     "lib/test/TestHelper.js",
      "lib/test/TestReporter.js",
      "lib/test/TestRunner.js",
      "lib/test/browser.rb",
@@ -578,7 +579,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://code.google.com/p/distil-js/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
 
   if s.respond_to? :specification_version then

data/lib/bootstrap-template.js

@@ -1,3 +1,4 @@
+/*jsl:ignore*/ /**#nocode+*/
 (function() {
     var baseUrl= findScriptBaseName();
 
@@ -54,3 +55,4 @@
     @LOAD_SCRIPTS@
     
 })();
+/**#nocode-*/ /*jsl:end*/

data/lib/project.rb

@@ -155,7 +155,7 @@ class Project < Configurable
            value.is_a?(Hash) && value.has_key?("enabled") && !value["enabled"])
 
       puts
-      puts "#{project_name} #{section}:"
+      puts "#{project_name}/#{section}:"
       puts
 
       task= Task.by_name(section) || Task.by_product_name(section)

data/lib/task.rb

@@ -9,6 +9,7 @@ class Task < Configurable
 
   option :remove_prefix
   option_alias :remove_prefix, :source_folder
+  option :validate, true
   
   def initialize(target, settings)
     super(settings, target)

data/lib/tasks/javascript-task.rb

@@ -14,7 +14,6 @@ class JavascriptTask < SingleOutputTask
   option :jsdoc_plugins, "#{$vendor_dir}/jsdoc-extras/plugins"
   option :doc_folder, "doc"
   option :generate_docs, false
-  option :generate_import, false
   option :class_list, ""
   option :class_list_template, "#{$vendor_dir}/jsdoc-extras/templates/classlist"
 
@@ -50,10 +49,6 @@ class JavascriptTask < SingleOutputTask
       end
     end
 
-    if (generate_import)
-      @name_import= "#{prefix}#{target_name}-import#{type}"
-      @products << @name_import
-    end
   end
   
   # JsTask handles files that end in .js
@@ -63,7 +58,7 @@ class JavascriptTask < SingleOutputTask
 
   def validate_files
 
-    return if (!File.exists?($lint_command))
+    return if (!validate || !File.exists?($lint_command))
         
     tmp= Tempfile.new("jsl.conf")
     
@@ -193,21 +188,19 @@ class JavascriptTask < SingleOutputTask
     @debug= replace_tokens(template, {
               "LOAD_SCRIPTS" => @debug
             })
-  end
 
-  def finish
-    super
-    return if (!generate_import)
-
-    File.delete(@name_import) if (File.exists?(@name_import))
-    
-    File.open(@name_import, "w") { |f|
-      f.write(notice_text)
-      
-      @included_files.each { |inc|
-        f.puts "/*jsl:import #{inc.relative_to_folder(output_folder)}*/"
-      }
+    destination=File.expand_path(remove_prefix||"")
+    @included_files.each { |inc|
+        @debug << "/*jsl:import #{inc.relative_to_folder(destination)}*/\n"
     }
   end
+
+  def uncompressed_preamble
+    "/**#nocode+*/\n\n"
+  end
   
+  def uncompressed_postscript
+    "\n\n/**#nocode-*/"
+  end
+
 end

data/lib/tasks/single-output-task.rb

@@ -47,6 +47,14 @@ class SingleOutputTask < OutputTask
     @included_files.each { |f| process_file(f) }
   end
 
+  def uncompressed_preamble
+    ""
+  end
+  
+  def uncompressed_postscript
+    ""
+  end
+  
   def finish
     return if (!output_type)
     
@@ -66,7 +74,9 @@ class SingleOutputTask < OutputTask
     
     File.open(@name_concat, "w") { |f|
       f.write(notice_text)
+      f.write(uncompressed_preamble)
       f.write(concat)
+      f.write(uncompressed_postscript)
     }
     
     minified= minify(concat)

data/lib/test/Test.js

@@ -1,230 +1,3 @@
-function TestHelper(scope, report, test, testName)
-{
-    this.scope= scope;
-    this.report= report;
-    this.test= test;
-    this.testName= testName;
-    this._async= false;    
-}
-TestHelper.prototype= {
-
-    __ASYNC_MARKER__: 'async_marker',
-    
-    stringFromValue: function(v)
-    {
-        return String(v);
-    },
-    
-    compareArrays: function(a1, a2)
-    {
-        if (a1.length==a2.length)
-        {
-            var len=a1.length;
-            var i;
-
-            for (i=0; i<len; ++i)
-                if (a1[i]!==a2[i])
-                    return false;
-            return true;
-        }
-
-        return false;
-    },
-    
-    log: function()
-    {
-        this.report.log.apply(this.report, arguments);
-    },
-    
-    passed: function()
-    {
-        if (this._finished)
-            return;
-            
-        this.report.passed(this.test, this.testName);
-        this.finishAsync();
-    },
-    
-    clearTimer: function()
-    {
-        if (!this._timer)
-            return;
-        window.clearTimeout(this._timer);
-        this._timer= 0;
-    },
-    
-    finishAsync: function()
-    {
-        if (!this._async || this._finished)
-            return;
-        
-        this._finished= true;
-        this.clearTimer();
-        try
-        {
-            if (this.teardown)
-                this.teardown.call(this.scope);
-        }
-        catch (e)
-        {
-            this.report.exceptionInTeardown(this.test, this.testName, e);
-        }
-        
-        this.report.endTest(this.test, this.testName);
-        if (this.ontestcomplete)
-            this.ontestcomplete();
-    },
-    
-    /** Create an asynchronous handler for this method. If the test
-     *  doesn't complete before the timeout expires, then the test
-     *  fails.
-     */
-    async: function(timeout)
-    {
-        var helper= this;
-        
-        function timeoutFn()
-        {
-            helper.report.timeoutExpired(helper.test, helper.testName, timeout);
-            helper.finishAsync();
-        }
-        
-        this._timer= window.setTimeout(timeoutFn, timeout);
-        this._async= true;
-        return this.__ASYNC_MARKER__;
-    },
-
-    assert: function(value, msg)
-    {
-        this.assertTrue(value, msg);
-    },
-    
-    assertEqual: function(value, expected, msg)
-    {
-        if ('object'===typeof(value) && 'object'===typeof(expected) &&
-            value.splice && expected.splice)
-        {
-            if (this.compareArrays(value, expected))
-                return;
-        }
-        else if (value===expected)
-            return;
-
-        this.fail(msg||(this.stringFromValue(value) + '===' +
-                        this.stringFromValue(expected)));
-    },
-
-    assertNotEqual: function(value, expected, msg)
-    {
-        if (value!==expected)
-            return;
-        this.fail(msg||(this.stringFromValue(value) + '!==' +
-                        this.stringFromValue(expected)));
-    },
-
-    assertTrue: function(value, msg)
-    {
-        if (true===value)
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is not true'));
-    },
-
-    assertFalse: function(value, msg)
-    {
-        if (false===value)
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is not false'));
-    },
-
-    assertNull: function(value, msg)
-    {
-        if (null===value)
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is not null'));
-    },
-
-    assertNotNull: function(value, msg)
-    {
-        if (null!==value)
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is null'));
-    },
-
-    assertUndefined: function(value, msg)
-    {
-        if ('undefined'===typeof(value))
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is not undefined'));
-    },
-
-    assertNotUndefined: function(value, msg)
-    {
-        if ('undefined'!==typeof(value))
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is undefined'));
-    },
-
-    assertMatch: function(regex, value, msg)
-    {
-        if (regex.exec(value))
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' did not match /' + regex.source + '/'));
-    },
-
-    assertNotMatch: function(regex, value, msg)
-    {
-        if (!regex.exec(value))
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' matched /' + regex.source + '/'));
-    },
-    
-    assertInstanceOf: function(value, klass, msg)
-    {
-        if (value instanceof klass)
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is not an instance'));
-    },
-
-    assertNotInstanceOf: function(value, klass, msg)
-    {
-        if (!(value instanceof klass))
-            return;
-        this.fail(msg||(this.stringFromValue(value) + ' is an instance'));
-    },
-    
-    fail: function(msg)
-    {
-        if (this._finished)
-            return;
-            
-        msg= msg||'failed';
-        this.report.failed(this.test, this.testName, msg);
-        
-        this.finishAsync();
-        
-        var error= new Error(msg);
-        error.name= 'AssertionError';
-        throw error;
-    },
-    
-    skip: function(why)
-    {
-        if (this._finished)
-            return;
-            
-        why= why||'Test skipped';
-        this.report.skipped(this.test, this.testName, why);
-        
-        this.finishAsync();
-
-        var error= new Error(why);
-        error.name= 'AssertionError';
-        throw error;
-    }
-
-};
-
-
 var Test= {
 
     /** Register a group of tests. This might do some clever processing of
@@ -241,6 +14,14 @@ var Test= {
         this._tests={};
         this.numberOfRegisteredTests= 0;
     },
+
+    pending: function(arg)
+    {
+    },
+    
+    spec: function(name, decl)
+    {
+    },
     
     numberOfRegisteredTests: 0,
     _tests: {}

data/lib/test/TestHelper.js

@@ -0,0 +1,225 @@
+function TestHelper(scope, report, test, testName)
+{
+    this.scope= scope;
+    this.report= report;
+    this.test= test;
+    this.testName= testName;
+    this._async= false;    
+}
+TestHelper.prototype= {
+
+    __ASYNC_MARKER__: 'async_marker',
+    
+    stringFromValue: function(v)
+    {
+        return String(v);
+    },
+    
+    compareArrays: function(a1, a2)
+    {
+        if (a1.length==a2.length)
+        {
+            var len=a1.length;
+            var i;
+
+            for (i=0; i<len; ++i)
+                if (a1[i]!==a2[i])
+                    return false;
+            return true;
+        }
+
+        return false;
+    },
+    
+    log: function()
+    {
+        this.report.log.apply(this.report, arguments);
+    },
+    
+    passed: function()
+    {
+        if (this._finished)
+            return;
+            
+        this.report.passed(this.test, this.testName);
+        this.finishAsync();
+    },
+    
+    clearTimer: function()
+    {
+        if (!this._timer)
+            return;
+        window.clearTimeout(this._timer);
+        this._timer= 0;
+    },
+    
+    finishAsync: function()
+    {
+        if (!this._async || this._finished)
+            return;
+        
+        this._finished= true;
+        this.clearTimer();
+        try
+        {
+            if (this.teardown)
+                this.teardown.call(this.scope);
+        }
+        catch (e)
+        {
+            this.report.exceptionInTeardown(this.test, this.testName, e);
+        }
+        
+        this.report.endTest(this.test, this.testName);
+        if (this.ontestcomplete)
+            this.ontestcomplete();
+    },
+    
+    /** Create an asynchronous handler for this method. If the test
+     *  doesn't complete before the timeout expires, then the test
+     *  fails.
+     */
+    async: function(timeout)
+    {
+        var helper= this;
+        
+        function timeoutFn()
+        {
+            helper.report.timeoutExpired(helper.test, helper.testName, timeout);
+            helper.finishAsync();
+        }
+        
+        this._timer= window.setTimeout(timeoutFn, timeout);
+        this._async= true;
+        return this.__ASYNC_MARKER__;
+    },
+
+    assert: function(value, msg)
+    {
+        this.assertTrue(value, msg);
+    },
+    
+    assertEqual: function(value, expected, msg)
+    {
+        if ('object'===typeof(value) && 'object'===typeof(expected) &&
+            value.splice && expected.splice)
+        {
+            if (this.compareArrays(value, expected))
+                return;
+        }
+        else if (value===expected)
+            return;
+
+        this.fail(msg||(this.stringFromValue(value) + '===' +
+                        this.stringFromValue(expected)));
+    },
+
+    assertNotEqual: function(value, expected, msg)
+    {
+        if (value!==expected)
+            return;
+        this.fail(msg||(this.stringFromValue(value) + '!==' +
+                        this.stringFromValue(expected)));
+    },
+
+    assertTrue: function(value, msg)
+    {
+        if (true===value)
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is not true'));
+    },
+
+    assertFalse: function(value, msg)
+    {
+        if (false===value)
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is not false'));
+    },
+
+    assertNull: function(value, msg)
+    {
+        if (null===value)
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is not null'));
+    },
+
+    assertNotNull: function(value, msg)
+    {
+        if (null!==value)
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is null'));
+    },
+
+    assertUndefined: function(value, msg)
+    {
+        if ('undefined'===typeof(value))
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is not undefined'));
+    },
+
+    assertNotUndefined: function(value, msg)
+    {
+        if ('undefined'!==typeof(value))
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is undefined'));
+    },
+
+    assertMatch: function(regex, value, msg)
+    {
+        if (regex.exec(value))
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' did not match /' + regex.source + '/'));
+    },
+
+    assertNotMatch: function(regex, value, msg)
+    {
+        if (!regex.exec(value))
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' matched /' + regex.source + '/'));
+    },
+    
+    assertInstanceOf: function(value, klass, msg)
+    {
+        if (value instanceof klass)
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is not an instance'));
+    },
+
+    assertNotInstanceOf: function(value, klass, msg)
+    {
+        if (!(value instanceof klass))
+            return;
+        this.fail(msg||(this.stringFromValue(value) + ' is an instance'));
+    },
+    
+    fail: function(msg)
+    {
+        if (this._finished)
+            return;
+            
+        msg= msg||'failed';
+        this.report.failed(this.test, this.testName, msg);
+        
+        this.finishAsync();
+        
+        var error= new Error(msg);
+        error.name= 'AssertionError';
+        throw error;
+    },
+    
+    skip: function(why)
+    {
+        if (this._finished)
+            return;
+            
+        why= why||'Test skipped';
+        this.report.skipped(this.test, this.testName, why);
+        
+        this.finishAsync();
+
+        var error= new Error(why);
+        error.name= 'AssertionError';
+        throw error;
+    }
+
+};

data/lib/test/scriptwrapper.html

@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>@title@</title>
+        <script src="/lib/test/TestHelper.js" type="text/javascript" charset="utf-8"></script>
         <script src="/lib/test/Test.js" type="text/javascript" charset="utf-8"></script>
         @scripts@
     </head>

data/lib/test/unittest.html

@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>Unit Tests</title>
+        <script src="/lib/test/TestHelper.js" type="text/javascript" charset="utf-8"></script>
         <script src="/lib/test/Test.js" type="text/javascript" charset="utf-8"></script>
         <script src="/lib/test/HtmlTestReporter.js" type="text/javascript" charset="utf-8"></script>
         <script src="/lib/test/TestRunner.js" type="text/javascript" charset="utf-8"></script>

data/vendor/jsdoc-extras/templates/coherent/publish.js

@@ -72,8 +72,8 @@ function publish(symbolSet) {
 
 	var summary= generateJsonSummary(symbols);
 	
-    // publish.classesIndex = classesTemplate.process(classes); // kept in memory
- 	publish.classesIndex = publishClassListSummary(summary); // kept in memory
+    publish.classesIndex = classesTemplate.process(classes); // kept in memory
+    // publish.classesIndex = publishClassListSummary(summary); // kept in memory
 	
 	var classesJson= publishJsonSummary(summary);
 	IO.saveFile(publish.conf.outDir, "all-classes.json", classesJson);

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-25 00:00:00 -07:00
 default_executable: distil
 dependencies: []
 
@@ -52,6 +57,7 @@ files:
 - lib/tasks/test-task.rb
 - lib/test/HtmlTestReporter.js
 - lib/test/Test.js
+- lib/test/TestHelper.js
 - lib/test/TestReporter.js
 - lib/test/TestRunner.js
 - lib/test/browser.rb
@@ -594,18 +600,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit