whiskey_disk 0.6.13 → 0.6.14

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+0.6.14 / 2011-02-23 
+==================
+
+  * forcing bash as the execution shell
+
 0.6.13 / 2011-02-20 
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.6.13
+0.6.14

data/lib/whiskey_disk.rb

@@ -133,11 +133,11 @@ class WhiskeyDisk
     end
     
     def run(domain, cmd)
-      system('ssh', '-v', domain[:name], build_command(domain, cmd))
+      system('ssh', '-v', domain[:name], 'bash', '-c', build_command(domain, cmd))
     end
     
     def shell(domain, cmd)
-      system(build_command(domain, cmd))
+      system('bash', '-c', build_command(domain, cmd))
     end
     
     def flush
@@ -215,7 +215,7 @@ class WhiskeyDisk
 
     def run_script(script)
       return unless script
-      enqueue(%Q<cd #{self[:deploy_to]}; echo "Running post script..."; #{env_vars} sh -x #{build_path(script)}>)
+      enqueue(%Q<cd #{self[:deploy_to]}; echo "Running post script..."; #{env_vars} bash -x #{build_path(script)}>)
     end
 
     def ensure_main_parent_path_is_present

data/spec/whiskey_disk_spec.rb

@@ -384,22 +384,22 @@ describe 'WhiskeyDisk' do
       
         it 'should attempt to run the post setup script' do        
           WhiskeyDisk.run_post_setup_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/setup/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -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})      
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  bash -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;.*bash -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})         
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -x /path/to/setup/script})         
         end
       end
       
@@ -410,22 +410,22 @@ describe 'WhiskeyDisk' do
 
         it 'should attempt to run the post setup script' do        
           WhiskeyDisk.run_post_setup_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/setup/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -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})      
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  bash -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;.*bash -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})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -x /path/to/main/repo/path/to/setup/script})
         end
       end
     end
@@ -492,22 +492,22 @@ describe 'WhiskeyDisk' do
       
         it 'should attempt to run the post deployment script' do        
           WhiskeyDisk.run_post_deploy_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/deployment/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -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})      
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  bash -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;.*bash -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})         
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -x /path/to/deployment/script})         
         end
       end
       
@@ -518,22 +518,22 @@ describe 'WhiskeyDisk' do
 
         it 'should attempt to run the post deployment script' do        
           WhiskeyDisk.run_post_deploy_hooks
-          WhiskeyDisk.buffer.join(' ').should.match(%r{sh -x .*/path/to/deployment/script})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -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})      
+          WhiskeyDisk.buffer.join(' ').should.match(%r{FOO='BAR'  bash -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;.*bash -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})
+          WhiskeyDisk.buffer.join(' ').should.match(%r{bash -x /path/to/main/repo/path/to/deployment/script})
         end
       end
     end
@@ -868,14 +868,14 @@ describe 'WhiskeyDisk' do
     end
 
     it 'should pass the string to the shell with verbosity enabled' do
-      WhiskeyDisk.should.receive(:system).with("set -x; ls")
+      WhiskeyDisk.should.receive(:system).with('bash', '-c', "set -x; ls")
       WhiskeyDisk.shell(@domain, 'ls')
     end
       
     it 'should include domain role settings when the domain has roles' do
       @domain = { :name => @domain_name, :roles => [ 'web', 'db' ] }
       WhiskeyDisk.configuration = { 'domain' => [ @domain ] }
-      WhiskeyDisk.should.receive(:system).with("set -x; export WD_ROLES='web:db'; ls")
+      WhiskeyDisk.should.receive(:system).with('bash', '-c', "set -x; export WD_ROLES='web:db'; ls")
       WhiskeyDisk.shell(@domain, 'ls')        
     end
   end
@@ -898,14 +898,14 @@ describe 'WhiskeyDisk' do
     end
 
     it 'should pass the string to ssh for the domain, with verbosity enabled' do
-      WhiskeyDisk.should.receive(:system).with('ssh', '-v', @domain_name, "set -x; ls")
+      WhiskeyDisk.should.receive(:system).with('ssh', '-v', @domain_name, 'bash', '-c', "set -x; ls")
       WhiskeyDisk.run(@domain, 'ls')
     end
       
     it 'should include domain role settings when the domain has roles' do
       @domain = { :name => @domain_name, :roles => [ 'web', 'db' ] }
       WhiskeyDisk.configuration = { 'domain' => [ @domain ] }
-      WhiskeyDisk.should.receive(:system).with('ssh', '-v', @domain_name, "set -x; export WD_ROLES='web:db'; ls")
+      WhiskeyDisk.should.receive(:system).with('ssh', '-v', @domain_name, 'bash', '-c', "set -x; export WD_ROLES='web:db'; ls")
       WhiskeyDisk.run(@domain, 'ls')        
     end
   end

data/whiskey_disk.gemspec

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