distil 0.14.0.i → 0.14.0

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.14.0.i"
+  s.version = "0.14.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2011-03-03}
+  s.date = %q{2011-03-17}
   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", "jsl"]
   s.extensions = ["vendor/extconf.rb"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "assets/distil.js",
+     "assets/mime.types",
      "bin/distil",
      "bin/jsl",
      "distil.gemspec",
@@ -758,17 +759,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<treetop>, [">= 1.4.8"])
       s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"])
     else
       s.add_dependency(%q<json>, [">= 1.4.3"])
+      s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
       s.add_dependency(%q<treetop>, [">= 1.4.8"])
       s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.4.3"])
+    s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
     s.add_dependency(%q<treetop>, [">= 1.4.8"])
     s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])

data/lib/distil/javascript-file-validator.rb

@@ -80,7 +80,7 @@ module Distil
         puts
       end
 
-      raise BuildFailure if errors>0 || warnings>0
+      raise BuildFailure if errors>0 # || warnings>0
     end
   end
   

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

@@ -14,7 +14,7 @@ module Distil
     }.gsub(/^\s*/, '')
     
     def can_embed_as_content(file)
-      ["css", "html", "json"].include?(file.extension)
+      ["css", "html", "json", "sql"].include?(file.extension)
     end
 
     def escape_embeded_content(file)
@@ -72,6 +72,9 @@ module Distil
         
         if (APPLICATION_TYPE==project.project_type)
           output.puts File.read(BOOTSTRAP_SCRIPT)
+          if (project.synchronise_assets)
+            output.puts "\n\ndistil.sync= true;\n\n"
+          end
           output.puts FILE_SEPARATOR
         end
 
@@ -85,7 +88,8 @@ module Distil
           content= f.rewrite_content_relative_to_path(nil)
           next if !content || content.empty?
           
-          output.puts content
+          output.puts content.strip
+          output.puts "\n"
           output.puts FILE_SEPARATOR
         }
 
@@ -99,8 +103,8 @@ module Distil
 
           next if !content || content.empty?
             
-          output.puts content
-          output.puts ""
+          output.puts content.strip
+          output.puts "\n"
           output.puts FILE_SEPARATOR
         }
         
@@ -120,6 +124,9 @@ module Distil
         
         if (APPLICATION_TYPE==project.project_type)
           output.puts File.read(BOOTSTRAP_SCRIPT)
+          if (project.synchronise_assets)
+            output.puts "\n\ndistil.sync= true;\n\n"
+          end
         end
         
         if project.global_export

data/lib/distil/project.rb

@@ -26,9 +26,12 @@ module Distil
     attr_reader :dependency_aliases
     attr_reader :doc_src_path
     attr_reader :doc_output_path
+    attr_reader :synchronise_assets
     
     alias_config_key :project_type, :type
-
+    alias_config_key :synchronise_assets, :synchronize_assets
+    alias_config_key :synchronise_assets, :sync
+    
     def self.find(dir=nil)
       cwd= Dir.pwd
       dir ||= Dir.pwd
@@ -80,6 +83,8 @@ module Distil
       @languages= []
       @additional_globals= []
       @name= File.basename(@folder, ".*")
+      @raw_sources = []
+      @synchronise_assets = false
       
       ignore_warnings= false
 
@@ -195,16 +200,29 @@ module Distil
     end
     
     def build
-      libraries.each { |lib|
-        lib.build
-      }
-
+      FileUtils.mkdir_p(output_path)
+      
+      if @parent.nil?
+        libraries.each { |lib|
+          lib.build
+        }
+      end
+      
       puts "\n#{name}:\n\n" unless @parent
+
+      failed = false
       
-      subprojects.each { |subproject|
-        subproject.build
+      @subprojects.each { |subproject|
+        begin
+          subproject.build
+        rescue BuildFailure
+          failed = true
+        end
       }
 
+      # Don't keep going if one of the sub-projects failed.
+      raise BuildFailure if failed
+      
       compute_source_files
       return if up_to_date?
       

data/lib/distil/source-file/javascript-file.rb

@@ -3,6 +3,7 @@ module Distil
   JSL_IMPORT_REGEX= /\/\*jsl:import\s+([^\*]*)\*\//
   NIB_ASSET_REGEX= /(NIB\.asset(?:Url)?)\(['"]([^)]+)['"]\)/
   NIB_DECLARATION_REGEX= /NIB\(\s*(["'])(\w(?:\w|-)*)\1\s*,/
+  DISTIL_ASSET_REGEX= /(distil.asset(?:Url)?)\(['"]([^)]+)['"]\)/
   
   class JavascriptFile < SourceFile
     include YuiMinifiableFile
@@ -31,7 +32,15 @@ module Distil
     
     def rewrite_content_relative_to_path(path)
       text= content.gsub(JSL_IMPORT_REGEX, '')
-      text.gsub(NIB_ASSET_REGEX) do |match|
+      text= text.gsub(NIB_ASSET_REGEX) do |match|
+          asset= project.file_from_path(File.join(dirname, $2))
+          if asset
+            "#{$1}(\"#{asset.relative_path}\")"
+          else
+            match
+          end
+      end
+      text= text.gsub(DISTIL_ASSET_REGEX) do |match|
           asset= project.file_from_path(File.join(dirname, $2))
           if asset
             "#{$1}(\"#{asset.relative_path}\")"
@@ -72,14 +81,23 @@ module Distil
           end
         end
         
-        line.scan(NIB_ASSET_REGEX) do |match|
-          asset= project.file_from_path(File.join(dirname, $1))
+        line.scan(DISTIL_ASSET_REGEX) do |match|
+          asset= project.file_from_path(File.join(dirname, $2))
           if asset
             add_asset(asset)
           else
             error "Missing asset file: #{$1}", line_num
           end
         end
+
+        line.scan(NIB_ASSET_REGEX) do |match|
+          asset= project.file_from_path(File.join(dirname, $2))
+          if asset
+            add_asset(asset)
+          else
+            error "Missing asset file: #{$2}", line_num
+          end
+        end
       end
 
       if is_nib_file

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  hash: 82
-  prerelease: 7
+  hash: 39
+  prerelease: 
   segments: 
   - 0
   - 14
   - 0
-  - i
-  version: 0.14.0.i
+  version: 0.14.0
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,9 +35,24 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
+  name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
+        version: "1.16"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,11 +64,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: treetop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +80,11 @@ dependencies:
         - 8
         version: 1.4.8
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,7 +96,7 @@ dependencies:
         - 1
         version: 1.1.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 description: A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit
 email: 
 executables: 
@@ -97,6 +111,7 @@ files:
 - Rakefile
 - VERSION
 - assets/distil.js
+- assets/mime.types
 - bin/distil
 - bin/jsl
 - distil.gemspec
@@ -846,14 +861,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: