chef-provisioning-ssh 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00cc5042c2f375db2b5a8d3022e1d985d99469c7
-  data.tar.gz: 1c336508827b7210d1841c130c2144b3e5e2741e
+  metadata.gz: 0160449d53c76b17219f4ef4fe5dc8e55654e5d3
+  data.tar.gz: bd6731b3071044c7208ba30180b420dca411e331
 SHA512:
-  metadata.gz: 366aebea4b1247d780f6e984bd292da3f9c919e8e60412e1ec6c063a61f78bb0d07c3e0112bf83f3901bb491dcec9b3ce0be7b8c8728958f53cea3c10b8525df
-  data.tar.gz: cd28ef27a447cc40ce986bae7b68b5737b5540758dac8654fb30bb78ef185ce6491c68ac410e2fe52420422639a5060097b04162c8b87bd2113f287313dcbb50
+  metadata.gz: b7a9c1006367c1d1286687070656b949e964efae71ca7f4f24b8d8dee3b333306ad9bfac4a8bebc98b6b5505aedd223069f09e1371800bbed2c352b1f6c2e484
+  data.tar.gz: deae4dfb868c0cbd77c2013475b6f75ada26fc9ab6001c21ea36806f16b8bf7503bd9d7af9ac30f70b5b2bcd2f7f521921ffb5b36defee4ce5bba911b58ff5c4

data/lib/chef/provisioning/ssh_driver/driver.rb

@@ -142,11 +142,16 @@ class Chef
         end
 
         def connect_to_machine(machine_spec, machine_options)
-          allocate_machine(action_handler, machine_spec, machine_options)
           if machine_options[:transport_options] && machine_options[:transport_options]['is_windows']
             machine_for(machine_spec, machine_options)
           else
-            machine_for(machine_spec, machine_options_for)
+            if machine_spec.location && ssh_machine_exists?(machine_spec.name)
+              _current_machine_options = existing_machine_hash(machine_spec)
+              current_machine_options  = stringify_keys(_current_machine_options.dup)
+            end
+            host_for(current_machine_options['transport_options'])
+            initialize_ssh(current_machine_options['transport_options'])
+            machine_for(machine_spec, machine_options_for(current_machine_options))
           end
         end
 
@@ -321,7 +326,7 @@ class Chef
             new_hash['ssh_options']['password'] = new_transport_options['password'] if new_transport_options['password']
           end
 
-          merged_transport_options        = Chef::Mixin::DeepMerge.merge(current_transport_options, new_transport_options)
+          merged_transport_options        = Chef::Mixin::DeepMerge.merge(current_transport_options.to_hash, new_transport_options.to_hash)
           _merged_transport_options       = merged_transport_options.dup
           updated_transport_options_hash = _merged_transport_options.dup
           updated_transport_options_hash = Chef::Mixin::DeepMerge.merge(merged_transport_options, new_hash) unless new_hash.empty?

data/lib/chef/provisioning/ssh_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module SshDriver
-      VERSION = '0.0.5'
+      VERSION = '0.0.6'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zack Zondlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning