whiskey_disk 0.6.15 → 0.6.16

data/CHANGELOG

@@ -1,4 +1,13 @@
 
+0.6.16 / 2011-03-08 
+==================
+
+  * Turning off shallow clones for 'wd setup'
+  * minor refactoring of new checkout functionality
+  * check out the specified branch on setup
+  * adding integration specs to test setup + deploy at once
+  * tweaking a couple of old path specs
+
 0.6.15 / 2011-03-07 
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.6.15
+0.6.16

data/lib/whiskey_disk.rb

@@ -190,10 +190,14 @@ class WhiskeyDisk
       %Q(rakep=`#{env_vars} rake -P` && if [[ `echo "${rakep}" | grep #{task}` != "" ]]; then #{cmd}; fi )
     end
     
-    def clone_repository(repo, path)
+    def safe_branch_checkout(path, my_branch)
+      %Q(cd #{path} && git checkout -b #{my_branch} origin/#{my_branch} || git checkout #{my_branch})
+    end
+    
+    def clone_repository(repo, path, my_branch)
       enqueue "cd #{parent_path(path)}"
       enqueue("if [ -e #{path} ]; then echo 'Repository already cloned to [#{path}].  Skipping.'; " +
-              "else git clone --depth 1 #{repo} #{tail_path(path)} ; fi")
+              "else git clone #{repo} #{tail_path(path)} && #{safe_branch_checkout(path, my_branch)}; fi")
     end
    
     def refresh_checkout(path, repo_branch)
@@ -231,12 +235,12 @@ class WhiskeyDisk
 
     def checkout_main_repository
       needs(:deploy_to, :repository)
-      clone_repository(self[:repository], self[:deploy_to])
+      clone_repository(self[:repository], self[:deploy_to], branch)
     end
     
     def checkout_configuration_repository
       needs(:deploy_config_to, :config_repository)
-      clone_repository(self[:config_repository], self[:deploy_config_to])
+      clone_repository(self[:config_repository], self[:deploy_config_to], config_branch)
     end
     
     def update_main_repository_checkout

data/spec/whiskey_disk_spec.rb

@@ -202,19 +202,45 @@ describe 'WhiskeyDisk' do
     
     it 'should work from the main repository checkout parent path' do
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main})
-      WhiskeyDisk.buffer.join(' ').should.not.match(%r{cd /path/to/main/repo})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main[^/]})
     end
       
-    it 'should attempt to shallow clone the main repository to the repository checkout path' do
+    it 'should attempt to clone the main repository to the repository checkout path' do
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{clone --depth 1 #{@parameters['repository']} repo})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{clone #{@parameters['repository']} repo})
     end
     
     it 'should make the main repository clone conditional on the lack of a main repository checkout' do
       WhiskeyDisk.checkout_main_repository
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e #{@parameters['deploy_to']} \]; then .*; fi})
     end
+    
+    it 'should do a branch creation checkout of the master branch when no branch is specified' do
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b master origin/master})
+    end
+    
+    it 'should fall back to a regular checkout of the master branch when no branch is specified' do
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout master})
+    end
+    
+    it 'should do a branch creation checkout of the specified branch when a branch is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b production origin/production})
+    end
+
+    it 'should fall back to a regular checkout of the specified branch when a branch is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'branch' => 'production'})
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| git checkout production})
+    end
+
+    it 'should do branch checkouts from the repository path' do
+      WhiskeyDisk.checkout_main_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo && git checkout})      
+    end
   end
   
   describe 'checking out the configuration repository' do
@@ -235,19 +261,29 @@ describe 'WhiskeyDisk' do
 
     it 'should work from the configuration repository checkout parent path' do
       WhiskeyDisk.checkout_configuration_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/config})
-      WhiskeyDisk.buffer.join(' ').should.not.match(%r{cd /path/to/config/repo})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/config[^/]})
     end
 
-    it 'should attempt to shallow clone the configuration repository to the repository checkout path' do
+    it 'should attempt to clone the configuration repository to the repository checkout path' do
       WhiskeyDisk.checkout_configuration_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{clone --depth 1 #{@parameters['config_repository']} repo})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{clone #{@parameters['config_repository']} repo})
     end
     
     it 'should make the configuration repository clone conditional on the lack of a main repository checkout' do
       WhiskeyDisk.checkout_configuration_repository
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e #{@parameters['deploy_config_to']} \]; then .*; fi})
     end
+
+    it 'should do a branch creation checkout of the master branch when no branch is specified' do
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b master origin/master})
+    end
+    
+    it 'should do a branch creation checkout of the specified branch when a branch is specified' do
+      WhiskeyDisk.configuration = @parameters.merge({'config_branch' => 'production'})
+      WhiskeyDisk.checkout_configuration_repository
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git checkout -b production origin/production})
+    end
   end
   
   describe 'updating the main repository checkout' do

data/whiskey_disk.gemspec

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