facter 1.6.11 → 1.6.12.rc1

data/ext/packaging/tasks/clean.rake

@@ -0,0 +1,5 @@
+desc "Clean all built packages, eg rm -rf pkg"
+task :clean do
+  rm_rf 'pkg'
+end
+

data/ext/packaging/tasks/deb.rake

@@ -0,0 +1,105 @@
+def pdebuild args
+  results_dir = args[:work_dir]
+  cow         = args[:cow]
+  devel_repo  = args[:devel]
+  set_cow_envs(cow)
+  begin
+    sh "pdebuild --configfile #{@pbuild_conf} --buildresult #{results_dir} --pbuilder cowbuilder -- --override-config --othermirror=\"deb #{@apt_repo_url} #{ENV['DIST']} main dependencies #{devel_repo}\" --basepath /var/cache/pbuilder/#{cow}/"
+  rescue
+    STDERR.puts "Something went wrong. Hopefully the backscroll or #{results_dir}/#{@name}_#{@debversion}.build file has a clue."
+    exit 1
+  end
+end
+
+def update_cow(cow, is_rc = nil)
+  ENV['FOSS_DEVEL'] = is_rc
+  set_cow_envs(cow)
+  begin
+    sh "sudo cowbuilder --update --override-config --configfile #{@pbuild_conf} --basepath /var/cache/pbuilder/#{cow} --distribution #{ENV['DIST']} --architecture #{ENV['ARCH']}"
+  rescue
+    STDERR.puts "Couldn't update the cow #{cow}. Perhaps you don't have sudo?"
+    exit 1
+  end
+end
+
+def debuild args
+  results_dir = args[:work_dir]
+  begin
+    sh "debuild --no-lintian -uc -us"
+  rescue
+    STDERR.puts "Something went wrong. Hopefully the backscroll or #{results_dir}/#{@name}_#{@debversion}.build file has a clue."
+    exit 1
+  end
+end
+
+task :prep_deb_tars, :work_dir do |t,args|
+  work_dir = args.work_dir
+  cp_p "pkg/#{@name}-#{@version}.tar.gz", work_dir
+  cd work_dir do
+    sh "tar zxf #{@name}-#{@version}.tar.gz"
+    mv "#{@name}-#{@version}", "#{@name}-#{@debversion}"
+    mv "#{@name}-#{@version}.tar.gz", "#{@name}_#{@origversion}.orig.tar.gz"
+  end
+end
+
+task :build_deb, :deb_command, :cow, :devel do |t,args|
+  deb_build = args.deb_command
+  cow       = args.cow
+  devel     = args.devel
+  work_dir  = get_temp
+  dest_dir  = "#{@build_root}/pkg/deb/#{cow.split('-')[1] unless cow.nil?}"
+  check_tool(deb_build)
+  mkdir_p dest_dir
+  deb_args  = { :work_dir => work_dir, :cow => cow, :devel => devel}
+  Rake::Task[:prep_deb_tars].reenable
+  Rake::Task[:prep_deb_tars].invoke(work_dir)
+  cd "#{work_dir}/#{@name}-#{@debversion}" do
+    mv 'ext/debian', '.'
+    begin
+      send(deb_build, deb_args)
+      cp FileList["#{work_dir}/*.deb", "#{work_dir}/*.dsc", "#{work_dir}/*.changes", "#{work_dir}/*.debian.tar.gz", "#{work_dir}/*.orig.tar.gz"], dest_dir
+      rm_rf "#{work_dir}/#{@name}-#{@debversion}"
+    rescue
+      STDERR.puts "Something went wrong. Hopefully the backscroll or #{work_dir}/#{@name}_#{@debversion}.build file has a clue."
+    end
+    rm_rf work_dir
+  end
+end
+
+namespace :package do
+  desc "Create a deb from this repo, using debuild (all builddeps must be installed)"
+  task :deb => :tar do
+    Rake::Task[:build_deb].invoke('debuild')
+  end
+end
+
+namespace :pl do
+  desc "Create a deb from this repo using the default cow #{@default_cow}."
+  task :deb => "package:tar"  do
+    Rake::Task[:build_deb].invoke('pdebuild', @default_cow)
+  end
+
+  desc "Create an RC deb from this repo using the default cow #{@default_cow}."
+  task :deb_rc => "package:tar" do
+    Rake::Task[:build_deb].invoke('pdebuild', @default_cow, 'devel')
+  end
+
+  desc "Create debs from this git repository using all cows specified in build_defaults yaml"
+  task :deb_all do
+    @cows.split(' ').each do |cow|
+      Rake::Task["package:tar"].invoke
+      Rake::Task[:build_deb].reenable
+      Rake::Task[:build_deb].invoke('pdebuild', cow)
+    end
+  end
+
+  desc "Create RC debs from this git repository using all cows specified in build_defaults yaml"
+  task :deb_all_rc do
+    @cows.split(' ').each do |cow|
+      Rake::Task["package:tar"].invoke
+      Rake::Task[:build_deb].reenable
+      Rake::Task[:build_deb].invoke('pdebuild', cow, 'devel')
+    end
+  end
+end
+

