librarian 0.0.13 → 0.0.14

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.14
+
+* \#39 Fixes a regression induced by using `git reset --hard SHA`.
+
 ## 0.0.13
 
 * \#36 Fixes an issue where, if a dependency has a git source (the upstream), and the upstream is updated,

data/lib/librarian/source/git.rb

@@ -83,7 +83,7 @@ module Librarian
           repository.fetch!(:tags => true)
           repository.fetch!
           repository.merge_all_remote_branches!
-          repository.reset_hard! repository.hash_from(sha || ref)
+          repository.checkout!(repository.hash_from(sha || ref), :force => true)
           @sha ||= repository.current_commit_hash
         end
       end

data/lib/librarian/source/git/repository.rb

@@ -40,20 +40,14 @@ module Librarian
           end
         end
 
-        def checkout!(reference)
+        def checkout!(reference, options ={ })
           within do
             command = "checkout #{reference}"
+            command <<  " --force" if options[:force]
             run!(command)
           end
         end
 
-        def reset_hard!(reference)
-          within do
-            command = "reset --hard #{reference}"
-            run!(command, false)
-          end
-        end
-
         def fetch!(options = { })
           within do
             command = "fetch"
@@ -72,7 +66,7 @@ module Librarian
         def hash_from(reference)
           within do
             command = "rev-parse #{reference}"
-            run!(command)
+            run!(command).strip
           end
         end
 
@@ -85,7 +79,7 @@ module Librarian
 
         def merge_all_remote_branches!
           remote_branches.each do |branch|
-            checkout!(branch.slice(%r{[^/]+$}))
+            checkout!(branch.slice(%r{[^/]+$}), :force => true)
             merge! branch
           end
         end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &16739740 !ruby/object:Gem::Requirement
+  requirement: &15281700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16739740
+  version_requirements: *15281700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16753740 !ruby/object:Gem::Requirement
+  requirement: &15281180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16753740
+  version_requirements: *15281180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16751920 !ruby/object:Gem::Requirement
+  requirement: &15280600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16751920
+  version_requirements: *15280600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &16749300 !ruby/object:Gem::Requirement
+  requirement: &15279900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16749300
+  version_requirements: *15279900
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &16748440 !ruby/object:Gem::Requirement
+  requirement: &15278980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16748440
+  version_requirements: *15278980
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &16754860 !ruby/object:Gem::Requirement
+  requirement: &15278400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16754860
+  version_requirements: *15278400
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &17524920 !ruby/object:Gem::Requirement
+  requirement: &15277240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *17524920
+  version_requirements: *15277240
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &17522700 !ruby/object:Gem::Requirement
+  requirement: &15276740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17522700
+  version_requirements: *15276740
 description: Librarian
 email:
 - y_feldblum@yahoo.com