distil 0.12.0 → 0.12.1

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

data/assets/distil.js

@@ -267,7 +267,15 @@
       return;
     }
 
-    def.path= currentResource.path + def.folder;
+    if (distil.sync)
+    {
+      var url= getRunningScriptSource();
+      var lastSlash= url.lastIndexOf('/');
+      def.path= url.substring(0,lastSlash+1) + def.folder;
+    }
+    else
+      def.path= currentResource.path + def.folder;
+      
     if ('/'!==def.path.slice(-1))
       def.path+='/';
       

data/distil.gemspec

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

@@ -39,6 +39,10 @@ class String
     word= self.to_s.gsub(/(?:^|\W)(.)/) { $1.upcase }
     word[0..0].downcase + word[1..-1]
   end
+  def starts_with?(prefix)
+    prefix = prefix.to_s
+    self[0, prefix.length] == prefix
+  end
 end
 
 

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

@@ -114,8 +114,12 @@ EOS
         files.each { |file|
           f.write("/*jsl:import #{relative_path(file)}*/\n")
         }
+        
+        if (APP_TYPE==target.target_type)
+          f.puts "distil.sync= #{Kernel::Boolean(synchronous_load)};"
+        end
+        
         f.write(<<-EOS)
-distil.sync= #{synchronous_load ? 'true' : 'false'};
 
 distil.module('#{target.name}', {
   folder: '',

data/lib/distil/product/minified.rb

@@ -17,7 +17,7 @@ module Distil
       @up_to_date= true
       
     	# Run the Y!UI Compressor
-    	system "java -jar #{COMPRESSOR} #{concatenated_name} -o #{filename}"
+    	system "java -jar #{COMPRESSOR} \"#{concatenated_name}\" -o \"#{filename}\""
     	
     	if 'css'==extension
     		buffer= File.read(filename)

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

@@ -18,7 +18,7 @@ module Distil
         config["source_folder"]= "build/$(mode)"
       end
       super(config, parent)
-      
+
       self.output_folder= File.join(parent.output_folder, name)
     end
 
@@ -47,7 +47,7 @@ module Distil
       FileUtils.rm(output_folder) if File.symlink?(output_folder)
       
       if DEBUG_MODE==mode
-        FileUtils.symlink(File.expand_path(source_folder), output_folder)
+        FileUtils.symlink(SourceFile.path_relative_to_folder(File.expand_path(source_folder), File.dirname(output_folder)), output_folder)
       else
         FileUtils.cp_r(File.expand_path(source_folder), output_folder)
       end

data/lib/distil/target.rb

@@ -141,33 +141,29 @@ module Distil
       assets.each { |a|
         path= a.file_path || a.relative_to_folder(source_folder)
 
+        next if File.expand_path(path).starts_with?(project.output_folder)
+        
         parts= File.dirname(path).split(File::SEPARATOR)
         if ('.'==parts[0])
-          product_path= File.join(output_folder, path)
+          product_path= File.join(project.output_folder, path)
           FileUtils.rm product_path if File.exists? product_path
-          File.symlink a.relative_to_folder(output_folder), product_path
+          File.symlink a.relative_to_folder(project.output_folder), product_path
           next
         end
 
-        for i in (0..parts.length-1)
-          f= parts[0..i].join(File::SEPARATOR)
-          if !folders.include?(f)
-            folders << f
-          end
-        end
-      
+        folders << parts[0] if !folders.include?(parts[0])
       }
     
-      folders.sort!
-      
       folders.each { |f|
         src_folder= File.join(source_folder, f)
         product_folder= File.join(project.output_folder, f)
+
+        relative_folder= SourceFile.path_relative_to_folder(src_folder, project.output_folder)
         
-        next if File.exists?(product_folder)
         FileUtils.rm product_folder if File.symlink?(product_folder)
+        next if File.directory?(product_folder)
         
-        File.symlink src_folder, product_folder
+        File.symlink relative_folder, product_folder
       }
     end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -07:00
+date: 2010-07-14 00:00:00 -07:00
 default_executable: distil
 dependencies: 
 - !ruby/object:Gem::Dependency