rspec-puppet-facts 0.7.0 → 0.8.0

data/facts/get_facts.sh

@@ -18,7 +18,12 @@ for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0; do
   minor_version=$(echo $version | cut -c1-3)
   output_dir="/vagrant/${minor_version}"
   mkdir -p $output_dir
+  if [ $operatingsystem == 'archlinux' -o $operatingsystem == 'gentoo' ]; then
+    output_file="${output_dir}/${operatingsystem}-${hardwaremodel}.facts"
+  else
+    output_file="${output_dir}/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
+  fi
   echo $version | grep -q -E '^1\.' &&
-    FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee "${output_dir}/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts" ||
-    FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | tee "${output_dir}/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
+    FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||
+    FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | tee $output_file
 done

data/lib/rspec-puppet-facts.rb

@@ -11,9 +11,25 @@ module RspecPuppetFacts
 
     opts[:supported_os].map do |os_sup|
       operatingsystem = os_sup['operatingsystem'].downcase
-      os_sup['operatingsystemrelease'].map do |operatingsystemmajrelease|
+      if os_sup['operatingsystemrelease']
+        os_sup['operatingsystemrelease'].map do |operatingsystemmajrelease|
+          opts[:hardwaremodels].each do |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"))
+            # Use File.exists? instead of File.file? here so that we can stub File.file?
+            if ! File.exists?(file)
+              warn "Can't find facts for '#{os}' for facter #{facter_minor_version}, skipping..."
+            else
+              h[os] = JSON.parse(IO.read(file), :symbolize_names => true)
+            end
+          end
+        end
+      else
+        # Assuming this is a rolling release Operating system
         opts[:hardwaremodels].each do |hardwaremodel|
-          os = "#{operatingsystem}-#{operatingsystemmajrelease.split(/[ \.]/)[0]}-#{hardwaremodel}"
+          os = "#{operatingsystem}-#{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"))

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

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

data/spec/rspec_puppet_facts_spec.rb

@@ -140,35 +140,35 @@ describe 'RspecPuppetFacts' do
       end
     end
 
-    context 'When operatingsystemrelease has minor release' do
+    context 'When specifying rolling release operating system' do
       subject {
         on_supported_os(
           {
             :supported_os => [
               {
-                "operatingsystem" => "RedHat",
+                "operatingsystem" => "Debian",
                 "operatingsystemrelease" => [
-                  "5",
-                  "6.5",
-                  "6.6",
-                  "7.1"
-                ]
-              }
+                  "8",
+                ],
+              },
+              {
+                "operatingsystem" => "Archlinux",
+              },
             ]
           }
         )
       }
+
       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
+      it 'should have 2 elements' do
+        expect(subject.size).to eq 2
       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',
+          'archlinux-x86_64',
+          'debian-8-x86_64',
         ]
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Mickaël Canévet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -123,8 +123,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- facts/1.6/archlinux-3-i386.facts
-- facts/1.6/archlinux-3-x86_64.facts
+- facts/1.6/archlinux-i386.facts
+- facts/1.6/archlinux-x86_64.facts
 - facts/1.6/centos-5-i386.facts
 - facts/1.6/centos-5-x86_64.facts
 - facts/1.6/centos-6-i386.facts
@@ -143,6 +143,8 @@ files:
 - facts/1.6/freebsd-10-x86_64.facts
 - facts/1.6/freebsd-9-i386.facts
 - facts/1.6/freebsd-9-x86_64.facts
+- facts/1.6/gentoo-i386.facts
+- facts/1.6/gentoo-x86_64.facts
 - facts/1.6/opensuse-12-i386.facts
 - facts/1.6/opensuse-12-x86_64.facts
 - facts/1.6/opensuse-13-i386.facts
@@ -173,8 +175,8 @@ files:
 - facts/1.6/ubuntu-12.04-x86_64.facts
 - facts/1.6/ubuntu-14.04-i386.facts
 - facts/1.6/ubuntu-14.04-x86_64.facts
-- facts/1.7/archlinux-3-i386.facts
-- facts/1.7/archlinux-3-x86_64.facts
+- facts/1.7/archlinux-i386.facts
+- facts/1.7/archlinux-x86_64.facts
 - facts/1.7/centos-5-i386.facts
 - facts/1.7/centos-5-x86_64.facts
 - facts/1.7/centos-6-i386.facts
@@ -193,6 +195,8 @@ files:
 - facts/1.7/freebsd-10-x86_64.facts
 - facts/1.7/freebsd-9-i386.facts
 - facts/1.7/freebsd-9-x86_64.facts
+- facts/1.7/gentoo-i386.facts
+- facts/1.7/gentoo-x86_64.facts
 - facts/1.7/opensuse-12-i386.facts
 - facts/1.7/opensuse-12-x86_64.facts
 - facts/1.7/opensuse-13-i386.facts
@@ -223,8 +227,8 @@ files:
 - facts/1.7/ubuntu-12.04-x86_64.facts
 - facts/1.7/ubuntu-14.04-i386.facts
 - facts/1.7/ubuntu-14.04-x86_64.facts
