distil 0.14.0.b → 0.14.0.c

data/VERSION

@@ -1 +1 @@
-0.14.0.b
+0.14.0.c

data/bin/distil

@@ -6,7 +6,7 @@ module Distil
   VENDOR_DIR= File.expand_path(File.join(File.dirname(__FILE__), "..", "vendor"))
   ASSETS_DIR= File.expand_path(File.join(File.dirname(__FILE__), "..", "assets"))
   APP_NAME= File.basename($0)
-  APP_SCRIPT= $0
+  APP_SCRIPT= File.expand_path($0)
   
   $:.unshift(LIB_DIR)
 
@@ -24,23 +24,43 @@ module Distil
     opts.banner = help
 
     opts.on("--server [PORT]", "Start web server (default port 8888)") do |port|
-      options['server'] = true
-      options['server_port'] = port unless port.nil?
+      options[:server] = true
+      options[:server_port] = port unless port.nil?
     end
     
     opts.on("--base URL", "The base path for the server") do |url|
-      options['url']= url
+      options[:server_url]= url
+    end
+    
+    opts.on("--project PROJECT", "The project to build") do |project|
+      options[:project_file]= project
+    end
+    
+    opts.on("--output-folder FOLDER", "Where to put the build products") do |output_folder|
+      options[:output_path]= File.expand_path(output_folder)
     end
   end
   opts.parse!
+
+  if options[:project_file]
+    if !File.exist?(options[:project_file])
+      puts "#{APP_NAME}: No such file: #{options[:project_file]}"
+      exit 1
+    end
+    project= Project.from_file(options[:project_file])
+  else
+    project= Project.find(Dir.pwd)
+  end
   
-  project= Project.find(Dir.pwd)
   unless project
     puts "#{APP_NAME}: Could not find project to build"
     exit 1
   end
 
-  puts "\n#{project.name}:\n\n"
+  if options[:output_path]
+    project.output_path= options[:output_path]
+  end
+  
   commands= ARGV.empty? ? ['build'] : ARGV
   commands.each { |cmd|
     project.send cmd

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.14.0.b"
+  s.version = "0.14.0.c"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2010-12-22}
   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/library.rb

@@ -55,8 +55,7 @@ module Distil
         when File.exist?("Buildfile") || File.exists?("buildfile") || File.exist?("#{name}.jsproj")
           @build_command= APP_SCRIPT
           remote_project= Project.find(path)
-          output_folder= remote_project ? remote_project.output_folder : 'build'
-          @product_path= File.join(path, output_folder)
+          @product_path= remote_project ? remote_project.output_path : File.join(path, 'build')
         when File.exist?("Makefile") || File.exist?("makefile")
           @build_command= "make"
         when File.exists?("Rakefile") || File.exists?("rakefile")
@@ -68,7 +67,7 @@ module Distil
         end
       end
       
-      build
+      # build
     end
 
     def to_s
@@ -169,7 +168,7 @@ module Distil
     end
     
     def output_path
-      @output_path||= File.join(project.output_path, name)
+      File.join(project.output_path, name)
     end
     
     def up_to_date?
@@ -204,8 +203,6 @@ module Distil
       end
       
       File.unlink(output_path) if File.symlink?(output_path)
-      
-      # FileUtils.rm_rf(project_path) if File.directory?(project_path)
       File.symlink(project.relative_output_path_for(product_path), output_path)
     end
     

data/lib/distil/project.rb

@@ -12,7 +12,7 @@ module Distil
     include FileVendor
     include JavascriptFileValidator
     
-    attr_reader :name, :path, :folder, :source_folder, :output_folder, :include_paths
+    attr_reader :name, :path, :folder, :source_folder, :output_path, :include_paths
     attr_reader :assets, :asset_aliases
     attr_reader :libraries_by_name, :libraries
     attr_reader :languages, :project_type
