distil 0.8.2 → 0.8.4

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.4

data/bin/distil

@@ -41,5 +41,4 @@ if (!File.exists?(project_file))
 end
 
 project= Project.new(project_file, arg_settings)
-project.build_external_projects
-project.build_targets
+project.build

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.8.2"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-17}
   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"]
@@ -26,9 +26,7 @@ Gem::Specification.new do |s|
      "lib/file-types/html-file.rb",
      "lib/file-types/javascript-file.rb",
      "lib/file-types/json-file.rb",
-     "lib/file-types/nib-file.rb",
      "lib/filter.rb",
-     "lib/filters/coherent-asset-filter.rb",
      "lib/filters/css-filter.rb",
      "lib/filters/file-reference-filter.rb",
      "lib/filters/jsl-dependency-filter.rb",
@@ -42,7 +40,6 @@ Gem::Specification.new do |s|
      "lib/tasks/css-task.rb",
      "lib/tasks/javascript-task.rb",
      "lib/tasks/multiple-output-task.rb",
-     "lib/tasks/nib-task.rb",
      "lib/tasks/output-task.rb",
      "lib/tasks/single-output-task.rb",
      "lib/tasks/test-task.rb",

data/lib/file-types/javascript-file.rb

@@ -14,7 +14,7 @@ class JavascriptFile < SourceFile
   def escape_embeded_content(content)
     content.gsub("\\", "\\\\").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
   end
-  
+
   def debug_content(options)
     destination= File.expand_path(options.remove_prefix||"")
     path= @file_path ? @file_path : self.relative_to_folder(destination)

data/lib/file-types/json-file.rb

@@ -6,6 +6,10 @@ class JsonFile < JavascriptFile
     ".json"
   end
 
+  def content_type
+    "js"
+  end
+  
   def minify_content(source)
     super("(#{source})")[1..-3]
   end

data/lib/project.rb

@@ -3,7 +3,8 @@ require "#{$script_dir}/target"
 require 'yaml'
 
 class Project < Configurable
-
+  attr_reader :project_file
+  
   option :tasks, Array
   option_alias :tasks, :task
   
@@ -19,6 +20,12 @@ class Project < Configurable
 
   option :external_projects
 
+  option :distileries, Array
+  option_alias :distileries, :distilleries
+  option_alias :distileries, :distilery
+  option_alias :distileries, :distillery
+  
+  
   def initialize(project_file, settings)
     @@current= self
     @project_file= File.expand_path(project_file)
@@ -48,6 +55,29 @@ class Project < Configurable
     nil
   end
 
+  def build
+    load_distileries
+    build_external_projects
+    build_targets
+  end
+  
+  def load_distileries
+    return if distileries.nil?
+    
+    distileries.each { |d|
+      if (File.exists?(d))
+        require d
+        next
+      end
+      path= Gem.required_location(d, 'distilery.rb')
+      if (path.nil?)
+        puts "Missing distilery: #{d}"
+      end
+      next if path.nil?
+      require path
+    }
+  end
+  
   def build_external_projects
     projects= external_projects
     if (projects.nil?)

data/lib/source-file.rb

@@ -114,16 +114,9 @@ class SourceFile
       next if !f.handles_file(self)
       c= f.filter_content(self, c, options)
     }
-    "#{c}\n"
+    c
   end
     
-  def content_relative_to_destination(destination)
-    content.gsub(/\{\{FILEREF\(([^)]*)\)\}\}/) { |match|
-      file= SourceFile.from_path($1)
-      file.relative_to_folder(destination)
-    }
-  end
-
   def debug_content(options)
     self.filtered_content(options)
   end

data/lib/target.rb

@@ -18,6 +18,10 @@ class Target < Configurable
     @extras.each { |task_name, task_settings|
       next if (tasks && !tasks.include?(task_name))
       t= Task.by_name(task_name)
+      if (t.nil?)
+        error("Unknown task: #{task_name}")
+        next
+      end
       @tasks << t.new(self, task_settings)
     }
 

data/lib/task.rb

@@ -117,6 +117,9 @@ class Task < Configurable
     }
     oldest_product_modification_time= product_modification_times.max
     
