facter 1.6.11 → 1.6.12.rc1

data/CHANGELOG

@@ -1,3 +1,29 @@
+1.6.12rc1
+===
+3ad05f1 Remove version test from facter
+fce4b01 fix redhat spec release template variable
+903b1d9 Stop using sed to generate the preflight erb
+601a967 Use git read-only packaging repo for public access
+dd3401e Fixup apple packaging
+e0454df Remove libexec from file list as its only in 2.x
+1e7f5b3 Update debhelper compat to 7, add format
+6659e61 Fixup redhat spec erb template for f17
+6752530 Shift to using packaging repo
+fe311c2 Remove obsolete tasks directory
+900895f Group requires together
+8c18e33 Move facter redhat spec file to erb
+84f8e10 Add debian build artifacts to facter project
+d2d3baf Replace rake/gempackagetask with rubygems/gempackagetask
+6f58b4e Move tasks out of 'rake' subdirectory
+db9d154 Move packaging files to ext, rm conf
+c0cbe62 (#15464) Make Facter.version settable via Facter.version=
+0b49eae (#15464) Make contributing easy via bundle Gemfile
+bf6ee4f Retabbed conf/redhat/facter.spec to lineup tag contents.
+defbfb8 (#15291) Add Vendor tag to Facter spec file
+17243bb Update facter redhat spec for fedora 17
+7ca9122 Update a facter build-requires for f17
+d5d2328 (#11640) Added support for new OpenStack MAC addresses
+
 1.6.11
 ===
 f75e46e Add build-requires of ruby-rdoc for manpage generation

data/Gemfile

@@ -0,0 +1,14 @@
+source :rubygems
+
+gemspec
+
+group(:development, :test) do
+  gem "rspec", "~> 2.10.0", :require => false
+  gem "mocha", "~> 0.10.5", :require => false
+end
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end
+
+# vim:filetype=ruby

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    facter (1.6.11)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  facter!
+  mocha (~> 0.10.5)
+  rspec (~> 2.10.0)

data/Rakefile

@@ -1,103 +1,61 @@
 # Rakefile for facter
 
-$: << File.expand_path('lib')
+# We need access to the Puppet.version method
+$LOAD_PATH.unshift(File.expand_path("lib"))
+require 'facter/version'
+
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
 require 'rubygems'
 require 'rspec'
 require 'rspec/core/rake_task'
+require 'rake'
+require 'yaml'
+
 begin
   require 'rcov'
 rescue LoadError
 end
 
 Dir['tasks/**/*.rake'].each { |t| load t }
+Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
 
-require 'rake'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-
-FILES = FileList[
-  '[A-Z]*',
-  'install.rb',
-  'bin/**/*',
-  'lib/**/*',
-  'conf/**/*',
-  'etc/**/*',
-  'spec/**/*'
-]
-
-def get_version
-  `git describe`.strip
+begin
+  @build_defaults ||= YAML.load_file('ext/build_defaults.yaml')
+  @packaging_url  = @build_defaults['packaging_url']
+  @packaging_repo = @build_defaults['packaging_repo']
+rescue
+  STDERR.puts "Unable to read the packaging repo info from ext/build_defaults.yaml"
 end
 
-# :build_environment and :tar are mostly borrowed from puppet-dashboard Rakefile
-task :build_environment do
-  unless ENV['FORCE'] == '1'
-    modified = `git status --porcelain | sed -e '/^\?/d'`
-    if modified.split(/\n/).length != 0
-      puts <<-HERE
-!! ERROR: Your git working directory is not clean. You must
-!! remove or commit your changes before you can create a package:
-
-#{`git status | grep '^#'`.chomp}
-
-!! To override this check, set FORCE=1 -- e.g. `rake package:deb FORCE=1`
-      HERE
-      raise
+namespace :package do
+  desc "Bootstrap packaging automation, e.g. clone into packaging repo"
+  task :bootstrap do
+    if File.exist?("ext/#{@packaging_repo}")
+      puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
+    else
+      cd 'ext' do
+        %x{git clone #{@packaging_url}}
+      end
     end
   end
-end
-
-desc "Create a release .tar.gz"
-task :tar => :build_environment do
-  name = "facter"
-  rm_rf 'pkg/tar'
-  temp=`mktemp -d -t tmpXXXXXX`.strip!
-  version = get_version
-  base = "#{temp}/#{name}-#{version}/"
-  mkdir_p base
-  sh "git checkout-index -af --prefix=#{base}"
-  mkdir_p "pkg/tar"
-  sh "tar -C #{temp} -pczf #{temp}/#{name}-#{version}.tar.gz #{name}-#{version}"
-  mv "#{temp}/#{name}-#{version}.tar.gz", "pkg/tar"
-  rm_rf temp
-  puts "Tarball is pkg/tar/#{name}-#{version}.tar.gz"
-end
 
-spec = Gem::Specification.new do |spec|
-  spec.platform = Gem::Platform::RUBY
-  spec.name = 'facter'
-  spec.files = FILES.to_a
-  spec.executables = %w{facter}
-  spec.version = get_version.split('-')[0]
-  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'
-  spec.rubyforge_project = 'facter'
-  spec.has_rdoc = true
-  spec.rdoc_options <<
-    '--title' <<  'Facter - System Inventory Tool' <<
-    '--main' << 'README' <<
-    '--line-numbers'
-end
-Rake::GemPackageTask.new(spec) do |pkg|
+  desc "Remove all cloned packaging automation"
+  task :implode do
+    rm_rf "ext/#{@packaging_repo}"
+  end
 end
 
-task :package => :tar
-
 task :default do
   sh %{rake -T}
 end
 
 # Aliases for spec
-task :test    => [:spec]
-task :tests   => [:spec]
-task :specs   => [:spec]
+task :tests   => [:test]
+task :specs   => [:test]
 
-RSpec::Core::RakeTask.new do |t|
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:test) do |t|
   t.pattern ='spec/{unit,integration}/**/*_spec.rb'
   t.fail_on_error = true
 end

data/ext/build_defaults.yaml

@@ -0,0 +1,20 @@
+---
+packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
+packaging_repo: 'packaging'
+default_cow: 'base-squeeze-i386.cow'
+cows: 'base-lucid-amd64.cow base-lucid-i386.cow base-natty-amd64.cow base-natty-i386.cow base-oneiric-amd64.cow base-oneiric-i386.cow base-precise-amd64.cow base-precise-i386.cow base-sid-amd64.cow base-sid-i386.cow base-squeeze-amd64.cow base-squeeze-i386.cow base-testing-amd64.cow base-testing-i386.cow base-wheezy-i386.cow'
+pbuild_conf: '/etc/pbuilderrc'
+packager: 'puppetlabs'
+gpg_name: 'info@puppetlabs.com'
+gpg_key: '4BD6EC30'
+sign_tar: TRUE
+# a space separated list of mock configs
+final_mocks: 'pl-5-i386 pl-5-x86_64 pl-6-i386 pl-6-x86_64 fedora-15-i386 fedora-15-x86_64 fedora-16-i386 fedora-16-x86_64 fedora-17-i386 fedora-17-x86_64'
+rc_mocks: 'pl-5-i386-dev pl-5-x86_64-dev pl-6-i386-dev pl-6-x86_64-dev fedora-15-i386-dev fedora-15-x86_64-dev fedora-16-i386-dev fedora-16-x86_64-dev fedora-17-i386-dev fedora-17-x86_64-dev'
+yum_host: 'burji.puppetlabs.com'
+yum_repo_path: '~/repo/'
+build_gem: TRUE
+build_dmg: TRUE
+apt_host: 'burji.puppetlabs.com'
+apt_repo_url: 'http://apt.puppetlabs.com'
+apt_repo_path: '/opt/repository/incoming'

data/ext/debian/changelog.erb

@@ -0,0 +1,71 @@
+facter (<%= @debversion %>) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Update to version <% @debversion %>
+
+ -- Puppet Labs Release <info@puppetlabs.com>  <%= Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")%>
+
+facter (2.0.0-0.1rc4puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Imported upstream 2.0.0rc4. 
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Thu, 24 May 2012 17:09:25 +0000
+
+facter (2.0.0-0.1rc3puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Imported upstream 2.0.0rc3. 
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Tue, 22 May 2012 11:48:25 +0000
+
+facter (2.0.0-0.1rc2puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Imported upstream 2.0.0rc2. 
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Thu, 17 May 2012 13:15:25 +0000
+
+facter (2.0.0-0.1rc1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Imported upstream 2.0.0rc1. Updated debian/control to include ruby1.9 options.
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Tue, 15 May 2012 23:43:25 +0000
+
+facter (1.6.8-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Imported Upstream version 1.6.8
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Mon, 23 Apr 2012 13:11:30 +0000
+
+facter (1.6.7-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid wheezy lucid squeeze precise; urgency=low
+
+  * Imported Upstream version 1.6.7
+
+ -- Moses Mendoza <moses@puppetlabs.com>  Thu, 29 Mar 2012 22:43:30 +0000
+
+facter (1.6.6-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid squeeze wheezy precise; urgency=low
+
+  * (#12436) Adding pciutils as a dependency.
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Fri, 10 Feb 2012 01:49:22 +0000
+
+facter (1.6.5-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid squeeze wheezy; urgency=low
+
+  * Release facter 1.6.5
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Wed, 25 Jan 2012 11:46:48 -0700
+
+facter (1.6.4-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid squeeze wheezy; urgency=low
+
+  * Release facter 1.6.4
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Wed, 7 Dec 2011 13:36:48 -0700
+
+facter (1.6.3-1puppetlabs1) hardy lucid maverick natty oneiric unstable lenny sid squeeze wheezy; urgency=low
+
+  * Initial packaging for facter 1.6.3
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Thu, 10 Nov 2011 11:00:48 -0700
+
+facter (1.6.2-1puppet1) hardy lucid maverick natty oneiric unstable lenny sid squeeze wheezy; urgency=low
+
+  * Initial packaging for facter 1.6.2
+
+ -- Matthaus Litteken <matthaus@puppetlabs.com>  Fri, 21 Oct 2011 11:00:48 -0700

data/ext/debian/compat

@@ -0,0 +1 @@
+7

data/ext/debian/control

@@ -0,0 +1,14 @@
+Source: facter
+Section: ruby
+Priority: optional
+Maintainer: Puppet Labs <info@puppetlabs.com>
+Build-Depends: cdbs, debhelper (>> 7), ruby1.8 | ruby1.9.1, libopenssl-ruby1.8 | libopenssl-ruby1.9.1
+Standards-Version: 3.9.1
+Homepage: http://www.puppetlabs.com
+
+Package: facter
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>= 1.8.5) | ruby1.9.1, libopenssl-ruby1.8 | libopenssl-ruby1.9.1, dmidecode, pciutils
+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.

data/ext/debian/copyright

@@ -0,0 +1,19 @@
+This package was debianized by Jacob Helwig <jacob@puppetlabs.com> on
+Sat, 11 Dec 2010 21:11:11 -0800
+
+It was downloaded from http://www.puppetlabs.com/
+
+Upstream Author:
+
+    Puppet Labs <info@puppetlabs.com>
+
+Copyright:
+
+    Copyright 2010-2011 Puppet Labs <info@puppetlabs.com>
+
+License: ASL-2
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    On a Debian system, the license can be found at
+    /usr/share/common-licenses/Apache-2.0 .
+

data/ext/debian/docs

@@ -0,0 +1,2 @@
+CHANGELOG
+README.md

data/ext/debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/buildcore.mk
+
+LIBDIR=$(shell /usr/bin/ruby1.8 -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')
+
+binary-install/facter::
+	 /usr/bin/ruby1.8 install.rb --sitelibdir=$(LIBDIR) --destdir=$(CURDIR)/debian/$(cdbs_curpkg) --quick --no-rdoc

data/ext/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

data/ext/facter-diff

@@ -0,0 +1,74 @@
+
+#!/usr/bin/env sh
+#
+# Output the difference between a facter command run on two different versions
+# of facter. Uses unified diff format.
+
+OPTIONS_SPEC="\
+facter-diff [options] <rev1> <rev2> [fact]...
+
+Example:
+
+    ./ext/facter-diff 1.5.7 1.0.2
+
+--
+h,help      Display this help"
+
+. "$(git --exec-path)/git-sh-setup"
+eval "$(echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
+trap 'err=$?; cleanup; exit $err' 0
+
+cleanup() {
+  test $origin && git checkout -q "$origin"
+}
+
+facter() {
+  ruby -Ilib bin/facter "$@"
+}
+
+log_facter_run() {
+  local ref=$1 && shift
+  local tmpfile=$1 && shift
+
+  git checkout -qf "$ref" ||
+    die "fatal: unable to checkout $ref"
+  facter "$@" > $tmpfile
+}
+
+verify_revision() {
+  git rev-parse --verify --quiet "$1" > /dev/null ||
+    die "fatal: '$1' is not a valid revision"
+}
+
+test $1 = "--" && shift # git rev-parse seems to leave the -- in
+test $# -eq 0 && usage
+
+test $# -gt 1 ||
+  die "fatal: must specify two revisions"
+
+status=$(git status -s)
+test -z "$status" ||
+  die "fatal: $0 cannot be used with a dirty working copy"
+
+origin=$(git rev-parse --symbolic-full-name HEAD)
+test "$origin" = "HEAD" &&
+  origin=$(git rev-parse HEAD)
+
+test -x "bin/facter" ||
+  die "fatal: $0 must be run from the project root"
+
+ref1="$1" && shift
+ref2="$1" && shift
+
+verify_revision $ref1
+verify_revision $ref2
+
+tmpfile1="/tmp/$(basename $0).$$.1.tmp"
+tmpfile2="/tmp/$(basename $0).$$.2.tmp"
+
+log_facter_run $ref1 $tmpfile1 $@
+log_facter_run $ref2 $tmpfile2 $@
+
+git checkout -f "$origin" > /dev/null 2>&1
+
+diff --label "$ref1" --label "$ref2" -u $tmpfile1 $tmpfile2

data/ext/osx/file_mapping.yaml

@@ -0,0 +1,27 @@
+directories:
+  lib:
+    path: 'usr/lib/ruby/site_ruby/1.8'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  bin:
+    path: 'usr/bin'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0755'
+  facter:
+    path: 'var/lib/facter'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+  etc:
+    path: 'etc'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'
+files:
+  '[A-Z]*':
+    path: 'usr/share/doc/facter'
+    owner: 'root'
+    group: 'wheel'
+    perms: '0644'