distil 0.12.2 → 0.12.3

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.12.3

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.12.2"
+  s.version = "0.12.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-07-27}
   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"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      "assets/distil.js",
      "bin/distil",
      "distil.gemspec",
+     "distil.tmproj",
      "lib/distil.rb",
      "lib/distil/browser.rb",
      "lib/distil/configurable.rb",
@@ -740,14 +741,14 @@ 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.6}
+  s.rubygems_version = %q{1.3.7}
   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
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
     else
       s.add_dependency(%q<json>, [">= 1.4.3"])

data/distil.tmproj

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>currentDocument</key>
+	<string>lib/distil/product.rb</string>
+	<key>documents</key>
+	<array>
+		<dict>
+			<key>expanded</key>
+			<true/>
+			<key>name</key>
+			<string>distil</string>
+			<key>regexFolderFilter</key>
+			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
+			<key>sourceDirectory</key>
+			<string></string>
+		</dict>
+	</array>
+	<key>fileHierarchyDrawerWidth</key>
+	<integer>270</integer>
+	<key>metaData</key>
+	<dict>
+		<key>lib/distil/product.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>7</integer>
+				<key>line</key>
+				<integer>79</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>42</integer>
+		</dict>
+		<key>lib/distil/product/concatenated.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>22</integer>
+				<key>line</key>
+				<integer>31</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>2</integer>
+		</dict>
+		<key>lib/distil/project.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>4</integer>
+				<key>line</key>
+				<integer>21</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>lib/distil/project/distil-project.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>7</integer>
+				<key>line</key>
+				<integer>115</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>78</integer>
+		</dict>
+		<key>lib/distil/project/external-project.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>35</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>lib/distil/target.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>204</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>174</integer>
+		</dict>
+	</dict>
+	<key>openDocuments</key>
+	<array>
+		<string>lib/distil/product.rb</string>
+		<string>lib/distil/product/concatenated.rb</string>
+		<string>lib/distil/project.rb</string>
+		<string>lib/distil/project/distil-project.rb</string>
+		<string>lib/distil/target.rb</string>
+		<string>lib/distil/project/external-project.rb</string>
+	</array>
+	<key>showFileHierarchyDrawer</key>
+	<false/>
+	<key>windowFrame</key>
+	<string>{{560, 300}, {1095, 878}}</string>
+</dict>
+</plist>

data/lib/distil/product/minified.rb

@@ -17,7 +17,16 @@ module Distil
       @up_to_date= true
       
     	# Run the Y!UI Compressor
-    	system "java -jar #{COMPRESSOR} \"#{concatenated_name}\" -o \"#{filename}\""
+    	if (!File.exist?(concatenated_name))
+    	  error("Missing source file for minify: #{concatenated_name}")
+    	  return
+  	  end
+  	  
+    	result= system "java -jar #{COMPRESSOR} \"#{concatenated_name}\" -o \"#{filename}\""
+    	if (!result)
+    	  error("Failed to minify: #{concatenated_name}")
+    	  return
+  	  end
     	
     	if 'css'==extension
     		buffer= File.read(filename)

data/lib/distil/product.rb

@@ -7,6 +7,8 @@ module Distil
     option :compressed_name, OutputPath, "$(name).$(extension).gz", :aliases=>['compressed']
 
     option :force, false
+
+    include ErrorReporter
     
     attr_accessor :assets, :target, :join_string
     class_attr :extension
@@ -75,6 +77,10 @@ module Distil
       raise NotImplementedError.new("No write_output method has been defined for this product.")
     end
     
+    def clean
+      FileUtils.rm filename if File.exist? filename
+    end
+    
     def relative_path(file)
       file=SourceFile.from_path(file) if file.is_a?(String)
       

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

@@ -109,6 +109,13 @@ module Distil
       return targets.all? { |target| target.up_to_date }
     end
 
+    def clean
+      # clean_external_projects
+      targets.each { |target|
+        target.clean
+      }
+    end
+    
     def build
       build_external_projects
       build_targets

data/lib/distil/project.rb

@@ -18,6 +18,9 @@ module Distil
     def build
     end
 
+    def clean
+    end
+    
     def self.fetch_project_using_git(options = {})
       uri= options["repository"]
       path= options["path"]

data/lib/distil/target.rb

@@ -3,7 +3,7 @@ module Distil
   class Target < Configurable
     include ErrorReporter
     
-    attr_accessor :project, :assets
+    attr_accessor :project, :assets, :file_aliases
     
     option :version, String
     option :name, String
@@ -32,6 +32,7 @@ module Distil
       @probed= Set.new
       @contents= {}
       @asset_aliases= {}
+      @file_aliases= {}
       
       if !include_files
         self.include_files= FileSet.new
@@ -135,6 +136,10 @@ module Distil
       @files
     end
 
+    def add_file_alias(original, full_path)
+      @file_aliases[original]= full_path
+    end
+    
     def symlink_assets
       folders= []
 
@@ -199,6 +204,11 @@ module Distil
       products.all? { |p| p.up_to_date }
     end
     
+    def clean
+      puts "\n#{name}:\n\n"
+      products.each { |p| p.clean }
+    end
+    
     def build
       puts "\n#{name}:\n\n"
 

data/lib/distil/task/jsl-dependency-task.rb

@@ -28,6 +28,7 @@ module Distil
           else
             dependency= target.find_file($1, file)
             if (dependency)
+              target.add_file_alias($1, dependency.full_path)
               file.add_dependency dependency
             else
               file.error "Missing import file: #{$1}", line_num

data/lib/distil/task/validate-js-task.rb

@@ -40,20 +40,17 @@ module Distil
       #   tmp << "+define #{g}\n"
       # }
       
-      # add aliases
-      target.project.external_projects.each { |project|
-        import_file= project.product_name(:import, 'js')
-        next if !File.exist?(import_file)
-        tmp << "+alias #{project.name} #{import_file}\n"
+      target.file_aliases.each { |original, full_path|
+        next if !File.exist?(full_path)
+        tmp << "+alias #{original} #{full_path}\n"
       }
-    
+      
       files.each { |f|
         next if !handles_file(f)
         tmp << "+process #{f}\n"
       }
 
       tmp.close()
-
       command= "#{LINT_COMMAND} -nologo -nofilelisting -conf #{tmp.path}"
 
       stdin, stdout, stderr= Open3.popen3(command)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 12
-  - 2
-  version: 0.12.2
+  - 3
+  version: 0.12.3
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -07:00
+date: 2010-07-27 00:00:00 -07:00
 default_executable: distil
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -45,6 +48,7 @@ files:
 - assets/distil.js
 - bin/distil
 - distil.gemspec
+- distil.tmproj
 - lib/distil.rb
 - lib/distil/browser.rb
 - lib/distil/configurable.rb
@@ -771,23 +775,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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