rspec-system 0.3.4 → 0.3.5

data/lib/rspec-system/node_set/vagrant.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'systemu'
+require 'net/ssh'
 
 module RSpecSystem
   # A NodeSet implementation for Vagrant.
@@ -29,6 +30,16 @@ module RSpecSystem
 
       log.info "[Vagrant#setup] Running 'vagrant up'"
       vagrant("up")
+
+      # Establish ssh connectivity
+      ssh_channels = {}
+      nodes.each do |k,v|
+        log.info "[Vagrant#setup] establishing Net::SSH channel with #{k}"
+        chan = Net::SSH.start(k, 'vagrant', :config => ssh_config)
+        ssh_channels[k] = chan
+      end
+      RSpec.configuration.ssh_channels = ssh_channels
+
       nil
     end
 
@@ -36,6 +47,11 @@ module RSpecSystem
     #
     # @return [void]
     def teardown
+      log.info "[Vagrant#teardown] closing all ssh channels"
+      RSpec.configuration.ssh_channels.each do |k,v|
+        v.close unless v.closed?
+      end
+
       log.info "[Vagrant#teardown] Running 'vagrant destroy'"
       vagrant("destroy --force")
       nil
@@ -51,19 +67,8 @@ module RSpecSystem
       dest = opts[:n].name
       cmd = opts[:c]
 
-      r = nil
-      Dir.chdir(@vagrant_path) do
-        ex = "vagrant ssh #{dest} --command \"cd /tmp && sudo sh -c '#{cmd}'\""
-        log.debug("[vagrant#run] Running command: #{ex}")
-        r = systemu ex
-        log.debug("[Vagrant#run] Finished running command: #{ex}.")
-      end
-
-      {
-        :exit_code => r[0].exitstatus,
-        :stdout => r[1],
-        :stderr => r[2]
-      }
+      ssh_channels = RSpec.configuration.ssh_channels
+      ssh_exec!(ssh_channels[dest], "cd /tmp && sudo sh -c '#{cmd}'")
     end
 
     # Transfer files to a host in the NodeSet.
@@ -207,5 +212,48 @@ module RSpecSystem
     def randmac
       "080027" + (1..3).map{"%0.2X"%rand(256)}.join
     end
+
+    # Execute command via SSH.
+    #
+    # A special version of exec! from Net::SSH that returns exit code and exit
+    # signal as well. This method is blocking.
+    #
+    # @api private
+    # @param ssh [Net::SSH::Connection::Session] an active ssh session
+    # @param command [String] command to execute
+    # @return [Hash] a hash of results
+    def ssh_exec!(ssh, command)
+      r = {
+        :stdout => '',
+        :stderr => '',
+        :exit_code => nil,
+        :exit_signal => nil,
+      }
+      ssh.open_channel do |channel|
+        channel.exec(command) do |ch, success|
+          unless success
+            abort "FAILED: couldn't execute command (ssh.channel.exec)"
+          end
+          channel.on_data do |ch,data|
+            r[:stdout]+=data
+          end
+
+          channel.on_extended_data do |ch,type,data|
+            r[:stderr]+=data
+          end
+
+          channel.on_request("exit-status") do |ch,data|
+            r[:exit_code] = data.read_long
+          end
+
+          channel.on_request("exit-signal") do |ch, data|
+            r[:exit_signal] = data.read_string
+          end
+        end
+      end
+      ssh.loop
+
+      r
+    end
   end
 end

data/lib/rspec-system/spec_helper.rb

@@ -14,6 +14,8 @@ RSpec.configure do |c|
   c.add_setting :system_tmp
   # Block to execute for environment setup
   c.add_setting :system_setup_block
+  # Storage for ssh channels
+  c.add_setting :ssh_channels, :default => {}
 
   def nodeset
     Pathname.new(File.join(File.basename(__FILE__), '..', '.nodeset.yml'))

data/rspec-system.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "0.3.4"
+  s.version     = "0.3.5"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/kbarber/rspec-system"
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rspec"
   s.add_runtime_dependency "kwalify"
   s.add_runtime_dependency "systemu"
+  s.add_runtime_dependency "net-ssh", '~>2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: 
 email:
 - ken@bob.sh