+    stat= File.stat(Project.current.project_file)
+    return (@need_to_build=true) if stat.mtime > oldest_product_modification_time
+
     @assets.each { |a|
       stat= File.stat(a)
       return (@need_to_build=true) if stat.mtime > oldest_product_modification_time
@@ -164,7 +167,6 @@ class Task < Configurable
     
     folders.sort!
     folders.each { |f|
-      # puts "#{File.join(remove_prefix, f)} => #{File.join(output_folder, f)}"
       src_folder= remove_prefix ? File.join(remove_prefix, f) : f
       src_folder= SourceFile.path_relative_to_folder(File.expand_path(src_folder), output_folder)
       
@@ -172,8 +174,6 @@ class Task < Configurable
       next if File.exists?(target_folder)
       File.symlink src_folder, target_folder
     }
-    
-    # puts "#{task_name}: folder=#{folders.inspect}"
   end
   
   def copy_assets
@@ -189,51 +189,7 @@ class Task < Configurable
       symlink_assets
     end
   end
-  
-  def copy_assets_orig
-    # puts "\nincluded:"
-    # @included_files.each { |f| puts f.file_path }
-    # 
-    # puts "\nordered:"
-    # @ordered_files.each { |f| puts f.file_path }
-    # puts "\nassets:"
-    # assets.each { |a| puts a.file_path }
-    
-    folders= assets.map { |a|
-      short_folder_name= File.dirname(a.file_path).split("/")[0]
-      if ("."==short_folder_name)
-        [a.file_path, a.relative_to_folder(output_folder)]
-      else      
-        short_folder_regex= /.*\/#{Regexp.escape(short_folder_name)}\//
-        # puts "#{a.file_path}: #{short_folder_regex.inspect}: #{a.relative_to_folder(@options.output_folder)}"
-        relative_folder_name= (a.relative_to_folder(output_folder))[short_folder_regex]
-        [short_folder_name, relative_folder_name]
-      end
-    }
-    folders.compact!
-    folders.uniq!
     
-    # puts "\nfolders:"
-    # folders.each { |f| puts f.inspect }
-    
-    folders.each { |f|
-      target_folder= "#{output_folder}/#{f[0]}"
-      FileUtils.rm target_folder if File.symlink?(target_folder)
-      # FileUtils.rm_r target_folder if File.exists?(target_folder)
-    }
-    
-    if ("release"==mode)
-      assets.each { |a| a.copy_to(output_folder) }
-    else
-      folders.each { |f|
-        # puts "#{f[0]}"
-        target_folder= "#{output_folder}/#{f[0]}"
-        source_folder= f[1]
-        File.symlink source_folder, target_folder
-      }
-    end
-  end
-  
   def cleanup
   end
   

data/lib/tasks/javascript-task.rb

@@ -25,6 +25,7 @@ class JavascriptTask < SingleOutputTask
   
   def initialize(target, options)
     super(target, options)
+    @concatenation_join_string = "\n/*jsl:ignore*/;/*jsl:end*/\n"
     
     if (generate_docs)
       @products << File.join(doc_folder, "index.html")
@@ -96,7 +97,10 @@ class JavascriptTask < SingleOutputTask
     tmp= Tempfile.new("jsdoc.conf")
     
     template= File.read(@options.jsdoc_conf)
-    doc_files= @included_files.map { |f| "\"#{f.file_path}\"" }
+    doc_files= @included_files.map { |f|
+      p= f.file_path || f.relative_to_folder(options.remove_prefix||"")
+      "\"#{p}\""
+    }
     
     conf= replace_tokens(template, {
                     "DOC_FILES"=>doc_files.join(",\n"),

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

@@ -21,6 +21,8 @@ class MultipleOutputTask < OutputTask
     
     # @options.output_folder= prefix
     FileUtils.mkdir_p(output_folder)
+
+    @concatenation_join_string= ""
     
     @prefix= prefix
     @concat= Hash.new
@@ -53,9 +55,15 @@ class MultipleOutputTask < OutputTask
       next if @files_to_exclude.include?(depend)
       
       concat << depend.filtered_content(options)
+      if (!concat.empty?)
+        concat << @concatenation_join_string||""
+      end
       debug << depend.debug_content(options)
     }
     
+    if (!concat.empty?)
+      concat << @concatenation_join_string||""
+    end
     concat << file.filtered_content(options)
     debug << file.debug_content(options)
     

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

@@ -22,6 +22,7 @@ class SingleOutputTask < OutputTask
     @name_gz= "#{prefix}#{target_name}.#{type}.gz"
     @name_debug= "#{prefix}#{target_name}-debug.#{type}"
 
+    @concatenation_join_string= ""
     @products= [@name_concat, @name_min, @name_gz, @name_debug]
     
     @concat = ""
@@ -30,6 +31,9 @@ class SingleOutputTask < OutputTask
 
   def process_files
     @included_files.each { |f|
+      if (!@concat.empty?)
+        @concat << @concatenation_join_string||""
+      end
       @concat << f.filtered_content(options)
       @debug << f.debug_content(options)
     }

data/lib/tasks/test-task.rb

@@ -277,4 +277,8 @@ class TestTask < Task
     @server.shutdown
   end
   
+  def need_to_build
+    true
+  end
+  
 end

data/lib/test/browser.rb

@@ -33,7 +33,7 @@ class FirefoxBrowser < Browser
   end
 
   def visit(url)
-    system("open -a \"Firefox 3.5.app\" '#{url}'") if macos?
+    system("open -a \"Firefox.app\" '#{url}'") if macos?
     system("#{@path} #{url}") if windows? 
     system("firefox #{url}") if linux?
   end

data/vendor/jsdoc-extras/plugins/distil-plugin.js

@@ -98,6 +98,19 @@ JSDOC.PluginManager.registerPlugin("DistilPlugin", {
     onDocCommentSrc: function(comment)
     {
         var src = comment.src;
+        var _this= this;
+        // if (/@method\b/.test(src))
+        //     print("Method: previous symbol=" + this.lastSymbol.name);
+        
+        function addScope(match, methodName)
+        {
+            if (_this.lastSymbol)
+                methodName= _this.lastSymbol.alias + "#" + methodName;
+            var tag= "@name "+methodName + "\n@function\n@description";
+            print("Replacing: \""+match+"\" with \""+tag+"\"");
+            return tag;
+        }
+        src= src.replace(/@method\s+(\S+)/, addScope);
 
         var indent = "";
         var indentLen = 0;

data/vendor/jsdoc-extras/plugins/interface-plugin.js

@@ -7,7 +7,6 @@ JSDOC.PluginManager.registerPlugin("InterfacePlugin", {
             return;
         if (symbol.comment.getTag("interface").length)
             symbol.isInterface= true;
-        symbol.implementedInterfaces= symbol.comment.getTag("implements");
     },
     
     onDocCommentTags: function(comment)
@@ -30,6 +29,9 @@ JSDOC.PluginManager.registerPlugin("InterfacePlugin", {
             case 'interface':
                 tag.desc= tag.nibbleName(tag.desc);
                 break;
+            case 'implements':
+                tag.desc= tag.nibbleName(tag.desc);
+                break;
         }
     }
     

data/vendor/jsdoc-extras/templates/coherent/class.tmpl

@@ -70,16 +70,14 @@
     					{+ancestors.join(" : ")+}.
 					<p/>
 				</if>
-				<if test="data.implementedInterfaces.length">
-					{!
-					    var implementedInterfaces= [];
-					    
-					    function linkToInterface(i)
-					    {
-					        return new Link.toSymbol(i);
-					    }
-					    implementedInterfaces= data.implementedInterfaces.map(linkToInterface);
-					!}
+				{!
+				    function linkToInterface(i)
+				    {
+				        return new Link().toSymbol(i.name);
+				    }
+				    var implementedInterfaces= data.comment.getTag("implements").map(linkToInterface);
+				!}
+				<if test="implementedInterfaces.length">
 				    <p>
     					<span class="label">Conforms to</span>
     					{+implementedInterfaces.join(", ")+}.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -08:00
+date: 2010-01-17 00:00:00 -08:00
 default_executable: distil
 dependencies: []
 
@@ -33,9 +33,7 @@ files:
 - lib/file-types/html-file.rb
 - lib/file-types/javascript-file.rb
 - lib/file-types/json-file.rb
-- lib/file-types/nib-file.rb
 - lib/filter.rb
-- lib/filters/coherent-asset-filter.rb
 - lib/filters/css-filter.rb
 - lib/filters/file-reference-filter.rb
 - lib/filters/jsl-dependency-filter.rb
@@ -49,7 +47,6 @@ files:
 - lib/tasks/css-task.rb
 - lib/tasks/javascript-task.rb
 - lib/tasks/multiple-output-task.rb
-- lib/tasks/nib-task.rb
 - lib/tasks/output-task.rb
 - lib/tasks/single-output-task.rb
 - lib/tasks/test-task.rb

data/lib/file-types/nib-file.rb

@@ -1,13 +0,0 @@
-require "#{$script_dir}/file-types/javascript-file.rb"
-
-class NibFile < JavascriptFile
-
-  def self.extension
-    ".jsnib"
-  end
-
-  def content_type
-    "js"
-  end
-
-end

data/lib/filters/coherent-asset-filter.rb

@@ -1,65 +0,0 @@
-require "#{$script_dir}/filters/file-reference-filter"
-
-$include_regex= /NIB\.asset\(['"]([^)]+)['"]\)/
-$include_regex_old= /INC\(['"]([^)]+)['"]\)/
-
-class CoherentAssetFilter < FileReferenceFilter
-  
-  def handles_file(file)
-    return [".js"].include?(file.extension)
-  end
-  
-  def preprocess_content(file, content)
-    content= content.split("\n")
-    
-    line_num=0
-    
-    content.each { |line|
-      
-      line_num+=1
-      
-      line.gsub!($include_regex) { |match|
-
-        import_file= File.expand_path(File.join(file.parent_folder, $1))
-
-        if (!File.exists?(import_file))
-          file.error "Missing import file: #{$1}", line_num
-          "NIB.asset('#{$1}')"
-        else
-          asset= SourceFile.from_path(import_file)
-          file.add_asset(asset);
-          if (file.can_embed_as_content(asset))
-            "NIB.asset('#{file_reference(asset)}','#{content_reference(asset)}')"
-          else
-            "NIB.asset('#{file_reference(asset)}')"
-          end
-        end
-        
-      }
-
-      line.gsub!($include_regex_old) { |match|
-
-        import_file= File.expand_path(File.join(file.parent_folder, $1))
-
-        if (!File.exists?(import_file))
-          file.error "Missing import file: #{$1}", line_num
-          "INC('#{$1}')"
-        else
-          asset= SourceFile.from_path(import_file)
-          file.add_asset(asset);
-          if (file.can_embed_as_content(asset))
-            "INC('#{file_reference(asset)}','#{content_reference(asset)}')"
-          else
-            "INC('#{file_reference(asset)}')"
-          end
-        end
-        
-      }
-      
-    }
-    
-    content.join("\n")
-  end
-
-end
-

data/lib/tasks/nib-task.rb

@@ -1,83 +0,0 @@
-require "#{$script_dir}/tasks/multiple-output-task.rb"
-require "#{$script_dir}/tasks/javascript-task.rb"
-
-class NibTask < MultipleOutputTask
-
-  def self.task_name
-    "jsnib"
-  end
-
-  def source_type
-    "js"
-  end
-  
-  def output_type
-    "jsnib"
-  end
-  
-  # NibTask handles files that end in .jsnib
-  def handles_file?(file_name)
-    "#{file_name}"[/\.jsnib$/]
-  end
-
-  def validate_file(file)
-
-    return if (!File.exists?($lint_command))
-        
-    tmp= Tempfile.new("jsl.conf")
-    
-    conf_files= [ "jsl.conf",
-                  "#{ENV['HOME']}/.jsl.conf",
-                  @options.jsl_conf
-                ]
-
-    jsl_conf= conf_files.find { |f| File.exists?(f) }
-
-    tmp << File.read(jsl_conf)
-    tmp << "\n"
-    
-    external_projects.each { |project|
-      tmp << "+include #{project["include"]}\n"
-    }
-    
-    file.dependencies.each { |f|
-      tmp << "+process #{f}\n"
-    }
-    
-    tmp << "+process #{file}\n"
-    
-    tmp.close()
-    
-    command= "#{$lint_command} -nologo -nofilelisting -conf #{tmp.path}"
-    
-    stdin, stdout, stderr= Open3.popen3(command)
-    stdin.close
-    output= stdout.read
-    errors= stderr.read
-
-    tmp.delete
-    
-    output= output.split("\n")
-    summary= output.pop
-    match= summary.match(/(\d+)\s+error\(s\), (\d+)\s+warning\(s\)/)
-    if (match)
-        @target.error_count+= match[1].to_i
-        @target.warning_count+= match[2].to_i
-    end
-    
-    output= output.join("\n")
-    
-    if (!output.empty?)
-        puts output
-        puts
-    end
-      
-  end
-
-  def validate_files
-    @included_files.each { |f|
-      validate_file(f)
-    }
-  end
-  
-end