whiskey_disk 0.6.14 → 0.6.15

data/CHANGELOG

@@ -1,4 +1,12 @@
 
+0.6.15 / 2011-03-07 
+==================
+
+  * integration specs for "git checkout #{branch}" functionality
+  * adding scenario to test git checkout on non-master branches
+  * Adding current_branch integration spec helper method
+  * Ensure specified branch is checked out before applying the refresh
+
 0.6.14 / 2011-02-23 
 ==================
 

data/README.markdown

@@ -345,8 +345,6 @@ Whiskey\_disk includes a helper library for use in rake tasks and other ruby scr
 find a ruby function 'role?' which returns true if you're currently being deployed to a domain with the given
 role.  For example:
 
-<code>
-    
     require 'whiskey_disk/helpers'
 
     namespace :deploy do
@@ -384,7 +382,6 @@ role.  For example:
       task :post_setup  => [ :create_rails_directories ]
       task :post_deploy => [ :db_migrate_if_necessary, :thinking_sphinx_restart, :bounce_passenger ]
     end
-</code>
 
 
 #### When working with the shell ####
@@ -710,8 +707,6 @@ Notice that there are no separate trees for 'uat' and 'qa' targets.
 
  - Here is a sample of a lib/tasks/deploy.rake from a Rails application we deployed once upon a time:
 
-<code>
-
     RAILS_ENV=ENV['RAILS_ENV'] if ENV['RAILS_ENV'] and '' != ENV['RAILS_ENV']
     Rake::Task['environment'].invoke
     
@@ -750,7 +745,6 @@ Notice that there are no separate trees for 'uat' and 'qa' targets.
       task :post_setup => [ :create_rails_directories, :setup_postgres_for_thinking_sphinx ]
       task :post_deploy => [ 'db:migrate', 'ts:config', :thinking_sphinx_restart, :bounce_passenger, :clear_asset_cache ]
     end
-</code>
 
 ### Future Directions ###
 
@@ -768,7 +762,7 @@ to see what we have in mind for the near future.
 
  - Rick Bradley (rick@rickbradley.com, github:rick)
  - Jeremy Holland (jeremy@jeremypholland.com, github:therubyneck): feature/bugfix contributions
- - Kevin Barnes (@vinbarnes), Yossef Mendellsohn (cardioid) for design help and proofreading
+ - Kevin Barnes (@vinbarnes), Yossef Mendelssohn (cardioid) for design help and proofreading
  - Alex Sharp (ajsharp@gmail.com) - issues, real-world usage cases, design feedback
  - Josh Moore (josh@codingforrent.com) - tracking down issues handling bad project Rakefiles
  - Cristi Balan (evilchelu) for feedback and proofreading

data/VERSION

@@ -1 +1 @@
-0.6.14
+0.6.15

data/lib/whiskey_disk.rb

@@ -199,6 +199,7 @@ class WhiskeyDisk
     def refresh_checkout(path, repo_branch)
       enqueue "cd #{path}"
       enqueue "git fetch origin +refs/heads/#{repo_branch}:refs/remotes/origin/#{repo_branch}"
+      enqueue "git checkout #{repo_branch}"
       enqueue "git reset --hard origin/#{repo_branch}"
     end
 

data/spec/spec_helper.rb

@@ -63,4 +63,8 @@ end
 
 def dump_log
   STDERR.puts("\n\n\n" + File.read(integration_log) + "\n\n\n")
+end
+
+def current_branch(path)
+  `cd #{deployed_file(path)} && git branch`.split("\n").grep(/^\*/).first.sub(/^\* /, '')
 end

data/spec/whiskey_disk_spec.rb

@@ -266,6 +266,17 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo})
     end
     
+    it 'should work from the default branch if no branch is specified' do
+      WhiskeyDisk.update_main_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout master})
+    end
+
+    it 'should work from the specified branch if one is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
+      WhiskeyDisk.update_main_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout production})
+    end
+    
     it 'should attempt to fetch only the master branch from the origin if no branch is specified' do
       WhiskeyDisk.update_main_repository_checkout
       WhiskeyDisk.buffer.join(' ').should.match(%r{git fetch origin \+refs/heads/master:refs/remotes/origin/master})

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.14"
+  s.version = "0.6.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-03-07}
   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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 6
-  - 14
-  version: 0.6.14
+  - 15
+  version: 0.6.15
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -06:00
+date: 2011-03-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency