rspec-system-puppet 0.2.0 → 0.3.0

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

@@ -5,7 +5,7 @@ module RSpecSystemPuppet::Helpers
   include RSpecSystem::Log
 
   # Basic helper to install puppet
-  def system_puppet_install(options = {})
+  def puppet_install(options = {})
     # Grab facts from node
     facts = system_node.facts
 
@@ -19,7 +19,16 @@ module RSpecSystemPuppet::Helpers
     # Grab PL repository and install PL copy of puppet
     log.info "Starting installation of puppet from PL repos"
     if facts['osfamily'] == 'RedHat'
-      system_run('rpm -ivh http://yum.puppetlabs.com/el/5/products/i386/puppetlabs-release-5-6.noarch.rpm')
+      if facts['operatingsystem'] == 'Fedora'
+        # Fedora testing is probably the best for now
+        system_run('sed -i "0,/RE/s/enabled=0/enabled=1/" /etc/yum.repos.d/fedora-updates-testing.repo')
+      else
+        if facts['operatingsystemrelease'] =~ /^6\./
+          system_run('rpm -ivh http://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-6.noarch.rpm')
+        else
+          system_run('rpm -ivh http://yum.puppetlabs.com/el/5/products/x86_64/puppetlabs-release-5-6.noarch.rpm')
+        end
+      end
       system_run('yum install -y puppet')
     elsif facts['osfamily'] == 'Debian'
       system_run("wget http://apt.puppetlabs.com/puppetlabs-release-#{facts['lsbdistcodename']}.deb")
@@ -34,7 +43,7 @@ module RSpecSystemPuppet::Helpers
   end
 
   # Helper to copy a module onto a node from source
-  def system_puppet_module_from_path(options)
+  def puppet_module_install(options)
     # Defaults etc.
     options = {
       :node => rspec_system_node_set.default_node,
@@ -51,4 +60,30 @@ module RSpecSystemPuppet::Helpers
     log.info("Now transferring module onto node")
     system_rcp(:sp => source, :d => node, :dp => File.join(module_path, module_name))
   end
+
+  # Runs puppet resource commands
+  def puppet_resource(opts)
+    if opts.is_a?(String)
+      opts = {:resource => opts}
+    end
+
+    # Defaults
+    opts = {
+      :node => rspec_system_node_set.default_node
+    }.merge(opts)
+
+    resource = opts[:resource]
+    node = opts[:node]
+
+    raise 'Must provide resource' unless resource
+
+    log.info("Now running puppet resource")
+    result = system_run(:n => node, :c => "puppet resource #{resource}")
+
+    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.2.0"
+  s.version     = "0.3.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["ken@bob.sh"]
   s.homepage    = "https://github.com/kbarber/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", '~> 0.2.0'
+  s.add_runtime_dependency "rspec-system", '~> 0.3.0'
 end

data/spec/system/basic_spec.rb

@@ -1,7 +1,14 @@
 require 'spec_helper_system'
 
 describe "basic tests:" do
-  it "check system_puppet_install works" do
-    system_puppet_install()
+  it "check puppet_install works" do
+    puppet_install()
+  end
+
+  it 'check puppet_resource returns an exit code of 0' do
+    puppet_resource('user') do |r|
+      r[:exit_code].should == 0
+      r[:stderr].should == ''
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-system-puppet
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ken Barber
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 description: