facter 1.5.2 → 1.5.3

data/Rakefile

@@ -27,9 +27,6 @@ project = Rake::RedLabProject.new("facter") do |p|
         'etc/*'
     ]
 
-    #p.epmhosts = %w{culain}
-    #p.rpmhost = "fedora1"
-    #p.sunpkghost = "sol10b"
 end
 
 project.mkgemtask do |gem|
@@ -42,15 +39,62 @@ project.mkgemtask do |gem|
     gem.author = "Luke Kanies"
 end
 
-if project.has?(:epm)
-    project.mkepmtask do |task|
-        task.bins = FileList.new("bin/facter")
-        task.rubylibs = FileList.new('lib/**/*')          
-    end
-end
-
 task :archive do
     raise ArgumentError, "You must specify the archive name by setting ARCHIVE; e.g., ARCHIVE=1.5.1rc1" unless archive = ENV["ARCHIVE"]
 
     sh "git archive --format=tar  --prefix=facter-#{archive}/ HEAD | gzip -c > facter-#{archive}.tgz"
 end
+
+namespace :ci do
+
+  desc "Run the CI prep tasks"
+  task :prep do
+    require 'rubygems'
+    gem 'ci_reporter'
+    require 'ci/reporter/rake/rspec'
+    require 'ci/reporter/rake/test_unit'
+    ENV['CI_REPORTS'] = 'results'
+  end
+
+  desc "Run CI RSpec tests"
+  task :spec => [:prep, 'ci:setup:rspec'] do
+     sh "cd spec; rake all; exit 0"
+  end
+
+end
+
+desc "Send patch information to the puppet-dev list"
+task :mail_patches do
+    if Dir.glob("00*.patch").length > 0
+        raise "Patches already exist matching '00*.patch'; clean up first"
+    end
+
+    unless %x{git status} =~ /On branch (.+)/
+        raise "Could not get branch from 'git status'"
+    end
+    branch = $1
+    
+    unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$}
+        raise "Branch name does not follow <type>/<parent>/<name> model; cannot autodetect parent branch"
+    end
+
+    type, parent, name = $1, $2, $3
+
+    # Create all of the patches
+    sh "git format-patch -C -M -s -n #{parent}..HEAD"
+
+    # And then mail them out.
+
+    # If we've got more than one patch, add --compose
+    if Dir.glob("00*.patch").length > 1
+        compose = "--compose"
+    else
+        compose = ""
+    end
+
+    # Now send the mail.
+    sh "git send-email #{compose} --no-chain-reply-to --no-signed-off-by-cc --suppress-from --no-thread --to puppet-dev@googlegroups.com 00*.patch"
+
+    # Finally, clean up the patches
+    sh "rm 00*.patch"
+end

data/bin/facter

@@ -75,7 +75,8 @@ options = {
     :yaml => false
 }
 
