whiskey_disk 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/whiskey_disk.rb

@@ -119,12 +119,25 @@ class WhiskeyDisk
     end
     
     def if_task_defined(task, cmd)
-      %Q{if [[ `rake -P | grep #{task}` != "" ]]; then #{cmd}; fi}
+      %Q{if [[ `#{env_vars} rake -P | grep #{task}` != "" ]]; then #{cmd}; fi}
     end
     
-    def conditional_clone(repo, path)
-      "if [ -e #{path} ]; then echo 'Repository already cloned to [#{path}].  Skipping.'; " +
-      "else git clone #{repo} #{tail_path(path)} ; fi"
+    def clone_repository(repo, path)
+      enqueue "cd #{parent_path(path)}"
+      enqueue("if [ -e #{path} ]; then echo 'Repository already cloned to [#{path}].  Skipping.'; " +
+              "else git clone #{repo} #{tail_path(path)} ; fi")
+    end
+   
+    def refresh_checkout(path, repo_branch)
+      enqueue "cd #{path}"
+      enqueue "git fetch origin +refs/heads/#{repo_branch}:refs/remotes/origin/#{repo_branch}"
+      enqueue "git reset --hard origin/#{repo_branch}"
+    end
+
+    def run_rake_task(path, task_name)
+      enqueue "cd #{path}"
+      enqueue(if_file_present("#{self[:deploy_to]}/Rakefile", 
+        if_task_defined(task_name, "#{env_vars} rake --trace #{task_name} to=#{self[:environment]}")))
     end
     
     def ensure_main_parent_path_is_present
@@ -139,28 +152,22 @@ class WhiskeyDisk
 
     def checkout_main_repository
       needs(:deploy_to, :repository)
-      enqueue "cd #{parent_path(self[:deploy_to])}"
-      enqueue conditional_clone(self[:repository], self[:deploy_to])
+      clone_repository(self[:repository], self[:deploy_to])
     end
     
     def checkout_configuration_repository
       needs(:deploy_config_to, :config_repository)
-      enqueue "cd #{parent_path(self[:deploy_config_to])}"
-      enqueue conditional_clone(self[:config_repository], self[:deploy_config_to])
+      clone_repository(self[:config_repository], self[:deploy_config_to])
     end
     
     def update_main_repository_checkout
       needs(:deploy_to)
-      enqueue "cd #{self[:deploy_to]}"
-      enqueue "git fetch origin +refs/heads/#{branch}:refs/remotes/origin/#{branch}"
-      enqueue "git reset --hard origin/#{branch}"
+      refresh_checkout(self[:deploy_to], branch)
     end
     
     def update_configuration_repository_checkout
       needs(:deploy_config_to)
-      enqueue "cd #{self[:deploy_config_to]}"
-      enqueue "git fetch origin +refs/heads/#{config_branch}:refs/remotes/origin/#{config_branch}"
-      enqueue "git reset --hard origin/#{config_branch}"
+      refresh_checkout(self[:deploy_config_to], config_branch)
     end
     
     def refresh_configuration
@@ -171,18 +178,12 @@ class WhiskeyDisk
     
     def run_post_setup_hooks
       needs(:deploy_to)
-      enqueue "cd #{self[:deploy_to]}"
-      enqueue(if_file_present("#{self[:deploy_to]}/Rakefile", 
-                if_task_defined("deploy:post_setup",
-                  "#{env_vars} rake --trace deploy:post_setup to=#{self[:environment]}")))
+      run_rake_task(self[:deploy_to], "deploy:post_setup")
     end
 
     def run_post_deploy_hooks
       needs(:deploy_to)
-      enqueue "cd #{self[:deploy_to]}"
-      enqueue(if_file_present("#{self[:deploy_to]}/Rakefile", 
-                if_task_defined("deploy:post_deploy",
-                  "#{env_vars} rake --trace deploy:post_deploy to=#{self[:environment]}")))
+      run_rake_task(self[:deploy_to], "deploy:post_deploy")
     end
   end
 end

data/spec/whiskey_disk_spec.rb

@@ -362,6 +362,16 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/main/repo/Rakefile \]; then .*; fi})
     end
     
+    it 'should ensure that any rake ENV variable are set when checking for deploy:post_setup tasks' do
+      @parameters = { 'deploy_to' => '/path/to/main/repo', 'rake_env' => { 'RAILS_ENV' => 'production', 'FOO' => 'bar' } }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters)
+      WhiskeyDisk.reset
+      WhiskeyDisk.run_post_setup_hooks
+      @parameters['rake_env'].each_pair do |k,v|
+        WhiskeyDisk.buffer.join(' ').should.match(%r{#{k}='#{v}' .*rake -P})
+      end
+    end
+    
     it 'should make the post setup rake tasks conditional on the deploy:post_setup rake task being defined' do
       WhiskeyDisk.run_post_setup_hooks
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[\[ \`rake -P | grep deploy:post_setup\` != "" \]\]; })      
@@ -406,6 +416,16 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo})
     end
     
+    it 'should ensure that any rake ENV variable are set when checking for deploy:post_setup tasks' do
+      @parameters = { 'deploy_to' => '/path/to/main/repo', 'rake_env' => { 'RAILS_ENV' => 'production', 'FOO' => 'bar' } }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters)
+      WhiskeyDisk.reset
+      WhiskeyDisk.run_post_deploy_hooks
+      @parameters['rake_env'].each_pair do |k,v|
+        WhiskeyDisk.buffer.join(' ').should.match(%r{#{k}='#{v}' .*rake -P})
+      end
+    end
+    
     it 'should make the post deployment rake tasks conditional on the presence of a Rakefile in the deployment path' do      
       WhiskeyDisk.run_post_deploy_hooks
       WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/main/repo/Rakefile \]; then .*; fi})

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2010-08-31}
   s.default_executable = %q{wd}
   s.description = %q{Opinionated gem for doing fast git-based server deployments.}
   s.email = %q{rick@rickbradley.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -05:00
+date: 2010-08-31 00:00:00 -05:00
 default_executable: wd
 dependencies: 
 - !ruby/object:Gem::Dependency