-- facts/2.0/archlinux-3-i386.facts
-- facts/2.0/archlinux-3-x86_64.facts
+- facts/2.0/archlinux-i386.facts
+- facts/2.0/archlinux-x86_64.facts
 - facts/2.0/centos-5-i386.facts
 - facts/2.0/centos-5-x86_64.facts
 - facts/2.0/centos-6-i386.facts
@@ -243,6 +247,8 @@ files:
 - facts/2.0/freebsd-10-x86_64.facts
 - facts/2.0/freebsd-9-i386.facts
 - facts/2.0/freebsd-9-x86_64.facts
+- facts/2.0/gentoo-i386.facts
+- facts/2.0/gentoo-x86_64.facts
 - facts/2.0/opensuse-12-i386.facts
 - facts/2.0/opensuse-12-x86_64.facts
 - facts/2.0/opensuse-13-i386.facts
@@ -273,8 +279,8 @@ files:
 - facts/2.0/ubuntu-12.04-x86_64.facts
 - facts/2.0/ubuntu-14.04-i386.facts
 - facts/2.0/ubuntu-14.04-x86_64.facts
-- facts/2.1/archlinux-3-i386.facts
-- facts/2.1/archlinux-3-x86_64.facts
+- facts/2.1/archlinux-i386.facts
+- facts/2.1/archlinux-x86_64.facts
 - facts/2.1/centos-5-i386.facts
 - facts/2.1/centos-5-x86_64.facts
 - facts/2.1/centos-6-i386.facts
@@ -293,6 +299,8 @@ files:
 - facts/2.1/freebsd-10-x86_64.facts
 - facts/2.1/freebsd-9-i386.facts
 - facts/2.1/freebsd-9-x86_64.facts
+- facts/2.1/gentoo-i386.facts
+- facts/2.1/gentoo-x86_64.facts
 - facts/2.1/opensuse-12-i386.facts
 - facts/2.1/opensuse-12-x86_64.facts
 - facts/2.1/opensuse-13-i386.facts
@@ -323,8 +331,8 @@ files:
 - facts/2.1/ubuntu-12.04-x86_64.facts
 - facts/2.1/ubuntu-14.04-i386.facts
 - facts/2.1/ubuntu-14.04-x86_64.facts
-- facts/2.2/archlinux-3-i386.facts
-- facts/2.2/archlinux-3-x86_64.facts
+- facts/2.2/archlinux-i386.facts
+- facts/2.2/archlinux-x86_64.facts
 - facts/2.2/centos-5-i386.facts
 - facts/2.2/centos-5-x86_64.facts
 - facts/2.2/centos-6-i386.facts
@@ -343,6 +351,8 @@ files:
 - facts/2.2/freebsd-10-x86_64.facts
 - facts/2.2/freebsd-9-i386.facts
 - facts/2.2/freebsd-9-x86_64.facts
+- facts/2.2/gentoo-i386.facts
+- facts/2.2/gentoo-x86_64.facts
 - facts/2.2/opensuse-12-i386.facts
 - facts/2.2/opensuse-12-x86_64.facts
 - facts/2.2/opensuse-13-i386.facts
@@ -373,8 +383,8 @@ files:
 - facts/2.2/ubuntu-12.04-x86_64.facts
 - facts/2.2/ubuntu-14.04-i386.facts
 - facts/2.2/ubuntu-14.04-x86_64.facts
-- facts/2.3/archlinux-3-i386.facts
-- facts/2.3/archlinux-3-x86_64.facts
+- facts/2.3/archlinux-i386.facts
+- facts/2.3/archlinux-x86_64.facts
 - facts/2.3/centos-5-i386.facts
 - facts/2.3/centos-5-x86_64.facts
 - facts/2.3/centos-6-i386.facts
@@ -393,6 +403,8 @@ files:
 - facts/2.3/freebsd-10-x86_64.facts
 - facts/2.3/freebsd-9-i386.facts
 - facts/2.3/freebsd-9-x86_64.facts
+- facts/2.3/gentoo-i386.facts
+- facts/2.3/gentoo-x86_64.facts
 - facts/2.3/opensuse-12-i386.facts
 - facts/2.3/opensuse-12-x86_64.facts
 - facts/2.3/opensuse-13-i386.facts
@@ -423,8 +435,8 @@ files:
 - facts/2.3/ubuntu-12.04-x86_64.facts
 - facts/2.3/ubuntu-14.04-i386.facts
 - facts/2.3/ubuntu-14.04-x86_64.facts
-- facts/2.4/archlinux-3-i386.facts
-- facts/2.4/archlinux-3-x86_64.facts
+- facts/2.4/archlinux-i386.facts
+- facts/2.4/archlinux-x86_64.facts
 - facts/2.4/centos-5-i386.facts
 - facts/2.4/centos-5-x86_64.facts
 - facts/2.4/centos-6-i386.facts
@@ -443,6 +455,8 @@ files:
 - facts/2.4/freebsd-10-x86_64.facts
 - facts/2.4/freebsd-9-i386.facts
 - facts/2.4/freebsd-9-x86_64.facts
+- facts/2.4/gentoo-i386.facts
+- facts/2.4/gentoo-x86_64.facts
 - facts/2.4/opensuse-12-i386.facts
 - facts/2.4/opensuse-12-x86_64.facts
 - facts/2.4/opensuse-13-i386.facts