knife-solo 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5fe9ecb3ae1c82b5e1adceb0108d37d8b8ec56
-  data.tar.gz: 869dda3bdfa85f9f57591d162a3067924b6f039c
+  metadata.gz: d1be6240f65ce8b7255b2da87a1aadad46e91139
+  data.tar.gz: dafd0b80483566f921c9ce779fa1baa0ced57d0d
 SHA512:
-  metadata.gz: 1516533d664b431e2424d493a02088f240eac13e7398bda438251e475433794554450f5430035b81223687fcfe5beb080b9c48dd9a39616c333a9b0430451899
-  data.tar.gz: 7cbe38fe74bcacc0c6e22bf20861ecef1f80a976ecfabfc83418abc41f85e71898189299e030fc7b18bda5670d92befbd1f974483276fefece00f43de53dd94e
+  metadata.gz: d72d04c97936e105e7d60d62399ad156500843b25023f8feea4d844cd8c01720e8f612521f14697050ab0ab424e192982f941e9d8c324d82c578da64daa5f43f
+  data.tar.gz: 55556df5ca2c38708d85b384f7a8b1108638fabb2b9d35dc42a83e1b3b86eef6d72b359523d93ae9627624171ca40e5377b0319ea5a3308f680b91aed1207887

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+# 0.4.2 / 2014-06-05
+
+## Changes and new features
+
+* SSH agent forwarding support ([328][], [347][], [358][])
+* SSH gateway support ([8d1f4f8][])
+* Support non-bash shells (csh, sh, dash, bash, and fish) ([351][])
+* Add `node_name` & `ssl_verify_mode` to `solo.rb` ([359][], [363][])
+* Store IP address in generated node file ([360][])
+* openSUSE 13 support ([352][])
+* Mavericks support ([356][])
+
+## Fixes
+
+* Avoid Net::SSH auto-reading default openssh configs when an ssh config file is used ([341][])
+
+## Thanks to our contributors!
+
+* [Yuki Sonoda][yugui]
+* [Todd Willey][xtoddx]
+* [Andy Leonard][anl]
+* [Robert L. Carpenter][robacarp]
+* [alexsiri7][alexsiri7]
+* [Ravil Bayramgalin][brainopia]
+* [Chun-wei Kuo][Domon]
+* [Angel Abad][angelabad]
+
+[308]: https://github.com/matschaffer/knife-solo/issues/308
+[328]: https://github.com/matschaffer/knife-solo/issues/328
+[347]: https://github.com/matschaffer/knife-solo/issues/347
+[351]: https://github.com/matschaffer/knife-solo/issues/351
+[352]: https://github.com/matschaffer/knife-solo/issues/352
+[358]: https://github.com/matschaffer/knife-solo/issues/358
+[359]: https://github.com/matschaffer/knife-solo/issues/359
+[360]: https://github.com/matschaffer/knife-solo/issues/360
+[363]: https://github.com/matschaffer/knife-solo/issues/363
+[356]: https://github.com/matschaffer/knife-solo/issues/356
+[8d1f4f8]: https://github.com/matschaffer/knife-solo/commit/8d1f4f8
+
 # 0.4.1 / 2013-12-07
 
 ## Changes and new features
@@ -402,57 +441,65 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * Generate node config on prepare
 * Cook via rsync
 
-[ChrisLundquist]:https://github.com/ChrisLundquist
-[DrGonzo65]:     https://github.com/DrGonzo65
-[Frozenproduce]: https://github.com/Frozenproduce
-[Motiejus]:      https://github.com/Motiejus
-[Nix-wie-weg]:   https://github.com/Nix-wie-weg
-[TheAlphaTester]:https://github.com/TheAlphaTester
-[TylerRick]:     https://github.com/TylerRick
-[aaronjensen]:   https://github.com/aaronjensen
-[amoslanka]:     https://github.com/amoslanka
-[ares]:          https://github.com/ares
-[aromarom64]:    https://github.com/aromarom64
-[avit]:          https://github.com/avit
-[bambuchaAdm]:   https://github.com/bambuchaAdm
-[brynary]:       https://github.com/brynary
-[btm]:           https://github.com/btm
-[dapatil]:       https://github.com/dapatil
-[davidsch]:      https://github.com/davidsch
-[deepak]:        https://github.com/deepak
-[dkinzer]:       https://github.com/dkinzer
-[dwradcliffe]:   https://github.com/dwradcliffe
-[fnichol]:       https://github.com/fnichol
-[funglaub]:      https://github.com/funglaub
-[gregf]:         https://github.com/gregf
-[gsterndale]:    https://github.com/gsterndale
-[hectcastro]:    https://github.com/hectcastro
-[hrp]:           https://github.com/hrp
-[jgarber]:       https://github.com/jgarber
-[jgrevich]:      https://github.com/jgrevich
-[kmdsbng]:       https://github.com/kmdsbng
-[makern]:        https://github.com/makern
-[michaelglass]:  https://github.com/michaelglass
-[naoya]:         https://github.com/naoya
-[natlownes]:     https://github.com/natlownes
-[patatepartie]:  https://github.com/patatepartie
-[patcon]:        https://github.com/patcon
-[pferdefleisch]: https://github.com/pferdefleisch
-[piglovesyou]:   https://github.com/piglovesyou
-[portertech]:    https://github.com/portertech
-[retr0h]:        https://github.com/retr0h
-[rmoriz]:        https://github.com/rmoriz
-[rosstimson]:    https://github.com/rosstimson
-[rubiojr]:       https://github.com/rubiojr
+[ChrisLundquist]:  https://github.com/ChrisLundquist
+[DrGonzo65]:       https://github.com/DrGonzo65
+[Frozenproduce]:   https://github.com/Frozenproduce
+[Motiejus]:        https://github.com/Motiejus
+[Nix-wie-weg]:     https://github.com/Nix-wie-weg
+[TheAlphaTester]:  https://github.com/TheAlphaTester
+[TylerRick]:       https://github.com/TylerRick
+[aaronjensen]:     https://github.com/aaronjensen
+[amoslanka]:       https://github.com/amoslanka
+[ares]:            https://github.com/ares
+[aromarom64]:      https://github.com/aromarom64
+[avit]:            https://github.com/avit
+[bambuchaAdm]:     https://github.com/bambuchaAdm
+[brynary]:         https://github.com/brynary
+[btm]:             https://github.com/btm
+[dapatil]:         https://github.com/dapatil
+[davidsch]:        https://github.com/davidsch
+[deepak]:          https://github.com/deepak
+[dkinzer]:         https://github.com/dkinzer
+[dwradcliffe]:     https://github.com/dwradcliffe
+[fnichol]:         https://github.com/fnichol
+[funglaub]:        https://github.com/funglaub
+[gregf]:           https://github.com/gregf
+[gsterndale]:      https://github.com/gsterndale
+[hectcastro]:      https://github.com/hectcastro
+[hrp]:             https://github.com/hrp
+[jgarber]:         https://github.com/jgarber
+[jgrevich]:        https://github.com/jgrevich
+[kmdsbng]:         https://github.com/kmdsbng
+[makern]:          https://github.com/makern
+[michaelglass]:    https://github.com/michaelglass
+[naoya]:           https://github.com/naoya
+[natlownes]:       https://github.com/natlownes
+[patatepartie]:    https://github.com/patatepartie
+[patcon]:          https://github.com/patcon
+[pferdefleisch]:   https://github.com/pferdefleisch
+[piglovesyou]:     https://github.com/piglovesyou
+[portertech]:      https://github.com/portertech
+[retr0h]:          https://github.com/retr0h
+[rmoriz]:          https://github.com/rmoriz
+[rosstimson]:      https://github.com/rosstimson
+[rubiojr]:         https://github.com/rubiojr
 [russellcardullo]: https://github.com/russellcardullo
