whiskey_disk 0.6.12 → 0.6.13

data/CHANGELOG

@@ -1,4 +1,13 @@
 
+0.6.13 / 2011-02-20 
+==================
+
+  * pass rake_env settings to post_* scripts
+  * Finish basic integration specs for post_* scripts
+  * should fail when post_* scripts are specified but missing
+  * basic integration specs for post_* scripts
+  * updating integration spec git repo data
+
 0.6.12 / 2011-02-20 
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.6.12
+0.6.13

data/lib/whiskey_disk.rb

@@ -215,8 +215,7 @@ class WhiskeyDisk
 
     def run_script(script)
       return unless script
-      path = build_path(script)
-      enqueue("if [ -e #{path} ]; then cd #{self[:deploy_to]}; sh -x #{path}; fi ")
+      enqueue(%Q<cd #{self[:deploy_to]}; echo "Running post script..."; #{env_vars} sh -x #{build_path(script)}>)
     end
 
     def ensure_main_parent_path_is_present

data/spec/whiskey_disk_spec.rb

@@ -379,7 +379,7 @@ describe 'WhiskeyDisk' do
     describe 'when a post setup script is specified' do
       describe 'and the script path does not start with a "/"' do      
         before do
-          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_setup_script' => '/path/to/setup/script' }
+          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_setup_script' => '/path/to/setup/script', 'rake_env' => { 'FOO' => 'BAR' }  }
         end
       
         it 'should attempt to run the post setup script' do        
@@ -387,25 +387,25 @@ describe 'WhiskeyDisk' do
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/setup/script})
         end
       
+        it 'should pass any environment variables when running the post setup script' do
+          WhiskeyDisk.run_post_setup_hooks
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  sh -x .*/path/to/setup/script})      
+        end
+
         it 'should cd to the deploy_to path prior to running the script' do
           WhiskeyDisk.run_post_setup_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo; sh -x /path/to/setup/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo;.*sh -x /path/to/setup/script})
         end
             
         it 'should use an absolute path to run the post setup script when the script path starts with a "/"' do
           WhiskeyDisk.run_post_setup_hooks
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x /path/to/setup/script})         
         end
-        
-        it 'should make the post setup script run conditional on the presence of the script' do
-          WhiskeyDisk.run_post_setup_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/setup/script \]; then .*; fi})
-        end
       end
       
       describe 'and the script path does not start with a "/"' do
         before do
-          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_setup_script' => 'path/to/setup/script' }
+          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_setup_script' => 'path/to/setup/script', 'rake_env' => { 'FOO' => 'BAR' } }
         end
 
         it 'should attempt to run the post setup script' do        
@@ -413,20 +413,20 @@ describe 'WhiskeyDisk' do
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/setup/script})
         end
       
+        it 'should pass any environment variables when running the post setup script' do
+          WhiskeyDisk.run_post_setup_hooks
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  sh -x .*/path/to/setup/script})      
+        end
+
         it 'should cd to the deploy_to path prior to running the script' do
           WhiskeyDisk.run_post_setup_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo; sh -x /path/to/main/repo/path/to/setup/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo;.*sh -x /path/to/main/repo/path/to/setup/script})
         end
       
         it 'should use a path relative to the setup path to run the post setup script' do
           WhiskeyDisk.run_post_setup_hooks
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x /path/to/main/repo/path/to/setup/script})
         end
-        
-        it 'should make the post setup script run conditional on the presence of the script' do
-          WhiskeyDisk.run_post_setup_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/main/repo/path/to/setup/script \]; then .*; fi})
-        end
       end
     end
         
@@ -487,7 +487,7 @@ describe 'WhiskeyDisk' do
     describe 'when a post deployment script is specified' do
       describe 'and the script path does not start with a "/"' do      
         before do
-          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_deploy_script' => '/path/to/deployment/script' }
+          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_deploy_script' => '/path/to/deployment/script', 'rake_env' => { 'FOO' => 'BAR' }  }
         end
       
         it 'should attempt to run the post deployment script' do        
@@ -495,25 +495,25 @@ describe 'WhiskeyDisk' do
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/deployment/script})
         end
         
+        it 'should pass any environment variables when running the post deploy script' do
+          WhiskeyDisk.run_post_deploy_hooks
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  sh -x .*/path/to/deployment/script})      
+        end
+
         it 'should cd to the deploy_to path prior to running the script' do
           WhiskeyDisk.run_post_deploy_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo; sh -x /path/to/deployment/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo;.*sh -x /path/to/deployment/script})
         end
         
         it 'should use an absolute path to run the post deployment script when the script path starts with a "/"' do
           WhiskeyDisk.run_post_deploy_hooks
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x /path/to/deployment/script})         
         end
-        
-        it 'should make the post deployment script run conditional on the presence of the script' do
-          WhiskeyDisk.run_post_deploy_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/deployment/script \]; then .*; fi})
-        end
       end
       
       describe 'and the script path does not start with a "/"' do
         before do
-          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_deploy_script' => 'path/to/deployment/script' }
+          WhiskeyDisk.configuration = { 'deploy_to' => '/path/to/main/repo', 'post_deploy_script' => 'path/to/deployment/script', 'rake_env' => { 'FOO' => 'BAR' }  }
         end
 
         it 'should attempt to run the post deployment script' do        
@@ -521,20 +521,20 @@ describe 'WhiskeyDisk' do
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/deployment/script})
         end
       
+        it 'should pass any environment variables when running the post deploy script' do
+          WhiskeyDisk.run_post_deploy_hooks
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  sh -x .*/path/to/deployment/script})      
+        end
+
         it 'should cd to the deploy_to path prior to running the script' do
           WhiskeyDisk.run_post_deploy_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo; sh -x /path/to/main/repo/path/to/deployment/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/main/repo;.*sh -x /path/to/main/repo/path/to/deployment/script})
         end
         
         it 'should use a path relative to the deployment path to run the post deployment script' do
           WhiskeyDisk.run_post_deploy_hooks
           WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x /path/to/main/repo/path/to/deployment/script})
         end
-        
-        it 'should make the post deployment script run conditional on the presence of the script' do
-          WhiskeyDisk.run_post_deploy_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{if \[ -e /path/to/main/repo/path/to/deployment/script \]; then .*; fi})
-        end
       end
     end
         

data/whiskey_disk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.12"
+  s.version = "0.6.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 6
-  - 12
-  version: 0.6.12
+  - 13
+  version: 0.6.13
 platform: ruby
 authors: 
 - Rick Bradley