facter 1.5 → 1.5.2

data/CHANGELOG

@@ -1,4 +1,54 @@
-1.5:
+1.5.2:
+    Fixed #1562 - Removed facter from PREREQS
+
+    Fixed #1558 - Updated virtual fact for xenu and xen0
+
+    Fixed #1555 - Ddded operatingsystemrelease for Solaris
+
+    Fixed #1559 - Update to dmidecode fact
+
+1.5.1:
+    Added a Process.waitall thread when there's a timeout, to avoid zombies.
+
+    Set the timeout the host-based and resolve-based resolutions to 2.
+
+    Fixed #1495 - CentOS version detection is now better.
+
+    Fixed #1422 - Facter now defaults to 0 timeout.
+
+    Fixes #1492 - added kernelversion fact
+
+    Added virtual fact
+
+    Modified the operatingsystem fact for Debian so it looks in
+    /etc/debian_version instead of /proc/version.
+
+    Fixes #1467 - macaddress not set on Ubuntu
+
+    Adding a rake task for creating an archive.
+
+    Adding better SuSE detection for both operatingsystem and release.
+
+    Add sample test and strawman solution for IP parsing code
+
+    Add module level tests for Facter::IPAddress
+
+    Fixed #1425 - Solaris
+
+    Feature #1487: Package creation scripts for Mac OS X
+
+    Feature #1478: Allow specification of --bindir --sbindir --sitelibdir --mandir
+
+    Feature #1475: CONFIG['bindir'] CONFIG['sbindir'] have undesirable defaults on
+
+    Fixes #1467 - macaddress not set on Ubuntu
+
+    Enabled a number of Windows facts - operating system, domain, ipaddress, macaddress, 
+    kernel, ipconfig and others 
+
+1.5.0:
+    Fixed Rakefile to include additional files including tests et al
+
     Fixed #1400 - OperatingSystemRelease should now work on CentOS
 
     Changed 'timeout' option to 'limit' to avoid scope issue

data/Rakefile

@@ -18,9 +18,12 @@ project = Rake::RedLabProject.new("facter") do |p|
         'install.rb',
         '[A-Z]*',
         'bin/**/*', 
+        'lib/facter.rb',
         'lib/**/*.rb', 
         'test/**/*.rb',
-        'doc/**/*',
+        'spec/**/*',
+        'conf/**/*',
+        'documentation/**/*',
         'etc/*'
     ]
 
@@ -45,3 +48,9 @@ if project.has?(:epm)
         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

data/conf/osx/PackageInfo.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string>com.reductivelabs.facter</string>
+	<key>CFBundleShortVersionString</key>
+	<string>{SHORTVERSION}</string>
+	<key>IFMajorVersion</key>
+	<integer>{MAJORVERSION}</integer>
+	<key>IFMinorVersion</key>
+	<integer>{MINORVERSION}</integer>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>RootAuthorization</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagIsRequired</key>
+	<false/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string>None</string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+</dict>
+</plist>

data/conf/osx/createpackage.sh

