rspec-system 1.1.0 → 1.2.0

data/README.md

@@ -43,7 +43,7 @@ Create the directory `spec/system` in your project, its recommended to make sure
     describe 'basics' do
       it 'should cat /etc/resolv.conf' do
         system_run('cat /etc/resolv.conf') do |r|
-          r[:stdout].should =~ /localhost/
+          r.stdout.should =~ /localhost/
         end
       end
     end

data/lib/rspec-system/helpers.rb

@@ -1,3 +1,5 @@
+require 'rspec-system/result'
+
 # This module contains the main rspec helpers that are to be used within
 # rspec-system tests. These are the meat-and-potatoes of your system tests,
 # and in theory there shouldn't be anything you can't do without the helpers
@@ -20,8 +22,8 @@
 #   describe 'test running' do
 #     it 'run cat' do
 #       system_run 'cat /etc/resolv.conf' do |r|
-#         r[:exit_code].should == 0
-#         r[:stdout].should =~ /localhost/
+#         r.exit_code.should == 0
+#         r.stdout.should =~ /localhost/
 #       end
 #     end
 #   end
@@ -59,9 +61,9 @@
 #     it 'test installing latest puppet' do
 #       install_puppet
 #       system_run('puppet apply --version') do |r|
-#         r[:exit_code] == 0
-#         r[:stdout].should =~ /3.1/
-#         r[:stderr].should == ''
+#         r.exit_code == 0
+#         r.stdout.should =~ /3.1/
+#         r.stderr.should == ''
 #       end
 #     end
 #   end
@@ -92,8 +94,10 @@ module RSpecSystem::Helpers
   #   that) specifies node to execute command on.
   # @option options [RSpecSystem::Node] :n alias for :node
   # @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
+  # @yieldparam result [RSpecSystem::Result] a result containing :exit_code,
+  #   :stdout and :stderr
+  # @return [RSpecSystem::Result] a result containing :exit_code, :stdout and
+  #   :stderr
   def system_run(options)
     ns = rspec_system_node_set
     dn = ns.default_node
@@ -116,7 +120,7 @@ module RSpecSystem::Helpers
       raise "Cannot use system_run with no :command option"
     end
 
-    result = ns.run(options)
+    result = RSpecSystem::Result.new(ns.run(options))
 
     if block_given?
       yield(result)

data/lib/rspec-system/result.rb

@@ -0,0 +1,11 @@
+require 'ostruct'
+
+module RSpecSystem
+  # This class represents a result from a helper command
+  class Result < OpenStruct
+    # Returns the value of a member.
+    def [](name)
+      @table[name.to_sym]
+    end
+  end
+end

data/lib/rspec-system.rb

@@ -8,3 +8,4 @@ require 'rspec-system/helpers'
 require 'rspec-system/node_set'
 require 'rspec-system/prefab'
 require 'rspec-system/node'
+require 'rspec-system/result'

data/rspec-system.gemspec

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

data/spec/system/system_rcp_spec.rb

@@ -8,8 +8,8 @@ describe "system_rcp:" do
     )
 
     system_run('cat /tmp/example_destination/example_file') do |r|
-      r[:exit_code].should == 0
-      r[:stdout].should =~ /Test content 1234/
+      r.exit_code.should == 0
+      r.stdout.should =~ /Test content 1234/
     end
   end
 end

data/spec/system/system_run_spec.rb

@@ -2,6 +2,13 @@ require 'spec_helper_system'
 
 describe "system_run:" do
   it "cat /etc/hosts" do
+    system_run("cat /etc/hosts") do |r|
+      r.exit_code.should == 0
+      r.stdout.should =~ /localhost/
+    end
+  end
+
+  it "cat /etc/hosts - test results using hash method" do
     system_run("cat /etc/hosts") do |r|
       r[:exit_code].should == 0
       r[:stdout].should =~ /localhost/
@@ -11,13 +18,13 @@ describe "system_run:" do
   it 'piping should be preserved' do
     system_run('rm -f /tmp/foo')
     system_run('echo "foo" > /tmp/foo') do |r|
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
 
     system_run('cat /tmp/foo') do |r|
-      r[:stdout].should =~ /foo/
-      r[:exit_code].should == 0
+      r.stdout.should =~ /foo/
+      r.exit_code.should == 0
     end
     system_run('rm -f /tmp/foo')
   end
@@ -25,13 +32,13 @@ describe "system_run:" do
   it 'escape single quotes properly' do
     system_run('rm -f /tmp/foo')
     system_run("echo 'foo' > /tmp/foo") do |r|
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
 
     system_run('cat /tmp/foo') do |r|
-      r[:stdout].should =~ /foo/
-      r[:exit_code].should == 0
+      r.stdout.should =~ /foo/
+      r.exit_code.should == 0
     end
     system_run('rm -f /tmp/foo')
   end

data/spec/unit/result_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe RSpecSystem::Result do
+  it 'should allow you to query using methods' do
+    result = subject.class.new(:foo => 'bar')
+    result.foo.should == 'bar'
+  end
+
+  it 'should allow you to query using hash queries' do
+    result = subject.class.new(:foo => 'bar')
+    result[:foo].should == 'bar'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-system
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -142,6 +142,7 @@ files:
 - lib/rspec-system/node_set/vsphere.rb
 - lib/rspec-system/prefab.rb
 - lib/rspec-system/rake_task.rb
+- lib/rspec-system/result.rb
 - lib/rspec-system/spec_helper.rb
 - resources/kwalify-schemas/nodeset_schema.yml
 - resources/kwalify-schemas/prefabs_schema.yml
@@ -156,6 +157,7 @@ files:
 - spec/system/system_run_spec.rb
 - spec/unit/kwalify-schemas/nodeset_schema_spec.rb
 - spec/unit/kwalify-schemas/prefabs_schema_spec.rb
+- spec/unit/result_spec.rb
 homepage: https://github.com/puppetlabs/rspec-system
 licenses: []
 post_install_message: 
@@ -186,3 +188,4 @@ test_files:
 - spec/system/system_run_spec.rb
 - spec/unit/kwalify-schemas/nodeset_schema_spec.rb
 - spec/unit/kwalify-schemas/prefabs_schema_spec.rb
+- spec/unit/result_spec.rb