distil 0.11.1 → 0.11.3

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.3

data/distil.gemspec

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

@@ -19,13 +19,14 @@ module Distil
       project_info["path"]= File.dirname(@project_file)
       
       begin
+
         super(project_info, parent)
-      rescue ValidationError
-        $stderr.print "#{APP_NAME}: #{project_file}: #{$!}\n"
+        load_external_projects
+
+      rescue ValidationError => err
+        puts "#{APP_NAME}: #{SourceFile.path_relative_to_folder(project_file, Dir.pwd)}: #{err.message}\n"
         exit 1
       end
-
-      load_external_projects
     end
 
     def targets

data/lib/distil/project.rb

@@ -18,6 +18,15 @@ module Distil
       uri= options["repository"]
       path= options["path"]
       
+      begin
+        `git --version 2>/dev/null`
+      rescue
+        nil
+      end
+      if $?.nil? || !$?.success?
+        raise ValidationError.new("The git version control tool is required to pull this repository: #{uri}")
+      end
+      
       FileUtils.mkdir_p(path)
       Dir.chdir path do
         init_cmd = "git init"
@@ -25,7 +34,8 @@ module Distil
         # 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 = "git pull --depth 1 #{uri}"
+        base_cmd = "git pull #{uri}"
         base_cmd+= " -q"
         # base_cmd += " -q" if options[:quiet] and not $verbose
         base_cmd += " #{options[:version]}" if options[:version]
@@ -34,7 +44,7 @@ module Distil
           # puts "removing: .git .gitignore" if $verbose
           # FileUtils.rm_rf %w(.git .gitignore)
         else
-          rm_rf path
+          # rm_rf path
         end
       end
     end

data/lib/distil.rb

@@ -61,8 +61,6 @@ def replace_tokens(string, params)
 	}
 end
 
-
-
 require 'distil/error-reporter'
 require 'distil/configurable'
 require 'distil/source-file'

metadata

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