facter 1.6.5 → 1.6.6

data/CHANGELOG

@@ -1,3 +1,15 @@
+1.6.6
+===
+e046144 Updated CHANGELOG for 1.6.6rc2
+c273d34 Make ec2 facts work on CentOS again (#12666)
+c218d84 (#12362) Use Tempfile to generate temp files
+f6bbe14 (#12170) Adds gem spec description Without this patch, the gem spec file is missing a description attribute, which caus
+5c5c330 Changes apple rake task to reflect package name facter instead of puppet.
+9b5cb26 Updating conf/redhat/facter.spec for 1.6.5 release.
+7d3889d (#12079) Fix order-dependent test failure due to odd stubbing.
+7f2a0e2 add a simple test for openstack ec2 facts
+cb598aa Support EC2 facts on OpenStack
+
 1.6.5
 ===
 71d3d3d (#12077) Add pciutils RPM dependency

data/Rakefile

@@ -38,6 +38,7 @@ spec = Gem::Specification.new do |spec|
   spec.executables = %w{facter}
   spec.version = Facter::FACTERVERSION
   spec.summary = 'Facter, a system inventory tool'
+  spec.description = 'You can prove anything with facts!'
   spec.author = 'Puppet Labs'
   spec.email = 'info@puppetlabs.com'
   spec.homepage = 'http://puppetlabs.com'

data/conf/redhat/facter.spec

@@ -1,17 +1,18 @@
-%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG["sitelibdir"]'
+%{!?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
-%global _ver 1.6.4
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.4
-Release: 0.1rc1%{?dist}
+Version: 1.6.6
+Release: 1%{?dist}
+#Release: 0.1rc1%{?dist}
 License: Apache 2.0
 Group: System Environment/Base
-URL: http://www.puppetlabs.com/puppet/related-projects/%{name}/
-Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
+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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +22,8 @@ BuildArch: noarch
 
 Requires: ruby >= 1.8.1
 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
 Requires: dmidecode
 Requires: pciutils
 %if %has_ruby_abi
@@ -34,7 +37,8 @@ system. Some of the facts are preconfigured, such as the hostname and the
 operating system. Additional facts can be added through simple Ruby scripts
 
 %prep
-%setup -q  -n %{name}-%{version}rc1
+%setup -q  -n %{name}-%{version}
+#%setup -q  -n %{name}-%{version}rc1
 
 %build
 
@@ -55,6 +59,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 23 2012 Michael Stahnke <stahnma@puppetlabs.com> - 1.6.6-1
+- Update for 1.6.6
+
+* Wed Jan 25 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 1.6.5-1
+- Update to 1.6.5
+
 * Wed Nov 30 2011 Matthaus Litteken <matthaus@puppetlabs.com> - 1.6.4-0.1rc1
 - 1.6.4 rc1
 

data/install.rb

@@ -37,6 +37,7 @@ require 'find'
 require 'fileutils'
 require 'optparse'
 require 'ostruct'
+require 'tempfile'
 
 begin
   require 'rdoc/rdoc'
@@ -217,8 +218,6 @@ def prepare_installation
     opts.parse!
   end
 
-  tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
-
   version = [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")
   libdir = File.join(RbConfig::CONFIG["libdir"], "ruby", version)
 
@@ -289,9 +288,6 @@ def prepare_installation
     FileUtils.makedirs(sitelibdir)
   end
 
-  tmpdirs << bindir
-
-  InstallOptions.tmp_dirs = tmpdirs.compact
   InstallOptions.site_dir = sitelibdir
   InstallOptions.bin_dir  = bindir
   InstallOptions.sbin_dir = sbindir
@@ -384,20 +380,12 @@ end
 # (e.g., bin/rdoc becomes rdoc); the shebang line handles running it. Under
 # windows, we add an '.rb' extension and let file associations do their stuff.
 def install_binfile(from, op_file, target)
-  tmp_dir = nil
-  InstallOptions.tmp_dirs.each do |t|
-    if File.directory?(t) and File.writable?(t)
-      tmp_dir = t
-      break
-    end
-  end
+  tmp_file = Tempfile.new('facter-binfile')
 
-  fail "Cannot find a temporary directory" unless tmp_dir
-  tmp_file = File.join(tmp_dir, '_tmp')
   ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
   File.open(from) do |ip|
-    File.open(tmp_file, "w") do |op|
+    File.open(tmp_file.path, "w") do |op|
       ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       op.puts "#!#{ruby}"
       contents = ip.readlines
@@ -422,7 +410,7 @@ def install_binfile(from, op_file, target)
     end
 
     if not installed_wrapper
-      tmp_file2 = File.join(tmp_dir, '_tmp_wrapper')
+      tmp_file2 = Tempfile.new('facter-wrapper')
       cwv = <<-EOS
 @echo off
 setlocal
@@ -430,15 +418,15 @@ set RUBY_BIN=%~dp0
 set RUBY_BIN=%RUBY_BIN:\\=/%
 "%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%facter" %*
 EOS
-      File.open(tmp_file2, "w") { |cw| cw.puts cwv }
-      FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
+      File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
+      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
 
-      File.unlink(tmp_file2)
+      tmp_file2.unlink
       installed_wrapper = true
     end
   end
-  FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
-  File.unlink(tmp_file)
+  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :verbose => true)
+  tmp_file.unlink
 end
 
 check_prereqs

data/lib/facter.rb

@@ -25,7 +25,7 @@ module Facter
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.5'
+  FACTERVERSION = '1.6.6'
   # = 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/ec2.rb

@@ -24,8 +24,8 @@ def userdata()
   end
 end
 
-if (Facter::Util::EC2.has_euca_mac? || Facter::Util::EC2.has_ec2_arp?) &&
-  Facter::Util::EC2.can_connect?
+if (Facter::Util::EC2.has_euca_mac? || Facter::Util::EC2.has_openstack_mac? || 
+    Facter::Util::EC2.has_ec2_arp?) && Facter::Util::EC2.can_connect?
 
   metadata
   userdata

data/lib/facter/util/ec2.rb

@@ -26,6 +26,12 @@ module Facter::Util::EC2
       !!(Facter.value(:macaddress) =~ %r{^[dD]0:0[dD]:})
     end
 
+    # Test if this host has a mac address used by OpenStack, which 
+    # normally starts with 02:16:3E
+    def has_openstack_mac?
+      !!(Facter.value(:macaddress) =~ %r{^02:16:3[eE]})
+    end
+
     # Test if the host has an arp entry in its cache that matches the EC2 arp,
     # which is normally +fe:ff:ff:ff:ff:ff+.
     def has_ec2_arp?
@@ -40,7 +46,7 @@ module Facter::Util::EC2
       arp_table = Facter::Util::Resolution.exec(arp_command)
       if not arp_table.nil?
         arp_table.each_line do |line|
-          return true if line.include?(mac_address)
+          return true if line.downcase.include?(mac_address)
         end
       end
       return false

data/spec/fixtures/unit/util/ec2/centos-arp-ec2.out

@@ -0,0 +1 @@
+? (10.240.93.1) at FE:FF:FF:FF:FF:FF [ether] on eth0

data/spec/unit/ec2_spec.rb

@@ -11,11 +11,12 @@ describe "ec2 facts" do
   describe "when running on ec2" do
     before :each do
       # This is an ec2 instance, not a eucalyptus instance
-      Facter::Util::EC2.expects(:has_euca_mac?).at_least_once.returns(false)
-      Facter::Util::EC2.expects(:has_ec2_arp?).at_least_once.returns(true)
+      Facter::Util::EC2.stubs(:has_euca_mac?).returns(false)
+      Facter::Util::EC2.stubs(:has_openstack_mac?).returns(false)
+      Facter::Util::EC2.stubs(:has_ec2_arp?).returns(true)
 
       # Assume we can connect
-      Facter::Util::EC2.expects(:can_connect?).at_least_once.returns(true)
+      Facter::Util::EC2.stubs(:can_connect?).returns(true)
     end
 
     it "should create flat meta-data facts" do
@@ -94,11 +95,40 @@ describe "ec2 facts" do
   describe "when running on eucalyptus" do
     before :each do
       # Return false for ec2, true for eucalyptus
-      Facter::Util::EC2.expects(:has_euca_mac?).at_least_once.returns(true)
-      Facter::Util::EC2.expects(:has_ec2_arp?).never
+      Facter::Util::EC2.stubs(:has_euca_mac?).returns(true)
+      Facter::Util::EC2.stubs(:has_openstack_mac?).returns(false)
+      Facter::Util::EC2.stubs(:has_ec2_arp?).returns(false)
 
       # Assume we can connect
-      Facter::Util::EC2.expects(:can_connect?).at_least_once.returns(true)
+      Facter::Util::EC2.stubs(:can_connect?).returns(true)
+    end
+
+    it "should create ec2_user_data fact" do
+      # No meta-data
+      Object.any_instance.expects(:open).\
+        with("#{api_prefix}/2008-02-01/meta-data/").\
+        at_least_once.returns(StringIO.new(""))
+
+      Object.any_instance.expects(:open).\
+        with("#{api_prefix}/2008-02-01/user-data/").\
+        at_least_once.returns(StringIO.new("test"))
+
+      # Force a fact load
+      Facter.collection.loader.load(:ec2)
+
+      Facter.fact(:ec2_userdata).value.should == ["test"]
+    end
+  end
+
+  describe "when running on openstack" do
+    before :each do
+      # Return false for ec2, true for eucalyptus
+      Facter::Util::EC2.stubs(:has_openstack_mac?).returns(true)
+      Facter::Util::EC2.stubs(:has_euca_mac?).returns(false)
+      Facter::Util::EC2.stubs(:has_ec2_arp?).returns(false)
+
+      # Assume we can connect
+      Facter::Util::EC2.stubs(:can_connect?).returns(true)
     end
 
     it "should create ec2_user_data fact" do
@@ -121,8 +151,8 @@ describe "ec2 facts" do
   describe "when api connect test fails" do
     it "should not populate ec2_userdata" do
       # Emulate ec2 for now as it matters little to this test
-      Facter::Util::EC2.expects(:has_euca_mac?).at_least_once.returns(true)
-      Facter::Util::EC2.expects(:has_ec2_arp?).never
+      Facter::Util::EC2.stubs(:has_euca_mac?).returns(true)
+      Facter::Util::EC2.stubs(:has_ec2_arp?).never
       Facter::Util::EC2.expects(:can_connect?).at_least_once.returns(false)
 
       # The API should never be called at this point

data/spec/unit/util/ec2_spec.rb

@@ -22,6 +22,13 @@ describe Facter::Util::EC2 do
         Facter::Util::EC2.has_ec2_arp?.should == true
       end
 
+      it "should succeed if arp table contains FE:FF:FF:FF:FF:FF" do
+        ec2arp = my_fixture_read("centos-arp-ec2.out")
+        Facter::Util::Resolution.expects(:exec).with("arp -an").\
+          at_least_once.returns(ec2arp)
+        Facter::Util::EC2.has_ec2_arp?.should == true
+      end
+
       it "should fail if arp table does not contain fe:ff:ff:ff:ff:ff" do
         ec2arp = my_fixture_read("linux-arp-not-ec2.out")
         Facter::Util::Resolution.expects(:exec).with("arp -an").
@@ -68,6 +75,22 @@ describe Facter::Util::EC2 do
     end
   end
 
+  describe "is_openstack_mac? method" do
+    it "should return true when the mac is an openstack one" do
+      Facter.expects(:value).with(:macaddress).\
+        at_least_once.returns("02:16:3e:54:89:fd")
+
+      Facter::Util::EC2.has_openstack_mac?.should == true
+    end
+
+    it "should return false when the mac is not a openstack one" do
+      Facter.expects(:value).with(:macaddress).\
+        at_least_once.returns("0c:1d:a0:bc:aa:02")
+
+      Facter::Util::EC2.has_openstack_mac?.should == false
+    end
+  end
+
   describe "can_connect? method" do
     it "returns true if api responds" do
       # Return something upon connecting to the root

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 6
+  version: 1.6.6
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-02-23 00:00:00 Z
 dependencies: []
 
-description: 
+description: You can prove anything with facts!
 email: info@puppetlabs.com
 executables: 
 - facter
@@ -165,6 +165,7 @@ files:
 - spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info
 - spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info
 - spec/fixtures/unit/selinux/selinux_sestatus
+- spec/fixtures/unit/util/ec2/centos-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-not-ec2.out
 - spec/fixtures/unit/util/ec2/windows-2008-arp-a-not-ec2.out