@@ -0,0 +1,167 @@
+#!/bin/bash
+#
+# Script to build an "old style" not flat pkg out of the facter repository.
+#
+# Author: Nigel Kersten (nigelk@google.com)
+#
+# Last Updated: 2008-07-31
+#
+# Copyright 2008 Google Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+
+INSTALLRB="install.rb"
+BINDIR="/usr/bin"
+SITELIBDIR="/usr/lib/ruby/site_ruby/1.8"
+PACKAGEMAKER="/Developer/usr/bin/packagemaker"
+PROTO_PLIST="PackageInfo.plist"
+PREFLIGHT="preflight"
+
+
+function find_installer() {
+  # we walk up three directories to make this executable from the root, 
+  # root/conf or root/conf/osx
+  if [ -f "./${INSTALLRB}" ]; then
+    installer="$(pwd)/${INSTALLRB}"
+  elif [ -f "../${INSTALLRB}" ]; then
+    installer="$(pwd)/../${INSTALLRB}"
+  elif [ -f "../../${INSTALLRB}" ]; then
+    installer="$(pwd)/../${INSTALLRB}"
+  else
+    installer=""
+  fi
+}
+
+function find_facter_root() {
+  facter_root=$(dirname "${installer}")
+}
+
+function install_facter() {
+  echo "Installing Facter to ${pkgroot}"
+  "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}" &> /dev/null
+  chown -R root:admin "${pkgroot}"
+}
+
+function get_facter_version() {
+  facter_version=$(RUBYLIB="${pkgroot}/${SITELIBDIR}:${RUBYLIB}" ruby -e "require 'facter'; puts Facter.version")
+}
+
+function prepare_package() {
+  # As we can't specify to follow symlinks from the command line, we have
+  # to go through the hassle of creating an Info.plist file for packagemaker
+  # to look at for package creation and substitue the version strings out.
+  # Major/Minor versions can only be integers, so we have "1" and "50" for
+  # facter version 1.5
+  # Note too that for 10.5 compatibility this Info.plist *must* be set to 
+  # follow symlinks.
+  VER1=$(echo ${facter_version} | awk -F "." '{print $1}')
+  VER2=$(echo ${facter_version} | awk -F "." '{print $2}')
+  VER3=$(echo ${facter_version} | awk -F "." '{print $3}')
+  major_version="${VER1}"
+  minor_version="${VER2}${VER3}"
+  cp "${facter_root}/conf/osx/${PROTO_PLIST}" "${pkgtemp}"
+  sed -i '' "s/{SHORTVERSION}/${facter_version}/g" "${pkgtemp}/${PROTO_PLIST}"
+  sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}"
+  sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}"
+  
+  # We need to create a preflight script to remove traces of previous
+  # facter installs due to limitations in Apple's pkg format.
+  mkdir "${pkgtemp}/scripts"
+  cp "${facter_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts"
+  
+  # substitute in the sitelibdir specified above on the assumption that this
+  # is where any previous facter install exists that should be cleaned out.
+  sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
+  chmod 0755 "${pkgtemp}/scripts/${PREFLIGHT}"
+}
+
+function create_package() {
+  rm -fr "$(pwd)/facter-${facter_version}.pkg"
+  echo "Building package"
+  echo "Note that packagemaker is reknowned for spurious errors. Don't panic."
+  "${PACKAGEMAKER}" --root "${pkgroot}" \
+                    --info "${pkgtemp}/${PROTO_PLIST}" \
+                    --scripts ${pkgtemp}/scripts \
+                    --out "$(pwd)/facter-${facter_version}.pkg"
+  if [ $? -ne 0 ]; then
+    echo "There was a problem building the package."
+    cleanup_and_exit 1
+    exit 1
+  else
+    echo "The package has been built at:"
+    echo "$(pwd)/facter-${facter_version}.pkg"
+  fi
+}
+
+function cleanup_and_exit() {
+  if [ -d "${pkgroot}" ]; then
+    rm -fr "${pkgroot}"
+  fi
+  if [ -d "${pkgtemp}" ]; then
+    rm -fr "${pkgtemp}"
+  fi
+  exit $1
+}
+
+# Program entry point
+function main() {
+
+  if [ $(whoami) != "root" ]; then
+    echo "This script needs to be run as root via su or sudo."
+    cleanup_and_exit 1
+  fi
+
+  find_installer
+  
+  if [ ! "${installer}" ]; then
+    echo "Unable to find ${INSTALLRB}"
+    cleanup_and_exit 1
+  fi
+
+  find_facter_root
+  
+  if [ ! "${facter_root}" ]; then
+    echo "Unable to find facter repository root."
+    cleanup_and_exit 1
+  fi
+  
+  pkgroot=$(mktemp -d -t facterpkg)
+  
+  if [ ! "${pkgroot}" ]; then
+    echo "Unable to create temporary package root."
+    cleanup_and_exit 1
+  fi
+  
+  pkgtemp=$(mktemp -d -t factertmp)
+  
+  if [ ! "${pkgtemp}" ]; then
+    echo "Unable to create temporary package root."
+    cleanup_and_exit 1
+  fi
+  
+  install_facter
+  get_facter_version
+  
+  if [ ! "${facter_version}" ]; then
+    echo "Unable to retrieve facter version"
+    cleanup_and_exit 1
+  fi
+  
+  prepare_package
+  create_package
+  
+  cleanup_and_exit 0
+}
+
+main "$@"

data/conf/osx/preflight

@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Make sure that old facter cruft is removed
+# This also allows us to downgrade facter as
+# it's more likely that installing old versions
+# over new will cause issues.
+#
+# ${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*"

data/conf/redhat/facter.spec

