distil 0.11.8 → 0.12.0

data/VERSION

@@ -1 +1 @@
-0.11.8
+0.12.0

data/assets/distil.js

@@ -246,7 +246,13 @@
     var path= module.path;
     
     for (var i=0, len=files.length; i<len; ++i)
-      loadResource(path + files[i], null, null, null, resource);
+    {
+      // loadResource(path + files[i], null, null, null, resource);
+      if (distil.sync && '.js'===files[i].slice(-3).toLowerCase())
+        document.write('<script src="'+path+files[i]+'"></script>');
+      else
+        loadResource(path + files[i], null, null, null, resource);
+    }
   };
   
   distil.module= function(name, def)

data/bin/distil

@@ -20,12 +20,11 @@ ARGV.each { |v|
   end
   
   v= v.gsub(/^-+/, '')
-  v.gsub!("-", "_")
   
   key,value= v.split("=")
-  if (!value)
-    value= true
-  end
+  key.gsub!("-", "_")
+  
+  value=true if !value
   
   if ("f"==key || "file"==key || "buildfile"==key)
     project_file= value

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.11.8"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-06-24}
+  s.date = %q{2010-07-08}
   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"]

data/lib/distil/configurable.rb

@@ -27,7 +27,7 @@ class Configurable
     keys= @@options.keys
     values= @@options.map { |k,v| convert_type(v[:type], v[:value]) }
   
-    s= Struct.new(*keys).new(*values)
+    s= @options ? @options : (@options=Struct.new(*keys).new(*values))
     return s if !settings
   
     setting_keys= settings.keys.map { |key| key.to_s }
@@ -61,6 +61,7 @@ class Configurable
 
     }
 
+    @extras.merge!(settings)
     s
   end
 
@@ -125,11 +126,11 @@ class Configurable
   end
 
   def initialize(options={}, parent=nil)
+    @extras= Hash.new
     if (parent.is_a?(Configurable))
       parent_options= parent.options
     end
-    @options= get_options(options, parent_options)
-    @extras= options
+    get_options(options, parent_options)
   end
   
   private

data/lib/distil/product/javascript-product.rb

@@ -7,7 +7,7 @@ module Distil
     
     option :global_export
     option :additional_globals, [], :aliases=>['globals']
-
+    
     def before_externals(f)
       f.puts("/*#nocode+*/")
       f.puts(bootstrap_source) if bootstrap
@@ -80,6 +80,7 @@ EOS
     extension "js"
 
     option :global_export
+    option :synchronous_load, false, :aliases=>['sync']
   
     def write_output
       return if up_to_date
@@ -114,7 +115,7 @@ EOS
           f.write("/*jsl:import #{relative_path(file)}*/\n")
         }
         f.write(<<-EOS)
-//distil.debug= true;
+distil.sync= #{synchronous_load ? 'true' : 'false'};
 
 distil.module('#{target.name}', {
   folder: '',

data/lib/distil/project/distil-project.rb

@@ -2,7 +2,7 @@ module Distil
   
   class DistilProject < Project
     
-    attr_reader :project_file
+    attr_reader :project_file, :targets
 
     option :ignore_warnings, false
 
@@ -11,30 +11,35 @@ module Distil
   
   
     def initialize(project_file, settings={}, parent=nil)
-      @project_file= File.expand_path(project_file)
-      @projects_by_name={}
-
-      project_info= YAML.load_file(@project_file)
-      project_info.merge!(settings)
-      project_info["path"]= File.dirname(@project_file)
       
       begin
 
+        @project_file= File.expand_path(project_file)
+        @projects_by_name={}
+
+        project_info= YAML.load_file(@project_file)
+        project_info["path"]= File.dirname(@project_file)
+
         super(project_info, parent)
-        load_external_projects
+        get_options(settings, parent)
 
+        FileUtils.mkdir_p(output_folder)
+
+        load_external_projects
+        find_targets
+        load_distileries
+        
       rescue ValidationError => err
         puts "#{APP_NAME}: #{SourceFile.path_relative_to_folder(project_file, Dir.pwd)}: #{err.message}\n"
         exit 1
       end
+      
     end
 
-    def targets
-      @targets if @targets
-      
+    def find_targets
       @targets= []
       target_list= @extras['targets']
-      
+    
       if !target_list
         @targets << Target.new(@extras.clone, self)
         return @targets
@@ -44,7 +49,7 @@ module Distil
         Target.new(target, self)
       }
     end
-
+    
     def load_external_projects
       return if !external_projects
       projects= []
@@ -82,14 +87,6 @@ module Distil
       server.start
     end
     
-    def build
-      FileUtils.mkdir_p(output_folder)
-      load_distileries
-      targets
-      build_external_projects
-      build_targets
-    end
-
     def load_distileries
       return if distileries.nil?
     
@@ -106,17 +103,23 @@ module Distil
         require path
       }
     end