@@ -58,9 +58,10 @@ module Distil
     
     def initialize(path, config={}, parent=nil)
       @path= path
+      @parent= parent
       @folder= File.dirname(@path)
       @source_folder= @folder
-      @output_folder= DEFAULT_OUTPUT_FOLDER
+      @output_path= File.join(@folder, DEFAULT_OUTPUT_FOLDER)
       @include_paths= [@folder]
       @include_files= []
       @asset_aliases= {}
@@ -88,9 +89,8 @@ module Distil
           end
           
           c.with :output_folder do |output_folder|
-            @output_folder= output_folder
+            self.output_path= File.expand_path(output_folder)
           end
-          FileUtils.mkdir_p output_folder
           
           c.with :source_folder do |source_folder|
             @source_folder= source_folder
@@ -115,8 +115,8 @@ module Distil
             @libraries_by_name[asset.name]= asset
           end
 
-          c.with_each :source do |file|
-            include_file(file)
+          c.with :source do |source_files|
+            @raw_sources= source_files
           end
         
           c.with_each :targets do |target|
@@ -138,6 +138,10 @@ module Distil
       return if @source_files_computed
       @source_files_computed= true
       
+      @raw_sources.each { |f|
+        include_file(f)
+      }
+      
       inspected= Set.new
       ordered_files= []
     
@@ -181,6 +185,12 @@ module Distil
     end
     
     def build
+      libraries.each { |lib|
+        lib.build
+      }
+
+      puts "\n#{name}:\n\n" unless @parent
+      
       subprojects.each { |subproject|
         subproject.build
       }
@@ -207,8 +217,9 @@ module Distil
       "<#{self.class}:0x#{object_id.to_s(16)} name=#{name}>"
     end
     
-    def output_path
-      @output_path ||= File.join(folder, output_folder)
+    def output_path=(path)
+      @output_path= path
+      FileUtils.mkdir_p @output_path
     end
     
     def relative_path_for(thing)
@@ -258,7 +269,7 @@ module Distil
 
           parts= File.dirname(path).split(File::SEPARATOR)
           if ('.'==parts[0])
-            product_path= File.join(output_folder, path)
+            product_path= File.join(output_path, path)
             FileUtils.rm product_path if File.exists? product_path
             File.symlink path, product_path
             next
@@ -280,7 +291,7 @@ module Distil
   
     def copy_assets
       assets.each { |a|
-        a.copy_to(output_folder, source_folder)
+        a.copy_to(output_path, source_folder)
       }
     end
   
@@ -342,12 +353,12 @@ module Distil
       files= []
       
       parts= path.split(File::SEPARATOR)
-      asset_name= parts[0]
+      library_name= parts[0]
       file_path= File.join(parts.slice(1..-1))
 
-      if (@libraries_by_name.include?(asset_name))
-        asset= @libraries_by_name[asset_name]
-        return Dir.glob(File.join(asset.output_path, file_path))
+      if (@libraries_by_name.include?(library_name))
+        library= @libraries_by_name[library_name]
+        return Dir.glob(File.join(library.output_path, file_path))
       end
       
       files.concat(Dir.glob(path));

data/lib/distil/server.rb

@@ -11,7 +11,7 @@ module Distil
     }
 
     server= WEBrick::HTTPServer.new(config)
-    server.mount(path || '/', WEBrick::HTTPServlet::FileHandler, project.output_folder)
+    server.mount(path || '/', WEBrick::HTTPServlet::FileHandler, project.output_path)
 
     ['INT', 'TERM'].each { |signal|
        trap(signal){ server.shutdown }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 88
   prerelease: true
   segments: 
   - 0
   - 14
   - 0
-  - b
-  version: 0.14.0.b
+  - c
+  version: 0.14.0.c
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -08:00
+date: 2010-12-22 00:00:00 -08:00
 default_executable: distil
 dependencies: 
 - !ruby/object:Gem::Dependency