data/ext/packaging/tasks/gem.rake

@@ -0,0 +1,50 @@
+if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
+  require 'rubygems/package_task'
+
+  def glob_gem_files
+    gem_files = []
+    files = FileList[@gem_files.split(' ')]
+    files.each do |file|
+      if File.directory?(file)
+        gem_files << FileList["#{file}/**/*"].exclude("ext/packaging/")
+      else
+        gem_files << file
+      end
+    end
+    gem_files
+  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
+
+    @gem_runtime_dependencies.each do |key, value|
+      s.add_runtime_dependency("#{key}", "#{value}")
+    end unless @gem_runtime_dependencies.nil?
+
+    @gem_devel_dependencies.each do |key, value|
+      s.add_devel_dependency("#{key}", "#{value}")
+    end unless @gem_devel_dependencies.nil?
+
+    @gem_rdoc_options.each do |option|
+      s.rdoc_options << option
+    end unless @gem_rdoc_options.nil?
+  end
+
+  namespace :package do
+    Gem::PackageTask.new(spec) do |pkg|
+      pkg.need_tar_gz = true
+    end
+  end
+end
+

data/ext/packaging/tasks/mock.rake

@@ -0,0 +1,88 @@
+
+def mock(mock_config, srpm)
+  check_tool('mock')
+  sh "mock -r #{mock_config} #{srpm}"
+end
+
+def srpm_file
+  srpm = Dir["pkg/srpm/*.rpm"][0]
+  check_file(srpm)
+  srpm
+end
+
+def mock_el_family(mock_config)
+  family = mock_config.split('-')[0]
+  family = 'el' if family == 'pl'
+  family
+end
+
+def mock_el_ver(mock_config)
+  version = mock_config.split('-')[1]
+  version = "f#{version}" if mock_config.split('-')[0] == 'fedora'
+  version
+end
+
+def build_rpm_with_mock(is_rc, subdir)
+  if is_rc
+    mocks = @rc_mocks
+  else
+    mocks = @final_mocks
+  end
+
+  mocks.split(' ').each do |mock_config|
+    family  = mock_el_family(mock_config)
+    version = mock_el_ver(mock_config)
+    arch    = mock_config.split('-')[2]
+    result  = "/var/lib/mock/#{mock_config}/result/*.rpm"
+
+    mock(mock_config, srpm_file)
+
+    Dir[result].each do |rpm|
+      rpm.strip!
+      unless ENV['RC_OVERRIDE'] == '1'
+        if is_rc == FALSE and rpm =~ /[0-9]+rc[0-9]+\./
+          puts "It looks like you might be trying to ship an RC to the production repos. Leaving rpm in #{result}. Pass RC_OVERRIDE=1 to override."
+          next
+        elsif is_rc and rpm !~ /[0-9]+rc[0-9]+\./
+          puts "It looks like you might be trying to ship a production release to the development repos. Leaving rpm in #{result}. Pass RC_OVERRIDE=1 to override."
+          next
+        end
+      end
+
+      case rpm
+        when /debuginfo/
+          rm_rf(rpm)
+        when /src\.rpm/
+          cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/SRPMS")
+        when /i.?86/
+          cp_pr(rpm, "pkg/#{family}/#{version}/#{subdir}/i386")
+        when /x86_64/
+          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/")
+      end
+    end
+  end
+end
+
+
+namespace :pl do
+  task :setup_el_dirs do
+    %x{mkdir -p pkg/el/{5,6}/{products,devel,dependencies}/{SRPMS,i386,x86_64}}
+    %x{mkdir -p pkg/fedora/{f15,f16,f17}/{products,devel,dependencies}/{SRPMS,i386,x86_64}}
+  end
+
+  desc "Use specified mocks to make final rpms, keyed to PL infrastructure, pass MOCK to specifiy config"
+  task :mock_final => [ "package:srpm", "pl:setup_el_dirs" ] do
+    subdir = ENV['subdir'] || 'products'
+    build_rpm_with_mock(FALSE, subdir)
+  end
+
+  desc "Use specified mocks to make RC rpms, keyed to PL infrastructure, pass MOCK to specify config"
+  task :mock_rc => [ "package:srpm", "pl:setup_el_dirs" ] do
+    subdir = 'devel'
+    build_rpm_with_mock(TRUE, subdir)
+  end
+end
+

data/ext/packaging/tasks/release.rake

@@ -0,0 +1,18 @@
+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 = '"' + get_version.to_s.strip + '"'
+    if contents.match("VERSION = #{old_version}")
+      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
+    else
+      contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
+    end
+    file = File.open(@version_file, 'w')
+    file.write contents
+    file.close
+    git_commit_file(@version_file)
+  end
+end
+

data/ext/packaging/tasks/rpm.rake

@@ -0,0 +1,39 @@
+def build_rpm(buildarg = "-bs")
+  check_tool('rpmbuild')
+  temp = get_temp
+  rpm_define = "--define \"%dist .el5\" --define \"%_topdir  #{temp}\" "
+  rpm_old_version = '--define "_source_filedigest_algorithm 1" --define "_binary_filedigest_algorithm 1" \
+     --define "_binary_payload w9.gzdio" --define "_source_payload w9.gzdio" \
+     --define "_default_patch_fuzz 2"'
+  args = rpm_define + ' ' + rpm_old_version
+  mkdir_pr temp, 'pkg/rpm', 'pkg/srpm', "#{temp}/SOURCES", "#{temp}/SPECS"
+  if @sign_tar
+    Rake::Task["pl:sign_tar"].invoke
+    cp_p "pkg/#{@name}-#{@version}.tar.gz.asc", "#{temp}/SOURCES"
+  end
+  cp_p "pkg/#{@name}-#{@version}.tar.gz", "#{temp}/SOURCES"
+  erb "ext/redhat/#{@name}.spec.erb", "#{temp}/SPECS/#{@name}.spec"
+  sh "rpmbuild #{args} #{buildarg} --nodeps #{temp}/SPECS/#{@name}.spec"
+  mv FileList["#{temp}/SRPMS/*.rpm"], "pkg/srpm"
+  mv FileList["#{temp}/RPMS/*/*.rpm"], "pkg/rpm"
+  rm_rf temp
+  puts
+  output = FileList['pkg/*/*.rpm']
+  puts "Wrote:"
+  output.each do | line |
+    puts line
+  end
+end
+
+namespace :package do
+  desc "Create srpm from this git repository (unsigned)"
+  task :srpm => :tar do
+    build_rpm("-bs")
+  end
+
+  desc "Create .rpm from this git repository (unsigned)"
+  task :rpm => :tar do
+    build_rpm("-ba")
+  end
+end
+

data/ext/packaging/tasks/ship.rake

@@ -0,0 +1,25 @@
+namespace :pl do
+  desc "Ship mocked rpms to #{@yum_host}"
+  task :ship_rpms do
+    rsync_to('pkg/el', @yum_host, @yum_repo_path)
+    rsync_to('pkg/fedora', @yum_host, @yum_repo_path)
+  end
+
+  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')
+  end
+
+  desc "Ship cow-built debs to #{@apt_host}"
+  task :ship_debs do
+    rsync_to('pkg/deb/', @apt_host, @apt_repo_path)
+  end
+
+  desc "Ship built gem to rubygems"
+  task :ship_gem do
+    ship_gem("pkg/#{@name}-#{@version}.gem")
+  end
+
+end
+
+

data/ext/packaging/tasks/sign.rake

@@ -0,0 +1,62 @@
+def sign_el5(rpm)
+  %x{rpm --define '%_gpg_name #{@gpg_name}' --define '%__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --digest-algo=sha1 --batch --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning -u %{_gpg_name} -sbo %{__signature_filename} %{__plaintext_filename}' --addsign #{rpm} > /dev/null}
+end
+
+def sign_modern(rpm)
+  %x{rpm --define '%_gpg_name #{@gpg_name}' --addsign #{rpm} > /dev/null}
+end
+
+def rpm_has_sig(rpm)
+  %x{rpm -Kv #{rpm} | grep "#{@gpg_key.downcase}" &> /dev/null}
+  $?.success?
+end
+
+def sign_deb_changes(file)
+  %x{debsign --re-sign -k#{@gpg_key} #{file}}
+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
+    unless File.exist? "pkg/#{@name}-#{@version}.tar.gz"
+      STDERR.puts "No tarball exists. Try rake package:tar?"
+      exit 1
+    end
+    gpg_sign_file "pkg/#{@name}-#{@version}.tar.gz"
+  end
+
+  desc "Sign mocked rpms, Defaults to PL Key, pass KEY to override"
+  task :sign_rpms do
+    el5_rpms    = Dir["pkg/el/5/**/*.rpm"].join(' ')
+    modern_rpms = (Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]).join(' ')
+    puts "Signing el5 rpms..."
+    sign_el5 el5_rpms
+    puts "Signing el6 and fedora rpms..."
+    sign_modern modern_rpms
+  end
+
+  desc "Check if all rpms are signed"
+  task :check_rpm_sigs do
+    signed = TRUE
+    rpms = Dir["pkg/el/5/**/*.rpm"] + Dir["pkg/el/6/**/*.rpm"] + Dir["pkg/fedora/**/*.rpm"]
+    print 'Checking rpm signatures'
+    rpms.each do |rpm|
+      if rpm_has_sig rpm
+        print '.'
+      else
+        puts "#{rpm} is unsigned."
+        signed = FALSE
+      end
+    end
+    exit 1 unless signed
+    puts "All rpms signed"
+  end
+
+  desc "Sign generated debian changes files. Defaults to PL Key, pass KEY to override"
+  task :sign_deb_changes do
+    restart_keychain
+    sign_deb_changes("pkg/deb/*/*.changes") unless Dir["pkg/deb/*/*.changes"].empty?
+    sign_deb_changes("pkg/deb/*.changes") unless Dir["pkg/deb/*.changes"].empty?
+  end
+end
+

data/ext/packaging/tasks/tar.rake

@@ -0,0 +1,19 @@
+namespace :package do
+  desc "Create a source tar archive"
+  task :tar => [ :clean ] do
+    workdir = "pkg/#{@name}-#{@version}"
+    mkdir_p(workdir)
+    FileList[@files.split(' ')].each do |f|
+      cp_pr(f, workdir)
+    end
+    erb("#{workdir}/ext/redhat/#{@name}.spec.erb", "#{workdir}/ext/redhat/#{@name}.spec")
+    erb("#{workdir}/ext/debian/changelog.erb", "#{workdir}/ext/debian/changelog")
+    rm_rf(FileList["#{workdir}/ext/debian/*.erb", "#{workdir}/ext/redhat/*.erb"])
+    cd "pkg" do
+      sh "tar --exclude=.gitignore --exclude=ext/#{@packaging_repo} -zcf #{@name}-#{@version}.tar.gz #{@name}-#{@version}"
+    end
+    rm_rf(workdir)
+    puts
+    puts "Wrote #{`pwd`.strip}/pkg/#{@name}-#{@version}.tar.gz"
+  end
+end

data/ext/project_data.yaml

@@ -0,0 +1,15 @@
+---
+project: 'facter'
+author: 'Puppet Labs'
+email: 'info@puppetlabs.com'
+homepage: 'https://github.com/puppetlabs/facter'
+summary: 'Facter, a system inventory tool'
+description: 'You can prove anything with facts!'
+version_file: 'lib/facter/version.rb'
+# files and gem_files are space separated lists
+files: '[A-Z]* acceptance bin documentation etc ext install.rb lib man spec'
+gem_files: '[A-Z]* install.rb bin etc ext lib spec'
+gem_require_path: 'lib'
+gem_test_files: 'spec/**/*'
+gem_executables: 'facter'
+gem_default_executables: 'facter'

data/{conf/redhat/facter.spec → ext/redhat/facter.spec.erb}

@@ -1,18 +1,25 @@
-%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG["sitelibdir"]')}
+# Fedora 17 ships with ruby 1.9, which uses vendorlibdir instead
+# of sitelibdir
+%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"]')
+%endif
+
+# VERSION is subbed out during rake srpm process
+# %global realversion <%= @version %>
+# %global rpmversion <%= @rpmversion %>
 
 Summary: Ruby module for collecting simple facts about a host operating system
 Name: facter
-Version: 1.6.11
-Release: 1%{?dist}
-#Release: 0.1rc1%{?dist}
-Epoch: 1
+Version: %{rpmversion}
+Release: <%= @rpmrelease -%>%{?dist}
+
 License: Apache 2.0
 Group: System Environment/Base
 URL: http://www.puppetlabs.com/puppet/related-projects/%{name}
-#Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
-Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
-#Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc
-Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
+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)
 
@@ -20,12 +27,18 @@ Requires: ruby >= 1.8.5
 Requires: which
 # dmidecode and pciutils are not available on all arches
 %ifarch %ix86 x86_64 ia64
-Requires: dmidecode
-Requires: pciutils
+Requires:       dmidecode
+Requires:       pciutils
+%endif
+Requires:       ruby(abi) >= 1.8
+BuildRequires:  ruby >= 1.8.5
+
+# In Fedora 17 ruby-rdoc is called rubygem-rdoc
+%if 0%{?fedora} >= 17
+BuildRequires:  rubygem-rdoc
+%else
+BuildRequires:  ruby-rdoc
 %endif
-Requires: ruby(abi) >= 1.8
-BuildRequires: ruby >= 1.8.5
-BuildRequires: ruby-rdoc
 
 %description
 Ruby module for collecting simple facts about a host Operating
@@ -33,14 +46,13 @@ 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  -n %{name}-%{version}
-#%setup -q  -n %{name}-%{version}rc1
+%setup -q  -n %{name}-%{realversion}
 
 %build
 
 %install
 rm -rf %{buildroot}
-ruby install.rb --destdir=%{buildroot} --quick
+ruby install.rb --destdir=%{buildroot} --quick --sitelibdir=%{facter_libdir}
 
 %clean
 rm -rf %{buildroot}
@@ -49,13 +61,19 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/facter
-%{ruby_sitelibdir}/facter.rb
-%{ruby_sitelibdir}/facter
+%{facter_libdir}/facter.rb
+%{facter_libdir}/facter
 %{_mandir}/man8/facter.8.gz
 %doc CHANGELOG INSTALL LICENSE README.md
 
 
 %changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
+- Build for <%= @version %>
+
+* Wed Aug 08 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.11-2
+- Use correct ruby libdir for fedora 17 / ruby 1.9
+
 * Wed Aug 08 2012 Moses Mendoza <moses@puppetlabs.com> - 1.6.11-1
 - Update for 1.6.11