facter 1.6.12 → 1.6.13.rc1

data/ext/packaging/tasks/gem.rake

@@ -1,4 +1,4 @@
-if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
+if @build_gem
   require 'rubygems/package_task'
 
   def glob_gem_files
@@ -15,18 +15,18 @@ if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
   end
 
   spec = Gem::Specification.new do |s|
-    s.name = @name
-    s.version = @gemversion
-    s.author = @author
-    s.email = @email
-    s.homepage = @homepage
-    s.summary = @summary
-    s.description = @description
-    s.files = glob_gem_files
-    s.require_path = @gem_require_path
-    s.test_files = FileList[@gem_test_files.split(' ')]
-    s.executables = @gem_executables
-    s.rubyforge_project = @gem_forge_project
+    s.name = @name                                        unless @name.nil?
+    s.version = @gemversion                               unless @gemversion.nil?
+    s.author = @author                                    unless @author.nil?
+    s.email = @email                                      unless @email.nil?
+    s.homepage = @homepage                                unless @homepage.nil?
+    s.summary = @summary                                  unless @summary.nil?
+    s.description = @description                          unless @description.nil?
+    s.files = glob_gem_files                              unless glob_gem_files.nil?
+    s.executables = @gem_executables                      unless @gem_executables.nil?
+    s.require_path = @gem_require_path                    unless @gem_require_path.nil?
+    s.test_files = FileList[@gem_test_files.split(' ')]   unless @gem_test_files.nil?
+    s.rubyforge_project = @gem_forge_project              unless @gem_forge_project.nil?
 
     @gem_runtime_dependencies.each do |gem, version|
       s.add_runtime_dependency("#{gem}", "#{version}") unless (version.nil? or version.empty?)

data/ext/packaging/tasks/ips.rake

@@ -1,79 +1,80 @@
-require 'erb'
-namespace :package do
-  namespace :ips do
-    workdir = "pkg/ips"
-    proto = workdir + '/proto'
+if @build_ips
+  require 'erb'
+  namespace :package do
+    namespace :ips do
+      workdir = "pkg/ips"
+      proto = workdir + '/proto'
+      repo = workdir + '/repo'
+      pkgs = workdir + '/pkgs'
+      repouri = "file://#{`pwd`.strip + '/' + repo}"
+      artifact = "#{pkgs}/#{@name}@#{@ipsversion}.p5p"
 
