rspec-puppet-facts 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e267fa84f829a97dd7a211cd499b7916038eda
-  data.tar.gz: 1cae575348cca8a0483c935f68d58d1c315b7c84
+  metadata.gz: 187629e1d3599c172d3b0e23135f5d92ae04a8e2
+  data.tar.gz: 1205b765d9578ded7591cd1822943212404f9634
 SHA512:
-  metadata.gz: 817f91d0427e96c4d57a4d3524adc8374308c23fd805384718f803a13853c71b29383f146797654f168aa93a83483ee13efa83f89cdbbc707597978f1b6d23bf
-  data.tar.gz: 65220d4078595dad750393f9e3ea2725b638da129d6cabd71e823d2b03c73700ffdabb1defa5e5c250551b5a6b3a69bd24f38bed35154e9ac9f0ab6f96bf418d
+  metadata.gz: 3d28c8fc4e11155a4c96e1f4f22816913eee8220d824305022b5bb084ec7a95a4bc4961b436b56959975beab6ee9375a01ed732302fa7c4f07ddd71e53afde9c
+  data.tar.gz: 7fd003eb3d0808311230355ff22dd791089d6878d7841ec8b58814c94a1ce17c09e4965c9ae4f4fbc9a275e47795739bb663f9ae74034973c93e1f9ce3d27f8d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+##2016-05-19 - Release 1.6.1
+- Fix a bug where not all specified Ubuntu or OpenBSD were captured
+
 ##2016-05-17 - Release 1.6.0
 - Cleanup and refactor methods
 - Add YARD documentation

data/lib/rspec-puppet-facts.rb

@@ -71,7 +71,19 @@ module RspecPuppetFacts
 
     os_facts_hash = {}
     received_facts.map do |facts|
-      os = "#{facts[:operatingsystem].downcase}-#{facts[:operatingsystemrelease].split('.')[0]}-#{facts[:hardwaremodel]}"
+      # Fix facter bug
+      if facts[:operatingsystem] == 'Ubuntu'
+        operatingsystemmajrelease = facts[:operatingsystemrelease].split('.')[0..1].join('.')
+      elsif facts[:operatingsystem] == 'OpenBSD'
+        operatingsystemmajrelease = facts[:operatingsystemrelease]
+      else
+        if facts[:operatingsystemmajrelease].nil?
+          operatingsystemmajrelease = facts[:operatingsystemrelease].split('.')[0]
+        else
+          operatingsystemmajrelease = facts[:operatingsystemmajrelease]
+        end
+      end
+      os = "#{facts[:operatingsystem].downcase}-#{operatingsystemmajrelease}-#{facts[:hardwaremodel]}"
       next unless os.start_with? RspecPuppetFacts.spec_facts_os_filter if RspecPuppetFacts.spec_facts_os_filter
       facts.merge! RspecPuppetFacts.common_facts
       os_facts_hash[os] = facts

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

@@ -2,6 +2,6 @@ module RspecPuppetFacts
   # This module contains the current version constant
   module Version
     # The current version of this gem
-    STRING = '1.6.0'
+    STRING = '1.6.1'
   end
 end

data/spec/rspec_puppet_facts_spec.rb

@@ -142,6 +142,40 @@ describe RspecPuppetFacts do
       end
     end
 
+    context 'When testing Ubuntu' do
+      subject {
+        on_supported_os(
+          {
+            :supported_os => [
+              {
+                "operatingsystem" => "Ubuntu",
+                "operatingsystemrelease" => [
+                  "14.04",
+                  "14.10",
+                  "15.04",
+                  "15.10",
+                ],
+              },
+            ],
+          }
+        )
+      }
+      it 'should return a hash' do
+        expect(subject.class).to eq Hash
+      end
+      it 'should have 4 elements' do
+        expect(subject.size).to eq 4
+      end
+      it 'should return supported OS' do
+        expect(subject.keys.sort).to eq [
+          'ubuntu-14.04-x86_64',
+          'ubuntu-14.10-x86_64',
+          'ubuntu-15.04-x86_64',
+          'ubuntu-15.10-x86_64',
+        ]
+      end
+    end
+
     context 'When testing FreeBSD 10' do
       subject {
         on_supported_os(
@@ -170,7 +204,7 @@ describe RspecPuppetFacts do
       end
     end
 
-    context 'When testing OpenBSD 5.7' do
+    context 'When testing OpenBSD' do
       subject {
         on_supported_os(
           {
@@ -193,7 +227,7 @@ describe RspecPuppetFacts do
       end
       it 'should return supported OS' do
         expect(subject.keys.sort).to eq [
-          'openbsd-5-amd64',
+          'openbsd-5.7-amd64',
         ]
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types