facter 2.4.3 → 2.4.4

data/ext/build_defaults.yaml

@@ -2,14 +2,14 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-lucid-amd64.cow base-precise-i386.cow base-precise-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-stable-i386.cow base-stable-amd64.cow base-testing-i386.cow base-testing-amd64.cow base-trusty-i386.cow base-trusty-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
+cows: 'base-precise-i386.cow base-precise-amd64.cow base-squeeze-i386.cow base-squeeze-amd64.cow base-trusty-i386.cow base-trusty-amd64.cow base-wheezy-i386.cow base-wheezy-amd64.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/lib/facter/application.rb

@@ -160,7 +160,9 @@ OPTIONS
                 "Enable timing.") { |v| Facter.timing(1) }
         opts.on("-p",
                 "--puppet",
-                "Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.") { |v| load_puppet }
+                "(Deprecated: use `puppet facts` instead) Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.") do |v|
+          load_puppet
+        end
 
         opts.on_tail("-v",
                      "--version",

data/lib/facter/dhcp_servers.rb

@@ -24,7 +24,8 @@ Facter.add(:dhcp_servers) do
     Facter::Core::Execution.which('nmcli')
   end
   confine do
-    Facter::Util::DHCPServers.network_manager_state != 'unknown'
+    s = Facter::Util::DHCPServers.network_manager_state
+    !s.empty? && (s != 'unknown')
   end
 
   setcode do

data/lib/facter/ldom.rb

@@ -47,15 +47,5 @@ if Facter.value(:kernel) == 'SunOS' &&
         end
       end
     end
-
-    # When ldom domainrole control = false, the system is a guest, so we mark it
-    # as a virtual system:
-    Facter.add("virtual") do
-      confine :ldom_domainrole_control => 'false'
-      has_weight 10
-      setcode do
-        Facter.value(:ldom_domainrole_impl)
-      end
-    end
   end
 end

data/lib/facter/util/processor.rb

@@ -232,7 +232,7 @@ module Processor
           end
         end
 
-      when "ppc64"
+      when "ppc64", "ppc64le"
         File.readlines(cpuinfo).each do |l|
           if l =~ /processor\s+:\s+(\d+)/
             processor_num = $1.to_i

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.4.3'
+    FACTERVERSION = '2.4.4'
   end
 
   # Returns the running version of Facter.

data/lib/facter/virtual.rb

@@ -89,6 +89,17 @@ Facter.add("virtual") do
   end
 end
 
+Facter.add("virtual") do
+  confine :kernel => 'SunOS'
+  confine :hardwareisa => 'sparc'
+  confine :ldom_domainrole_control => 'false'
+  has_weight 20 # Weight this before the default solaris implementation
+  setcode do
+    Facter.value(:ldom_domainrole_impl)
+  end
+end
+
+
 Facter.add("virtual") do
   confine :kernel => 'HP-UX'
   has_weight 10

data/spec/fixtures/cpuinfo/ppc64le

@@ -0,0 +1,15 @@
+processor       : 0
+cpu             : POWER8E (raw), altivec supported
+clock           : 3690.000000MHz
+revision        : 2.1 (pvr 004b 0201)
+
+processor       : 1
+cpu             : POWER8E (raw), altivec supported
+clock           : 3690.000000MHz
+revision        : 2.1 (pvr 004b 0201)
+
+timebase        : 512000000
+platform        : PowerNV
+model           : 8247-22L
+machine         : PowerNV 8247-22L
+firmware        : OPAL v3

data/spec/unit/application_spec.rb

@@ -54,6 +54,15 @@ describe Facter::Application do
       end
     end
 
+    ['-h', '--help'].each do |option|
+      it "issues a deprecation message for `--puppet`" do
+        Facter::Application.stubs(:exit).with(0)
+        expect do
+          Facter::Application.parse([option])
+        end.to have_printed('Deprecated: use `puppet facts` instead')
+      end
+    end
+
     it 'mutates argv so that non-option arguments are left' do
       argv = ['-y', '--trace', 'uptime', 'virtual']
       Facter::Application.parse(argv)

data/spec/unit/dhcp_servers_spec.rb

@@ -175,6 +175,28 @@ describe "DHCP server facts" do
           Facter.fact(:dhcp_servers).value.should be_nil
         end
       end
+      describe 'with nmcli version >= 0.9.9 available but printing an error to STDERR' do
+        before :each do
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("\n")
+          Facter::Core::Execution.stubs(:exec).with('nmcli --version').returns('nmcli tool, version 0.9.9.0')
+        end
+
+        it 'should not produce a dhcp_servers fact' do
+          Facter.fact(:dhcp_servers).value.should be_nil
+        end
+      end
+
+      describe 'with nmcli version <= 0.9.8 available but printing an error to STDERR' do
+        before :each do
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("\n")
+          Facter::Core::Execution.stubs(:exec).with('nmcli --version').returns('nmcli tool, version 0.9.7.0')
+        end
+
+        it 'should not produce a dhcp_servers fact' do
+          Facter.fact(:dhcp_servers).value.should be_nil
+        end
+      end
+
     end
 
     describe "without nmcli available" do

data/spec/unit/ldom_spec.rb

@@ -57,10 +57,6 @@ describe "ldom fact" do
     it "should return correct serial on version 1.0" do
       Facter.fact(:ldom_domainchassis).value.should == "0704RB0280"
     end
-
-    it "should return correct virtual on version 1.0" do
-      Facter.fact(:virtual).value.should == "LDoms"
-    end
   end
 
   describe "when running on non ldom hardware" do

data/spec/unit/processors/os_spec.rb

@@ -40,6 +40,13 @@ describe Facter::Processors::Linux do
         expect(count).to eq 2
       end
 
+      it "should be 2 in ppc64le fixture on Linux" do
+        Facter.fact(:architecture).stubs(:value).returns("ppc64le")
+        File.expects(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("ppc64le"))
+        count = subject.get_processor_count
+        expect(count).to eq 2
+      end
+
       it "should be 2 in panda-armel fixture on Linux" do
         Facter.fact(:architecture).stubs(:value).returns("arm")
         File.expects(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture_readlines("panda-armel"))

data/spec/unit/virtual_spec.rb

@@ -31,6 +31,18 @@ describe "Virtual fact" do
     Facter.fact(:virtual).value.should == "zone"
   end
 
+  it "should be LDoms on Solaris when an ldom" do
+    ldom_fixture = File.read(fixtures('ldom', 'ldom_v1'))
+    Facter.fact(:kernel).stubs(:value).returns("SunOS")
+    Facter.fact(:operatingsystem).stubs(:value).returns("Solaris")
+    Facter.fact(:hardwareisa).stubs(:value).returns("sparc")
+    Facter::Core::Execution.stubs(:which).with("virtinfo").returns 'virtinfo'
+    Facter::Core::Execution.stubs(:which).with("vmware").returns nil
+    Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").returns(ldom_fixture)
+    Facter.collection.internal_loader.load(:ldom)
+    Facter.fact(:virtual).value.should == "LDoms"
+  end
+
   it "should be jail on FreeBSD when a jail in kvm" do
     Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
     Facter::Util::Virtual.stubs(:jail?).returns(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies: []
 description: You can prove anything with facts!
 email: info@puppetlabs.com
@@ -190,6 +190,7 @@ files:
 - spec/fixtures/cpuinfo/amd64tri
 - spec/fixtures/cpuinfo/amd64twentyfour-grep
 - spec/fixtures/cpuinfo/amd64solo
+- spec/fixtures/cpuinfo/ppc64le
 - spec/fixtures/cpuinfo/beaglexm-armel
 - spec/fixtures/cpuinfo/amd64twentyfour
 - spec/fixtures/cpuinfo/sparc
@@ -537,6 +538,7 @@ test_files:
 - spec/fixtures/cpuinfo/amd64tri
 - spec/fixtures/cpuinfo/amd64twentyfour-grep
 - spec/fixtures/cpuinfo/amd64solo
+- spec/fixtures/cpuinfo/ppc64le
 - spec/fixtures/cpuinfo/beaglexm-armel
 - spec/fixtures/cpuinfo/amd64twentyfour
 - spec/fixtures/cpuinfo/sparc