rspec-puppet-facts 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 897f38860a4b9a2225c4b860aafe7c5e6e479a96
-  data.tar.gz: 52310c6ede44116e97494fce31583cd21e1b32e6
+  metadata.gz: f41a4eb01ece38f5295c387a1fe4efb27197d5cd
+  data.tar.gz: 1296bd2cbd04897d780d4f29e84e126d9b72ee59
 SHA512:
-  metadata.gz: 3c5482257bbca9c83ba78a14eb5379891df04ed75f4800947ae0ae1693ed6ed708c77b86b02d1bb68ec9d5f3db2de043561fa09e69d9038012e2550658e42229
-  data.tar.gz: 47151a11e40973783d0b501a141ba6d0ff94263b4e39ef992d22732b5f581aeadcf860b8cb069be4d5329ef46029a7b1a33027ee1c52620876b9a556b2fb1524
+  metadata.gz: 0e5784286b72d614a16e3aec427b0400745a5a5541cf92f02fb34d43e692d77b97d0c334493f0914345f934c978c772d4266a124abdc37b6b684d902806dee8d
+  data.tar.gz: e4713f095d37044a32ddb3a52b5b069ba94ad0b45cb91a55354ff2374104516b9267c9617502d9304b83b0aca187f4a8758a1d1b82866008c1c38fdd491668aa

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+##2015-04-26 - Release 0.7.0
+- Add support for Operating System minor release
+- Update README.md
+
 ##2015-03-06 - Release 0.6.0
 - Add facts for FreeBSD 9
 

data/README.md

@@ -1,17 +1,20 @@
 rspec-puppet-facts
 ==================
 
