distil 0.11.0 → 0.11.1

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.11.0"
+  s.version = "0.11.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-06-08}
   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"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/distil/product/javascript-doc-product.rb",
      "lib/distil/product/javascript-product.rb",
      "lib/distil/product/minified.rb",
+     "lib/distil/product/page-product.rb",
      "lib/distil/project.rb",
      "lib/distil/project/distil-project.rb",
      "lib/distil/project/external-project.rb",

data/lib/distil/product.rb

@@ -95,3 +95,4 @@ require 'distil/product/css-product'
 require 'distil/product/javascript-base-product'
 require 'distil/product/javascript-product'
 require 'distil/product/javascript-doc-product'
+require 'distil/product/page-product'

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

@@ -0,0 +1,27 @@
+module Distil
+
+  class PageProduct < Product
+    extension "html"
+
+    def filename
+      File.join(target.project.output_folder, "index.html")
+    end
+      
+    def write_output
+      output_folder= target.project.output_folder
+      mode= target.project.mode
+      
+      files.each { |f|
+        if (RELEASE_MODE==mode)
+          FileUtils.cp f, output_folder
+        else
+          product_path= File.join(output_folder, File.basename(f))
+          FileUtils.rm product_path if File.exists? product_path
+          File.symlink f.relative_to_folder(output_folder), product_path
+        end
+      }
+    end
+
+  end
+  
+end

data/lib/distil/project.rb

@@ -13,19 +13,70 @@ module Distil
     
     def build
     end
+
+    def self.fetch_project_using_git(options = {})
+      uri= options["repository"]
+      path= options["path"]
+      
+      FileUtils.mkdir_p(path)
+      Dir.chdir path do
+        init_cmd = "git init"
+        init_cmd+= " -q"
+        # init_cmd += " -q" if options[:quiet] and not $verbose
+        # puts init_cmd if $verbose
+        system(init_cmd)
+        base_cmd = "git pull --depth 1 #{uri}"
+        base_cmd+= " -q"
+        # base_cmd += " -q" if options[:quiet] and not $verbose
+        base_cmd += " #{options[:version]}" if options[:version]
+        # puts base_cmd if $verbose
+        if system(base_cmd)
+          # puts "removing: .git .gitignore" if $verbose
+          # FileUtils.rm_rf %w(.git .gitignore)
+        else
+          rm_rf path
+        end
+      end
+    end
     
     def self.from_config(config, parent=nil)
 
       if config.is_a?(String)
         string= config
+        uri= URI.parse(string)
+        
         config= { "name" => File.basename(config, ".*") }
-        full_path= File.expand_path(string)
+        if uri.scheme
+          config["repository"]= uri.to_s
+        else
+          config["path"]= uri.to_s
+        end
+        
+        full_path= File.expand_path(config["path"])
+        
         if File.exist?(full_path) && File.file?(full_path)
           config["path"]= File.dirname(full_path)
         else
           config["path"]= full_path
         end
       end
+
+      if !config["name"]
+        case when config["repository"]
+          uri= URI.parse(config["repository"])
+          config["name"]= File.basename(uri.path, ".*")
+        when config["path"]
+          config["name"]= File.basename(config["path"], ".*")
+        else
+          raise ValidationError.new("External project has neither name, path nor repository")
+        end
+      end
+      
+      config["path"]||= "ext/#{config["name"]}"
+
+      if config["repository"] && !File.directory?(config["path"])
+        fetch_project_using_git(config)
+      end
       
       config["mode"]||= parent.mode if parent
         

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

@@ -46,12 +46,16 @@ module Distil
 
     def load_external_projects
       return if !external_projects
-
-      self.external_projects= external_projects.map { |config|
+      projects= []
+      
+      external_projects.each { |config|
         project= Project.from_config(config, self)
         next if !project
+        projects << project
         @projects_by_name[project.name]= project
       }
+      
+      self.external_projects= projects
     end
 
     def external_project_with_name(name)

data/lib/distil/target.rb

@@ -79,6 +79,12 @@ module Distil
         @products << product if !product.files.empty?
       }
 
+      if APP_TYPE==target_type
+        product= PageProduct.new(@extras.clone, self)
+        product.files= files
+        @products << product if !product.files.empty?
+      end
+      
       @products
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: distil
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/distil/product/javascript-doc-product.rb
 - lib/distil/product/javascript-product.rb
 - lib/distil/product/minified.rb
+- lib/distil/product/page-product.rb
 - lib/distil/project.rb
 - lib/distil/project/distil-project.rb
 - lib/distil/project/external-project.rb