chef_cap 0.3.19 → 0.3.20

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.19"
+  VERSION = "0.3.20"
 end

data/recipes/chef_cap.rb

@@ -90,11 +90,17 @@ namespace :ssh do
 
   desc "Set any defined SSH options"
   task :set_options do
-    ssh_options[:paranoid] = ssh_options_paranoid rescue nil
-    ssh_options[:keys] = ssh_options_keys rescue nil
-    ssh_options[:forward_agent] = ssh_options_forward_agent rescue nil
-    ssh_options[:username] = ssh_options_username rescue user rescue nil
-    ssh_options[:port] = ssh_options_port rescue nil
+    options = {}
+    options[:config] = ssh_options_config rescue nil
+    options[:paranoid] = ssh_options_paranoid rescue nil
+    options[:keys] = ssh_options_keys rescue nil
+    options[:forward_agent] = ssh_options_forward_agent rescue nil
+    options[:username] = ssh_options_username rescue user rescue nil
+    options[:port] = ssh_options_port rescue nil
+    options.reject! { |key| options[key].nil? }
+    options.each_pair do |key, value|
+     ssh_options[key] = value
+    end
   end
 end
 before "chef:setup", "ssh:transfer_keys"
@@ -169,18 +175,12 @@ namespace :chef do
       install_chef_cmd = "gem install chef --no-ri --no-rdoc --version=#{chef_version}"
       run "#{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
 
-      gem_check_for_bundler_cmd = "gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
-      install_bundler_cmd = "gem install bundler --no-ri --no-rdoc"
-      run "#{gem_check_for_bundler_cmd} || #{install_bundler_cmd} && echo 'Bundler already on this server.'"
       run "rbenv rehash"
     else
       gem_check_for_chef_cmd = "gem specification --version '>=#{chef_version}' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
       install_chef_cmd = "sudo `cat #{rvm_bin_path}` default exec gem install chef --no-ri --no-rdoc --version=#{chef_version}"
       sudo "`cat #{rvm_bin_path}` default exec #{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
 
-      gem_check_for_bundler_cmd = "gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
-      install_bundler_cmd = "sudo `cat #{rvm_bin_path}` default exec gem install bundler --no-ri --no-rdoc"
-      sudo "`cat #{rvm_bin_path}` default exec #{gem_check_for_bundler_cmd} || #{install_bundler_cmd} && echo 'Bundler already on this server.'"
       sudo "`cat #{rvm_bin_path}` default exec which chef-solo"
     end
   end

data/spec/chef_cap_mock_cap.rb

@@ -93,7 +93,7 @@ end
 def unset(key)
   @variables.delete(key)
   self.instance_eval(<<-EOS)
-    undef #{key}
+    undef #{key} rescue nil
   EOS
 end
 

data/spec/chef_cap_spec.rb

@@ -229,7 +229,8 @@ describe "chef_cap" do
               "authorized_pub_file": "#{File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssh_public_key')}",
               "known_hosts": "knownhostscontent",
               "options": {
-                "keys": "some_ssh_key_path"
+                "keys": "some_ssh_key_path",
+                "username": null
               }
             }
           },
@@ -312,6 +313,12 @@ describe "chef_cap" do
         chef_cap.cap_after[:nossh].should_not be_nil
         chef_cap.cap_after[:nossh].should include("ssh:set_options")
       end
+
+      it "does not set nil values" do
+        chef_cap.cap_task["ssh:set_options"].call
+        chef_cap.cap_ssh_options.has_key?(:username).should be_false
+        chef_cap.cap_ssh_options.has_key?(:config).should be_false
+      end
     end
 
     context "when a value is null" do
@@ -510,7 +517,6 @@ describe "chef_cap" do
         it "sets up chef gem" do
           chef_cap.cap_servers.should_not be_empty
           chef_cap.should_receive(:sudo).ordered.with("`cat /tmp/.chef_cap_rvm_path` default exec gem specification --version '>=0.1982.1234' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || sudo `cat /tmp/.chef_cap_rvm_path` default exec gem install chef --no-ri --no-rdoc --version=0.1982.1234 && echo 'Chef Solo already on this server.'").and_return("mocked")
-          chef_cap.should_receive(:sudo).ordered.with("`cat /tmp/.chef_cap_rvm_path` default exec gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || sudo `cat /tmp/.chef_cap_rvm_path` default exec gem install bundler --no-ri --no-rdoc && echo 'Bundler already on this server.'").and_return("mocked")
           chef_cap.should_receive(:sudo).ordered.with("`cat /tmp/.chef_cap_rvm_path` default exec which chef-solo").and_return("mocked")
 
           chef_cap.cap_task["bootstrap:ruby"].call
@@ -562,7 +568,6 @@ describe "chef_cap" do
           chef_cap.cap_servers.should_not be_empty
           chef_cap.stub!(:put => "stubbed")
           chef_cap.should_receive(:run).ordered.with("gem specification --version '>=0.1982.1234' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || gem install chef --no-ri --no-rdoc --version=0.1982.1234 && echo 'Chef Solo already on this server.'").and_return("mocked")
-          chef_cap.should_receive(:run).ordered.with("gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || gem install bundler --no-ri --no-rdoc && echo 'Bundler already on this server.'").and_return("mocked")
           chef_cap.should_receive(:run).ordered.with("rbenv rehash").and_return("mocked")
 
           chef_cap.cap_task["bootstrap:ruby"].call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70281951400000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *70281951400000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70281951399500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70281951399500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -93,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1298707690600730626
+      hash: 1458186422045176253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,10 +112,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1298707690600730626
+      hash: 1458186422045176253
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"