-[ryandub]:       https://github.com/ryandub
-[searlm]:        https://github.com/searlm
-[skyeagle]:      https://github.com/skyeagle
-[smdern]:        https://github.com/smdern
-[teyrow]:        https://github.com/teyrow
-[tknerr]:        https://github.com/tknerr
-[tmatilai]:      https://github.com/tmatilai
-[tocky]:         https://github.com/tocky
-[vjpr]:          https://github.com/vjpr
-[zeph]:          https://github.com/zeph
-[allaire]:       https://github.com/allaire
+[ryandub]:         https://github.com/ryandub
+[searlm]:          https://github.com/searlm
+[skyeagle]:        https://github.com/skyeagle
+[smdern]:          https://github.com/smdern
+[teyrow]:          https://github.com/teyrow
+[tknerr]:          https://github.com/tknerr
+[tmatilai]:        https://github.com/tmatilai
+[tocky]:           https://github.com/tocky
+[vjpr]:            https://github.com/vjpr
+[zeph]:            https://github.com/zeph
+[allaire]:         https://github.com/allaire
+[yugui]:           https://github.com/yugui
+[xtoddx]:          https://github.com/xtoddx
+[anl]:             https://github.com/anl
+[robacarp]:        https://github.com/robacarp
+[alexsiri7]:       https://github.com/alexsiri7
+[brainopia]:       https://github.com/brainopia
+[Domon]:           https://github.com/Domon
+[angelabad]:       https://github.com/angelabad

data/lib/chef/knife/solo_bootstrap.rb

@@ -19,7 +19,7 @@ class Chef
 
       # Use (some) options from prepare and cook commands
       self.options = SoloPrepare.options
-      [:berkshelf, :librarian, :sync_only, :why_run].each { |opt| option opt, SoloCook.options[opt] }
+      [:berkshelf, :librarian, :sync_only, :why_run, :clean_up].each { |opt| option opt, SoloCook.options[opt] }
 
       def run
         validate!

data/lib/chef/knife/solo_cook.rb

@@ -67,6 +67,10 @@ class Chef
         :long        => '--provisioning-path path',
         :description => 'Where to store kitchen data on the node'
 
+      option :clean_up,
+        :long        => '--clean-up',
+        :description => 'Run the clean command after cooking'
+
       def run
         time('Run') do
 
@@ -89,6 +93,8 @@ class Chef
             generate_solorb
           end
           cook unless config[:sync_only]
+
+          clean_up if config[:clean_up]
         end
       end
 
@@ -121,6 +127,10 @@ class Chef
         upload_to_provision_path(:environment_path, 'environments')
       end
 
+      def ssl_verify_mode
+        Chef::Config[:ssl_verify_mode] || :verify_peer
+      end
+
       def expand_path(path)
         Pathname.new(path).expand_path
       end
@@ -246,8 +256,14 @@ class Chef
         file.unlink
       end
 
