rspec-system-puppet 1.0.2 → 1.1.0

data/README.md

@@ -128,14 +128,14 @@ And create your first system tests in say `spec/system/basic_spec.rb` (make sure
       it 'my class should work with no errors' do
         # Run it once and make sure it doesn't bail with errors
         puppet_apply(pp) do |r|
-          r[:exit_code].should_not eq(1)
+          r.exit_code.should_not eq(1)
         end
       end
 
       it 'my class should be idempotent' do
         # Run it again and make sure no changes occurred this time, proving idempotency
         puppet_apply(pp) do |r|
-          r[:exit_code].should == 0
+          r.exit_code.should == 0
         end
       end
     end

data/lib/rspec-system-puppet/helpers.rb

@@ -98,16 +98,16 @@ host { 'puppet':
   # @option opts [RSpecSystem::Node] :node node to execute DSL on
   # @option opts [Boolean] :debug true if debugging required
   # @option opts [Boolean] :trace true if trace required
-  # @return [Hash] a hash of results
+  # @return [RSpecSystem::Result] results containing keys :exit_code, :stdout and :stderr
   # @yield [result] yields result when called as a block
-  # @yieldparam result [Hash] a hash containing :exit_code, :stdout and :stderr
+  # @yieldparam result [RSpecSystem::Result] a hash containing :exit_code, :stdout and :stderr
   # @example
   #   puppet_agent.do |r|
-  #     r[:exit_code].should == 0
+  #     r.exit_code.should == 0
   #   end
   # @example with debugging enabled
   #   puppet_agent(:debug => true).do |r|
-  #     r[:exit_code].should == 0
+  #     r.exit_code.should == 0
   #   end
   def puppet_agent(opts = {})
     # Defaults etc.
@@ -155,6 +155,9 @@ host { 'puppet':
   # Runs puppet resource commands
   #
   # @param opts [Hash] a hash of opts
+  # @return [RSpecSystem::Result] results containing keys :exit_code, :stdout and :stderr
+  # @yield [result] yields result when called as a block
+  # @yieldparam result [RSpecSystem::Result] a hash containing :exit_code, :stdout and :stderr
   def puppet_resource(opts)
     if opts.is_a?(String)
       opts = {:resource => opts}
@@ -191,13 +194,13 @@ host { 'puppet':
   # @option opts [RSpecSystem::Node] :node node to execute DSL on
   # @option opts [Boolean] :debug true if debugging required
   # @option opts [Boolean] :trace true if trace required
-  # @return [Hash] a hash of results
+  # @return [RSpecSystem::Result] results containing keys :exit_code, :stdout and :stderr
   # @yield [result] yields result when called as a block
-  # @yieldparam result [Hash] a hash containing :exit_code, :stdout and :stderr
+  # @yieldparam result [RSpecSystem::Result] a hash containing :exit_code, :stdout and :stderr
   # @example
   #   it "run notice" do
   #     puppet_apply("notice('foo')") do |r|
-  #       r[:stdout].should =~ /foo/
+  #       r.stdout.should =~ /foo/
   #     end
   #   end
   def puppet_apply(opts)
@@ -247,9 +250,9 @@ host { 'puppet':
   #
   # @param opts [Hash] a hash of opts
   # @option opts [RSpecSystem::Node] :node node to execute DSL on
-  # @return [Hash] a hash of results
+  # @return [RSpecSystem::Result] a hash of results
   # @yield [result] yields result when called as a block
-  # @yieldparam result [Hash] a hash containing :facts, :exit_code, :stdout and
+  # @yieldparam result [RSpecSystem::Result] result containing :facts, :exit_code, :stdout and
   #   :stderr
   def facter(opts = {})
     # Defaults
@@ -266,7 +269,7 @@ host { 'puppet':
 
     begin
       facts = YAML::load(result[:stdout])
-      result[:facts] = facts
+      result.facts = facts
     rescue
     end
 

data/rspec-system-puppet.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system-puppet"
-  s.version     = "1.0.2"
+  s.version     = "1.1.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/puppetlabs/rspec-system-puppet"
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.required_ruby_version = '>= 1.8.7'
-  s.add_runtime_dependency "rspec-system", '~> 1.0'
+  s.add_runtime_dependency "rspec-system", '~> 1.2', '>= 1.2.0'
 end

data/spec/system/basic_spec.rb

@@ -9,63 +9,63 @@ describe "basic tests:" do
     puppet_master_install()
 
     puppet_agent do |r|
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
   end
 
   it 'try puppet agent with debug enabled' do
     puppet_agent(:debug => true) do |r|
-      r[:stderr].should == ''
-      r[:stdout].should =~ /Debug:/
-      r[:exit_code].should == 0
+      r.stderr.should == ''
+      r.stdout.should =~ /Debug:/
+      r.exit_code.should == 0
     end
   end
 
   it 'facter domain should return something valid' do
     facter do |r|
-      r[:facts]['domain'].should =~ /[a-z]+/
-      r[:exit_code].should == 0
+      r.facts['domain'].should =~ /[a-z]+/
+      r.exit_code.should == 0
     end
   end
 
   it 'facter fqdn should return something valid' do
     facter do |r|
-      r[:stderr].should == ''
-      r[:facts]['fqdn'] =~ /vm/
-      r[:exit_code].should == 0
+      r.stderr.should == ''
+      r.facts['fqdn'].should =~ /vm/
+      r.exit_code.should == 0
     end
   end
 
   it 'check puppet_resource returns an exit code of 0' do
     puppet_resource('user') do |r|
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
   end
 
   it 'check puppet apply with just a notice' do
     puppet_apply('notice("foo")') do |r|
-      r[:stdout].should =~ /foo/
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stdout.should =~ /foo/
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
   end
 
   it 'try puppet apply with debug mode' do
     puppet_apply(:code => 'notice("foo")', :debug => true) do |r|
-      r[:stdout].should =~ /foo/
-      r[:stdout].should =~ /Debug:/
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stdout.should =~ /foo/
+      r.stdout.should =~ /Debug:/
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
   end
 
   it 'try puppet apply with trace off' do
     puppet_apply(:code => 'notice("foo")', :trace => false) do |r|
-      r[:stdout].should =~ /foo/
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stdout.should =~ /foo/
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
   end
 
@@ -80,9 +80,9 @@ describe "basic tests:" do
       }
     EOS
     puppet_apply(pp) do |r|
-      r[:stdout].should =~ /Param1: bar/
-      r[:stderr].should == ''
-      r[:exit_code].should == 0
+      r.stdout.should =~ /Param1: bar/
+      r.stderr.should == ''
+      r.exit_code.should == 0
     end
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ken Barber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-25 00:00:00 Z
+date: 2013-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-system
@@ -25,11 +25,19 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
+        - 2
         - 0
-        version: "1.0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 description: