rspec-system-puppet 1.2.0 → 2.0.0

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 .*.swp
 doc/
 .yardoc
+.rspec_system/

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+2.0.0
+=====
+
+This major release adds rspec-system 2 support for using helpers in a subject. So now, all rspec-system-puppet helpers can be used as a normal helper or in a subject like so:
+
+    describe 'puppet tests' do
+      pp = 'notice("foo")'
+
+      context puppet_apply(pp) do
+        its(:stdout) { should =~ /foo/ }
+        its(:stderr) { should be_empty }
+        its(:exit_code) { should be_zero }
+      end
+    end
+
+You can also refresh a helper in the middle of a test, here is a neat way to test idempotency:
+
+    describe 'puppet tests' do
+      it 'test that code is idempotent' do
+        pp = "include myclass"
+
+        puppet_apply(pp) do |r|
+          r.stderr.should be_empty
+          r.exit_code.should_not == 1
+          r.refresh                    # this re-runs the puppet code
+          r.stderr.should be_empty
+          r.exit_code.should be_zero
+        end
+      end
+    end
+
+#### Detailed Changes
+
+* rspec-system 2 helpers (Ken Barber)

data/README.md

@@ -13,7 +13,7 @@ While unit testing using [rspec-puppet](https://rubygems.org/gems/rspec-puppet)
 
 Recommended to be installed first:
 
-* Vagrant 1.1.5 or greater
+* Vagrant 1.2.2 or greater
 * VirtualBox 4.2.10 or greater
 * RVM or RBenv (current instructions are based on RVM however)
 
@@ -88,6 +88,8 @@ You will need a spec helper for your tests to `require`. So create the file `spe
     require 'rspec-system/spec_helper'
     require 'rspec-system-puppet/helpers'
 
+    include RSpecSystemPuppet::Helpers
+
     RSpec.configure do |c|
       # Project root for the firewall code
       proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
@@ -95,6 +97,8 @@ You will need a spec helper for your tests to `require`. So create the file `spe
       # Enable colour in Jenkins
       c.tty = true
 
+      c.include RSpecSystemPuppet::Helpers
+
       # This is where we 'setup' the nodes before running our tests
       c.before :suite do
         # Install puppet
@@ -114,19 +118,25 @@ Now if you are using rspec-puppet, I advise you to seperate the location of your
 And create your first system tests in say `spec/system/basic_spec.rb` (make sure it has the _spec.rb suffix!):
 
     require 'spec_helper_system'
+
     describe 'basic tests:' do
+      # Using puppet_apply as a subject
+      context puppet_apply 'notice("foo")' do
+        its(:stdout) { should =~ /foo/ }
+        its(:stderr) { should be_empty }
+        its(:exit_code) { should be_zero }
+      end
+
+      # Using puppet_apply as a helper
       it 'my class should work with no errors' do
         pp = <<-EOS
           class { 'mymodule': }
         EOS
       
-        # 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
-
-        # Run it again and make sure no changes occurred this time, proving idempotency
+        # Run it twice and test for idempotency
         puppet_apply(pp) do |r|
+          r.exit_code.should_not == 1
+          r.refresh
           r.exit_code.should be_zero
         end
       end

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

@@ -1,95 +1,36 @@
 require 'rspec-system-puppet'
-
+require 'rspec-system-puppet/helpers/facter'
+require 'rspec-system-puppet/helpers/puppet_apply'
+require 'rspec-system-puppet/helpers/puppet_resource'
+require 'rspec-system-puppet/helpers/puppet_module_install'
+require 'rspec-system-puppet/helpers/puppet_install'
+require 'rspec-system-puppet/helpers/puppet_master_install'
+require 'rspec-system-puppet/helpers/puppet_agent'
+
+# This module contains the methods provide by rspec-system-puppet
 module RSpecSystemPuppet::Helpers
   include RSpecSystem::Helpers
-  include RSpecSystem::Log
 
   # Basic helper to install puppet
   #
   # @param opts [Hash] a hash of opts
-  def puppet_install(opts = {})
-    # Grab facts from node
-    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")
-      shell "sed -i 's/^mesg n/# mesg n/' /root/.profile"
-    end
-
-    # Grab PL repository and install PL copy of puppet
-    log.info "Starting installation of puppet from PL repos"
-    if facts['osfamily'] == 'RedHat'
-      if facts['operatingsystem'] == 'Fedora'
-        # Fedora testing is probably the best for now
-        shell 'sed -i "0,/RE/s/enabled=0/enabled=1/" /etc/yum.repos.d/fedora-updates-testing.repo'
-      else
-        if facts['operatingsystemrelease'] =~ /^6\./
-          shell 'rpm -ivh http://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-6.noarch.rpm'
-        else
-          shell 'rpm -ivh http://yum.puppetlabs.com/el/5/products/x86_64/puppetlabs-release-5-6.noarch.rpm'
-        end
-      end
-      shell 'yum install -y puppet'
-    elsif facts['osfamily'] == 'Debian'
-      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")
-    shell 'mkdir -p /etc/puppet/modules'
-
-    # Create alias for puppet
-    pp = <<-EOS
-host { 'puppet':
-  ip => '127.0.0.1',
-}
-    EOS
-    puppet_apply(pp)
-
-    # Create hiera.yaml
-    file = Tempfile.new('hierayaml')
-    begin
-      file.write(<<-EOS)
----
-:logger: noop
-      EOS
-      file.close
-      rcp(:sp => file.path, :dp => '/etc/puppet/hiera.yaml')
-    ensure
-      file.unlink
-    end
+  # @option opts [RSpecSystem::Node] :node node to execute DSL on
+  # @return [RspecSystemPuppet::Helpers::PuppetInstall] results
+  # @yield [result] yields result when called as a block
+  # @yieldparam result [RSpecSystem::Helpers::PuppetInstall] results
+  def puppet_install(opts = {}, &block)
+    RSpecSystemPuppet::Helpers::PuppetInstall.new(opts, self, &block)
   end
 
   # Basic helper to install a puppet master
   #
   # @param opts [Hash] a hash of opts
-  def puppet_master_install
-    # Defaults etc.
-    opts = {
-      :node => rspec_system_node_set.default_node,
-    }
-
-    node = opts[:node]
-
-    # Grab facts from node
-    facts = node(:node => node).facts
-
-    if facts['osfamily'] == 'RedHat'
-      shell(:n => node, :c => 'yum install -y puppet-server')
-      if facts['operatingsystemrelease'] =~ /^5\./
-        shell(:n => node, :c => '/etc/init.d/puppetmaster start')
-      else
-        shell(:n => node, :c => 'service puppetmaster start')
-      end
-    elsif facts['osfamily'] == 'Debian'
-      shell(:n => node, :c => 'apt-get install -y puppetmaster')
-      shell(:n => node, :c => 'service puppetmaster start')
-    end
+  # @option opts [RSpecSystem::Node] :node node to execute DSL on
+  # @return [RspecSystemPuppet::Helpers::PuppetMasterInstall] results
+  # @yield [result] yields result when called as a block
+  # @yieldparam result [RSpecSystem::Helpers::PuppetMasterInstall] results
+  def puppet_master_install(opts = {}, &block)
+    RSpecSystemPuppet::Helpers::PuppetMasterInstall.new(opts, self, &block)
   end
 
   # Run puppet agent
@@ -98,9 +39,9 @@ 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 [RSpecSystem::Result] results containing keys :exit_code, :stdout and :stderr
+  # @return [RSpecSystem::Helpers::PuppetAgent] results
   # @yield [result] yields result when called as a block
-  # @yieldparam result [RSpecSystem::Result] a hash containing :exit_code, :stdout and :stderr
+  # @yieldparam result [RSpecSystem::Helpers::PuppetAgent] results
   # @example
   #   puppet_agent.do |r|
   #     r.exit_code.should == 0
@@ -109,78 +50,34 @@ host { 'puppet':
   #   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]
-
-    cmd = "puppet agent -t --detailed-exitcodes"
-    cmd += " --debug" if opts[:debug]
-    cmd += " --trace" if opts[:trace]
-    result = shell(:n => node, :c => cmd)
-
-    if block_given?
-      yield(result)
-    else
-      result
-    end
+  def puppet_agent(opts = {}, &block)
+    RSpecSystemPuppet::Helpers::PuppetAgent.new(opts, self, &block)
   end
 
   # Helper to copy a module onto a node from source
   #
   # @param opts [Hash] a hash of opts
-  def puppet_module_install(opts)
-    # Defaults etc.
-    opts = {
-      :node => rspec_system_node_set.default_node,
-      :module_path => "/etc/puppet/modules",
-    }.merge(opts)
-
-    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
-
-    log.info("Now transferring module onto node")
-    rcp(:sp => source, :d => node, :dp => File.join(module_path, module_name))
+  # @option opts [RSpecSystem::Node] :node node to execute DSL on
+  # @return [RSpecSystem::Helpers::PuppetModuleInstall] results
+  # @yield [result] yields result when called as a block
+  # @yieldparam result [RSpecSystem::Helpers::PuppetModuleInstall] results
+  def puppet_module_install(opts, &block)
+    RSpecSystemPuppet::Helpers::PuppetModuleInstall.new(opts, self, &block)
   end
 
   # Runs puppet resource commands
   #
   # @param opts [Hash] a hash of opts
-  # @return [RSpecSystem::Result] results containing keys :exit_code, :stdout and :stderr
+  # @option opts [RSpecSystem::Node] :node node to execute DSL on
+  # @return [RSpecSystem::Helpers::PuppetResource] results
   # @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)
+  # @yieldparam result [RSpecSystem::Helpers::PuppetResource] results
+  def puppet_resource(opts, &block)
     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 = shell(:n => node, :c => "puppet resource #{resource}")
-
-    if block_given?
-      yield(result)
-    else
-      result
-    end
+    RSpecSystemPuppet::Helpers::PuppetResource.new(opts, self, &block)
   end
 
   # Run puppet DSL code directly with `puppet apply`.
@@ -194,89 +91,30 @@ 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 [RSpecSystem::Result] results containing keys :exit_code, :stdout and :stderr
+  # @return [RSpecSystem::Helpers::PuppetApply] helper object
   # @yield [result] yields result when called as a block
-  # @yieldparam result [RSpecSystem::Result] a hash containing :exit_code, :stdout and :stderr
-  # @example
+  # @yieldparam result [RSpecSystemPuppet::Helpers::PuppetApply] helper object
   #   it "run notice" do
   #     puppet_apply("notice('foo')") do |r|
   #       r.stdout.should =~ /foo/
   #     end
   #   end
-  def puppet_apply(opts)
+  def puppet_apply(opts, &block)
     if opts.is_a?(String)
       opts = {:code => opts}
     end
 
-    # Defaults
-    opts = {
-      :node => rspec_system_node_set.default_node,
-      :debug => false,
-      :trace => true,
-    }.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 = rcp(:sp => file.path, :dp => remote_path, :d => node)
-    file.unlink
-
-    log.info("Cat file to see contents")
-    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 = shell(:n => node, :c => cmd)
-
-    if block_given?
-      yield(result)
-    else
-      result
-    end
+    RSpecSystemPuppet::Helpers::PuppetApply.new(opts, self, &block)
   end
 
   # Run facter on a remote machine
   #
   # @param opts [Hash] a hash of opts
   # @option opts [RSpecSystem::Node] :node node to execute DSL on
-  # @return [RSpecSystem::Result] a hash of results
+  # @return [RSpecSystemPuppet::Helpers::Facter] helper object
   # @yield [result] yields result when called as a block
-  # @yieldparam result [RSpecSystem::Result] result containing :facts, :exit_code, :stdout and
-  #   :stderr
-  def facter(opts = {})
-    # Defaults
-    opts = {
-      :node => rspec_system_node_set.default_node,
-    }.merge(opts)
-
-    node = opts[:node]
-
-    raise "Must specify a node" unless node
-
-    cmd = "facter -y"
-    result = shell(:n => node, :c => cmd)
-
-    begin
-      facts = YAML::load(result.stdout)
-      result.facts = facts
-    rescue
-    end
-
-    if block_given?
-      yield(result)
-    else
-      result
-    end
+  # @yieldparam result [RSpecSystemPuppet::Helpers::Facter] helper object
+  def facter(opts = {}, &block)
+    RSpecSystemPuppet::Helpers::Facter.new(opts, self, &block)
   end
 end

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

@@ -0,0 +1,27 @@
+require 'rspec-system'
+require 'rspec-system/helper'
+require 'rspec-system/result'
+
+module RSpecSystem::Helpers
+  # Helper object behind RSpecSystemPuppet::Helpers#facter
+  class Facter < RSpecSystem::Helper
+    name 'facter'
+    properties :stdout, :stderr, :exit_code, :facts
+
+    # Gathers new results by executing the resource action
+    #
+    # @return [RSpecSystem::Result] raw execution results
+    def execute
+      node = opts[:node]
+      sh = shell :c => "facter -y", :n => node
+
+      rd = sh.to_hash
+      rd[:facts] = begin
+        YAML::load(sh.stdout)
+      rescue
+      end
+
+      rd
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'rspec-system'
+
+module RSpecSystem::Helpers
+  class PuppetAgent < RSpecSystem::Helper
+    name 'puppet_agent'
+    properties :stdout, :stderr, :exit_code
+
+    def initialize(opts, clr, &block)
+      # Defaults etc.
+      opts = {
+        :debug => false,
+        :trace => true,
+      }.merge(opts)
+
+      super(opts, clr, &block)
+    end
+
+    def execute
+      node = opts[:node]
+
+      cmd = "puppet agent -t --detailed-exitcodes"
+      cmd += " --debug" if opts[:debug]
+      cmd += " --trace" if opts[:trace]
+
+      shell(:c => cmd, :n => node).to_hash
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+require 'rspec-system'
+
+module RSpecSystem::Helpers
+  # puppet_apply helper
+  class PuppetApply < RSpecSystem::Helper
+    name 'puppet_apply'
+    properties :stdout, :stderr, :exit_code
+
+    def initialize(opts, clr, &block)
+      # Defaults
+      opts = {
+        :debug => false,
+        :trace => true,
+      }.merge(opts)
+
+      raise 'Must provide code' unless opts[:code]
+
+      super(opts, clr, &block)
+    end
+
+    # Run puppet apply in a shell and return results
+    #
+    # @return [Hash] results
+    def execute
+      code = opts[:code]
+      node = opts[:node]
+
+      log.info("Copying DSL to remote host")
+      file = Tempfile.new('rcp_puppet_apply')
+      file.write(code)
+      file.close
+
+      remote_path = '/tmp/puppetapply.' + rand(1000000000).to_s
+      r = rcp(:sp => file.path, :dp => remote_path, :d => node)
+      file.unlink
+
+      log.info("Cat file to see contents")
+      shell :c => "cat #{remote_path}", :n => node
+
+      log.info("Now running puppet apply")
+      cmd = "puppet apply --detailed-exitcodes"
+      cmd += " --debug" if opts[:debug]
+      cmd += " --trace" if opts[:trace]
+      cmd += " #{remote_path}"
+
+      shell(:c => cmd, :n => node).to_hash
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+require 'rspec-system'
+
+module RSpecSystem::Helpers
+  class PuppetInstall < RSpecSystem::Helper
+    name 'puppet_install'
+
+    def execute
+      node = opts[:node]
+
+      # Grab facts from node
+      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")
+        shell :c => "sed -i 's/^mesg n/# mesg n/' /root/.profile", :n => node
+      end
+
+      # Grab PL repository and install PL copy of puppet
+      log.info "Starting installation of puppet from PL repos"
+      if facts['osfamily'] == 'RedHat'
+        if facts['operatingsystem'] == 'Fedora'
+          # Fedora testing is probably the best for now
+          shell :c => 'sed -i "0,/RE/s/enabled=0/enabled=1/" /etc/yum.repos.d/fedora-updates-testing.repo', :n => node
+        else
+          if facts['operatingsystemrelease'] =~ /^6\./
+            shell :c => 'rpm -ivh http://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-6.noarch.rpm', :n => node
+          else
+            shell :c => 'rpm -ivh http://yum.puppetlabs.com/el/5/products/x86_64/puppetlabs-release-5-6.noarch.rpm', :n => node
+          end
+        end
+        shell :c => 'yum install -y puppet', :n => node
+      elsif facts['osfamily'] == 'Debian'
+        shell :c => "wget http://apt.puppetlabs.com/puppetlabs-release-#{facts['lsbdistcodename']}.deb", :n => node
+        shell :c => "dpkg -i puppetlabs-release-#{facts['lsbdistcodename']}.deb", :n => node
+        shell :c => 'apt-get update', :n => node
+        shell :c => 'apt-get install -y puppet', :n => node
+      end
+
+      # Prep modules dir
+      log.info("Preparing modules dir")
+      shell :c => 'mkdir -p /etc/puppet/modules', :n => node
+
+      # Create alias for puppet
+      pp = <<-EOS
+host { 'puppet':
+  ip => '127.0.0.1',
+}
+      EOS
+      puppet_apply(pp)
+
+      # Create hiera.yaml
+      file = Tempfile.new('hierayaml')
+      begin
+        file.write(<<-EOS)
+---
+:logger: noop
+        EOS
+        file.close
+        rcp(:sp => file.path, :dp => '/etc/puppet/hiera.yaml', :d => node)
+      ensure
+        file.unlink
+      end
+
+      {}
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'rspec-system'
+
+module RSpecSystem::Helpers
+  class PuppetMasterInstall < RSpecSystem::Helper
+    name 'puppet_master_install'
+
+    def execute
+      node = opts[:node]
+      facts = node.facts
+
+      if facts['osfamily'] == 'RedHat'
+        shell :c => 'yum install -y puppet-server', :n => node
+        if facts['operatingsystemrelease'] =~ /^5\./
+          shell :c => '/etc/init.d/puppetmaster start', :n => node
+        else
+          shell :c => 'service puppetmaster start', :n => node
+        end
+      elsif facts['osfamily'] == 'Debian'
+        shell :c => 'apt-get install -y puppetmaster', :n => node
+        shell :c => 'service puppetmaster start', :n => node
+      end
+
+      {}
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'rspec-system'
+
+module RSpecSystem::Helpers
+  class PuppetModuleInstall < RSpecSystem::Helper
+    name 'puppet_module_install'
+
+    def initialize(opts, clr, &block)
+      opts = {
+        :module_path => "/etc/puppet/modules",
+      }.merge(opts)
+
+      raise "Must provide :source and :module_name parameters" unless opts[:source] && opts[:module_name]
+
+      super(opts, clr, &block)
+    end
+
+    def execute
+      source = opts[:source]
+      module_name = opts[:module_name]
+      module_path = opts[:module_path]
+      node = opts[:node]
+
+      log.info("Now transferring module onto node")
+      result = rcp :sp => source, :d => node, :dp => File.join(module_path, module_name)
+      result.to_hash
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+require 'rspec-system'
+
+module RSpecSystem::Helpers
+  class PuppetResource < RSpecSystem::Helper
+    name 'puppet_resource'
+    properties :stdout, :stderr, :exit_code
+
+    def initialize(opts, clr, &block)
+      raise "Must provide resource" unless opts[:resource]
+      super(opts, clr, &block)
+    end
+
+    # Run puppet resource in a shell and return results
+    #
+    # @return [Hash] results
+    def execute
+      resource = opts[:resource]
+      node = opts[:node]
+
+      log.info("Now running puppet resource")
+      result = shell :c => "puppet resource #{resource}", :n => node
+      result.to_hash
+    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     = "1.2.0"
+  s.version     = "2.0.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.5', '>= 1.5.0'
+  s.add_runtime_dependency "rspec-system", '~> 2.0'
 end

data/spec/spec_helper_system.rb

@@ -1,6 +1,8 @@
 require 'rspec-system/spec_helper'
 require 'rspec-system-puppet/helpers'
 
+include RSpecSystemPuppet::Helpers
+
 def proj_root
   Pathname.new(File.join(File.dirname(__FILE__), '..'))
 end

data/spec/system/00_initial_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper_system'
+
+describe "installation tasks" do
+  it "check puppet_install works" do
+    puppet_install()
+  end
+
+  it 'check puppet_master_install works' do
+    puppet_master_install()
+
+    puppet_agent do |r|
+      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
+    end
+  end
+end

data/spec/system/facter_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper_system'
+
+describe "helper facter" do
+  it 'domain fact should return something valid' do
+    facter do |r|
+      r.stderr.should be_empty
+      r.facts['domain'].should =~ /[a-z]+/
+      r.exit_code.should be_zero
+    end
+  end
+
+  it 'fqdn fact should return something valid' do
+    facter do |r|
+      r.stderr.should be_empty
+      r.facts['fqdn'].should =~ /vm/
+      r.exit_code.should be_zero
+    end
+  end
+
+  context 'test as a subject' do
+    context facter do
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should be_zero }
+
+      it { subject.facts['fqdn'].should =~ /vm/ }
+    end
+  end
+end

data/spec/system/puppet_agent_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper_system'
+
+describe "helper puppet_agent" do
+  it 'should run without error' do
+    puppet_agent do |r|
+      r.stderr.should be_empty
+      r.exit_code.should be_zero
+    end
+  end
+
+  context 'test as a subject' do
+    context puppet_agent do
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should be_zero }
+    end
+  end
+end

