rspec-system 0.2.0 → 0.3.0

data/README.md

@@ -42,8 +42,8 @@ Create the directory `spec/system` in your project, make sure your unit tests go
 
     describe 'basics' do
       it 'should cat /etc/resolv.conf' do
-        system_run('cat /etc/resolv.conf') do |s,o,e|
-          o.should =~ /localhost/
+        system_run('cat /etc/resolv.conf') do |r|
+          r[:stdout].should =~ /localhost/
         end
       end
     end

data/lib/rspec-system/helpers.rb

@@ -19,9 +19,9 @@
 # @example Using run within your tests
 #   describe 'test running' do
 #     it 'run cat' do
-#       system_run 'cat /etc/resolv.conf' do |s, o, e|
-#         s.exitstatus.should == 0
-#         o.should =~ /localhost/
+#       system_run 'cat /etc/resolv.conf' do |r|
+#         r[:exit_code].should == 0
+#         r[:stdout].should =~ /localhost/
 #       end
 #     end
 #   end
@@ -58,10 +58,10 @@
 #
 #     it 'test installing latest puppet' do
 #       install_puppet
-#       system_run('puppet apply --version') do |s, o, e|
-#         s.exitstatus == 0
-#         o.should =~ /3.1/
-#         e.should == ''
+#       system_run('puppet apply --version') do |r|
+#         r[:exit_code] == 0
+#         r[:stdout].should =~ /3.1/
+#         r[:stderr].should == ''
 #       end
 #     end
 #   end
@@ -90,13 +90,9 @@ module RSpecSystem::Helpers
   #   default in your YAML file, otherwise if there is only one node it uses
   #   that) specifies node to execute command on.
   # @option options [RSpecSystem::Node] :n alias for :node
-  # @yield [status, stdout, stderr] yields status, stdout and stderr when
-  #   called as a block.
-  # @yieldparam status [Process::Status] the status of the executed command
-  # @yieldparam stdout [String] the standard out of the command result
-  # @yieldparam stderr [String] the standard error of the command result
-  # @return [Array<Process::Status,String,String>] returns status, stdout and
-  #  stderr when called as a simple method.
+  # @yield [result] yields result when called as a block
+  # @yieldparam result [Hash] a hash containing :exit_code, :stdout and :stderr
+  # @return [Hash] a hash containing :exit_code, :stdout and :stderr
   def system_run(options)
     ns = rspec_system_node_set
     dn = ns.default_node
@@ -120,16 +116,14 @@ module RSpecSystem::Helpers
     end
 
     log.info("system_run #{options[:c]} on #{options[:n].name} executed")
-    status, stdout, stderr = result = ns.run(options)
+    result = ns.run(options)
     log.info("system_run results:\n" +
       "-----------------------\n" +
-      "Exit Status: #{status.exitstatus}\n" +
-      "<stdout>#{stdout}</stdout>\n" +
-      "<stderr>#{stderr}</stderr>\n" +
+      result.pretty_inspect +
       "-----------------------\n")
 
     if block_given?
-      yield(*result)
+      yield(result)
     else
       result
     end

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

@@ -40,14 +40,19 @@ module RSpecSystem
       dest = opts[:n].name
       cmd = opts[:c]
 
-      result = ""
+      r = nil
       Dir.chdir(@vagrant_path) do
         cmd = "vagrant ssh #{dest} --command \"cd /tmp && sudo #{cmd}\""
         log.debug("[vagrant#run] Running command: #{cmd}")
-        result = systemu cmd
-        log.debug("[Vagrant#run] Finished running command: #{cmd}. Result is #{result}.")
+        r = systemu cmd
+        log.debug("[Vagrant#run] Finished running command: #{cmd}.")
       end
-      result
+
+      {
+        :exit_code => r[0].exitstatus,
+        :stdout => r[1],
+        :stderr => r[2]
+      }
     end
 
     # Transfer files to a host in the NodeSet.

data/lib/rspec-system/spec_helper.rb

@@ -61,7 +61,7 @@ RSpec.configure do |c|
   end
 
   # Default the system_tmp dir to something random
-  c.system_tmp = Dir.tmpdir
+  c.system_tmp = Dir.mktmpdir
 
   c.before :suite do
     start_nodes

data/rspec-system.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system"
-  s.version     = "0.2.0"
+  s.version     = "0.3.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/kbarber/rspec-system"

data/spec/system/basic_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper_system'
 
 describe "basic tests:" do
   it "check system_run works" do
-    system_run("cat /etc/hosts") do |s, o, e|
-      s.exitstatus.should == 0
-      o.should =~ /localhost/
+    system_run("cat /etc/hosts") do |r|
+      r[:exit_code].should == 0
+      r[:stdout].should =~ /localhost/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors: