facter 1.6.11 → 1.6.12.rc1

data/ext/osx/preflight.erb

@@ -0,0 +1,30 @@
+#!/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.
+
+<% begin %>
+<%  require 'rubygems' %>
+<% rescue LoadError %>
+<% end %>
+<% require 'rake' %>
+
+# remove libdir
+<% Dir.chdir("lib") %>
+<% FileList["**/*"].select {|i| File.file?(i)}.each do |file| %>
+/bin/rm -Rf "${3}<%= @apple_libdir %>/<%=file%>"
+<% end %>
+# remove bin files
+<% Dir.chdir("../bin") %>
+<% FileList["**/*"].select {|i| File.file?(i)}.each do |file| %>
+/bin/rm -Rf "${3}<%= @apple_bindir %>/<%=file%>"
+<% end %>
+<% Dir.chdir("..") %>
+
+# remove old doc files
+/bin/rm -Rf "${3}<%= @apple_docdir %>/<%=@package_name%>"

data/ext/osx/prototype.plist.erb

@@ -0,0 +1,38 @@
+<?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">
+<pkg-info version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string><%= @title %></string>
+	<key>CFBundleShortVersionString</key>
+	<string><%= @version %></string>
+	<key>IFMajorVersion</key>
+	<integer><%= @package_major_version %></integer>
+	<key>IFMinorVersion</key>
+	<integer><%= @package_minor_version %></integer>
+	<key>IFPkgBuildDate</key>
+	<date><%= @build_date %></date>
+	<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><%= @pm_restart %></string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+</dict>
+</pkg-info>

data/ext/packaging/README.md

@@ -0,0 +1,89 @@
+Packaging
+
+This is a repository for packaging artifacts for Puppet Labs software.
+The goal is to abstract and automate packaging processes beyond individual
+software projects to a level where this repo can be cloned inside any
+project and used to build Debian and Redhat packages.
+
+It expects the following directory structure in the project
+*   ext/{debian,redhat,osx}
+
+each of which contains templated erb files using the instance variables
+specified in the setupvars task. These include a debian changelog, a
+redhat spec file, and an osx preflight and plist.
+
+The top level Rakefile in the project should have the following added:
+```ruby
+Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
+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 from ext/build_defaults.yaml"
+end
+
+
+namespace :package do
+  desc "Bootstrap packaging automation, e.g. clone into packaging repo"
+  task :bootstrap do
+    cd 'ext' do
+      %x{git clone #{@packaging_url}}
+    end
+  end
+
+  desc "Remove all cloned packaging automation"
+  task :implode do
+    rm_rf "ext/#{@packaging_repo}"
+  end
+end
+```
+
+Also in ext should be two files, build_defaults.yaml and project_data.yaml.
+
+This is the sample build_defaults.yaml file from Hiera:
+```yaml
+---
+packaging_url: 'git@github.com:puppetlabs/packaging --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: FALSE
+# 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/'
+apt_host: 'burji.puppetlabs.com'
+apt_repo_url: 'http://apt.puppetlabs.com'
+apt_repo_path: '/opt/repository/incoming'
+# Whether to present the gem and apple tasks
+build_gem: TRUE
+build_dmg: TRUE
+```
+This is the sample project_data.yaml file:
+```yaml
+---
+project: 'hiera'
+author: 'Puppet Labs'
+email: 'info@puppetlabs.com'
+homepage: 'https://github.com/puppetlabs/hiera'
+summary: 'Light weight hierarchical data store'
+description: 'A pluggable data store for hierarcical data'
+version_file: '/lib/hiera.rb'
+# files and gem_files are space separated lists
+files: '[A-Z]* ext lib bin spec acceptance_tests'
+gem_files: '{bin,lib}/**/* CHANGELOG COPYING README.md LICENSE'
+gem_require_path: 'lib'
+gem_test_files: 'spec/**/*'
+gem_executables: 'hiera'
+gem_default_executables: 'hiera'
+# To add gem dependencies, indent.
+# This is an example only, hiera doesn't really depend on hiera-puppet
+gem_dependencies:
+  hiera-puppet: '1.0.0rc'
+```

data/ext/packaging/tasks/00_utils.rb

