ianwhite-garlic 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.8
+
+* 1 bugfix
+  * fix problem where dependencies weren't checking out repo tags or branches properly
+
 == 0.1.7
 
 * 2 minor enhancement

data/lib/garlic/target.rb

@@ -78,25 +78,17 @@ module Garlic
         cd(install_path) { `git checkout #{tree_ish || repo.head_sha}` }
       
       else
+        old_tree_ish = repo.head_sha
+        repo.checkout(tree_ish) if tree_ish       
         if read_sha(install_path) == repo.head_sha
-          puts "#{install_path} is up to date"
+          puts "#{install_path} is up to date at #{tree_ish || 'default'}"
         else
-          puts "#{install_path} needs update, exporting archive from #{repo.name}..."
-          if tree_ish
-            puts "Checking out #{tree_ish} of #{repo.name}"
-            old_tree_ish = repo.head_sha
-            repo.checkout(tree_ish) if tree_ish
-          end
-          
+          puts "#{install_path} needs update to #{tree_ish || 'default'}, exporting archive from #{repo.name}..."
           repo.export_to(File.join(path, install_path))
           cd(path) { garlic.instance_eval(&block) } if block_given?
           write_sha(install_path, repo.head_sha)
-          
-          if tree_ish
-            puts "Checking #{repo.name} back to where it was (#{old_tree_ish})"
-            repo.checkout(old_tree_ish)
-          end
         end
+        repo.checkout(old_tree_ish) if tree_ish
       end
     end
     

data/lib/garlic.rb

@@ -11,7 +11,7 @@ module Garlic
   module Version
     Major = 0
     Minor = 1
-    Tiny  = 7
+    Tiny  = 8
     
     String = [Major, Minor, Tiny].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ianwhite-garlic
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Ian White
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-22 00:00:00 -08:00
+date: 2009-02-08 00:00:00 -08:00
 default_executable: garlic
 dependencies: []