-result.each { |opt,arg|
+begin 
+  result.each { |opt,arg|
     case opt
         when "--version"
                         puts "%s" % Facter.version
@@ -101,7 +102,10 @@ result.each { |opt,arg|
             $stderr.puts "Invalid option '#{opt}'"
             exit(12)
     end
-}
+  }
+rescue
+  exit(12)
+end
 
 names = []
 

data/conf/osx/createpackage.sh

@@ -49,7 +49,8 @@ function find_facter_root() {
 
 function install_facter() {
   echo "Installing Facter to ${pkgroot}"
-  "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}" &> /dev/null
+  cd "$facter_root"
+  ./"${INSTALLRB}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}"
   chown -R root:admin "${pkgroot}"
 }
 

data/conf/osx/preflight

@@ -8,4 +8,5 @@
 # ${3} is the destination volume so that this works correctly
 # when being installed to volumes other than the current OS.
 
-rm -Rf "${3}{SITELIBDIR}/facter*"
+/bin/rm -Rf "${3}{SITELIBDIR}/facter"
+/bin/rm -Rf "${3}{SITELIBDIR/facter.rb"

data/conf/redhat/facter.spec

@@ -1,19 +1,19 @@
 %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%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.5.2
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 URL: http://reductivelabs.com/projects/facter
 Source0: http://reductivelabs.com/downloads/facter/%{name}-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %has_ruby_noarch
-BuildArchitectures: noarch
+BuildArch: noarch
 %endif
 
 Requires: ruby >= 1.8.1
@@ -23,7 +23,7 @@ Requires: ruby(abi) = 1.8
 %endif
 BuildRequires: ruby >= 1.8.1
 
-%description 
+%description
 Ruby module for collecting simple facts about a host Operating
 system. Some of the facts are preconfigured, such as the hostname and the
 operating system. Additional facts can be added through simple Ruby scripts
@@ -36,7 +36,7 @@ sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter
 
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+mkdir -p %{buildroot}
 
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
@@ -60,18 +60,34 @@ rm -rf %{buildroot}
 %{_bindir}/facter
 %{ruby_sitelibdir}/facter.rb
 %{ruby_sitelibdir}/facter
-%{ruby_sitelibdir}/facter/util
-%{ruby_sitelibdir}/facter/util/plist
-%{ruby_sitelibdir}/facter/util/*.rb
-%{ruby_sitelibdir}/facter/util/plist/*.rb
 %doc CHANGELOG COPYING INSTALL LICENSE README
 
 
 %changelog
+* Tue Sep 09 2008 Todd Zullinger <tmz@pobox.com> - 1.5.2-1
+- New version
+- Simplify spec file checking for Fedora and RHEL versions
+
+* Mon Sep  8 2008 David Lutterkort <dlutter@redhat.com> - 1.5.1-1
+- New version
+
+* Thu Jul 17 2008 David Lutterkort <dlutter@redhat.com> - 1.5.0-3
+- Change 'mkdir' in install to 'mkdir -p'
+
+* Thu Jul 17 2008 David Lutterkort <dlutter@redhat.com> - 1.5.0-2
+- Remove files that were listed twice in files section
+
 * Mon May 19 2008 James Turnbull <james@lovedthanlosty.net> - 1.5.0-1
 - New version
 - Added util and plist files
 
+* Mon Sep 24 2007 David Lutterkort <dlutter@redhat.com> - 1.3.8-1
+- Update license tag
+- Copy all of lib/ into ruby_sitelibdir
+
+* Thu Mar 29 2007 David Lutterkort <dlutter@redhat.com> - 1.3.7-1
+- New version
+
 * Fri Jan 19 2007 David Lutterkort <dlutter@redhat.com> - 1.3.6-1
 - New version
 

data/lib/facter.rb

@@ -1,20 +1,20 @@
 #--
 # Copyright 2006 Luke Kanies <luke@madstop.com>
-# 
+#
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-# 
+#
 #--
 
 module Facter
@@ -27,7 +27,7 @@ module Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.5.2'
+    FACTERVERSION = '1.5.3'
 	# = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
@@ -153,7 +153,7 @@ module Facter
             case bit
             when TrueClass: @@debug = 1
             when FalseClass: @@debug = 0
-            when Fixnum: 
+            when Fixnum:
                 if bit > 0
                     @@debug = 1
                 else

data/lib/facter/Cfkey.rb

@@ -22,7 +22,7 @@ Facter.add(:Cfkey) do
             "/var/cfengine/ppkeys/localhost.pub",
             "/var/lib/cfengine/ppkeys/localhost.pub",
             "/var/lib/cfengine2/ppkeys/localhost.pub"
-        ].each { |file|
+        ].each do |file|
             if FileTest.file?(file)
                 File.open(file) { |openfile|
                     value = openfile.readlines.reject { |line|
@@ -35,7 +35,7 @@ Facter.add(:Cfkey) do
             if value
                 break
             end
-        }
+        end
 
         value
     end

data/lib/facter/domain.rb

@@ -1,67 +1,36 @@
 Facter.add(:domain) do
     setcode do
-        # First force the hostname to be checked
+        # Get the domain from various sources; the order of these
+        # steps is important
+
         Facter.value(:hostname)
+        next $domain if defined? $domain and ! $domain.nil?
+
+        domain = Facter::Util::Resolution.exec('dnsdomainname')
+        next domain if domain =~ /.+\..+/
+
+        domain = Facter::Util::Resolution.exec('domainname')
+        next domain if domain =~ /.+\..+/
 
-        # Now check to see if it set the domain
-        if defined? $domain and ! $domain.nil?
-            $domain
-        else
-            nil
-        end
-    end
-end
-# Look for the DNS domain name command first.
-Facter.add(:domain) do
-    setcode do
-        domain = Facter::Util::Resolution.exec('dnsdomainname') or nil
-        # make sure it's a real domain
-        if domain and domain =~ /.+\..+/
-            domain
-        else
-            nil
-        end
-    end
-end
-Facter.add(:domain) do
-    setcode do
-        domain = Facter::Util::Resolution.exec('domainname') or nil
-        # make sure it's a real domain
-        if domain and domain =~ /.+\..+/
-            domain
-        else
-            nil
-        end
-    end
-end
-Facter.add(:domain) do
-    setcode do
-        value = nil
         if FileTest.exists?("/etc/resolv.conf")
+            domain = nil
+            search = nil
             File.open("/etc/resolv.conf") { |file|
-                # is the domain set?
                 file.each { |line|
                     if line =~ /domain\s+(\S+)/
-                        value = $1
-                        break
+                        domain = $1
+                    elsif line =~ /search\s+(\S+)/
+                        search = $1
                     end
                 }
             }
-            ! value and File.open("/etc/resolv.conf") { |file|
-                # is the search path set?
-                file.each { |line|
-                    if line =~ /search\s+(\S+)/
-                        value = $1
-                        break
-                    end
-                }
-            }
-            value
-        else
-            nil
+            next domain if domain
+            next search if search
         end
+        nil
     end
 end
+
 Facter.add(:domain) do
     confine :kernel => :windows
     setcode do
@@ -69,9 +38,9 @@ Facter.add(:domain) do
         domain = ""
         wmi = WIN32OLE.connect("winmgmts://")
         query = "select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True"
-        wmi.ExecQuery(query).each { |nic| 
+        wmi.ExecQuery(query).each { |nic|
             domain = nic.DNSDomain
-            break 
+            break
         }
         domain
     end

data/lib/facter/fqdn.rb

@@ -1,4 +1,5 @@
-Facter.add(:fqdn) do            setcode do
+Facter.add(:fqdn) do
+    setcode do
         host = Facter.value(:hostname)
         domain = Facter.value(:domain)
         if host and domain

data/lib/facter/hardwareisa.rb

@@ -1,4 +1,4 @@
 Facter.add(:hardwareisa) do
     setcode 'uname -p', '/bin/sh'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo FreeBSD OpenBSD NetBSD}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD}
 end

data/lib/facter/id.rb

@@ -1,4 +1,15 @@
 Facter.add(:id) do
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo AIX}
+    confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
     setcode "whoami"
 end
+
+Facter.add(:id) do
+    confine :operatingsystem => %w{Solaris}
+    setcode do
+        if %x{id} =~ /^uid=\d+\((\S+)\)/
+            $1
+        else
+            nil
+        end
+    end
+end

data/lib/facter/interfaces.rb

@@ -0,0 +1,32 @@
+# interfaces.rb
+# Try to get additional Facts about the machine's network interfaces
+#
+# Original concept Copyright (C) 2007 psychedelys <psychedelys@gmail.com>
+# Update and *BSD support (C) 2007 James Turnbull <james@lovedthanlost.net>
+#
+
+require 'facter/util/ip'
+
+# Note that most of this only works on a fixed list of platforms; notably, Darwin
+# is missing.
+
+Facter.add(:interfaces) do
+    confine :kernel => Facter::Util::IP.supported_platforms
+    setcode do
+        Facter::Util::IP.get_interfaces.collect { |iface| Facter::Util::IP.alphafy(iface) }.join(",")
+    end
+end
+
+Facter::Util::IP.get_interfaces.each do |interface|
+
+    # Make a fact for each detail of each interface.  Yay.
+    #   There's no point in confining these facts, since we wouldn't be able to create
+    # them if we weren't running on a supported platform.
+    %w{ipaddress macaddress netmask}.each do |label|
+        Facter.add(label + "_" + Facter::Util::IP.alphafy(interface)) do
+            setcode do
+                Facter::Util::IP.get_interface_value(interface, label)
+            end
+        end
+    end
+end

data/lib/facter/ipaddress.rb

@@ -25,7 +25,7 @@ Facter.add(:ipaddress, :timeout => 2) do
             # we need Hostname to exist for this to work
             host = nil
             if host = Facter::Util::Resolution.exec("host #{hostname}")
-                host = host.chomp.split(/\s/)
+                list = host.chomp.split(/\s/)
                 if defined? list[-1] and
                         list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
                     list[-1]

data/lib/facter/kernelrelease.rb

@@ -14,10 +14,10 @@ Facter.add(:kernelrelease) do
         version = ""
         connection_string = "winmgmts://./root/cimv2"
         wmi = WIN32OLE.connect(connection_string)
-        wmi.ExecQuery("SELECT Version from Win32_OperatingSystem").each { |ole|
+        wmi.ExecQuery("SELECT Version from Win32_OperatingSystem").each do |ole|
             version = "#{ole.Version}"
             break
-        }
+        end
         version
     end
 end