rspec-system-puppet 1.1.0 → 1.2.0

data/README.md

@@ -96,10 +96,7 @@ You will need a spec helper for your tests to `require`. So create the file `spe
       c.tty = true
 
       # This is where we 'setup' the nodes before running our tests
-      c.system_setup_block = proc do
-        # TODO: find a better way of importing this into this namespace
-        include RSpecSystemPuppet::Helpers
-
+      c.before :suite do
         # Install puppet
         puppet_install
         puppet_master_install
@@ -118,24 +115,19 @@ And create your first system tests in say `spec/system/basic_spec.rb` (make sure
 
     require 'spec_helper_system'
     describe 'basic tests:' do
-      # Here we create the var 'pp' to be later tested
-      let(pp) do
+      it 'my class should work with no errors' do
         pp = <<-EOS
           class { 'mymodule': }
         EOS
-      end
-
-      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)
         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 be_zero
         end
       end
     end
@@ -163,6 +155,7 @@ Consult the .nodeset.yml file for the list of sets.
 * [API Documentation](http://rubydoc.info/gems/rspec-system-puppet/) - this provides the Ruby API docs for the Puppet Helpers. In particular look at the [Helpers](http://rubydoc.info/gems/rspec-system-puppet/RSpecSystemPuppet/Helpers) sub-class.
 * [rspec-system docs](http://rubydoc.info/gems/rspec-system) - This is the main library rspec-system-puppet utilises, and should provide more in-depth instructions on doing more complex stuff than what this gem alone provides.
 * [puppetlabs-firewall](http://github.com/puppetlabs/puppetlabs-firewall) - If you want to see the library in action this module is the primary guinea pig for rspec-system-puppet and should give you some ideas on writing tests of your own. Look under `spec/system` for the tests.
+* [puppetlabs-puppetdb](http://github.com/puppetlabs/puppetlabs-puppetdb) - Another example of the module in action.
 
 ## CI Integration
 

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

@@ -9,13 +9,13 @@ module RSpecSystemPuppet::Helpers
   # @param opts [Hash] a hash of opts
   def puppet_install(opts = {})
     # Grab facts from node
-    facts = system_node.facts
+    facts = node.facts
 
     # Remove annoying mesg n from profile, otherwise on Debian we get:
     # stdin: is not a tty which messes with our tests later on.
     if facts['osfamily'] == 'Debian'
       log.info("Remove 'mesg n' from profile to stop noise")
-      system_run("sed -i 's/^mesg n/# mesg n/' /root/.profile")
+      shell "sed -i 's/^mesg n/# mesg n/' /root/.profile"
     end
 
     # Grab PL repository and install PL copy of puppet
@@ -23,25 +23,25 @@ module RSpecSystemPuppet::Helpers
     if facts['osfamily'] == 'RedHat'
       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')
+        shell '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')
+          shell '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')
+          shell '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')
+      shell 'yum install -y puppet'
     elsif facts['osfamily'] == 'Debian'
-      system_run("wget http://apt.puppetlabs.com/puppetlabs-release-#{facts['lsbdistcodename']}.deb")
-      system_run("dpkg -i puppetlabs-release-#{facts['lsbdistcodename']}.deb")
-      system_run('apt-get update')
-      system_run('apt-get install -y puppet')
+      shell "wget http://apt.puppetlabs.com/puppetlabs-release-#{facts['lsbdistcodename']}.deb"
+      shell "dpkg -i puppetlabs-release-#{facts['lsbdistcodename']}.deb"
+      shell 'apt-get update'
+      shell 'apt-get install -y puppet'
     end
 
     # Prep modules dir
     log.info("Preparing modules dir")
-    system_run('mkdir -p /etc/puppet/modules')
+    shell 'mkdir -p /etc/puppet/modules'
 
     # Create alias for puppet
     pp = <<-EOS
@@ -59,7 +59,7 @@ host { 'puppet':
 :logger: noop
       EOS
       file.close
-      system_rcp(:sp => file.path, :dp => '/etc/puppet/hiera.yaml')
+      rcp(:sp => file.path, :dp => '/etc/puppet/hiera.yaml')
     ensure
       file.unlink
     end
@@ -77,18 +77,18 @@ host { 'puppet':
     node = opts[:node]
 
     # Grab facts from node
-    facts = system_node(:node => node).facts
+    facts = node(:node => node).facts
 
     if facts['osfamily'] == 'RedHat'
-      system_run(:n => node, :c => 'yum install -y puppet-server')
+      shell(:n => node, :c => 'yum install -y puppet-server')
       if facts['operatingsystemrelease'] =~ /^5\./
-        system_run(:n => node, :c => '/etc/init.d/puppetmaster start')
+        shell(:n => node, :c => '/etc/init.d/puppetmaster start')
       else
-        system_run(:n => node, :c => 'service puppetmaster start')
+        shell(:n => node, :c => 'service puppetmaster start')
       end
     elsif facts['osfamily'] == 'Debian'
-      system_run(:n => node, :c => 'apt-get install -y puppetmaster')
-      system_run(:n => node, :c => 'service puppetmaster start')
+      shell(:n => node, :c => 'apt-get install -y puppetmaster')
+      shell(:n => node, :c => 'service puppetmaster start')
     end
   end
 
@@ -122,7 +122,7 @@ host { 'puppet':
     cmd = "puppet agent -t --detailed-exitcodes"
     cmd += " --debug" if opts[:debug]
     cmd += " --trace" if opts[:trace]
-    result = system_run(:n => node, :c => cmd)
+    result = shell(:n => node, :c => cmd)
 
     if block_given?
       yield(result)
@@ -149,7 +149,7 @@ host { 'puppet':
     raise "Must provide :source and :module_name parameters" unless source && module_name
 
     log.info("Now transferring module onto node")
-    system_rcp(:sp => source, :d => node, :dp => File.join(module_path, module_name))
+    rcp(:sp => source, :d => node, :dp => File.join(module_path, module_name))
   end
 
   # Runs puppet resource commands
@@ -174,7 +174,7 @@ host { 'puppet':
     raise 'Must provide resource' unless resource
 
     log.info("Now running puppet resource")
-    result = system_run(:n => node, :c => "puppet resource #{resource}")
+    result = shell(:n => node, :c => "puppet resource #{resource}")
 
     if block_given?
       yield(result)
@@ -226,18 +226,18 @@ host { 'puppet':
     file.close
 
     remote_path = '/tmp/puppetapply.' + rand(1000000000).to_s
-    r = system_rcp(:sp => file.path, :dp => remote_path, :d => node)
+    r = 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}")
+    shell(:n => node, :c => "cat #{remote_path}")
 
     log.info("Now running puppet apply")
     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)
+    result = shell(:n => node, :c => cmd)
 
     if block_given?
       yield(result)
@@ -265,10 +265,10 @@ host { 'puppet':
     raise "Must specify a node" unless node
 
     cmd = "facter -y"
-    result = system_run(:n => node, :c => cmd)
+    result = shell(:n => node, :c => cmd)
 
     begin
-      facts = YAML::load(result[:stdout])
+      facts = YAML::load(result.stdout)
       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.1.0"
+  s.version     = "1.2.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.2', '>= 1.2.0'
+  s.add_runtime_dependency "rspec-system", '~> 1.5', '>= 1.5.0'
 end

metadata

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