rspec-system-puppet 0.3.2 → 0.3.3

data/README.md

@@ -1,3 +1,3 @@
 # rspec-system-puppet
 
-`rspec-system-puppet` is a Puppet plugin for [rspec-system](https://rubygems.org/gems/ruby-system).
+`rspec-system-puppet` is a Puppet plugin for [rspec-system](https://rubygems.org/gems/rspec-system).

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

@@ -81,18 +81,34 @@ host { 'puppet':
   # Run puppet agent
   #
   # @param opts [Hash] a hash of opts
+  # @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
   # @yield [result] yields result when called as a block
   # @yieldparam result [Hash] a hash containing :exit_code, :stdout and :stderr
-  def puppet_agent
+  # @example
+  #   puppet_agent.do |r|
+  #     r[:exit_code].should == 0
+  #   end
+  # @example with debugging enabled
+  #   puppet_agent(:debug => true).do |r|
+  #     r[:exit_code].should == 0
+  #   end
+  def puppet_agent(opts = {})
     # Defaults etc.
     opts = {
       :node => rspec_system_node_set.default_node,
-    }
+      :debug => false,
+      :trace => true,
+    }.merge(opts)
 
     node = opts[:node]
 
-    result = system_run(:n => node, :c => 'puppet agent -t --detailed-exitcodes')
+    cmd = "puppet agent -t --detailed-exitcodes"
+    cmd += " --debug" if opts[:debug]
+    cmd += " --trace" if opts[:trace]
+    result = system_run(:n => node, :c => cmd)
 
     if block_given?
       yield(result)
@@ -159,6 +175,8 @@ host { 'puppet':
   #   code to execute with option defaults
   # @option opts [String] :code the Puppet DSL code to execute
   # @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
   # @yield [result] yields result when called as a block
   # @yieldparam result [Hash] a hash containing :exit_code, :stdout and :stderr
@@ -168,9 +186,6 @@ host { 'puppet':
   #       r[:stdout].should =~ /foo/
   #     end
   #   end
-  # @todo Support for custom switches perhaps?
-  # @todo The destination path is static, need a good remote random path
-  #   generator
   def puppet_apply(opts)
     if opts.is_a?(String)
       opts = {:code => opts}
@@ -178,7 +193,9 @@ host { 'puppet':
 
     # Defaults
     opts = {
-      :node => rspec_system_node_set.default_node
+      :node => rspec_system_node_set.default_node,
+      :debug => false,
+      :trace => true,
     }.merge(opts)
 
     code = opts[:code]
@@ -199,7 +216,11 @@ host { 'puppet':
     system_run(:n => node, :c => "cat #{remote_path}")
 
     log.info("Now running puppet apply")
-    result = system_run(:n => node, :c => "puppet apply --detailed-exitcodes #{remote_path}")
+    cmd = "puppet apply --detailed-exitcodes"
+    cmd += " --debug" if opts[:debug]
+    cmd += " --trace" if opts[:trace]
+    cmd += " #{remote_path}"
+    result = system_run(:n => node, :c => cmd)
 
     if block_given?
       yield(result)

data/rspec-system-puppet.gemspec

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

data/spec/system/basic_spec.rb

@@ -14,6 +14,14 @@ describe "basic tests:" do
     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
+    end
+  end
+
   it 'facter domain should return something valid' do
     system_run("facter domain") do |r|
       r[:stdout].should =~ /[a-z]+/
@@ -44,4 +52,21 @@ describe "basic tests:" do
       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
+    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
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-system-puppet
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Ken Barber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-15 00:00:00 Z
+date: 2013-04-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-system