distil 0.7.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-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/project.rb

@@ -17,7 +17,7 @@ class Project < Configurable
   option :mode
   option :ignore_warnings, false
 
-  option :external_projects, Array.new
+  option :external_projects
 
   def initialize(project_file, settings)
     @project_file= File.expand_path(project_file)
@@ -29,26 +29,53 @@ class Project < Configurable
   end
   
   def build_external_projects
+    projects= external_projects
+    if (projects.nil?)
+      @options.external_projects= []
+      return
+    end
     
     # Handle external projects
-    external_projects.map! { |project|
-
-      if !project.is_a?(String)
-        project
-      else
-        project={
-          "folder"=>project,
+    if (projects.is_a?(String))
+      projects= projects.split(/\s*,\s*/)
+    end
+    
+    if (projects.is_a?(Array))
+      projects= projects.map { |folder|
+        {
+          "folder"=>folder
+        }
+      }
+    else
+      projects= projects.map { |folder, project|
+        
+        if project.is_a?(String)
+          project= {
+            "url"=>project
+          }
+        end
+      
+        defaults= {
+          "folder"=>folder,
           "build"=>"distil",
-          "include"=>File.join(project, "build")
+          "include"=>File.join(folder, "build")
         }
-      end
-    }
+
+        defaults.merge(project)
+      }
+    end
     
-    external_projects.each { |project|
+    # build or get each project
+    projects.each { |project|
       
       if (project.key?("folder") && !File.directory?(project["folder"]))
-        puts "#{@project_file}: external project folder missing: #{project["folder"]}"
-        exit
+        if (project["url"])
+          url= project["url"]
+          system "svn co #{url} #{project["folder"]}"
+        else
+          puts "#{@project_file}: external project folder missing: #{project["folder"]}"
+          exit
+        end
       end
   
       if (!project.key?("include"))
@@ -65,7 +92,10 @@ class Project < Configurable
       system(build)
       Dir.chdir(wd)
     }
-
+    
+    @options.external_projects= projects
+    
+    puts "external_projects=#{external_projects.inspect}"
   end
   
   def build_targets

data/lib/tasks/javascript-task.rb

@@ -44,7 +44,7 @@ class JavascriptTask < SingleOutputTask
     tmp << File.read(jsl_conf)
     tmp << "\n"
     
-    @options.external_projects.each { |project|
+    external_projects.each { |project|
       tmp << "+include #{project["include"]}\n"
     }
     

data/lib/tasks/nib-task.rb

@@ -36,7 +36,7 @@ class NibTask < MultipleOutputTask
     tmp << File.read(jsl_conf)
     tmp << "\n"
     
-    @options.external_projects.each { |project|
+    external_projects.each { |project|
       tmp << "+include #{project["include"]}\n"
     }
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -08:00
+date: 2009-12-22 00:00:00 -08:00
 default_executable: distil
 dependencies: []