rspec-system-puppet 2.1.0 → 2.2.0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+2.2.0
+=====
+
+This feature release provides the ability to pass a :puppet setting to the facter helper, allowing you to return puppet facts when querying. At the moment the setting is false by default.
+
+#### Detailed Changes
+
+* Add puppet option to facter helper (Trey Dockendorf)
+
 2.1.0
 =====
 

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

@@ -111,6 +111,7 @@ module RSpecSystemPuppet::Helpers
   # Run facter on a remote machine
   #
   # @param opts [Hash] a hash of opts
+  # @option opts [Boolean] :puppet true to load Puppet custom facts
   # @option opts [RSpecSystem::Node] :node node to execute DSL on
   # @return [RSpecSystemPuppet::Helpers::Facter] helper object
   # @yield [result] yields result when called as a block

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

@@ -8,12 +8,25 @@ module RSpecSystem::Helpers
     name 'facter'
     properties :stdout, :stderr, :exit_code, :facts
 
+    def initialize(opts, clr, &block)
+      # Defaults etc.
+      opts = {
+        :puppet => false,
+      }.merge(opts)
+
+      super(opts, clr, &block)
+    end
+
     # 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
+      
+      cmd = "facter --yaml"
+      cmd += " --puppet" if opts[:puppet]
+      
+      sh = shell :c => cmd, :n => node
 
       rd = sh.to_hash
       rd[:facts] = begin

data/rspec-system-puppet.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # Metadata
   s.name        = "rspec-system-puppet"
-  s.version     = "2.1.0"
+  s.version     = "2.2.0"
   s.authors     = ["Ken Barber"]
   s.email       = ["info@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/rspec-system-puppet"

data/spec/fixtures/mymodule/lib/facter/myfact.rb

@@ -0,0 +1,7 @@
+# myfact.rb
+
+Facter.add("myfact") do
+  setcode do
+    'myfact'
+  end
+end

data/spec/system/00_initial_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper_system'
 
 describe "installation tasks" do
+  let(:test_path) do
+    proj_root + 'spec' + 'fixtures' + 'mymodule'
+  end
+ 
   it "check puppet_install works" do
     puppet_install()
   end
@@ -8,6 +12,8 @@ describe "installation tasks" do
   it 'check puppet_master_install works' do
     puppet_master_install()
 
+    puppet_module_install(:source => test_path, :module_name => 'mymodule')
+
     puppet_agent do |r|
       r.stderr.should == ''
       r.exit_code.should == 0

data/spec/system/facter_spec.rb

@@ -17,6 +17,14 @@ describe "helper facter" do
     end
   end
 
+  it 'puppet option should return valid myfact fact' do
+    facter(:puppet => true) do |r|
+      r.stderr.should be_empty
+      r.facts['myfact'].should =~ /myfact/
+      r.exit_code.should be_zero
+    end
+  end
+
   context 'test as a subject' do
     context facter do
       its(:stderr) { should be_empty }

data/spec/system/puppet_module_install_spec.rb

@@ -1,15 +1,7 @@
 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',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-system-puppet
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ken Barber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-13 00:00:00 Z
+date: 2013-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-system
@@ -60,6 +60,7 @@ files:
 - lib/rspec-system-puppet/helpers/puppet_module_install.rb
 - lib/rspec-system-puppet/helpers/puppet_resource.rb
 - rspec-system-puppet.gemspec
+- spec/fixtures/mymodule/lib/facter/myfact.rb
 - spec/fixtures/mymodule/manifests/init.pp
 - spec/spec_helper.rb
 - spec/spec_helper_system.rb