data/spec/system/puppet_apply_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper_system'
+
+describe "helper puppet_apply" do
+  it 'should print notice message to stdout' do
+    puppet_apply('notice("foo")') do |r|
+      r.stdout.should =~ /foo/
+      r.stderr.should be_empty
+      r.exit_code.should be_zero
+    end
+  end
+
+  it 'in debug mode should return notice message to stdout and Debug: labels' do
+    puppet_apply(:code => 'notice("foo")', :debug => true) do |r|
+      r.stdout.should =~ /foo/
+      r.stdout.should =~ /Debug:/
+      r.stderr.should be_empty
+      r.exit_code.should be_zero
+    end
+  end
+
+  it 'with trace off it should work normally' do
+    puppet_apply(:code => 'notice("foo")', :trace => false) do |r|
+      r.stdout.should =~ /foo/
+      r.stderr.should be_empty
+      r.exit_code.should be_zero
+    end
+  end
+
+  context 'test as a subject' do
+    context puppet_apply 'notice("foo")' do
+      its(:stdout) { should =~ /foo/ }
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should be_zero }
+    end
+  end
+end

data/spec/system/puppet_module_install_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper_system'
+
+describe "helper puppet_module_install" do
+  let(:test_path) do
+    proj_root + 'spec' + 'fixtures' + 'mymodule'
+  end
+
+  it 'should return no errors when including a class' do
+    puppet_module_install(
+      :source => test_path,
+      :module_name => 'mymodule'
+    )
+    pp = <<-EOS.gsub(/^\s{6}/, '')
+      class { 'mymodule':
+        param1 => 'bar',
+      }
+    EOS
+    puppet_apply(pp) do |r|
+      r.stdout.should =~ /Param1: bar/
+      r.stderr.should be_empty
+      r.exit_code.should be_zero
+    end
+  end
+end

data/spec/system/puppet_resource_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper_system'
+
+describe "helper puppet_resource" do
+  it 'for "user" should returns an exit code of 0' do
+    puppet_resource('user') do |r|
+      r.stderr.should be_empty
+      r.exit_code.should be_zero
+    end
+  end
+
+  context 'test as a subject' do
+    context puppet_resource 'user' do
+      its(:stdout) { should_not be_empty }
+      its(:stderr) { should be_empty }
+      its(:exit_code) { should be_zero }
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-system-puppet
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 15
   prerelease: 
   segments: 
-  - 1
   - 2
   - 0
-  version: 1.2.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Ken Barber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-30 00:00:00 Z
+date: 2013-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-system
@@ -24,20 +24,12 @@ dependencies:
     none: false
     requirements: 
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 1
-        - 5
+        - 2
         - 0
-        version: 1.5.0
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 description: 
@@ -53,17 +45,30 @@ files:
 - .gitignore
 - .nodeset.yml
 - .ruby-version
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/rspec-system-puppet.rb
 - lib/rspec-system-puppet/helpers.rb
+- lib/rspec-system-puppet/helpers/facter.rb
+- lib/rspec-system-puppet/helpers/puppet_agent.rb
+- lib/rspec-system-puppet/helpers/puppet_apply.rb
+- lib/rspec-system-puppet/helpers/puppet_install.rb
+- lib/rspec-system-puppet/helpers/puppet_master_install.rb
+- lib/rspec-system-puppet/helpers/puppet_module_install.rb
+- lib/rspec-system-puppet/helpers/puppet_resource.rb
 - rspec-system-puppet.gemspec
 - spec/fixtures/mymodule/manifests/init.pp
 - spec/spec_helper.rb
 - spec/spec_helper_system.rb
-- spec/system/basic_spec.rb
+- spec/system/00_initial_spec.rb
+- spec/system/facter_spec.rb
+- spec/system/puppet_agent_spec.rb
+- spec/system/puppet_apply_spec.rb
+- spec/system/puppet_module_install_spec.rb
+- spec/system/puppet_resource_spec.rb
 homepage: https://github.com/puppetlabs/rspec-system-puppet
 licenses: []
 
@@ -101,5 +106,10 @@ signing_key:
 specification_version: 3
 summary: Puppet rspec-system plugin
 test_files: 
-- spec/system/basic_spec.rb
+- spec/system/00_initial_spec.rb
+- spec/system/facter_spec.rb
+- spec/system/puppet_agent_spec.rb
+- spec/system/puppet_apply_spec.rb
+- spec/system/puppet_module_install_spec.rb
+- spec/system/puppet_resource_spec.rb
 has_rdoc: 

data/spec/system/basic_spec.rb

@@ -1,88 +0,0 @@
-require 'spec_helper_system'
-
-describe "basic tests:" do
-  it "check puppet_install works" do
-    puppet_install()
-  end
-
-  it 'check master install works' do
-    puppet_master_install()
-
-    puppet_agent do |r|
-      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
-    end
-  end
-
-  it 'facter domain should return something valid' do
-    facter do |r|
-      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'].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
-    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
-
-  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
-
-  it 'check for no errors when including a class' do
-    puppet_module_install(
-      :source => proj_root + 'spec' + 'fixtures' + 'mymodule',
-      :module_name => 'mymodule'
-    )
-    pp = <<-EOS.gsub(/^\s{6}/, '')
-      class { 'mymodule':
-        param1 => 'bar',
-      }
-    EOS
-    puppet_apply(pp) do |r|
-      r.stdout.should =~ /Param1: bar/
-      r.stderr.should == ''
-      r.exit_code.should == 0
-    end
-  end
-end