@@ -0,0 +1,120 @@
+%{!?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_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
+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
+%endif
+
+Requires: ruby >= 1.8.1
+Requires: which
+%if %has_ruby_abi
+Requires: ruby(abi) = 1.8
+%endif
+BuildRequires: ruby >= 1.8.1
+
+%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
+
+%prep
+%setup -q
+
+%build
+sed -i -e 's@^#!.*$@#! /usr/bin/ruby@' bin/facter
+
+%install
+rm -rf %{buildroot}
+mkdir %{buildroot}
+
+%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
+%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter
+%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util
+%{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}/facter/util/plist
+%{__install} -d -m0755 %{buildroot}%{_bindir}
+%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
+
+%{__install} -p -m0644 lib/*.rb %{buildroot}%{ruby_sitelibdir}
+%{__install} -p -m0644 lib/facter/*.rb %{buildroot}%{ruby_sitelibdir}/facter
+%{__install} -p -m0644 lib/facter/util/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util
+%{__install} -p -m0644 lib/facter/util/plist/*.rb %{buildroot}%{ruby_sitelibdir}/facter/util/plist
+%{__install} -p -m0755 bin/facter %{buildroot}%{_bindir}
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_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
+* Mon May 19 2008 James Turnbull <james@lovedthanlosty.net> - 1.5.0-1
+- New version
+- Added util and plist files
+
+* Fri Jan 19 2007 David Lutterkort <dlutter@redhat.com> - 1.3.6-1
+- New version
+
+* Thu Jan 18 2007 David Lutterkort <dlutter@redhat.com> - 1.3.5-3
+- require which; facter is very unhappy without it
+
+* Mon Nov 20 2006 David Lutterkort <dlutter@redhat.com> - 1.3.5-2
+- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or
+  later to allow building on older fedora releases
+
+* Tue Oct 10 2006 David Lutterkort <dlutter@redhat.com> - 1.3.5-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter@redhat.com> - 1.3.4-1
+- New version
+
+* Wed Sep 13 2006 David Lutterkort <dlutter@redhat.com> - 1.3.3-2
+- Rebuilt for FC6
+
+* Wed Jun 28 2006 David Lutterkort <dlutter@redhat.com> - 1.3.3-1
+- Rebuilt
+
+* Fri Jun 19 2006 Luke Kanies <luke@madstop.com> - 1.3.0-1
+- Fixed spec file to work again with the extra memory and processor files.
+- Require ruby(abi). Build as noarch
+
+* Fri Jun 9 2006 Luke Kanies <luke@madstop.com> - 1.3.0-1
+- Added memory.rb and processor.rb
+
+* Mon Apr 17 2006 David Lutterkort <dlutter@redhat.com> - 1.1.4-4
+- Rebuilt with changed upstream tarball
+
+* Tue Mar 21 2006 David Lutterkort <dlutter@redhat.com> - 1.1.4-3
+- Do not rely on install.rb, it will be deleted upstream
+
+* Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 1.1.4-2
+- Commented out noarch; requires fix for bz184199
+
+* Mon Mar  6 2006 David Lutterkort <dlutter@redhat.com> - 1.1.4-1
+- Removed unused macros
+
+* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 1.1.1-2
+- Fix BuildRoot. Add dist to release tag
+
+* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 1.1.1-1
+- Initial build.

data/conf/solaris/pkginfo

@@ -0,0 +1,7 @@
+PKG=CSWfacter
+NAME=facter - System Fact Gatherer
+VERSION=1.3.5
+CATEGORY=application
+VENDOR=http://reductivelabs.com/projects/facter
+HOTLINE=http://reductivelabs.com/cgi-bin/facter.cgi
+EMAIL=luke@madstop.com

data/documentation/custom.page

@@ -0,0 +1,22 @@
+---
+inMenu: true
+directoryName: Custom Facts
+---
+
+Facter does everything it can to make adding custom facts easy.  It will
+autoload any files it finds in a ``facter/`` directory in its search
+path, so you don't need to modify the package files.  Also, Facter will
+search through your environment for any variables whose names start with
+'FACTER_' (case insensitive) and automatically add those facts.
+
+As a simple example, here is how I publish my home directory to Puppet:
+
+   Facter.add("home") do
+        setcode do
+            ENV['HOME']
+        end
+    end 
+
+I have ~/lib/ruby in my $RUBYLIB environment variable, so I just created
+~/lib/ruby/facter and dropped the above code into a ``home.rb`` file
+within that directory.