-[![Build Status](https://travis-ci.org/mcanevet/rspec-puppet-facts.png?branch=master)](https://travis-ci.org/mcanevet/rspec-puppet-facts)
-[![Code Climate](https://codeclimate.com/github/mcanevet/rspec-puppet-facts/badges/gpa.svg)](https://codeclimate.com/github/mcanevet/rspec-puppet-facts)
-[![Gem Version](https://badge.fury.io/rb/rspec-puppet-facts.svg)](http://badge.fury.io/rb/rspec-puppet-facts)
+[![Build Status](https://img.shields.io/travis/mcanevet/rspec-puppet-facts/master.svg)](https://travis-ci.org/mcanevet/rspec-puppet-facts)
+[![Code Climate](https://img.shields.io/codeclimate/github/mcanevet/rspec-puppet-facts.svg)](https://codeclimate.com/github/mcanevet/rspec-puppet-facts)
+[![Gem Version](https://img.shields.io/gem/v/rspec-puppet-facts.svg)](https://rubygems.org/gems/rspec-puppet-facts)
+[![Gem Downloads](https://img.shields.io/gem/dt/rspec-puppet-facts.svg)](https://rubygems.org/gems/rspec-puppet-facts)
 [![Coverage Status](https://img.shields.io/coveralls/mcanevet/rspec-puppet-facts.svg)](https://coveralls.io/r/mcanevet/rspec-puppet-facts?branch=master)
 
 Based on an original idea from [apenney](https://github.com/apenney/puppet_facts/).
 
 Simplify your unit tests by looping on every supported Operating System and populating facts.
 
-Before
-------
+Testing a class or define
+-------------------------
+
+### Before
 
 ```ruby
 require 'spec_helper'
@@ -27,7 +30,7 @@ describe 'myclass' do
         ...
       }
       
-      it { should compile.with_all_deps }
+      it { is_expected.to compile.with_all_deps }
       ...
     end
   end
@@ -41,7 +44,7 @@ describe 'myclass' do
         ...
       }
       
-      it { should compile.with_all_deps }
+      it { is_expected.to compile.with_all_deps }
       ...
     end
   end
@@ -50,8 +53,7 @@ describe 'myclass' do
 end
 ```
 
-After
------
+### After
 
 ```ruby
 require 'spec_helper'
@@ -64,15 +66,136 @@ describe 'myclass' do
         facts
       end
       
-      it { should compile.with_all_deps }
+      it { is_expected.to compile.with_all_deps }
+      ...
+      case facts[:osfamily]
+      when 'Debian'
+        ...
+      else
+        ...
+      end
+    end
+  end
+end
+```
+
+Testing a type or provider
+--------------------------
+
+### Before
+
+```ruby
+require 'spec_helper'
+
+describe Puppet::Type.type(:mytype) do
+
+  context "on debian-7-x86_64" do
+    before :each do
+      Facter.clear
+      Facter.stubs(:fact).with(:osfamily).returns Facter.add(:osfamily) { setcode { 'Debian' } }
+      Facter.stubs(:fact).with(:operatingsystem).returns Facter.add(:operatingsystem) { setcode { 'Debian' } }
+      Facter.stubs(:fact).with(:operatingsystemmajrelease).returns Facter.add(:operatingsystemmajrelease) { setcode { '7' } }
+    end
+    ...
+  end
+
+  context "on redhat-7-x86_64" do
+    before :each do
+      Facter.clear
+      Facter.stubs(:fact).with(:osfamily).returns Facter.add(:osfamily) { setcode { 'RedHat' } }
+      Facter.stubs(:fact).with(:operatingsystem).returns Facter.add(:operatingsystem) { setcode { 'RedHat' } }
+      Facter.stubs(:fact).with(:operatingsystemmajrelease).returns Facter.add(:operatingsystemmajrelease) { setcode { '7' } }
+    end
+    ...
+  end
+end
+
+```
+
+### After
+
+```ruby
+require 'spec_helper'
+
+describe Puppet::Type.type(:mytype) do
+
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      before :each do
+        Facter.clear
+        facts.each do |k, v|
+          Facter.stubs(:fact).with(k).returns Facter.add(k) { setcode { v } }
+        end
+      end
       ...
       case facts[:osfamily]
       when 'Debian'
         ...
-      when 'RedHat'
+      else
         ...
       end
+      ...
+    end
+  end
+end
+
+```
+
+Testing a function
+------------------
+
+### Before
+
+```ruby
+require 'spec_helper'
+
+describe Puppet::Parser::Functions.function(:myfunction) do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  context "on debian-7-x86_64" do
+    before :each do
+      scope.stubs(:lookupvar).with('::osfamily').returns('Debian')
+      scope.stubs(:lookupvar).with('osfamily').returns('Debian')
+      scope.stubs(:lookupvar).with('::operatingsystem').returns('Debian')
+      scope.stubs(:lookupvar).with('operatingsystem').returns('Debian')
+      ...
+    end
+    ...
+  end
+
+  context "on redhat-7-x86_64" do
+    before :each do
+      scope.stubs(:lookupvar).with('::osfamily').returns('RedHat')
+      scope.stubs(:lookupvar).with('osfamily').returns('RedHat')
+      scope.stubs(:lookupvar).with('::operatingsystem').returns('RedHat')
+      scope.stubs(:lookupvar).with('operatingsystem').returns('RedHat')
+      ...
+    end
+    ...
+  end
+end
+```
+
+### After
+
+```ruby
+require 'spec_helper'
+
+describe Puppet::Parser::Functions.function(:myfunction) do
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      before :each do
+        facts.each do |k, v|
+          scope.stubs(:lookupvar).with("::#{k}").returns(v)
+          scope.stubs(:lookupvar).with(k).returns(v)
+        end
+      end
     end
+    
+    ...
+    
   end
 end
 ```
@@ -108,7 +231,7 @@ describe 'myclass' do
         facts
       end
       
-      it { should compile.with_all_deps }
+      it { is_expected.to compile.with_all_deps }
       ...
     end
   end
@@ -130,7 +253,7 @@ describe 'myclass' do
         })
       end
       
-      it { should compile.with_all_deps }
+      it { is_expected.to compile.with_all_deps }
       ...
     end
   end

data/lib/rspec-puppet-facts.rb

@@ -13,7 +13,7 @@ module RspecPuppetFacts
       operatingsystem = os_sup['operatingsystem'].downcase
       os_sup['operatingsystemrelease'].map do |operatingsystemmajrelease|
         opts[:hardwaremodels].each do |hardwaremodel|
-          os = "#{operatingsystem}-#{operatingsystemmajrelease.split(" ")[0]}-#{hardwaremodel}"
+          os = "#{operatingsystem}-#{operatingsystemmajrelease.split(/[ \.]/)[0]}-#{hardwaremodel}"
           # TODO: use SemVer here
           facter_minor_version = Facter.version[0..2]
           file = File.expand_path(File.join(File.dirname(__FILE__), "../facts/#{facter_minor_version}/#{os}.facts"))
@@ -52,10 +52,3 @@ module RspecPuppetFacts
     JSON.parse(File.read('metadata.json'))
   end
 end
-
-RSpec.configure do |c|
-  begin
-    c.formatter = 'NyanCatFormatter' if Date.today.strftime('%m%d') == '0401'
-  rescue LoadError
-  end
-end

data/lib/rspec-puppet-facts/version.rb

@@ -1,5 +1,5 @@
 module RspecPuppetFacts
   module Version
-    STRING = '0.6.0'
+    STRING = '0.7.0'
   end
 end

data/rspec-puppet-facts.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha'
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'facter'
-  s.add_runtime_dependency 'nyan-cat-formatter' if Date.today.strftime('%m%d') == '0401'
 end

data/spec/rspec_puppet_facts_spec.rb

@@ -139,5 +139,38 @@ describe 'RspecPuppetFacts' do
         expect { subject }.to output(/Can't find facts for 'debian-4-x86_64'/).to_stderr
       end
     end
+
+    context 'When operatingsystemrelease has minor release' do
+      subject {
+        on_supported_os(
+          {
+            :supported_os => [
+              {
+                "operatingsystem" => "RedHat",
+                "operatingsystemrelease" => [
+                  "5",
+                  "6.5",
+                  "6.6",
+                  "7.1"
+                ]
+              }
+            ]
+          }
+        )
+      }
+      it 'should return a hash' do
+        expect(subject.class).to eq Hash
+      end
+      it 'should have 3 elements' do
+        expect(subject.size).to eq 3
+      end
+      it 'should return supported OS' do
+        expect(subject.keys.sort).to eq [
+          'redhat-5-x86_64',
+          'redhat-6-x86_64',
+          'redhat-7-x86_64',
+        ]
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types