puppet 3.0.0.rc8 → 3.0.0

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

@@ -8,6 +8,11 @@ def check_tool(tool)
   end
 end
 
+def has_tool(tool)
+  %x{which #{tool}}
+  return $?.success?
+end
+
 def find_tool(tool)
   location = %x{which #{tool}}.chomp
   location if $?.success?
@@ -163,9 +168,12 @@ def get_rpmrelease
     end
 end
 
-def restart_keychain
-  kill_keychain
-  start_keychain
+def load_keychain
+  unless @keychain_loaded
+    kill_keychain
+    start_keychain
+    @keychain_loaded = TRUE
+  end
 end
 
 def kill_keychain
@@ -234,3 +242,49 @@ def x(v)
   print %x[#{v}]
 end
 
+def ask_yes_or_no
+  answer = STDIN.gets.downcase.chomp
+  return TRUE if answer =~ /^y$|^yes$/
+  return FALSE if answer =~ /^n$|^no$/
+  puts "Nope, try something like yes or no or y or n, etc:"
+  ask_yes_or_no
+end
+
+def handle_method_failure(method, args)
+  STDERR.puts "There was an error running the method #{method} with the arguments:"
+  args.each { |param, arg| STDERR.puts "\t#{param} => #{arg}\n" }
+  STDERR.puts "The rake session is paused. Would you like to retry #{method} with these args and continue where you left off? [y,n]"
+  if ask_yes_or_no
+    send(method, args)
+  else
+    exit 1
+  end
+end
+
+def invoke_task(task, args=nil)
+  Rake::Task[task].reenable
+  Rake::Task[task].invoke(args)
+end
+
+def confirm_ship(files)
+  STDOUT.puts "The following files have been built and are ready to ship:"
+  files.each { |file| STDOUT.puts "\t#{file}\n" unless File.directory?(file) }
+  STDOUT.puts "Ship these files?? [y,n]"
+  ask_yes_or_no
+end
+
+def boolean_value(var)
+  return TRUE if (var == TRUE || ( var.is_a?(String) && var.downcase == 'true' ))
+  FALSE
+end
+
+def git_tag(version)
+  begin
+    sh "git tag -s -u #{@gpg_key} -m '#{version}' #{version}"
+  rescue Exception => e
+    STDERR.puts e
+    STDERR.puts "Unable to tag repo at #{version}"
+    exit 1
+  end
+end
+

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

@@ -25,38 +25,40 @@ rescue
 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']
-  @certificate_pem= ENV['CERT_PEM']     || @pkg_defaults['certificate_pem']
-  @privatekey_pem = ENV['PRIVATE_PEM']  || @pkg_defaults['privatekey_pem']
-  @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']
-  @ips_repo       = @pkg_defaults['ips_repo']
-  @ips_store      = @pkg_defaults['ips_store']
-  @ips_host       = @pkg_defaults['ips_host']
+  @pkg_defaults    ||= YAML.load_file('ext/build_defaults.yaml')
+  @sign_tar        = boolean_value( ENV['SIGN_TAR'] || @pkg_defaults['sign_tar']  )
+  @build_gem       = boolean_value( ENV['GEM']      || @pkg_defaults['build_gem'] )
+  @build_dmg       = boolean_value( ENV['DMG']      || @pkg_defaults['build_dmg'] )
+  @build_ips       = boolean_value( ENV['IPS']      || @pkg_defaults['build_ips'] )
+  @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']
+  @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']
+  @certificate_pem = ENV['CERT_PEM']     || @pkg_defaults['certificate_pem']
+  @privatekey_pem  = ENV['PRIVATE_PEM']  || @pkg_defaults['privatekey_pem']
+  @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']
+  @ips_repo        = @pkg_defaults['ips_repo']
+  @ips_store       = @pkg_defaults['ips_store']
+  @ips_host        = @pkg_defaults['ips_host']
 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
-@ipsversion   ||= get_ips_version
-@debversion   ||= get_debversion
-@origversion  ||= get_origversion
-@rpmversion   ||= get_rpmversion
-@rpmrelease   ||= get_rpmrelease
+@build_root      ||= Dir.pwd
+@version         ||= get_dash_version
+@gemversion      ||= get_dot_version
+@ipsversion      ||= get_ips_version
+@debversion      ||= get_debversion
+@origversion     ||= get_origversion
+@rpmversion      ||= get_rpmversion
+@rpmrelease      ||= get_rpmrelease
+@keychain_loaded ||= FALSE

data/ext/packaging/tasks/apple.rake

@@ -182,7 +182,7 @@ def pack_source
   end
 end
 
-if @build_dmg or @build_dmg == 'TRUE' or @build_dmg == 'true'
+if @build_dmg
   namespace :package do
     desc "Task for building an Apple Package"
     task :apple => [:setup] do

data/ext/packaging/tasks/deb.rake

@@ -5,17 +5,18 @@ def pdebuild args
   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
+  rescue Exception => e
+    puts e
+    handle_method_failure('pdebuild', args)
   end
 end
 
 def update_cow(cow, is_rc = nil)
   ENV['FOSS_DEVEL'] = is_rc
+  ENV['PATH'] = "/usr/sbin:#{ENV['PATH']}"
   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']}"
+    sh "sudo -E /usr/sbin/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
@@ -49,19 +50,16 @@ task :build_deb, :deb_command, :cow, :devel do |t,args|
   work_dir  = get_temp
   dest_dir  = "#{@build_root}/pkg/deb/#{cow.split('-')[1] unless cow.nil?}"
   check_tool(deb_build)
+  update_cow(cow, devel)
   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
+    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}"
     rm_rf work_dir
   end
 end

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
@@ -44,8 +44,11 @@ if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
   end
 
   namespace :package do
-    Gem::PackageTask.new(spec) do |pkg|
-      pkg.need_tar_gz = true
+    gem_task = Gem::PackageTask.new(spec)
+    desc "Build a gem"
+    task :gem => [ "clean" ] do
+      gem_task.define
+      Rake::Task[:gem].invoke
     end
   end
 end

data/ext/packaging/tasks/ips.rake

@@ -1,78 +1,80 @@
-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"
+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
+      # Ensure that our manifest is sane.
+      task :lint => :license do
+        x %[pkglint #{workdir}/#{@name}.p5m]
+      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 :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 do
-      x %[pkg install -nv -g #{artifact} #{@name}@#{@ipsversion}]
+      task :dry_install do
+        x %[pkg install -nv -g #{artifact} #{@name}@#{@ipsversion}]
+      end
     end
-  end
 
-  desc "Creates an ips version"
-  task :ips do
-    Rake::Task['package:ips:prepare'].invoke
-    Rake::Task['package:ips:package'].invoke
-  end
+    desc "Creates an ips version"
+    task :ips do
+      Rake::Task['package:ips:prepare'].invoke
+      Rake::Task['package:ips:package'].invoke
+    end
 
+  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,56 @@
-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
+    load_keychain if has_tool('keychain')
+    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
+    load_keychain if has_tool('keychain')
+    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
 
+
+