whiskey_disk 0.6.21 → 0.6.22

data/CHANGELOG

@@ -1,4 +1,10 @@
 
+0.6.22 / 2011-04-10 
+==================
+
+  * support branch-switching on deployments
+  * added integration spec for "branch switching" behavior
+
 0.6.21 / 2011-04-06 
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.6.21
+0.6.22

data/lib/whiskey_disk.rb

@@ -91,12 +91,12 @@ class WhiskeyDisk
       needs(:deploy_to, :repository)
       
       check = "cd #{self[:deploy_to]}; " +
-              "ml=\`cat .git/refs/heads/#{branch}\`; " +
+              "ml=\`git log -1 --pretty=format:%H\`; " +
               "mr=\`git ls-remote #{self[:repository]} refs/heads/#{branch}\`; "
       
       if self[:deploy_config_to]
         check += "cd #{self[:deploy_config_to]}; " +
-                 "cl=\`cat .git/refs/heads/#{config_branch}\`; " +
+                 "cl=\`git log -1 --pretty=format:%H\`; " +
                  "cr=\`git ls-remote #{self[:config_repository]} refs/heads/#{config_branch}\`; "
       end
       
@@ -258,7 +258,7 @@ class WhiskeyDisk
     def snapshot_git_revision
       needs(:deploy_to)
       enqueue "cd #{self[:deploy_to]}"
-      enqueue %Q{ml=\`cat .git/refs/heads/#{branch}\`}
+      enqueue %Q{ml=\`git log -1 --pretty=format:%H\`}
     end
     
     def initialize_git_changes

data/spec/whiskey_disk_spec.rb

@@ -342,15 +342,15 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{rm -f /path/to/main/repo/.whiskey_disk_git_changes})
     end
         
-    it 'should capture the current git HEAD ref for the specified branch' do
+    it 'should capture the current git HEAD ref for the current branch' do
       WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
       WhiskeyDisk.update_main_repository_checkout
-      WhiskeyDisk.buffer.join(' ').should.match(%r{ml=\`cat .git/refs/heads/production\`})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{ml=\`git log -1 --pretty=format:%H\`})
     end
     
-    it 'should capture the current git HEAD ref for the master branch if no branch is specified' do
+    it 'should capture the current git HEAD ref for the current branch if no branch is specified' do
       WhiskeyDisk.update_main_repository_checkout
-      WhiskeyDisk.buffer.join(' ').should.match(%r{ml=\`cat .git/refs/heads/master\`})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{ml=\`git log -1 --pretty=format:%H\`})
     end
     
     it 'should attempt to fetch only the master branch from the origin if no branch is specified' do
@@ -800,16 +800,16 @@ describe 'WhiskeyDisk' do
             WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("then { COMMAND ; }; else echo \"No changes to deploy.\"; fi")))            
           end
           
-          it "should query the head of the main checkout's master branch if no branch is specified" do
+          it "should query the head of the main checkout's current branch if no branch is specified" do
             WhiskeyDisk.enqueue("COMMAND")
-            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`cat .git/refs/heads/master\`;")))
+            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`git log -1 --pretty=format:%H\`;")))
           end
           
-          it "should query the head of the main checkout's specified branch if a branch is specified" do
+          it "should query the head of the main checkout's current branch if a branch is specified" do
             WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
             WhiskeyDisk.enable_staleness_checks
             WhiskeyDisk.enqueue("COMMAND")
-            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`cat .git/refs/heads/production\`;")))
+            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`git log -1 --pretty=format:%H\`;")))
           end
           
           it "should query the head on the main repository's master branch if no branch is specified" do            
@@ -864,16 +864,16 @@ describe 'WhiskeyDisk' do
             WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("then { COMMAND ; }; else echo \"No changes to deploy.\"; fi")))            
           end
           
-          it "should query the head of the main checkout's master branch if no branch is specified" do
+          it "should query the head of the main checkout's current branch if no branch is specified" do
             WhiskeyDisk.enqueue("COMMAND")
-            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`cat .git/refs/heads/master\`;")))
+            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`git log -1 --pretty=format:%H\`;")))
           end
           
-          it "should query the head of the main checkout's specified branch if a branch is specified" do
+          it "should query the head of the main checkout's current branch if a branch is specified" do
             WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
             WhiskeyDisk.enable_staleness_checks
             WhiskeyDisk.enqueue("COMMAND")
-            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`cat .git/refs/heads/production\`;")))
+            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_to}; ml=\`git log -1 --pretty=format:%H\`;")))
           end
           
           it "should query the head on the main repository's master branch if no branch is specified" do            
@@ -888,16 +888,16 @@ describe 'WhiskeyDisk' do
             WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("mr=\`git ls-remote #{@repository} refs/heads/production\`;")))
           end
           
-          it "should query the head of the config checkout's master branch if no branch is specified" do
+          it "should query the head of the config checkout's current branch if no branch is specified" do
             WhiskeyDisk.enqueue("COMMAND")
-            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_config_to}; cl=\`cat .git/refs/heads/master\`;")))
+            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_config_to}; cl=\`git log -1 --pretty=format:%H\`;")))
           end
           
-          it "should query the head of the config checkout's specified branch if a branch is specified" do
+          it "should query the head of the config checkout's current branch if a branch is specified" do
             WhiskeyDisk.configuration = @parameters.merge({'config_branch' => 'production'})
             WhiskeyDisk.enable_staleness_checks
             WhiskeyDisk.enqueue("COMMAND")
-            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_config_to}; cl=\`cat .git/refs/heads/production\`;")))
+            WhiskeyDisk.bundle.should.match(Regexp.new(Regexp.escape("cd #{@deploy_config_to}; cl=\`git log -1 --pretty=format:%H\`;")))
           end
           
           it "should query the head on the config repository's master branch if no branch is specified" do            

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.21"
+  s.version = "0.6.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2011-04-06}
+  s.date = %q{2011-04-10}
   s.description = %q{Opinionated gem for doing fast git-based server deployments.}
   s.email = %q{rick@rickbradley.com}
   s.executables = ["wd_role", "wd"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 6
-  - 21
-  version: 0.6.21
+  - 22
+  version: 0.6.22
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -05:00
+date: 2011-04-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency