kitchen-policyfile-nodes 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e28bf1a710e744fe97eb2e57c6e50caf9d90587
-  data.tar.gz: 81b936c2f5db15b73e019badb70ca88e0481ce2f
+  metadata.gz: dd3001fe7b97d7e286bf216736e46e7a2e154e26
+  data.tar.gz: 0ad6b3d0d2f563dbdb9843479ff72db3703f0b36
 SHA512:
-  metadata.gz: 202bd5311d0216e6f1d1dbe0a5b6e8e0c82c70d8ba79b525b7e89817d0411090ce255de86888791e0e7d5aa6645e75770cf445ef00236e1abdbb594688340f84
-  data.tar.gz: 52ee9be31fc8957d503273a7c4fbd1cabed25f990c2c08f479bc0681a0dc5934516498d8dcdf2462acd74ddedfce401be9d12ea27bfe26dcd878a9e0a3a10b00
+  metadata.gz: 92a9977dc49c2c681293a0fbff203d5ace3cc9c9f62d5051d01e31e2713d3f01f34e31f30ff7414501ddd9f2da42ea64123013b0c8fbfa17285b28740872aecb
+  data.tar.gz: a752e3cf02a01bacc1db2423db52b94758677b56b1750bfd76f88f73abb432bebef11a7c93d2bbf05c171b24d35b503b0f89b5e4749c1421e63fdf7cc1e94c83

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 1.1.0 (March 16, 2015)
+  - Switch to SCP download of node json object
+  - Create node_path directory if doesn't exists
+
+## 1.0.1 (March 15, 2015)
+  - Update documentation and gem description
+
+## 1.0.0 (March 14, 2015)
+  - Initial release of kitchen-policyfile-nodes

data/README.md

@@ -1,14 +1,12 @@
 # Kitchen::PolicyfileNodes
 
-Provisioner `policyfile_nodes` extends `policyfile_zero` by adding one more step in the end of converge - it copies the resulted node
-JSON object to the `nodes_path` on the host machine after successful converge. It allows you to use this node object for searches while converging another
+Provisioner `policyfile_nodes` extends `policyfile_zero` by adding one more step in the end of converge - it downloads the resulted node
+JSON object to the `nodes_path` on the host machine after successful converge over SSH. It allows you to use this node object for searches while converging another
 Test Kitchen suites. So, you can use actual node IP addresses to communicate nodes with each other.
 
 For example, 'web' node need to search 'db' node ip.
 In `policyfile_zero` we have to create mock in node_path for this search. `policyfile_nodes` will create mock automatically.
 
-`policyfile_nodes` supports SSH and SFTP (kitchen-sync) transporters.
-
 ## Requirements
 
 * ChefDK 0.10.0+

data/lib/kitchen/provisioner/policyfile_nodes.rb

@@ -49,103 +49,37 @@ module Kitchen
           debug('Transfer complete')
           conn.execute(env_cmd(provisioner.prepare_command))
           conn.execute(env_cmd(provisioner.run_command))
-          # Get node json object generated by chef_client
-          output = conn.execute_with_output(env_cmd(provisioner.dump_command))
-          File.open(provisioner.ext_node_file, 'w') { |f| f << output }
+          # Download node json object generated by chef_client
+          info("Transferring #{provisioner.int_node_file} " \
+               "from instance to #{provisioner.ext_node_file}")
+          conn.execute(env_cmd(conn.download(provisioner.int_node_file,
+                                             provisioner.ext_node_file)))
+          debug('Transfer complete')
         end
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
       ensure
         instance.provisioner.cleanup_sandbox
       end
-
-      def int_node_file
-        File.join(config[:root_path], 'nodes', "#{instance.name}.json")
-      end
     end
   end
 end
 
 module Kitchen
   module Transport
-    class Sftp
-      class Connection
-        # Execute a remote command over SFTP and return the command's exit code and output.
-        #
-        # @param command [String] command string to execute
-        # @return [Hash] the exit code and output of the command
-        def execute_with_output_and_exit_code(command)
-          exit_code = nil
-          output = ''
-          session.open_channel do |channel|
-            channel.request_pty
-
-            channel.exec(command) do |_ch, _success|
-              channel.on_data do |_ch, data|
-                output << data
-              end
-
-              channel.on_extended_data do |_ch, _type, data|
-                output << data
-              end
-
-              channel.on_request('exit-status') do |_ch, data|
-                exit_code = data.read_long
-              end
-            end
-          end
-          session.loop { exit_code.nil? }
-          [exit_code, output]
-        end
-      end
-    end
-
     class Ssh
       class Connection
-        # Execute a remote command over SSH and return the command's exit code and output.
-        #
-        # @param command [String] command string to execute
-        # @return [Hash] the exit code and output of the command
-        def execute_with_output_and_exit_code(command)
-          exit_code = nil
-          output = ''
-          session.open_channel do |channel|
-            channel.request_pty
-
-            channel.exec(command) do |_ch, _success|
-              channel.on_data do |_ch, data|
-                output << data
-              end
-
-              channel.on_extended_data do |_ch, _type, data|
-                output << data
-              end
-
-              channel.on_request('exit-status') do |_ch, data|
-                exit_code = data.read_long
-              end
-            end
-          end
-          session.loop { exit_code.nil? }
-          [exit_code, output]
-        end
-
-        # Execute command over SSH and return the command's output.
+        # Download JSON node file from instance to
+        # node_path over SCP
         #
-        # @param command [String] command string to execute
-        # @return [String] the output of the executed command
-        def execute_with_output(command)
-          return if command.nil?
-          logger.debug("[SSH] #{self} (#{command})")
-          exit_code, output = execute_with_output_and_exit_code(command)
-
-          if exit_code != 0
-            raise Transport::SshFailed,
-              "SSH exited (#{exit_code}) for command: [#{command}]"
-          end
-          output
+        # @param remote [String] file path on instance
+        # @param local [String] file path on host
+        def download(remote, local)
+          FileUtils.mkdir_p(File.dirname(local))
+          session.scp.download!(remote, local, {})
+          logger.debug("Downloaded #{remote} to #{local}")
         rescue Net::SSH::Exception => ex
-          raise SshFailed, "SSH command failed (#{ex.message})"
+          raise SshFailed, "SCP download failed (#{ex.message})"
         end
       end
     end
@@ -173,9 +107,11 @@ module Kitchen
           debug('Transfer complete')
           conn.execute(prepare_command)
           conn.execute(run_command)
-          # Get node json object generated by chef_client
-          output = conn.execute_with_output(dump_command)
-          File.open(ext_node_file, 'w') { |f| f << output }
+          # Download node json object generated by chef_client
+          info("Transferring #{int_node_file} " \
+               "from instance to #{ext_node_file}")
+          conn.download(int_node_file, ext_node_file)
+          debug('Transfer complete')
         end
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
@@ -205,10 +141,6 @@ module Kitchen
       def int_node_file
         File.join(config[:root_path], 'nodes', "#{instance.name}.json")
       end
-
-      def dump_command
-        "sh -c 'cat #{int_node_file}'"
-      end
     end
   end
 end

data/lib/kitchen/provisioner/policyfile_nodes_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   # Version string for Policyfile_nodes Kitchen driver
   module Provisioner
-    POLICYFILE_NODES_VERSION = '1.0.1'.freeze
+    POLICYFILE_NODES_VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-policyfile-nodes
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrei Skopenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -111,6 +111,7 @@ files:
 - ".gitignore"
 - ".kitchen.yml"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile