rspec-system-puppet 0.3.0 → 0.3.1

data/.nodeset.yml

@@ -3,29 +3,29 @@ default_set: 'centos-64-x64'
 sets:
   'centos-59-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'centos-59-x64'
   'centos-64-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'centos-64-x64'
   'fedora-18-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'fedora-18-x64'
   'debian-607-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'debian-607-x64'
   'debian-70rc1-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'debian-70rc1-x64'
   'ubuntu-server-10044-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'ubuntu-server-10044-x64'
   'ubuntu-server-12042-x64':
     nodes:
-      "main":
+      "main.foo.vm":
         prefab: 'ubuntu-server-12042-x64'

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

@@ -5,7 +5,9 @@ module RSpecSystemPuppet::Helpers
   include RSpecSystem::Log
 
   # Basic helper to install puppet
-  def puppet_install(options = {})
+  #
+  # @param opts [Hash] a hash of opts
+  def puppet_install(opts = {})
     # Grab facts from node
     facts = system_node.facts
 
@@ -43,17 +45,19 @@ module RSpecSystemPuppet::Helpers
   end
 
   # Helper to copy a module onto a node from source
-  def puppet_module_install(options)
+  #
+  # @param opts [Hash] a hash of opts
+  def puppet_module_install(opts)
     # Defaults etc.
-    options = {
+    opts = {
       :node => rspec_system_node_set.default_node,
       :module_path => "/etc/puppet/modules",
-    }.merge(options)
+    }.merge(opts)
 
-    source = options[:source]
-    module_name = options[:module_name]
-    module_path = options[:module_path]
-    node = options[:node]
+    source = opts[:source]
+    module_name = opts[:module_name]
+    module_path = opts[:module_path]
+    node = opts[:node]
 
     raise "Must provide :source and :module_name parameters" unless source && module_name
 
@@ -62,6 +66,8 @@ module RSpecSystemPuppet::Helpers
   end
 
   # Runs puppet resource commands
+  #
+  # @param opts [Hash] a hash of opts
   def puppet_resource(opts)
     if opts.is_a?(String)
       opts = {:resource => opts}
@@ -86,4 +92,62 @@ module RSpecSystemPuppet::Helpers
       result
     end
   end
+
+  # Run puppet DSL code directly with `puppet apply`.
+  #
+  # This takes a string of PuppetDSL code, uploads it to the test server and
+  # executes it directly with `puppet apply`.
+  #
+  # @param opts [Hash, String] a hash of opts, or a string containing the
+  #   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
+  # @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
+  # @example
+  #   it "run notice" do
+  #     puppet_apply("notice('foo')") do |r|
+  #       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}
+    end
+
+    # Defaults
+    opts = {
+      :node => rspec_system_node_set.default_node
+    }.merge(opts)
+
+    code = opts[:code]
+    node = opts[:node]
+
+    raise 'Must provide code' unless code
+
+    log.info("Copying DSL to remote host")
+    file = Tempfile.new('rsp_puppet_apply')
+    file.write(code)
+    file.close
+
+    remote_path = '/tmp/puppetapply.' + rand(1000000000).to_s
+    r = system_rcp(:sp => file.path, :dp => remote_path, :d => node)
+    file.unlink
+
+    log.info("Cat file to see contents")
+    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}")
+
+    if block_given?
+      yield(result)
+    else
+      result
+    end
+  end
 end

data/rspec-system-puppet.gemspec

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

data/spec/system/basic_spec.rb

@@ -5,10 +5,34 @@ describe "basic tests:" do
     puppet_install()
   end
 
+  it 'facter domain should return something valid' do
+    system_run("facter domain") do |r|
+      r[:stdout].should =~ /[a-z]+/
+      r[:stderr].should == ''
+      r[:exit_code].should == 0
+    end
+  end
+
+  it 'facter fqdn should return something valid' do
+    system_run("facter fqdn") do |r|
+      r[:stdout].should =~ /vm/
+      r[:stderr].should == ''
+      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
+    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
     end
   end
 end

metadata

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