-  
+
+    def up_to_date
+      return false if !external_projects.all?{ |project| project.up_to_date }
+      return targets.all? { |target| target.up_to_date }
+    end
+
+    def build
+      build_external_projects
+      build_targets
+    end
+
     def build_external_projects
       external_projects.each { |project|
         project.build
       }
     end
 
-    def up_to_date
-      targets.all? { |target| target.up_to_date }
-    end
-    
     def build_targets
       targets.each { |target|
         target.build

data/lib/distil/project/external-project.rb

@@ -19,7 +19,7 @@ module Distil
       end
       super(config, parent)
       
-      @options.output_folder= File.join(parent.output_folder, name)
+      self.output_folder= File.join(parent.output_folder, name)
     end
 
     def product_name(product_type, extension)
@@ -28,6 +28,11 @@ module Distil
       Interpolated.value_of(name, info)
     end
     
+    def up_to_date
+      build
+      true
+    end
+    
     def build
       wd= Dir.getwd
       Dir.chdir(path)

data/lib/distil/project.rb

@@ -11,6 +11,10 @@ module Distil
     option :mode, DEBUG_MODE, :valid_values=>[DEBUG_MODE, RELEASE_MODE]
     option :force
     
+    def up_to_date
+      true
+    end
+    
     def build
     end
 

data/lib/distil/source-file.rb

@@ -136,7 +136,6 @@ module Distil
     end
   
     def dependencies
-      content
       @dependencies
     end
 
@@ -146,7 +145,6 @@ module Distil
     end
   
     def assets
-      content
       @assets
     end
   

data/lib/distil/target.rb

@@ -41,7 +41,7 @@ module Distil
         self.exclude_files= FileSet.new
       end
 
-      @options.global_export=name if true==global_export
+      @options.global_export=name.as_identifier if true==global_export
 
       projects= []
       include_projects.each { |name|
@@ -165,6 +165,8 @@ module Distil
         product_folder= File.join(project.output_folder, f)
         
         next if File.exists?(product_folder)
+        FileUtils.rm product_folder if File.symlink?(product_folder)
+        
         File.symlink src_folder, product_folder
       }
     end
@@ -206,9 +208,7 @@ module Distil
 
       if !up_to_date
         tasks.each { |t| t.process_files(files) }
-      
         products.each { |p| p.write_output }
-      
         build_assets
       end
       
@@ -216,19 +216,7 @@ module Distil
     end
     
     def find_file(file, source_file=nil)
-      return nil if project.external_projects.nil?
-      
-      parts= file.split(File::SEPARATOR)
-      project_name= parts[0]
-
-      external_project= project.external_project_with_name(project_name)
-      return nil if !external_project
-
-      if 1==parts.length
-        return SourceFile::from_path(external_project.product_name(:import, source_file.extension))
-      else
-        return SourceFile::from_path(File.join(external_project.source_folder, *parts[1..-1]))
-      end
+      project.find_file(file, source_file)
     end
     
     def get_content_for_file(file)

data/lib/distil.rb

@@ -34,6 +34,14 @@ def exist?(path, file)
   File.file?(File.join(path, file))
 end
 
+class String
+  def as_identifier
+    word= self.to_s.gsub(/(?:^|\W)(.)/) { $1.upcase }
+    word[0..0].downcase + word[1..-1]
+  end
+end
+
+
 module Distil
   
   FRAMEWORK_TYPE = "framework"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 8
-  version: 0.11.8
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -07:00
+date: 2010-07-08 00:00:00 -07:00
 default_executable: distil
 dependencies: 
 - !ruby/object:Gem::Dependency