facter 1.6.8 → 1.6.9

data/CHANGELOG

@@ -1,3 +1,14 @@
+1.6.9
+===
+b398bd8 (#14334) Fix dmidecode based facts on DragonFly BSD
+6c46b2c (#14332) Correct stubbing on Ubuntu
+753f3a4 Revert "(#12864) Windows: get primary DNS from registry"
+ac51593 Wrap dmidecode/pciutils in ifarch block
+fbaa8fe (#11511) Correct lsbrelease specfile filename
+14eee2b (#12864) Windows: get primary DNS from registry
+2842c96 Update rpm spec file
+515fd65 (#11511) Split lsb facts into multiple files
+
 1.6.8
 ===
 b86fe4c (#12831) Add rspec tests to have_which method in Resolution

data/conf/redhat/facter.spec

@@ -1,11 +1,8 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
-%define has_ruby_noarch %has_ruby_abi
-
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.6
+Version: 1.6.9
 Release: 1%{?dist}
 #Release: 0.1rc1%{?dist}
 License: Apache 2.0
@@ -14,22 +11,19 @@ URL: http://www.puppetlabs.com/puppet/related-projects/%{name}
 #Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
 Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
 #Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc
+Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %has_ruby_noarch
-BuildArch: noarch
-%endif
 
-Requires: ruby >= 1.8.1
+Requires: ruby >= 1.8.5
 Requires: which
-# Note: dmidecode is only available on x86 and x86_64 so this package may need to move into being
-#  arch specific if people are using ppc, arm, s390 etc
+# dmidecode and pciutils are not available on all arches
+%ifarch %ix86 x86_64 ia64
 Requires: dmidecode
 Requires: pciutils
-%if %has_ruby_abi
-Requires: ruby(abi) = 1.8
 %endif
-BuildRequires: ruby >= 1.8.1
+Requires: ruby(abi) = 1.8
+BuildRequires: ruby >= 1.8.5
 
 %description
 Ruby module for collecting simple facts about a host Operating
@@ -59,6 +53,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu May 17 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.9-1
+- Update for 1.6.9
+
+* Thu May 10 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 1.6.9-0.1rc1
+- Update for 1.6.9rc1
+
+* Mon Apr 30 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.8-1
+- Update for 1.6.8, spec for arch-specific build, req ruby 1.8.5
+
 * Thu Feb 23 2012 Michael Stahnke <stahnma@puppetlabs.com> - 1.6.6-1
 - Update for 1.6.6
 

data/lib/facter.rb

@@ -25,7 +25,7 @@ module Facter
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.8'
+  FACTERVERSION = '1.6.9'
   # = Facter
   # Functions as a hash of 'facts' you might care about about your
   # system, such as mac address, IP address, Video card, etc.

data/lib/facter/lsbdistcodename.rb

@@ -0,0 +1,18 @@
+# Fact: lsbdistcodename
+#
+# Purpose: Return Linux Standard Base information for the host.
+#
+# Resolution:
+#   Uses the lsb_release system command
+#
+# Caveats:
+#   Only works on Linux (and the kfreebsd derivative) systems.
+#   Requires the lsb_release program, which may not be installed by default.
+#   Also is as only as accurate as that program outputs.
+
+Facter.add(:lsbdistcodename) do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    Facter::Util::Resolution.exec('lsb_release -c -s')
+  end
+end

data/lib/facter/lsbdistdescription.rb

@@ -0,0 +1,21 @@
+# Fact: lsbdistdescription
+#
+# Purpose: Return Linux Standard Base information for the host.
+#
+# Resolution:
+#   Uses the lsb_release system command
+#
+# Caveats:
+#   Only works on Linux (and the kfreebsd derivative) systems.
+#   Requires the lsb_release program, which may not be installed by default.
+#   Also is as only as accurate as that program outputs.
+
+Facter.add(:lsbdistdescription) do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    if output = Facter::Util::Resolution.exec('lsb_release -d -s')
+      # the output may be quoted (at least it is on gentoo)
+      output.sub(/^"(.*)"$/,'\1')
+    end
+  end
+end

data/lib/facter/lsbdistid.rb

@@ -0,0 +1,18 @@
+# Fact: lsbdistid
+#
+# Purpose: Return Linux Standard Base information for the host.
+#
+# Resolution:
+#   Uses the lsb_release system command
+#
+# Caveats:
+#   Only works on Linux (and the kfreebsd derivative) systems.
+#   Requires the lsb_release program, which may not be installed by default.
+#   Also is as only as accurate as that program outputs.
+
+Facter.add(:lsbdistid) do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    Facter::Util::Resolution.exec('lsb_release -i -s')
+  end
+end

data/lib/facter/lsbdistrelease.rb

@@ -0,0 +1,18 @@
+# Fact: lsbdistrelease
+#
+# Purpose: Return Linux Standard Base information for the host.
+#
+# Resolution:
+#   Uses the lsb_release system command
+#
+# Caveats:
+#   Only works on Linux (and the kfreebsd derivative) systems.
+#   Requires the lsb_release program, which may not be installed by default.
+#   Also is as only as accurate as that program outputs.
+
+Facter.add(:lsbdistrelease) do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    Facter::Util::Resolution.exec('lsb_release -r -s')
+  end
+end

data/lib/facter/lsbrelease.rb

@@ -0,0 +1,18 @@
+# Fact: lsbrelease
+#
+# Purpose: Return Linux Standard Base information for the host.
+#
+# Resolution:
+#   Uses the lsb_release system command
+#
+# Caveats:
+#   Only works on Linux (and the kfreebsd derivative) systems.
+#   Requires the lsb_release program, which may not be installed by default.
+#   Also is as only as accurate as that program outputs.
+
+Facter.add(:lsbrelease) do
+  confine :kernel => [ :linux, :"gnu/kfreebsd" ]
+  setcode do
+    Facter::Util::Resolution.exec('lsb_release -v -s')
+  end
+end

data/lib/facter/operatingsystem.rb

@@ -10,7 +10,6 @@
 #
 # Caveats:
 #
-require 'facter/lsb'
 
 Facter.add(:operatingsystem) do
   confine :kernel => :sunos

data/lib/facter/util/manufacturer.rb

@@ -13,7 +13,7 @@ module Facter::Manufacturer
       return nil unless FileTest.exists?("/usr/local/sbin/dmidecode")
 
       output=%x{/usr/local/sbin/dmidecode 2>/dev/null}
-    when 'NetBSD'
+    when 'NetBSD', 'DragonFly'
       return nil unless FileTest.exists?("/usr/pkg/sbin/dmidecode")
 
       output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
@@ -38,7 +38,7 @@ module Facter::Manufacturer
             if line =~ /#{key}/ and line =~ /\n\s+#{value} (.+)\n/
               result = $1.strip
               Facter.add(facterkey) do
-                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd" ]
+                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd", :dragonfly ]
                 setcode do
                   result
                 end

data/spec/unit/lsbdistcodename_spec.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+
+describe "lsbdistcodename fact" do
+
+  [ "Linux", "GNU/kFreeBSD"].each do |kernel|
+    describe "on #{kernel}" do
+      before :each do
+        Facter.fact(:kernel).stubs(:value).returns kernel
+      end
+
+      it "should return the codename through lsb_release -c -s" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -c -s').returns 'n/a'
+        Facter.fact(:lsbdistcodename).value.should == 'n/a'
+      end
+
+      it "should return nil if lsb_release is not installed" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -c -s').returns nil
+        Facter.fact(:lsbdistcodename).value.should be_nil
+      end
+    end
+  end
+
+end

data/spec/unit/lsbdistdescription_spec.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+
+describe "lsbdistdescription fact" do
+
+  [ "Linux", "GNU/kFreeBSD"].each do |kernel|
+    describe "on #{kernel}" do
+      before :each do
+        Facter.fact(:kernel).stubs(:value).returns kernel
+      end
+
+      it "should return the description through lsb_release -d -s" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -d -s').returns '"Gentoo Base System release 2.1"'
+        Facter.fact(:lsbdistdescription).value.should == 'Gentoo Base System release 2.1'
+      end
+
+      it "should return nil if lsb_release is not installed" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -d -s').returns nil
+        Facter.fact(:lsbdistdescription).value.should be_nil
+      end
+    end
+  end
+
+end

data/spec/unit/lsbdistid_spec.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+
+describe "lsbdistid fact" do
+
+  [ "Linux", "GNU/kFreeBSD"].each do |kernel|
+    describe "on #{kernel}" do
+      before :each do
+        Facter.fact(:kernel).stubs(:value).returns kernel
+      end
+
+      it "should return the id through lsb_release -i -s" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -i -s').returns 'Gentoo'
+        Facter.fact(:lsbdistid).value.should == 'Gentoo'
+      end
+
+      it "should return nil if lsb_release is not installed" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -i -s').returns nil
+        Facter.fact(:lsbdistid).value.should be_nil
+      end
+    end
+  end
+
+end

data/spec/unit/lsbdistrelease_spec.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+
+describe "lsbdistrelease fact" do
+
+  [ "Linux", "GNU/kFreeBSD"].each do |kernel|
+    describe "on #{kernel}" do
+      before :each do
+        Facter.fact(:kernel).stubs(:value).returns kernel
+      end
+
+      it "should return the release through lsb_release -r -s" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -r -s').returns '2.1'
+        Facter.fact(:lsbdistrelease).value.should == '2.1'
+      end
+
+      it "should return nil if lsb_release is not installed" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -r -s').returns nil
+        Facter.fact(:lsbdistrelease).value.should be_nil
+      end
+    end
+  end
+
+end

data/spec/unit/lsbrelease_spec.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env rspec
+
+require 'spec_helper'
+
+describe "lsbrelease fact" do
+
+  [ "Linux", "GNU/kFreeBSD"].each do |kernel|
+    describe "on #{kernel}" do
+      before :each do
+        Facter.fact(:kernel).stubs(:value).returns kernel
+      end
+
+      it "should return the release through lsb_release -v -s" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -v -s').returns 'n/a'
+        Facter.fact(:lsbrelease).value.should == 'n/a'
+      end
+
+      it "should return nil if lsb_release is not installed" do
+        Facter::Util::Resolution.stubs(:exec).with('lsb_release -v -s').returns nil
+        Facter.fact(:lsbrelease).value.should be_nil
+      end
+    end
+  end
+
+end

data/spec/unit/operatingsystem_spec.rb

@@ -37,6 +37,9 @@ describe "Operating System fact" do
   describe "on Linux" do
     before :each do
       Facter.fact(:kernel).stubs(:value).returns("Linux")
+
+      # Always stub lsbdistid by default, so tests work on Ubuntu
+      Facter.stubs(:value).with(:lsbdistid).returns(nil)
     end
 
     {
@@ -69,7 +72,7 @@ describe "Operating System fact" do
       it "on Ubuntu should use the lsbdistid fact" do
         FileUtils.stubs(:exists?).with("/etc/debian_version").returns true
 
-        Facter.fact(:lsbdistid).expects(:value).returns("Ubuntu")
+        Facter.stubs(:value).with(:lsbdistid).returns("Ubuntu")
         Facter.fact(:operatingsystem).value.should == "Ubuntu"
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 6
-  - 8
-  version: 1.6.8
+  - 9
+  version: 1.6.9
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: []
 
 description: You can prove anything with facts!
@@ -56,8 +56,12 @@ files:
 - lib/facter/kernelmajversion.rb
 - lib/facter/kernelrelease.rb
 - lib/facter/kernelversion.rb
-- lib/facter/lsb.rb
+- lib/facter/lsbdistcodename.rb
+- lib/facter/lsbdistdescription.rb
+- lib/facter/lsbdistid.rb
+- lib/facter/lsbdistrelease.rb
 - lib/facter/lsbmajdistrelease.rb
+- lib/facter/lsbrelease.rb
 - lib/facter/macaddress.rb
 - lib/facter/macosx.rb
 - lib/facter/manufacturer.rb
@@ -217,7 +221,12 @@ files:
 - spec/unit/id_spec.rb
 - spec/unit/interfaces_spec.rb
 - spec/unit/ipaddress6_spec.rb
+- spec/unit/lsbdistcodename_spec.rb
+- spec/unit/lsbdistdescription_spec.rb
+- spec/unit/lsbdistid_spec.rb
+- spec/unit/lsbdistrelease_spec.rb
 - spec/unit/lsbmajdistrelease_spec.rb
+- spec/unit/lsbrelease_spec.rb
 - spec/unit/macaddress_spec.rb
 - spec/unit/memory_spec.rb
 - spec/unit/operatingsystem_spec.rb
@@ -279,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facter
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Facter, a system inventory tool

data/lib/facter/lsb.rb

@@ -1,39 +0,0 @@
-# Fact: lsb
-#
-# Purpose: Return Linux Standard Base information for the host.
-#
-# Resolution:
-#   Uses the lsb_release system command and parses the output with a series of
-#   regular expressions.
-#
-# Caveats:
-#   Only works on Linux (and the kfreebsd derivative) systems.
-#   Requires the lsb_release program, which may not be installed by default.
-#   Also is as only as accurate as that program outputs.
-
-## lsb.rb
-## Facts related to Linux Standard Base (LSB)
-
-{  "LSBRelease"         => %r{^LSB Version:\t(.*)$},
-   "LSBDistId"          => %r{^Distributor ID:\t(.*)$},
-   "LSBDistRelease"     => %r{^Release:\t(.*)$},
-   "LSBDistDescription" => %r{^Description:\t(.*)$},
-   "LSBDistCodeName"    => %r{^Codename:\t(.*)$}
-}.each do |fact, pattern|
-  Facter.add(fact) do
-    confine :kernel => [ :linux, :"gnu/kfreebsd" ]
-    setcode do
-      unless defined?(lsbdata) and defined?(lsbtime) and (Time.now.to_i - lsbtime.to_i < 5)
-        type = nil
-        lsbtime = Time.now
-        lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null')
-      end
-
-      if pattern.match(lsbdata)
-        $1
-      else
-        nil
-      end
-    end
-  end
-end