-    # Create a source repo
-    # We dont clean the base pkg directory only ips work dir.
-    task :clean do
-      %x[rm -rf #{workdir}]
-    end
+      # Create a source repo
+      # We dont clean the base pkg directory only ips work dir.
+      task :clean do
+        %x[rm -rf #{workdir}]
+      end
 
-    # Create an installation image at ips/proto
-    task :prepare => :clean do
-      check_tool('pkgsend')
-      x %[mkdir -p #{workdir}]
-      x %[gmake -f ext/ips/rules DESTDIR=#{proto} 2>#{workdir}/build.out ]
-    end
+      # Create an installation image at ips/proto
+      task :prepare => :clean do
+        check_tool('pkgsend')
+        x %[mkdir -p #{workdir}]
+        x %[gmake -f ext/ips/rules DESTDIR=#{proto} 2>#{workdir}/build.out ]
+      end
 
-    # Process templates and write the initial manifest
-    task :prototmpl do
-      erb("ext/ips/#{@name}.p5m.erb", workdir + '/' + @name + '.p5m.x')
-    end
+      # Process templates and write the initial manifest
+      task :prototmpl do
+        erb("ext/ips/#{@name}.p5m.erb", workdir + '/' + @name + '.p5m.x')
+      end
 
-    # Update manifest to include the installation image information.
-    task :protogen => :prototmpl do
-      x %[pkgsend generate #{proto} >> #{workdir}/#{@name}.p5m.x ]
-      os=%x[uname -p].chomp
-    end
+      # Update manifest to include the installation image information.
+      task :protogen => :prototmpl do
+        x %[pkgsend generate #{proto} >> #{workdir}/#{@name}.p5m.x ]
+        os=%x[uname -p].chomp
+      end
 
-    # Generate and resolve dependency list
-    task :protodeps => :protogen do
-      x %[pkgdepend generate -d #{proto} #{workdir}/#{@name}.p5m.x > #{workdir}/#{@name}.depends ]
-      x %[pkgdepend resolve -m #{workdir}/#{@name}.depends ]
-      x %[cat #{workdir}/#{@name}.depends.res >> #{workdir}/#{@name}.p5m.x]
-    end
+      # Generate and resolve dependency list
+      task :protodeps => :protogen do
+        x %[pkgdepend generate -d #{proto} #{workdir}/#{@name}.p5m.x > #{workdir}/#{@name}.depends ]
+        x %[pkgdepend resolve -m #{workdir}/#{@name}.depends ]
+        x %[cat #{workdir}/#{@name}.depends.res >> #{workdir}/#{@name}.p5m.x]
+      end
 
-    # Mogrify manifest to remove unncecessary info, and other kinds of transforms.
-    task :protomogrify => :protodeps do
-      x %[pkgmogrify ./ext/ips/transforms ./#{workdir}/#{@name}.p5m.x| pkgfmt >> #{workdir}/#{@name}.p5m ]
-    end
+      # Mogrify manifest to remove unncecessary info, and other kinds of transforms.
+      task :protomogrify => :protodeps do
+        x %[pkgmogrify ./ext/ips/transforms ./#{workdir}/#{@name}.p5m.x| pkgfmt >> #{workdir}/#{@name}.p5m ]
+      end
 
-    # Generate and resolve dependency list
-    task :license => :protomogrify do
-      x %[cp LICENSE #{proto}/#{@name}.license]
-    end
+      # Generate and resolve dependency list
+      task :license => :protomogrify do
+        x %[cp LICENSE #{proto}/#{@name}.license]
+      end
 
-    # Ensure that our manifest is sane.
-    task :lint => :license do
-      x %[pkglint #{workdir}/#{@name}.p5m]
-    end
-
-    # the older versions may require --fmri-in-manifest
-    task :package => :lint do
-      x %[pkgsend -s #{@ips_repo} publish -d #{proto} --fmri-in-manifest #{workdir}/#{@name}.p5m]
-    end
+      # Ensure that our manifest is sane.
+      task :lint => :license do
+        x %[pkglint #{workdir}/#{@name}.p5m]
+      end
 
-    task :retrieve do
-      %x[rm #{workdir}/#{@name}.p5p]
-      x %[pkgrecv -s #{@ips_repo} -a -d #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
-      x %[pkg list -n -g #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
-    end
+      task :package => :lint do
+        x %[rm -rf #{pkgs}]
+        x %[mkdir -p #{pkgs}]
+        x %[pkgrepo create #{repo}]
+        x %[pkgrepo set -s #{repo} publisher/prefix=puppetlabs.com]
+        x %[pkgsend -s #{repouri} publish -d #{proto} --fmri-in-manifest #{workdir}/#{@name}.p5m]
+        x %[rm -f #{artifact}]
+        x %[pkgrecv -s #{repouri} -a -d #{artifact} #{@name}@#{@ipsversion}]
+       end
 
-    task :dry_install => :retrieve do
-      x %[pkg install -nv -g #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
+      task :dry_install do
+        x %[pkg install -nv -g #{artifact} #{@name}@#{@ipsversion}]
+      end
     end
 
-    task :install_cmd => :retrieve do
-      puts %x[pkg install -nv -g #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
+    desc "Creates an ips version"
+    task :ips do
+      Rake::Task['package:ips:prepare'].invoke
+      Rake::Task['package:ips:package'].invoke
     end
-  end
 
-  desc "Uploads an ips version"
-  task :ips do
-    Rake::Task['package:ips:prepare'].invoke
-    Rake::Task['package:ips:package'].invoke
   end
-
 end

data/ext/packaging/tasks/mock.rake

@@ -49,7 +49,7 @@ def build_rpm_with_mock(is_rc, subdir)
         end
       end
 
-      case rpm
+      case File.basename(rpm)
         when /debuginfo/
           rm_rf(rpm)
         when /src\.rpm/
@@ -60,7 +60,7 @@ def build_rpm_with_mock(is_rc, subdir)
           cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/x86_64")
         when /noarch/
           cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/i386")
-          ln("pkg/#{family}/#{version}/#{subdir}/i386/#{File.basename rpm}", "pkg/#{family}/#{version}/#{subdir}/x86_64/")
+          ln("pkg/#{family}/#{version}/#{subdir}/i386/#{File.basename(rpm)}", "pkg/#{family}/#{version}/#{subdir}/x86_64/")
       end
     end
   end

data/ext/packaging/tasks/release.rake

@@ -1,20 +1,54 @@
-namespace :package do
-  desc "Update the version in #{@version_file} to current and commit."
-  task :versionbump  do
-    old_version =  get_version_file_version
-    contents = IO.read(@version_file)
-    new_version = '"' + @version.to_s.strip + '"'
-    if contents.match("VERSION = #{old_version}")
-      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
-    elsif contents.match("#{@name.upcase}VERSION = #{old_version}")
-      contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
-    else
-      contents.gsub!(old_version, @version)
+# These tasks are "release" chains that couple as much of the release process for a package as possible
+
+namespace :pl do
+  if @build_gem
+    desc "Build and ship a gem"
+    task :release_gem do
+      invoke_task("package:gem")
+      if confirm_ship(FileList["pkg/*.gem"])
+        invoke_task("pl:ship_gem")
+      end
+    end
+  end
+
+  desc "Release deb RCs, e.g. package:tar, pl:{deb_all_rc, sign_deb_changes, ship_debs}"
+  task :release_deb_rc do
+    invoke_task("pl:deb_all_rc")
+    invoke_task("pl:sign_deb_changes")
+    if confirm_ship(FileList["pkg/deb/**/*"])
+      invoke_task("pl:ship_debs")
+    end
+  end
+
+  desc "Release deb FINALs, e.g. package:tar, pl:{deb_all, sign_deb_changes, ship_debs}"
+  task :release_deb_final do
+    invoke_task("pl:deb_all")
+    invoke_task("pl:sign_deb_changes")
+    if confirm_ship(FileList["pkg/deb/**/*"])
+      invoke_task("pl:ship_debs")
+    end
+  end
+
+  desc "Release rpm RCs, e.g. package:tar, pl:{mock_rc, sign_rpms, ship_rpms, update_yum_repo}"
+  task :release_rpm_rc do
+    invoke_task("pl:mock_rc")
+    invoke_task("pl:sign_rpms")
+    if confirm_ship(FileList["pkg/el/**/*", "pkg/fedora/**/*"])
+      invoke_task("pl:ship_rpms")
+      invoke_task("pl:update_yum_repo")
+    end
+  end
+
+  desc "Release rpm FINALs, e.g. package:tar, pl:{mock_final, sign_rpms, ship_rpms, update_yum_repo}"
+  task :release_rpm_final do
+    invoke_task("pl:mock_final")
+    invoke_task("pl:sign_rpms")
+    if confirm_ship(FileList["pkg/el/**/*", "pkg/fedora/**/*"])
+      invoke_task("pl:ship_rpms")
+      invoke_task("pl:update_yum_repo")
     end
-    file = File.open(@version_file, 'w')
-    file.write contents
-    file.close
-    git_commit_file(@version_file)
   end
 end
 
+
+

data/ext/packaging/tasks/ship.rake

@@ -7,7 +7,7 @@ namespace :pl do
 
   desc "Update remote rpm repodata on #{@yum_host}"
   task :update_yum_repo do
-    remote_ssh_cmd(@yum_host, '/var/lib/gems/1.8/gems/rake-0.9.2.2/bin/rake -I /opt/repository/ mk_repo')
+    remote_ssh_cmd(@yum_host, '/var/lib/gems/1.8/gems/rake-0.9.2.2/bin/rake -f /opt/repository/Rakefile mk_repo')
   end
 
   desc "Ship cow-built debs to #{@apt_host}"
@@ -15,7 +15,17 @@ namespace :pl do
     rsync_to('pkg/deb/', @apt_host, @apt_repo_path)
   end
 
-  if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
+  if @build_ips
+    desc "Update remote ips repository on #{@ips_host}"
+    task :update_ips_repo do
+      rsync_to('pkg/ips/pkgs', @ips_host, @ips_store)
+      remote_ssh_cmd(@ips_host, "pkgrecv -s #{@ips_store}/pkgs/#{@name}@#{@ipsversion}.p5p -d #{@ips_repo} \\*")
+      remote_ssh_cmd(@ips_host, "pkgrepo refresh -s #{@ips_repo}")
+      remote_ssh_cmd(@ips_host, "/usr/sbin/svcadm restart svc:/application/pkg/server")
+    end
+  end
+
+  if @build_gem
     desc "Ship built gem to rubygems"
     task :ship_gem do
       ship_gem("pkg/#{@name}-#{@gemversion}.gem")

data/ext/packaging/tasks/sign.rake

@@ -15,6 +15,13 @@ def sign_deb_changes(file)
   %x{debsign --re-sign -k#{@gpg_key} #{file}}
 end
 
+# requires atleast a self signed prvate key and certificate pair
+def sign_ips(pkg)
+  %x{pkgsign -s pkg/ips/repo/  -k #{@privatekey_pem} -c #{@certificate_pem} #{@name}@#{@ipsversion}}
+  %x{rm -f #{pkg}}
+  %x{pkgrecv -s pkg/ips/repo -a -d #{pkg} #{@name}@#{@ipsversion}}
+end
+
 namespace :pl do
   desc "Sign the tarball, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
   task :sign_tar do
@@ -35,6 +42,15 @@ namespace :pl do
     sign_modern modern_rpms
   end
 
+  if @build_ips
+    desc "Sign ips package, Defaults to PL Key, pass KEY to override"
+    task :sign_ips do
+      ips_pkgs    = Dir["pkg/ips/pkgs/*.p5p"].join(' ')
+      puts "Signing ips packages..."
+      sign_ips ips_pkgs
+    end
+  end
+
   desc "Check if all rpms are signed"
   task :check_rpm_sigs do
     signed = TRUE

data/ext/packaging/tasks/tag.rake

@@ -0,0 +1,8 @@
+namespace 'pl' do
+  desc "Tag this repository, requires a TAG, e.g. TAG=1.1.1"
+  task "tag" do
+    check_var('TAG', ENV['TAG'])
+    git_tag(ENV['TAG'])
+  end
+end
+

data/ext/packaging/tasks/version.rake

@@ -0,0 +1,20 @@
+namespace :package do
+  desc "Update the version in #{@version_file} to current and commit."
+  task :versionbump  do
+    old_version =  get_version_file_version
+    contents = IO.read(@version_file)
+    new_version = '"' + @version.to_s.strip + '"'
+    if contents.match("VERSION = #{old_version}")
+      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
+    elsif contents.match("#{@name.upcase}VERSION = #{old_version}")
+      contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
+    else
+      contents.gsub!(old_version, @version)
+    end
+    file = File.open(@version_file, 'w')
+    file.write contents
+    file.close
+    git_commit_file(@version_file)
+  end
+end
+

data/ext/redhat/facter.spec.erb

@@ -3,23 +3,23 @@
 %if 0%{?fedora} >= 17
 %global facter_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
 %else
-%global facter_libdir   %(ruby -rrbconfig -e 'puts Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG["sitelibdir"]')
+%global facter_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
 %endif
 
 # VERSION is subbed out during rake srpm process
-# %global realversion <%= @version %>
-# %global rpmversion <%= @rpmversion %>
+%global realversion <%= @version %>
+%global rpmversion <%= @rpmversion %>
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
 Version: %{rpmversion}
 Release: <%= @rpmrelease -%>%{?dist}
-
-License: Apache 2.0
+Epoch: 1
+License: ASL 2.0
 Group: System Environment/Base
 URL: http://www.puppetlabs.com/puppet/related-projects/%{name}
+# Note this URL will only be valid at official tags from Puppet Labs
 Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
-Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz.asc
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,11 +64,11 @@ rm -rf %{buildroot}
 %{facter_libdir}/facter.rb
 %{facter_libdir}/facter
 %{_mandir}/man8/facter.8.gz
-%doc CHANGELOG INSTALL LICENSE README.md
+%doc LICENSE README.md
 
 
 %changelog
-* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
+* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  1:<%= @rpmversion %>-<%= @rpmrelease %>
 - Build for <%= @version %>
 
 * Wed Aug 08 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.11-2

data/install.rb

@@ -47,12 +47,6 @@ rescue LoadError
   $haverdoc = false
 end
 
-# Monkey patch RbConfig->Config for Rubies older then 1.8.5.
-unless defined? ::RbConfig
-  require 'rbconfig'
-  ::RbConfig = ::Config
-end
-
 begin
   if $haverdoc
      rst2man = %x{which rst2man.py}
@@ -77,15 +71,13 @@ def glob(list)
   g = list.map { |i| Dir.glob(i) }
   g.flatten!
   g.compact!
-  g.reject! { |e| e =~ /\.svn/ }
   g
 end
 
 # Set these values to what you want installed.
-sbins = glob(%w{sbin/*})
 bins  = glob(%w{bin/*})
-rdoc  = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
-ri  = glob(%w(bin/*.rb sbin/* lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
+rdoc  = glob(%w{bin/* lib/**/*.rb README README-library TODO }).reject { |e| e=~ /\.(bat|cmd)$/ }
+ri  = glob(%w(bin/*.rb lib/**/*.rb)).reject { |e| e=~ /\.(bat|cmd)$/ }
 man   = glob(%w{man/man8/*})
 libs  = glob(%w{lib/**/*.rb lib/**/*.py})
 tests = glob(%w{tests/**/*.rb})
@@ -190,8 +182,8 @@ def prepare_installation
     opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
       InstallOptions.bindir = bindir
     end
-    opts.on('--sbindir[=OPTIONAL]', 'Installation directory for system binaries', 'overrides RbConfig::CONFIG["sbindir"]') do |sbindir|
-      InstallOptions.sbindir = sbindir
+    opts.on('--ruby[=OPTIONAL]', 'Ruby interpreter to use with installation', 'overrides ruby used to call install.rb') do |ruby|
+      InstallOptions.ruby = ruby
     end
     opts.on('--sitelibdir[=OPTIONAL]', 'Installation directory for libraries', 'overrides RbConfig::CONFIG["sitelibdir"]') do |sitelibdir|
       InstallOptions.sitelibdir = sitelibdir
@@ -221,14 +213,12 @@ def prepare_installation
   version = [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")
   libdir = File.join(RbConfig::CONFIG["libdir"], "ruby", version)
 
-  # Mac OS X 10.5 and higher declare bindir and sbindir as
+  # Mac OS X 10.5 and higher declare bindir
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
-  # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin
   # which is not generally where people expect executables to be installed
   # These settings are appropriate defaults for all OS X versions.
   if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/
     RbConfig::CONFIG['bindir'] = "/usr/bin"
-    RbConfig::CONFIG['sbindir'] = "/usr/sbin"
   end
 
   if not InstallOptions.bindir.nil?
@@ -237,12 +227,6 @@ def prepare_installation
     bindir = RbConfig::CONFIG['bindir']
   end
 
-  if not InstallOptions.sbindir.nil?
-    sbindir = InstallOptions.sbindir
-  else
-    sbindir = RbConfig::CONFIG['sbindir']
-  end
-
   if not InstallOptions.sitelibdir.nil?
     sitelibdir = InstallOptions.sitelibdir
   else
@@ -267,30 +251,25 @@ def prepare_installation
   if (destdir = ENV['DESTDIR'])
     warn "DESTDIR is deprecated. Use --destdir instead."
     bindir = join(destdir, bindir)
-    sbindir = join(destdir, sbindir)
     mandir = join(destdir, mandir)
     sitelibdir = join(destdir, sitelibdir)
 
     FileUtils.makedirs(bindir)
-    FileUtils.makedirs(sbindir)
     FileUtils.makedirs(mandir)
     FileUtils.makedirs(sitelibdir)
     # This is the new way forward
   elsif (destdir = InstallOptions.destdir)
     bindir = join(destdir, bindir)
-    sbindir = join(destdir, sbindir)
     mandir = join(destdir, mandir)
     sitelibdir = join(destdir, sitelibdir)
 
     FileUtils.makedirs(bindir)
-    FileUtils.makedirs(sbindir)
     FileUtils.makedirs(mandir)
     FileUtils.makedirs(sitelibdir)
   end
 
   InstallOptions.site_dir = sitelibdir
   InstallOptions.bin_dir  = bindir
-  InstallOptions.sbin_dir = sbindir
   InstallOptions.lib_dir  = libdir
   InstallOptions.man_dir  = mandir
 end
@@ -382,17 +361,18 @@ end
 def install_binfile(from, op_file, target)
   tmp_file = Tempfile.new('facter-binfile')
 
-  ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+  if not InstallOptions.ruby.nil?
+    ruby = InstallOptions.ruby
+  else
+    ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+  end
 
   File.open(from) do |ip|
     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
-      if contents[0] =~ /^#!/
-        contents.shift
-      end
-      op.write contents.join()
+      contents.shift if contents[0] =~ /^#!/
+      op.write contents.join
     end
   end
 
@@ -436,7 +416,6 @@ run_tests(tests) if InstallOptions.tests
 #build_rdoc(rdoc) if InstallOptions.rdoc
 #build_ri(ri) if InstallOptions.ri
 #build_man(bins) if InstallOptions.man
-do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)
 do_man(man)