@@ -0,0 +1,214 @@
+# Utility methods used by the various rake tasks
+
+def check_tool(tool)
+  %x{which #{tool}}
+  unless $?.success?
+    STDERR.puts "#{tool} tool not found...exiting"
+    exit 1
+  end
+end
+
+def find_tool(tool)
+  location = %x{which #{tool}}.chomp
+  location if $?.success?
+end
+
+def check_file(file)
+  unless File.exist?(file)
+    STDERR.puts "#{file} file not found...exiting"
+    exit 2
+  end
+end
+
+def check_var(varname,var=nil)
+  if var.nil?
+    STDERR.puts "Requires #{varname} be set...exiting"
+    exit 3
+  end
+end
+
+def check_host(host)
+  unless host == %x{hostname}.chomp!
+    STDERR.puts "Requires host to be #{host}...exiting"
+    exit 5
+  end
+end
+
+def erb(erbfile,  outfile)
+  template = File.read(erbfile)
+  message = ERB.new(template, nil, "-")
+  output = message.result(binding)
+  File.open(outfile, 'w') { |f| f.write output }
+  puts "Generated: #{outfile}"
+end
+
+def cp_pr(src, dest, options={})
+  mandatory = {:preserve => true}
+  cp_r(src, dest, options.merge(mandatory))
+end
+
+def cp_p(src, dest, options={})
+  mandatory = {:preserve => true}
+  cp(src, dest, options.merge(mandatory))
+end
+
+def mv_f(src, dest, options={})
+  force = {:force => true}
+  mv(src, dest, options.merge(mandatory))
+end
+
+def git_co(dist)
+  %x{git reset --hard ; git checkout #{dist}}
+  unless $?.success?
+    STDERR.puts 'Could not checkout #{dist} git branch to build package from...exiting'
+    exit 1
+  end
+end
+
+def get_temp
+  temp = `mktemp -d -t tmpXXXXXX`.strip
+end
+
+def remote_ssh_cmd target, command
+  check_tool('ssh')
+  puts "Executing '#{command}' on #{target}"
+  %x{ssh #{target} '#{command}'}
+end
+
+def rsync_to *args
+  check_tool('rsync')
+  flags = "-Havxl -O --no-perms --no-owner --no-group"
+  source  = args[0]
+  target  = args[1]
+  dest    = args[2]
+  puts "rsyncing #{source} to #{target}"
+  %x{rsync #{flags} #{source} #{ENV['USER']}@#{target}:#{dest}}
+end
+
+def scp_file_from(host,path,file)
+  %x{scp #{ENV['USER']}@#{host}:#{path}/#{file} #{@tempdir}/#{file}}
+end
+
+def scp_file_to(host,path,file)
+  %x{scp #{@tempdir}/#{file} #{ENV['USER']}@#{host}:#{path}}
+end
+
+def timestamp
+  Time.now.strftime("%Y-%m-%d %H:%M:%S")
+end
+
+def get_dash_version
+  if File.exists?('.git')
+    %x{git describe}.chomp.split('-')[0..1].join('-').gsub('v','')
+  else
+    get_pwd_version
+  end
+end
+
+def get_dot_version
+  if File.exists?('.git')
+    %x{git describe}.chomp.gsub('-', '.').split('.')[0..3].join('.').gsub('v', '')
+  else
+    get_pwd_version
+  end
+end
+
+def get_pwd_version
+  %x{pwd}.strip.split('.')[-1]
+end
+
+def get_debversion
+  (@version.include?("rc") ? @version.sub(/rc[0-9]+/, '0.1\0') : "#{@version}-1") + "#{@packager}#{get_debrelease}"
+end
+
+def get_origversion
+  @debversion.split('-')[0]
+end
+
+def get_rpmversion
+  @version.match(/^([0-9.]+)/)[1]
+end
+
+def get_version_file_version
+  File.open( @version_file ) {|io| io.grep(/VERSION = /)}[0].split()[-1]
+end
+
+def get_debrelease
+  ENV['RELEASE'] || '1'
+end
+
+def get_rpmrelease
+  ENV['RELEASE'] ||
+    if @version.include?("rc")
+      "0.1" + @version.gsub('-', '_').match(/rc[0-9]+.*/)[0]
+    else
+      "1"
+    end
+end
+
+def restart_keychain
+  kill_keychain
+  start_keychain
+end
+
+def kill_keychain
+  %x{keychain -k mine}
+end
+
+def start_keychain
+  keychain = %x{/usr/bin/keychain -q --agents gpg --eval #{@gpg_key}}.chomp
+  new_env = keychain.match(/(GPG_AGENT_INFO)=([^;]*)/)
+  ENV[new_env[1]] = new_env[2]
+end
+
+def gpg_sign_file(file)
+  gpg ||= find_tool('gpg')
+
+  if gpg
+    sh "#{gpg} --armor --detach-sign -u #{@gpg_key} #{file}"
+  else
+    STDERR.puts "No gpg available. Cannot sign tarball. Exiting..."
+    exit 1
+  end
+end
+
+def mkdir_pr *args
+  args.each do |arg|
+    mkdir_p arg
+  end
+end
+
+def set_cow_envs(cow)
+  elements = cow.split('-')
+  if elements.size != 3
+    STDERR.puts "Expecting a cow name split on hyphens, e.g. 'base-squeeze-i386'"
+    exit 1
+  else
+    dist = elements[1]
+    arch = elements[2]
+    if dist.nil? or arch.nil?
+      STDERR.puts "Couldn't get the arg and dist from cow name. Expecting something like 'base-dist-arch'"
+      exit 1
+    end
+    arch = arch.split('.')[0] if arch.include?('.')
+  end
+
+  ENV['DIST'] = dist
+  ENV['ARCH'] = arch
+end
+
+def ln(target, name)
+  %x{ln -f #{target} #{name}}
+end
+
+def git_commit_file(file)
+  %x{which git &> /dev/null}
+  if $?.success? and File.exist?('.git')
+    %x{git commit #{file} -m "Commit changes to #{file}" &> /dev/null}
+  end
+end
+
+def ship_gem(file)
+  %x{gem push #{file}}
+end
+

data/ext/packaging/tasks/10_setupvars.rake

@@ -0,0 +1,59 @@
+require 'rubygems'
+require 'rubygems/package_task'
+require 'rspec/core/rake_task'
+require 'yaml'
+require 'erb'
+
+begin
+  @project_specs            ||= YAML.load_file('ext/project_data.yaml')
+  @name                     = @project_specs['project']
+  @author                   = @project_specs['author']
+  @email                    = @project_specs['email']
+  @homepage                 = @project_specs['homepage']
+  @summary                  = @project_specs['summary']
+  @description              = @project_specs['description']
+  @files                    = @project_specs['files']
+  @version_file             = @project_specs['version_file']
+  @gem_files                = @project_specs['gem_files']
+  @gem_require_path         = @project_specs['gem_require_path']
+  @gem_test_files           = @project_specs['gem_test_files']
+  @gem_executables          = @project_specs['gem_executables']
+  @gem_runtime_dependencies = @project_specs['gem_runtime_dependencies']
+  @gem_devel_dependencies   = @project_specs['gem_devel_dependencies']
+  @gem_rdoc_options         = @project_specs['gem_rdoc_options']
+  @gem_forge_project        = @project_specs['gem_forge_project']
+rescue
+  STDERR.puts "There was an error loading the project specifications from the 'ext/project_data.yaml' file."
+  exit 1
+end
+
+begin
+  @pkg_defaults   ||= YAML.load_file('ext/build_defaults.yaml')
+  @default_cow    = ENV['COW']          || @pkg_defaults['default_cow']
+  @cows           = ENV['COW']          || @pkg_defaults['cows']
+  @pbuild_conf    = ENV['PBUILDCONF']   || @pkg_defaults['pbuild_conf']
+  @packager       = ENV['PACKAGER']     || @pkg_defaults['packager']
+  @sign_tar       = ENV['SIGN_TAR']     || @pkg_defaults['sign_tar']
+  @final_mocks    = ENV['MOCK']         || @pkg_defaults['final_mocks']
+  @rc_mocks       = ENV['MOCK']         || @pkg_defaults['rc_mocks']
+  @gpg_name       = ENV['GPG_NAME']     || @pkg_defaults['gpg_name']
+  @gpg_key        = ENV['GPG_KEY']      || @pkg_defaults['gpg_key']
+  @build_gem      = ENV['GEM']          || @pkg_defaults['build_gem']
+  @build_dmg      = ENV['DMG']          || @pkg_defaults['build_dmg']
+  @yum_host       = @pkg_defaults['yum_host']
+  @yum_repo_path  = @pkg_defaults['yum_repo_path']
+  @apt_host       = @pkg_defaults['apt_host']
+  @apt_repo_url   = @pkg_defaults['apt_repo_url']
+  @apt_repo_path  = @pkg_defaults['apt_repo_path']
+rescue
+  STDERR.puts "There was an error loading the packaging defaults from the 'ext/build_defaults.yaml' file."
+  exit 1
+end
+
+@build_root   ||= Dir.pwd
+@version      ||= get_dash_version
+@gemversion   ||= get_dot_version
+@debversion   ||= get_debversion
+@origversion  ||= get_origversion
+@rpmversion   ||= get_rpmversion
+@rpmrelease   ||= get_rpmrelease

data/ext/packaging/tasks/apple.rake

@@ -0,0 +1,201 @@
+# Title:        Rake task to build Apple packages for #{@name}.
+# Author:       Gary Larizza
+# Date:         05/18/2012
+# Description:  This task will create a DMG-encapsulated package that will
+#               install a package on OS X systems. This happens by building
+#               a directory tree of files that will then be fed to the
+#               packagemaker binary (can be installed by installing the
+#               XCode Tools) which will create the .pkg file.
+#
+
+# Path to Binaries (Constants)
+TAR           = '/usr/bin/tar'
+CP            = '/bin/cp'
+INSTALL       = '/usr/bin/install'
+DITTO         = '/usr/bin/ditto'
+PACKAGEMAKER  = '/Developer/usr/bin/packagemaker'
+SED           = '/usr/bin/sed'
+
+# Setup task to populate all the variables
+task :setup do
+  # Read the Apple file-mappings
+  begin
+    @source_files        = YAML.load_file('ext/osx/file_mapping.yaml')
+  rescue
+    STDERR.puts "Could not load Apple file mappings from 'ext/osx/file_mapping.yaml'"
+    exit 1
+  end
+  @package_name          = @name
+  @title                 = "#{@name}-#{@version}"
+  @reverse_domain        = "com.#{@packager}.#{@package_name}"
+  @package_major_version = @version.split('.')[0]
+  @package_minor_version = @version.split('.')[1] +
+                           @version.split('.')[2].split('-')[0].split('rc')[0]
+  @pm_restart            = 'None'
+  @build_date            = timestamp
+  @apple_bindir          = '/usr/bin'
+  @apple_sbindir         = '/usr/sbin'
+  @apple_libdir          = '/usr/lib/ruby/site_ruby/1.8'
+  @apple_docdir          = '/usr/share/doc'
+end
+
+# method:       make_directory_tree
+# description:  This method sets up the directory structure that packagemaker
+#               needs to build a package. A prototype.plist file (holding
+#               package-specific options) is built from an ERB template located
+#               in the ext/osx directory.
+def make_directory_tree
+  project_tmp    = "#{get_temp}/#{@package_name}"
+  @scratch       = "#{project_tmp}/#{@title}"
+  @working_tree  = {
+     'scripts'   => "#{@scratch}/scripts",
+     'resources' => "#{@scratch}/resources",
+     'working'   => "#{@scratch}/root",
+     'payload'   => "#{@scratch}/payload",
+  }
+  puts "Cleaning Tree: #{project_tmp}"
+  rm_rf(project_tmp)
+  @working_tree.each do |key,val|
+    mkdir_p(val)
+  end
+
+  erb 'ext/osx/preflight.erb', "#{@working_tree["scripts"]}/preflight"
+  erb 'ext/osx/prototype.plist.erb', "#{@scratch}/prototype.plist"
+
+end
+
+# method:        build_dmg
+# description:   This method builds a package from the directory structure in
+#                /tmp/#{@name} and puts it in the
+#                /tmp/#{@name}/#{@name}-#{version}/payload directory. A DMG is
+#                created, using hdiutil, based on the contents of the
+#                /tmp/#{@name}/#{@name}-#{version}/payload directory. The resultant
+#                DMG is placed in the pkg/apple directory.
+#
+def build_dmg
+  # Local Variables
+  dmg_format_code   = 'UDZO'
+  zlib_level        = '9'
+  dmg_format_option = "-imagekey zlib-level=#{zlib_level}"
+  dmg_format        = "#{dmg_format_code} #{dmg_format_option}"
+  dmg_file          = "#{@title}.dmg"
+  package_file      = "#{@title}.pkg"
+  pm_extra_args     = '--verbose --no-recommend --no-relocate'
+  package_target_os = '10.5'
+
+  # Build .pkg file
+  system("sudo #{PACKAGEMAKER} --root #{@working_tree['working']} \
+    --id #{@reverse_domain} \
+    --filter DS_Store \
+    --target #{package_target_os} \
+    --title #{@title} \
+    --info #{@scratch}/prototype.plist \
+    --scripts #{@working_tree['scripts']} \
+    --resources #{@working_tree['resources']} \
+    --version #{@version} \
+    #{pm_extra_args} --out #{@working_tree['payload']}/#{package_file}")
+
+  # Build .dmg file
+  system("sudo hdiutil create -volname #{@title} \
+    -srcfolder #{@working_tree['payload']} \
+    -uid 99 \
+    -gid 99 \
+    -ov \
+    -format #{dmg_format} \
+    #{dmg_file}")
+
+  if File.directory?("#{pwd}/pkg/apple")
+    mv("#{pwd}/#{dmg_file}", "#{pwd}/pkg/apple/#{dmg_file}")
+    puts "moved:   #{dmg_file} has been moved to #{pwd}/pkg/apple/#{dmg_file}"
+  else
+    mkdir_p("#{pwd}/pkg/apple")
+    mv(dmg_file, "#{pwd}/pkg/apple/#{dmg_file}")
+    puts "moved:   #{dmg_file} has been moved to #{pwd}/pkg/apple/#{dmg_file}"
+  end
+end
+
+# method:        pack_source
+# description:   This method copies the #{@name} source into a directory
+#                structure in /tmp/#{@name}/#{@name}-#{version}/root mirroring the
+#                structure on the target system for which the package will be
+#                installed. Anything installed into /tmp/#{@name}/root will be
+#                installed as the package's payload.
+#
+def pack_source
+  work          = "#{@working_tree['working']}"
+  source = pwd
+
+  # Make all necessary directories
+  @source_files.each_value do |files|
+    files.each_value do |params|
+      mkdir_p "#{work}/#{params['path']}"
+    end
+  end
+
+  # Install directory contents into place
+  unless @source_files['directories'].nil?
+    @source_files['directories'].each do |dir, params|
+      unless FileList["#{source}/#{dir}/*"].empty?
+        cmd = "#{DITTO} #{source}/#{dir}/ #{work}/#{params['path']}"
+        puts cmd
+        system(cmd)
+      end
+    end
+  end
+
+  # Setup a preflight script and replace variables in the files with
+  # the correct paths.
+  chown('root', 'wheel', "#{@working_tree['scripts']}/preflight")
+  chmod(0644, "#{@working_tree['scripts']}/preflight")
+
+  # Do a run through first setting the specified permissions then
+  # making sure 755 is set for all directories
+  unless @source_files['directories'].nil?
+    @source_files['directories'].each do |dir, params|
+      owner = params['owner']
+      group = params['group']
+      perms = params['perms']
+      path  = params['path']
+      chmod_R(Integer(perms), "#{work}/#{path}")
+      chown_R(owner, group, "#{work}/#{path}")
+      chmod(0755, "#{work}/#{path}")
+      Dir["#{work}/#{path}/**/*"].each do |file|
+        chmod(0755, file) if File.directory?(file)
+      end
+    end
+  end
+
+  # Install any files
+  unless @source_files['files'].nil?
+    @source_files['files'].each do |file, params|
+      owner = params['owner']
+      group = params['group']
+      perms = params['perms']
+      dest  = params['path']
+      # Allow for regexs like [A-Z]*
+      FileList[file].each do |file|
+        cmd = "#{INSTALL} -o #{owner} -g #{group} -m #{perms} #{source}/#{file} #{work}/#{dest}"
+        puts cmd
+        system(cmd)
+      end
+    end
+  end
+end
+
+if @build_dmg or @build_dmg == 'TRUE' or @build_dmg == 'true'
+  namespace :package do
+    desc "Task for building an Apple Package"
+    task :apple => [:setup] do
+      # Test for Root and Packagemaker binary
+      raise "Please run rake as root to build Apple Packages" unless Process.uid == 0
+      raise "Packagemaker must be installed. Please install XCode Tools" unless \
+        File.exists?('/Developer/usr/bin/packagemaker')
+
+      make_directory_tree
+      pack_source
+      build_dmg
+      chmod_R(0775, "#{pwd}/pkg")
+    end
+  end
+end
+