-      def rsync(source_path, target_path, extra_opts = '--delete')
-        cmd = ['rsync', '-rL', rsync_debug, rsync_permissions, %Q{--rsh=ssh #{ssh_args}}, extra_opts]
+      def rsync(source_path, target_path, extra_opts = '--delete-after')
+        if config[:ssh_gateway]
+          ssh_command = "ssh -TA #{config[:ssh_gateway]} ssh -T -o StrictHostKeyChecking=no #{ssh_args}"
+        else
+          ssh_command = "ssh #{ssh_args}"
+        end
+
+        cmd = ['rsync', '-rL', rsync_debug, rsync_permissions, %Q{--rsh=#{ssh_command}}, extra_opts]
         cmd += rsync_excludes.map { |ignore| "--exclude=#{ignore}" }
         cmd << adjust_rsync_path_on_client(source_path)
         cmd << %Q{:#{adjust_rsync_path_on_node(target_path)}}
@@ -291,10 +307,18 @@ class Chef
         raise "chef-solo failed. See output above." unless result.success?
       end
 
+      def clean_up
+        clean = SoloClean.new
+        clean.ui = ui
+        clean.name_args = @name_args
+        clean.config.merge! config
+        clean.run
+      end
+
       protected
 
       def patch_cookbooks_install
-        add_cookbook_path(patch_cookbooks_path) 
+        add_cookbook_path(patch_cookbooks_path)
       end
     end
   end

data/lib/knife-solo/bootstraps.rb

@@ -62,11 +62,13 @@ module KnifeSolo
 
       def http_client_get_url(url, file)
         stream_command <<-BASH
-          if command -v curl >/dev/null 2>&1; then
-            curl -L -o #{file} #{url}
-          else
-            wget -O #{file} #{url}
-          fi
+          /bin/sh -c " \
+            if command -v curl >/dev/null 2>&1; then \
+              curl -L -o '#{file}' '#{url}'; \
+            else \
+              wget -O '#{file}' '#{url}'; \
+            fi; \
+          "
         BASH
       end
 

data/lib/knife-solo/bootstraps/darwin.rb

@@ -7,7 +7,7 @@ module KnifeSolo::Bootstraps
 
     def distro
       case issue
-      when %r{10.[6-8]}
+      when %r{10.[6-9]}
         {:type => 'omnibus'}
       else
         raise "OS X version #{issue} not supported"

data/lib/knife-solo/bootstraps/linux.rb

@@ -85,6 +85,8 @@ module KnifeSolo::Bootstraps
         {:type => "debianoid_gem"}
       when %r{Raspbian}
         {:type => "debianoid_gem"}
+      when %r{Linux Mint}
+        {:type => "debianoid_gem"}
       when %r{Ubuntu}i
         {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Linaro}
@@ -95,6 +97,8 @@ module KnifeSolo::Bootstraps
         {:type => "yum_omnibus"}
       when %r{Red Hat Enterprise}
         {:type => "yum_omnibus"}
+      when %r{Oracle Linux Server}
+        {:type => "yum_omnibus"}
       when %r{Enterprise Linux Enterprise Linux Server}
         {:type => "yum_omnibus"}
       when %r{Fedora release}
@@ -105,7 +109,7 @@ module KnifeSolo::Bootstraps
         {:type => "yum_omnibus"}
       when %r{SUSE Linux Enterprise Server 1[12]}
         {:type => "omnibus"}
-      when %r{openSUSE 12}
+      when %r{openSUSE 1[23]}
         {:type => "zypper_omnibus"}
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
         {:type => "emerge_gem"}

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.4.1'
+    '0.4.2'
   end
 
   def self.post_install_message

data/lib/knife-solo/node_config_command.rb

@@ -74,7 +74,8 @@ module KnifeSolo
           attributes = config[:json_attributes] || config[:first_boot_attributes] || {}
           run_list = { :run_list => config[:run_list] || [] }
           environment = config[:environment] ? { :environment => config[:environment] } : {}
-          f.print attributes.merge(run_list).merge(environment).to_json
+          automatic = host ? { :automatic => { :ipaddress => host } } : {}
+          f.print JSON.pretty_generate(attributes.merge(run_list).merge(environment).merge(automatic))
         end
       end
     end

data/lib/knife-solo/resources/solo.rb.erb

@@ -1,3 +1,5 @@
+node_name <%= host.inspect %>
+
 base = File.expand_path('..', __FILE__)
 
 nodes_path                File.join(base, 'nodes')
@@ -6,6 +8,7 @@ data_bag_path             File.join(base, 'data_bags')
 encrypted_data_bag_secret File.join(base, 'data_bag_key')
 environment_path          File.join(base, 'environments')
 environment               <%= node_environment.inspect %>
+ssl_verify_mode           <%= ssl_verify_mode.inspect %>
 
 cookbook_path []
 <% cookbook_paths.each_with_index do |path, i| -%>

data/lib/knife-solo/ssh_command.rb

@@ -5,6 +5,7 @@ module KnifeSolo
     def self.load_deps
       require 'knife-solo/ssh_connection'
       require 'net/ssh'
+      require 'net/ssh/gateway'
     end
 
     def self.included(other)
@@ -38,6 +39,10 @@ module KnifeSolo
           :long        => '--ssh-password PASSWORD',
           :description => 'The ssh password'
 
+        option :ssh_gateway,
+          :long        => '--ssh-gateway GATEWAY',
+          :description => 'The ssh gateway'
+
         option :ssh_identity,
           :long        => '--ssh-identity FILE',
           :description => 'Deprecated. Replaced with --identity-file.'
@@ -47,6 +52,12 @@ module KnifeSolo
           :long        => '--identity-file FILE',
           :description => 'The ssh identity file'
 
+        option :forward_agent,
+          :long        => '--forward-agent',
+          :description => 'Forward SSH authentication',
+          :boolean     => true,
+          :default     => false
+
         option :ssh_port,
           :short       => '-p PORT',
           :long        => '--ssh-port PORT',
@@ -118,7 +129,7 @@ module KnifeSolo
     end
 
     def try_connection
-      Net::SSH.start(host, user, connection_options) do |ssh|
+      ssh_connection.session do |ssh|
         ssh.exec!("true")
       end
     end
@@ -132,10 +143,15 @@ module KnifeSolo
       options[:port] = config[:ssh_port] if config[:ssh_port]
       options[:password] = config[:ssh_password] if config[:ssh_password]
       options[:keys] = [config[:identity_file]] if config[:identity_file]
+      options[:gateway] = config[:ssh_gateway] if config[:ssh_gateway]
+      options[:forward_agent] = true if config[:forward_agent]
       if !config[:host_key_verify]
         options[:paranoid] = false
         options[:user_known_hosts_file] = "/dev/null"
       end
+      # Respect users' specification of config[:ssh_config]
+      # Prevents Net::SSH itself from applying the default ssh_config files.
+      options[:config] = false
       options
     end
 
@@ -160,12 +176,13 @@ module KnifeSolo
       host_arg = [user, host].compact.join('@')
       config_arg = "-F #{config[:ssh_config]}" if config[:ssh_config]
       ident_arg = "-i #{config[:identity_file]}" if config[:identity_file]
-      port_arg = "-p #{config[:ssh_port]}" if config[:ssh_port]      
+      forward_arg = "-o ForwardAgent=yes" if config[:forward_agent]
+      port_arg = "-p #{config[:ssh_port]}" if config[:ssh_port]
       knownhosts_arg  =  "-o UserKnownHostsFile=#{connection_options[:user_known_hosts_file]}" if config[:host_key_verify] == false
       stricthosts_arg = "-o StrictHostKeyChecking=no" if config[:host_key_verify] == false
 
 
-      [host_arg, config_arg, ident_arg, port_arg, knownhosts_arg, stricthosts_arg].compact.join(' ')
+      [host_arg, config_arg, ident_arg, forward_arg, port_arg, knownhosts_arg, stricthosts_arg].compact.join(' ')
     end
 
     def sudo_command
@@ -195,7 +212,7 @@ module KnifeSolo
         Chef::Log.debug("Using replacement sudo command: #{sudo_command}")
         replacement = sudo_command
       elsif sudo_available?
-        replacement = 'sudo -p \'knife sudo password: \''
+        replacement = 'sudo -E -p \'knife sudo password: \''
       else
         replacement = ''
       end
@@ -229,10 +246,15 @@ module KnifeSolo
 
       output = ui.stdout if options[:streaming]
 
-      @connection ||= SshConnection.new(host, user, connection_options, method(:password))
+
+      @connection ||= ssh_connection
       @connection.run_command(command, output)
     end
 
+    def ssh_connection
+       SshConnection.new(host, user, connection_options, method(:password))
+    end
+
     # Runs commands from the specified array until successful.
     # Returns the result of the successful command or an ExecResult with
     # exit_code 1 if all fail.

data/lib/knife-solo/ssh_connection.rb

@@ -32,8 +32,16 @@ module KnifeSolo
 
     attr_reader :host, :user, :connection_options
 
-    def session
-      @session ||= Net::SSH.start(host, user, connection_options)
+    def session(&block)
+      @session ||= begin
+        if connection_options[:gateway]
+          co = connection_options
+          gw_user,gw =  co.delete(:gateway).split '@'
+          Net::SSH::Gateway.new(gw, gw_user).ssh(host, user, co, &block)
+        else
+          Net::SSH.start(host, user, connection_options, &block)
+        end
+      end
     end
 
     def password

data/test/integration/debian6_bootstrap_test.rb

@@ -1,12 +1,15 @@
 require 'integration_helper'
 
+
 class Debian6BootstrapTest < IntegrationTest
   def user
     "admin"
   end
 
   def image_id
-    "ami-7ce17315"
+    # PVM 64-bit
+    # From https://wiki.debian.org/Cloud/AmazonEC2Image/Squeeze
+    "ami-0740476e"
   end
 
   def prepare_server

data/test/integration/debian7_knife_bootstrap_test.rb

@@ -6,7 +6,9 @@ class Debian7KnifeBootstrapTest < IntegrationTest
   end
 
   def image_id
-    "ami-9e95e8f7"
+    # PVM instance store
+    # From https://wiki.debian.org/Cloud/AmazonEC2Image/Wheezy
+    "ami-848a6eec"
   end
 
   def prepare_server

data/test/node_config_command_test.rb

@@ -45,7 +45,8 @@ class NodeConfigCommandTest < TestCase
       cmd = command(@host)
       cmd.generate_node_config
       assert cmd.node_config.exist?
-      assert_match '{"run_list":[]}', cmd.node_config.read
+
+      assert_config_contains({"run_list" => []}, cmd)
     end
   end
 
@@ -72,7 +73,8 @@ class NodeConfigCommandTest < TestCase
     in_kitchen do
       cmd = command(@host, "--run-list=role[base],recipe[foo]")
       cmd.generate_node_config
-      assert_match '{"run_list":["role[base]","recipe[foo]"]}', cmd.node_config.read
+
+      assert_config_contains({"run_list" => ["role[base]","recipe[foo]"]}, cmd)
     end
   end
 
@@ -81,7 +83,13 @@ class NodeConfigCommandTest < TestCase
       foo_json = '"foo":{"bar":[1,2],"baz":"x"}'
       cmd = command(@host, "--json-attributes={#{foo_json}}")
       cmd.generate_node_config
-      assert_match "{#{foo_json},\"run_list\":[]}", cmd.node_config.read
+
+      expected_hash = {
+        "foo" => {"bar" => [1,2], "baz" => "x"},
+        "run_list" => []
+      }
+
+      assert_config_contains expected_hash, cmd
     end
   end
 
@@ -94,17 +102,28 @@ class NodeConfigCommandTest < TestCase
       cmd.config[:json_attributes]       = JSON.parse("{#{foo_json}}")
       cmd.config[:first_boot_attributes] = JSON.parse("{#{ignored_json}}")
       cmd.generate_node_config
-      assert_match "{#{foo_json},\"run_list\":[]}", cmd.node_config.read
+
+      expected_hash = {
+        "foo" => 99,
+        "run_list" => []
+      }
+
+      assert_config_contains expected_hash, cmd
     end
   end
 
   def test_generates_a_node_config_with_specified_first_boot_attributes
     in_kitchen do
-      foo_json = '"foo":null'
       cmd = command(@host)
-      cmd.config[:first_boot_attributes] = JSON.parse("{#{foo_json}}")
+      cmd.config[:first_boot_attributes] = {"foo"=>nil}
       cmd.generate_node_config
-      assert_match "{#{foo_json},\"run_list\":[]}", cmd.node_config.read
+
+      expected_hash = {
+        "foo" => nil,
+        "run_list" => []
+      }
+
+      assert_config_contains expected_hash, cmd
     end
   end
 
@@ -114,10 +133,33 @@ class NodeConfigCommandTest < TestCase
       run_list = 'recipe[baz]'
       cmd = command(@host, "--run-list=#{run_list}", "--json-attributes={#{foo_json}}")
       cmd.generate_node_config
-      assert_match "{#{foo_json},\"run_list\":[\"#{run_list}\"]}", cmd.node_config.read
+
+      expected_hash = {
+        "foo" => "bar",
+        "run_list" => [run_list]
+      }
+
+      assert_config_contains expected_hash, cmd
+
     end
   end
 
+  def test_generates_a_node_config_with_the_ip_address
+    in_kitchen do
+      cmd = command(@host)
+      cmd.generate_node_config
+
+      expected_hash = {
+        "automatic" => { "ipaddress" => @host }
+      }
+
+      assert_config_contains expected_hash, cmd
+
+    end
+  end
+
+
+
   def test_creates_the_nodes_directory_if_needed
     outside_kitchen do
       cmd = command(@host, "--node-name=mynode")
@@ -126,7 +168,17 @@ class NodeConfigCommandTest < TestCase
     end
   end
 
+  private
+
   def command(*args)
     knife_command(DummyNodeConfigCommand, *args)
   end
+
+  def assert_config_contains expected_hash, cmd
+    config = JSON.parse(cmd.node_config.read)
+    expected_hash.each do |k, v|
+      assert_equal v, config[k]
+    end
+  end
+
 end

data/test/solo_bootstrap_test.rb

@@ -17,6 +17,10 @@ class SoloBootstrapTest < TestCase
     end
   end
 
+  def test_includes_clean_up_cook_option
+    assert Chef::Knife::SoloBootstrap.options.include?(:clean_up), "Should support option :clean_up"
+  end
+
   def test_runs_prepare_and_cook
     Chef::Knife::SoloPrepare.any_instance.expects(:run)
     Chef::Knife::SoloCook.any_instance.expects(:run)

data/test/solo_cook_test.rb

@@ -4,6 +4,7 @@ require 'support/validation_helper'
 
 require 'berkshelf'
 require 'chef/cookbook/chefignore'
+require 'chef/knife/solo_clean'
 require 'chef/knife/solo_cook'
 require 'fileutils'
 require 'knife-solo/berkshelf'
@@ -33,6 +34,65 @@ class SoloCookTest < TestCase
     end
   end
 
+  def test_sets_ssl_verify_mode_returns_verify_peer_for_nil
+    Chef::Config[:ssl_verify_mode] = nil
+    assert_equal :verify_peer, command.ssl_verify_mode
+  end
+
+  def test_sets_ssl_verify_mode
+    Chef::Config[:ssl_verify_mode] = :verify_none
+    assert_equal :verify_none, command.ssl_verify_mode
+  end
+
+  def test_rsync_without_gateway_connection_options
+    in_kitchen do
+
+      cmd = knife_command(Chef::Knife::SoloCook)
+      cmd.expects(:system!).with('rsync',
+                                  '-rL',
+                                  '--rsh=ssh ssh_arguments',
+                                  '--delete-after',
+                                  '--exclude=revision-deploys',
+                                  '--exclude=tmp',
+                                  '--exclude=.git',
+                                  '--exclude=.hg',
+                                  '--exclude=.svn',
+                                  '--exclude=.bzr',
+                                  'source',
+                                  ':dest')
+
+      cmd.stubs(:ssh_args => 'ssh_arguments')
+      cmd.stubs(:windows_node? => false)
+
+      cmd.rsync 'source', 'dest'
+    end
+  end
+
+  def test_rsync_with_gateway_connection_options
+    in_kitchen do
+
+      cmd = knife_command(Chef::Knife::SoloCook)
+      cmd.config[:ssh_gateway] = 'user@gateway'
+      cmd.expects(:system!).with('rsync',
+                                  '-rL',
+                                  '--rsh=ssh -TA user@gateway ssh -T -o StrictHostKeyChecking=no ssh_arguments',
+                                  '--delete-after',
+                                  '--exclude=revision-deploys',
+                                  '--exclude=tmp',
+                                  '--exclude=.git',
+                                  '--exclude=.hg',
+                                  '--exclude=.svn',
+                                  '--exclude=.bzr',
+                                  'source',
+                                  ':dest')
+
+      cmd.stubs(:ssh_args => 'ssh_arguments')
+      cmd.stubs(:windows_node? => false)
+
+      cmd.rsync 'source', 'dest'
+    end
+  end
+
   def test_expanded_config_paths_returns_empty_array_for_nil
     Chef::Config[:foo] = nil
     assert_equal [], command.expanded_config_paths(:foo)
@@ -85,7 +145,7 @@ class SoloCookTest < TestCase
       cmd.run
       #note: cookbook_paths are in order of precedence (low->high)
       assert_equal cmd.patch_cookbooks_path, cmd.cookbook_paths[0]
-    end 
+    end
   end
 
   def test_does_not_run_berkshelf_if_no_berkfile
@@ -198,6 +258,22 @@ class SoloCookTest < TestCase
     end
   end
 
+  def test_runs_clean_after_cook_if_enabled_by_option
+    Chef::Knife::SoloClean.any_instance.expects(:run)
+
+    in_kitchen do
+      command("somehost", "--clean-up").run
+    end
+  end
+
+  def test_does_not_run_clean_after_cook_if_not_enabled_by_option
+    Chef::Knife::SoloClean.any_instance.expects(:run).never
+
+    in_kitchen do
+      command("somehost").run
+    end
+  end
+
   def test_validates_chef_version
     in_kitchen do
       cmd = command("somehost")

data/test/ssh_command_test.rb

@@ -58,9 +58,27 @@ class SshCommandTest < TestCase
     assert_equal "test", cmd.connection_options[:password]
   end
 
+  def test_try_connection_without_gateway_connects_using_ssh
+    cmd = command("10.0.0.1")
+    Net::SSH.expects(:start).with(cmd.host, cmd.user, cmd.connection_options)
+
+    cmd.try_connection
+  end
+
+  def test_try_connection_with_gateway_connects_using_ssh_gateway
+    cmd = command("10.0.0.1", "--ssh-gateway=user@gateway")
+    ssh_mock = mock 'ssh_mock'
+    Net::SSH::Gateway.expects(:new).with('gateway', 'user').returns(ssh_mock)
+    ssh_mock.expects(:ssh).with(cmd.host, cmd.user, cmd.connection_options.except(:gateway))
+
+    Net::SSH.expects(:start).never
+
+    cmd.try_connection
+  end
+
   def test_uses_default_keys_if_conncetion_succeeds
     cmd = command("10.0.0.1")
-    assert_equal({}, cmd.connection_options)
+    assert_equal false, cmd.connection_options[:config]
   end
 
   def test_uses_ssh_config_if_matched
@@ -70,6 +88,7 @@ class SshCommandTest < TestCase
     assert_equal "bob", cmd.connection_options[:user]
     assert_equal "id_rsa_bob", cmd.connection_options[:keys].first
     assert_equal "bob", cmd.user
+    assert_equal false, cmd.connection_options[:config]
   end
 
   def test_handles_port_specification
@@ -88,6 +107,18 @@ class SshCommandTest < TestCase
     assert_equal "/dev/null",  cmd.connection_options[:user_known_hosts_file]
   end
 
+  def test_handle_forward_agent
+    cmd = command("10.0.0.1", "--forward-agent")
+    assert_equal true,  cmd.connection_options[:forward_agent]
+  end
+
+
+  def test_handle_ssh_gateway
+    gateway = 'test@host.com'
+    cmd = command("10.0.0.1", "--ssh-gateway", gateway)
+    assert_equal gateway,  cmd.connection_options[:gateway]
+  end
+
   def test_handle_default_host_key_verify_is_paranoid
     cmd = command("10.0.0.1")
     assert_nil(cmd.connection_options[:paranoid]) # Net:SSH default is :paranoid => true
@@ -119,6 +150,14 @@ class SshCommandTest < TestCase
     cmd = command("usertest@10.0.0.1", "--no-host-key-verify")
     cmd.validate_ssh_options!
     assert_equal "usertest@10.0.0.1 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", cmd.ssh_args
+
+    cmd = command("usertest@10.0.0.1", "--forward-agent")
+    cmd.validate_ssh_options!
+    assert_equal "usertest@10.0.0.1 -o ForwardAgent=yes", cmd.ssh_args
+
+    cmd = command("usertest@10.0.0.1", "--ssh-gateway=test@host.com")
+    cmd.validate_ssh_options!
+    assert_equal "usertest@10.0.0.1", cmd.ssh_args
   end
 
   def test_barks_without_atleast_a_hostname

metadata

@@ -1,215 +1,215 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0.beta.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0.beta.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: librarian-chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.12'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
@@ -218,7 +218,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
+- ".coveralls.yml"
 - CHANGELOG.md
 - LICENSE
 - README.rdoc
@@ -248,6 +248,29 @@ files:
 - lib/knife-solo/librarian.rb
 - lib/knife-solo/node_config_command.rb
 - lib/knife-solo/resources/knife.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/.travis.yml
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/CHANGELOG
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/LICENSE
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/NOTICE
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/README.md
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search/overrides.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search/parser.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/lucene.treetop
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/lucene_nodes.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/query_transform.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/metadata.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/recipes/default.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/Gemfile
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/alpha.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/beta.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/without_json_class.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/jerry.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/lea.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/mike.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/tom.json
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_data_bags.rb
+- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_search.rb
 - lib/knife-solo/resources/solo.rb.erb
 - lib/knife-solo/ssh_command.rb
 - lib/knife-solo/ssh_connection.rb
@@ -311,29 +334,6 @@ files:
 - test/support/validation_helper.rb
 - test/test_helper.rb
 - test/tools_test.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/.travis.yml
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/CHANGELOG
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/LICENSE
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/NOTICE
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/README.md
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search/overrides.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/search/parser.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/lucene.treetop
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/lucene_nodes.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/libraries/vendor/chef/solr_query/query_transform.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/metadata.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/recipes/default.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/Gemfile
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/alpha.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/beta.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/node/without_json_class.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/jerry.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/lea.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/mike.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/data/data_bags/users/tom.json
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_data_bags.rb
-- lib/knife-solo/resources/patch_cookbooks/chef-solo-search/tests/test_search.rb
 homepage: http://matschaffer.github.io/knife-solo/
 licenses: []
 metadata: {}
@@ -353,17 +353,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A collection of knife plugins for dealing with chef solo