puppet 2.7.23 → 2.7.24

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

@@ -32,30 +32,31 @@ end
 # variables are called out specifically because they are likely to require
 # overriding in at least some cases.
 #
-@build.sign_tar        = boolean_value(ENV['SIGN_TAR']) if ENV['SIGN_TAR']
-@build.build_gem       = boolean_value(ENV['GEM'])      if ENV['GEM']
-@build.build_dmg       = boolean_value(ENV['DMG'])      if ENV['DMG']
-@build.build_ips       = boolean_value(ENV['IPS'])      if ENV['IPS']
-@build.build_doc       = boolean_value(ENV['DOC'])      if ENV['DOC']
-@build.build_pe        = boolean_value(ENV['PE_BUILD']) if ENV['PE_BUILD']
-@build.debug           = boolean_value(ENV['DEBUG'])    if ENV['DEBUG']
-@build.default_cow     = ENV['COW']                     if ENV['COW']
-@build.cows            = ENV['COW']                     if ENV['COW']
-@build.pbuild_conf     = ENV['PBUILDCONF']              if ENV['PBUILDCONF']
-@build.packager        = ENV['PACKAGER']                if ENV['PACKAGER']
-@build.default_mock    = ENV['MOCK']                    if ENV['MOCK']
-@build.final_mocks     = ENV['MOCK']                    if ENV['MOCK']
-@build.rc_mocks        = ENV['MOCK']                    if ENV['MOCK']
-@build.gpg_name        = ENV['GPG_NAME']                if ENV['GPG_NAME']
-@build.gpg_key         = ENV['GPG_KEY']                 if ENV['GPG_KEY']
-@build.certificate_pem = ENV['CERT_PEM']                if ENV['CERT_PEM']
-@build.privatekey_pem  = ENV['PRIVATE_PEM']             if ENV['PRIVATE_PEM']
-@build.yum_host        = ENV['YUM_HOST']                if ENV['YUM_HOST']
-@build.yum_repo_path   = ENV['YUM_REPO']                if ENV['YUM_REPO']
-@build.apt_host        = ENV['APT_HOST']                if ENV['APT_HOST']
-@build.apt_repo_path   = ENV['APT_REPO']                if ENV['APT_REPO']
-@build.pe_version      = ENV['PE_VER']                  if ENV['PE_VER']
-@build.notify          = ENV['NOTIFY']                  if ENV['NOTIFY']
+@build.sign_tar            = boolean_value(ENV['SIGN_TAR'])          if ENV['SIGN_TAR']
+@build.build_gem           = boolean_value(ENV['GEM'])               if ENV['GEM']
+@build.build_dmg           = boolean_value(ENV['DMG'])               if ENV['DMG']
+@build.build_ips           = boolean_value(ENV['IPS'])               if ENV['IPS']
+@build.build_doc           = boolean_value(ENV['DOC'])               if ENV['DOC']
+@build.build_pe            = boolean_value(ENV['PE_BUILD'])          if ENV['PE_BUILD']
+@build.debug               = boolean_value(ENV['DEBUG'])             if ENV['DEBUG']
+@build.update_version_file = ENV['NEW_STYLE_PACKAGE']                if ENV['NEW_STYLE_PACKAGE']
+@build.default_cow         = ENV['COW']                              if ENV['COW']
+@build.cows                = ENV['COW']                              if ENV['COW']
+@build.pbuild_conf         = ENV['PBUILDCONF']                       if ENV['PBUILDCONF']
+@build.packager            = ENV['PACKAGER']                         if ENV['PACKAGER']
+@build.default_mock        = ENV['MOCK']                             if ENV['MOCK']
+@build.final_mocks         = ENV['MOCK']                             if ENV['MOCK']
+@build.rc_mocks            = ENV['MOCK']                             if ENV['MOCK']
+@build.gpg_name            = ENV['GPG_NAME']                         if ENV['GPG_NAME']
+@build.gpg_key             = ENV['GPG_KEY']                          if ENV['GPG_KEY']
+@build.certificate_pem     = ENV['CERT_PEM']                         if ENV['CERT_PEM']
+@build.privatekey_pem      = ENV['PRIVATE_PEM']                      if ENV['PRIVATE_PEM']
+@build.yum_host            = ENV['YUM_HOST']                         if ENV['YUM_HOST']
+@build.yum_repo_path       = ENV['YUM_REPO']                         if ENV['YUM_REPO']
+@build.apt_host            = ENV['APT_HOST']                         if ENV['APT_HOST']
+@build.apt_repo_path       = ENV['APT_REPO']                         if ENV['APT_REPO']
+@build.pe_version          = ENV['PE_VER']                           if ENV['PE_VER']
+@build.notify              = ENV['NOTIFY']                           if ENV['NOTIFY']
 
 ##
 # These parameters are either generated dynamically by the project, or aren't
@@ -89,6 +90,20 @@ end
 # @tar_host isn't set.
 @build.tar_host ||= @build.yum_host
 
+# Though undocumented, we had specified gem_devel_dependencies as an allowed
+# parameter for @build, and it was supposed to correspond with
+# gem_development_dependencies in a gem spec. It was dumb to call it 'devel'
+# instead of 'development', which would have been a cleaner mapping. Here, we
+# deprecate this.
+if @build.gem_devel_dependencies
+  @build.gem_development_dependencies = @build.gem_devel_dependencies
+  warn "
+  DEPRECATED, 9-Nov-2013: 'gem_devel_dependencies' has been replaced with
+  'gem_development_dependencies.' Please update this field in your
+  project_data.yaml
+  "
+end
+
 if @build.debug
   @build.print_params
 end

data/ext/packaging/tasks/20_setupextravars.rake

@@ -10,8 +10,7 @@ namespace :pl do
     unless ENV['PARAMS_FILE'] && ENV['PARAMS_FILE'] != ''
       tempdir = args.tempdir
       raise "pl:load_extras requires a directory containing extras data" if tempdir.nil?
-      @build.set_params_from_file("#{tempdir}/team/#{@build.builder_data_file}")
-      @build.set_params_from_file("#{tempdir}/project/#{@build.builder_data_file}")
+      @build.set_params_from_file("#{tempdir}/#{@build.builder_data_file}")
       # Overrideable
       @build.build_pe   = boolean_value(ENV['PE_BUILD']) if ENV['PE_BUILD']
       # right now, puppetdb is the only one to override these, because it needs
@@ -27,9 +26,6 @@ namespace :pl do
     end
   end
 end
-if @build.team == 'release'
-  @build.benchmark = TRUE
-end
 
 ##
 # Starting with puppetdb, we'll maintain two separate build-data files, one for

data/ext/packaging/tasks/30_metrics.rake

@@ -1,41 +1,33 @@
-if @build.benchmark
-  @metrics          = []
-  @pg_major_version = nil
-  @db_table         = 'metrics'
-
-  def add_metrics args
-    @metrics << {
-      :bench      => args[:bench],
-      :dist       => ( args[:dist]        || ENV['DIST']       ),
-      :pkg        => ( args[:pkg]         || @build.project    ),
-      :version    => ( args[:version]     || @build.version    ),
-      :pe_version => ( args[:pe_version]  || @build.pe_version ),
-      :date       => ( args[:date]        || timestamp         ),
-      :who        => ( args[:who]         || ENV['USER']       ),
-      :where      => ( args[:where]       || hostname          )
-    }
-  end
+@metrics          = []
+def add_shipped_metrics args
+  @metrics << {
+    :type         => 'shipped',
+    :package      => ( args[:package]             || @build.project    ),
+    :version      => ( args[:version]             || @build.version    ),
+    :pe_version   => ( args[:pe_version]          || @build.pe_version ),
+    :is_rc        => ( args[:is_rc]               || false             ),
+  }
+end
 
-  def post_metrics
-    if psql = find_tool('psql')
-      ENV["PGCONNECT_TIMEOUT"]="10"
+def post_shipped_metrics
+  require 'net/http'
+  @metrics.each do |metric|
+    type         = metric[:type]
+    package      = metric[:package]
+    version      = metric[:version]
+    pe_version   = metric[:pe_version]
+    is_rc        = metric[:is_rc]
 
-      @metrics.each do |metric|
-        date        = metric[:date]
-        pkg         = metric[:pkg]
-        dist        = metric[:dist]
-        bench       = metric[:bench]
-        who         = metric[:who]
-        where       = metric[:where]
-        version     = metric[:version]
-        pe_version  = metric[:pe_version]
-        @pg_major_version ||= %x{/usr/bin/psql --version}.match(/psql \(PostgreSQL\) (\d)\..*/)[1].to_i
-        no_pass_fail = "-w" if @pg_major_version > 8
-        %x{#{psql} #{no_pass_fail} -c "INSERT INTO #{@db_table} \
-        (date, package, dist, build_time, build_user, build_loc, version, pe_version) \
-        VALUES ('#{date}', '#{pkg}', '#{dist}', #{bench}, '#{who}', '#{where}', '#{version}', '#{pe_version}')"}
-      end
-      @metrics = []
-    end
+    uri = URI(@build.metrics_url)
+    res = Net::HTTP.post_form(
+      uri,
+      {
+        'type'          => type,
+        'package'       => package,
+        'version'       => version,
+        'pe_version'    => pe_version,
+        'is_rc'         => is_rc,
+      }
+    )
   end
 end

data/ext/packaging/tasks/apple.rake

@@ -32,7 +32,8 @@ task :setup do
   @build_date            = Time.new.strftime("%Y-%m-%dT%H:%M:%SZ")
   @apple_bindir          = '/usr/bin'
   @apple_sbindir         = '/usr/sbin'
-  @apple_libdir          = '/usr/lib/ruby/site_ruby/1.8'
+  @apple_libdir          = '/usr/lib/ruby/site_ruby'
+  @apple_old_libdir      = '/usr/lib/ruby/site_ruby/1.8'
   @apple_docdir          = '/usr/share/doc'
 end
 
@@ -68,6 +69,10 @@ def make_directory_tree
     erb 'ext/osx/prototype.plist.erb', "#{@scratch}/prototype.plist"
   end
 
+  if File.exists?('ext/packaging/static_artifacts/PackageInfo.plist')
+    cp 'ext/packaging/static_artifacts/PackageInfo.plist', "#{@scratch}/PackageInfo.plist"
+  end
+
 end
 
 # method:        build_dmg
@@ -86,7 +91,6 @@ def build_dmg
   dmg_format        = "#{dmg_format_code} #{dmg_format_option}"
   dmg_file          = "#{@title}.dmg"
   package_file      = "#{@title}.pkg"
-  package_target_os = '10.4'
 
   # Build .pkg file
   system("sudo #{PKGBUILD} --root #{@working_tree['working']} \
@@ -95,6 +99,7 @@ def build_dmg
     --version #{@version} \
     --install-location / \
     --ownership preserve \
+    --info #{@scratch}/PackageInfo.plist \
     #{@working_tree['payload']}/#{package_file}")
 
   # Build .dmg file
@@ -235,10 +240,7 @@ if @build.build_dmg
         pack_source
         build_dmg
       end
-      if @build.benchmark
-        add_metrics({ :dist => 'osx', :bench => bench })
-        post_metrics
-      end
+    puts "Finished building in: #{bench}"
     end
   end
 

data/ext/packaging/tasks/build.rake

@@ -38,11 +38,13 @@ module Build
                       :gem_dependencies,
                       :gem_description,
                       :gem_devel_dependencies,
+                      :gem_development_dependencies,
                       :gem_excludes,
                       :gem_executables,
                       :gem_files,
                       :gem_forge_project,
                       :gem_name,
+                      :gem_platform_dependencies,
                       :gem_rdoc_options,
                       :gem_require_path,
                       :gem_runtime_dependencies,
@@ -64,6 +66,7 @@ module Build
                       :jenkins_packaging_job,
                       :jenkins_repo_path,
                       :metrics,
+                      :metrics_url,
                       :name,
                       :notify,
                       :project,
@@ -92,8 +95,11 @@ module Build
                       :tarball_path,
                       :task,
                       :team,
+                      :templates,
+                      :update_version_file,
                       :version,
                       :version_file,
+                      :version_strategy,
                       :yum_host,
                       :yum_repo_path]
 

data/ext/packaging/tasks/deb.rake

@@ -57,8 +57,7 @@ task :build_deb, :deb_command, :cow do |t,args|
       rm_rf work_dir
     end
   end
-  # See 30_metrics.rake to see what this is doing
-  add_metrics({ :dist => ENV['DIST'], :bench => bench }) if @build.benchmark
+  puts "Finished building in: #{bench}"
 end
 
 namespace :package do
@@ -73,7 +72,6 @@ namespace :pl do
   task :deb => "package:tar"  do
     check_var('PE_VER', @build.pe_version) if @build.build_pe
     Rake::Task[:build_deb].invoke('pdebuild', @build.default_cow)
-    post_metrics if @build.benchmark
   end
 
   desc "Create debs from this git repository using all cows specified in build_defaults yaml"
@@ -84,6 +82,5 @@ namespace :pl do
       Rake::Task[:build_deb].reenable
       Rake::Task[:build_deb].invoke('pdebuild', cow)
     end
-    post_metrics if @build.benchmark
   end
 end

data/ext/packaging/tasks/fetch.rake

@@ -29,20 +29,30 @@ namespace :pl do
     rm_rf "#{ENV['HOME']}/.packaging" if File.directory?("#{ENV['HOME']}/.packaging")
     # Touch the .packaging file which is allows packaging to present remote tasks
     touch "#{ENV['HOME']}/.packaging"
-    tempdir = get_temp
-    mkdir_pr("#{tempdir}/team", "#{tempdir}/project")
-    begin
-      if dist = el_version
-        if dist.to_i < 6
-          flag = "-k"
+    if dist = el_version
+      if dist.to_i < 6
+        flag = "-k"
+      end
+    end
+    [project_data_url, team_data_url].each do |url|
+      begin
+        tempdir = get_temp
+        %x{curl --fail --silent #{flag} #{url}/#{@build.builder_data_file} > #{tempdir}/#{@build.builder_data_file}}
+        case $?.exitstatus
+        when 0
+          invoke_task("pl:load_extras", tempdir)
+        when 22
+          if url == team_data_url
+            fail "Could not load team extras data from #{url}. This should not normally happen"
+          else
+            puts "No build data file for #{@build.project}, skipping load of extra build data."
+          end
+        else
+          fail "There was an error fetching the builder extras data from #{url}."
         end
+      ensure
+        rm_rf tempdir
       end
-      sh "curl #{flag} #{project_data_url}/#{@build.builder_data_file} > #{tempdir}/project/#{@build.builder_data_file}"
-      sh "curl #{flag} #{team_data_url}/#{@build.builder_data_file} > #{tempdir}/team/#{@build.builder_data_file}"
-      invoke_task("pl:load_extras", tempdir)
-      rm_rf(tempdir)
-    rescue
-      fail "There was an error fetching the builder extras data."
     end
   end
 end

data/ext/packaging/tasks/gem.rake

@@ -24,50 +24,103 @@ if @build.build_gem
     gem_files = gem_files - gem_excludes_file_list
   end
 
-  spec = Gem::Specification.new do |s|
-    s.name = @build.project                                     unless @build.project.nil?
-    s.name = @build.gem_name                                    unless @build.gem_name.nil?
-    s.version = @build.gemversion                               unless @build.gemversion.nil?
-    s.author = @build.author                                    unless @build.author.nil?
-    s.email = @build.email                                      unless @build.email.nil?
-    s.homepage = @build.homepage                                unless @build.homepage.nil?
-    s.summary = @build.summary                                  unless @build.summary.nil?
-    s.summary = @build.gem_summary                              unless @build.gem_summary.nil?
-    s.description = @build.description                          unless @build.description.nil?
-    s.description = @build.gem_description                      unless @build.gem_description.nil?
-    s.files = glob_gem_files                                    unless glob_gem_files.nil?
-    s.executables = @build.gem_executables                      unless @build.gem_executables.nil?
-    s.require_path = @build.gem_require_path                    unless @build.gem_require_path.nil?
-    s.test_files = FileList[@build.gem_test_files.split(' ')]   unless @build.gem_test_files.nil?
-    s.rubyforge_project = @build.gem_forge_project              unless @build.gem_forge_project.nil?
+  def add_gem_dependency(opts = {})
+    spec = opts[:spec]
+    version = opts[:version]
+    type = opts[:type].to_s
+    gem = opts[:gem].to_s
+    if opts[:version].nil? or opts[:version].empty?
+      spec.send("add_#{type}_dependency".to_sym, gem)
+    else
+      spec.send("add_#{type}_dependency".to_sym, gem, version)
+    end
+    spec
+  end
+
+  def create_default_gem_spec
+    spec = Gem::Specification.new do |s|
+      s.name = @build.project                                     unless @build.project.nil?
+      s.name = @build.gem_name                                    unless @build.gem_name.nil?
+      s.version = @build.gemversion                               unless @build.gemversion.nil?
+      s.author = @build.author                                    unless @build.author.nil?
+      s.email = @build.email                                      unless @build.email.nil?
+      s.homepage = @build.homepage                                unless @build.homepage.nil?
+      s.summary = @build.summary                                  unless @build.summary.nil?
+      s.summary = @build.gem_summary                              unless @build.gem_summary.nil?
+      s.description = @build.description                          unless @build.description.nil?
+      s.description = @build.gem_description                      unless @build.gem_description.nil?
+      s.files = glob_gem_files                                    unless glob_gem_files.nil?
+      s.executables = @build.gem_executables                      unless @build.gem_executables.nil?
+      s.require_path = @build.gem_require_path                    unless @build.gem_require_path.nil?
+      s.test_files = FileList[@build.gem_test_files.split(' ')]   unless @build.gem_test_files.nil?
+      s.rubyforge_project = @build.gem_forge_project              unless @build.gem_forge_project.nil?
+      @build.gem_rdoc_options.each do |option|
+        s.rdoc_options << option
+      end unless @build.gem_rdoc_options.nil?
+    end
 
     @build.gem_runtime_dependencies.each do |gem, version|
-      s.add_runtime_dependency("#{gem}", "#{version}") unless (version.nil? or version.empty?)
-      s.add_runtime_dependency("#{gem}") if (version.nil? or version.empty?)
+      spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :runtime)
     end unless @build.gem_runtime_dependencies.nil?
 
-    @build.gem_devel_dependencies.each do |gem, version|
-      s.add_devel_dependency("#{gem}", "#{version}") unless (version.nil? or version.empty?)
-      s.add_devel_dependency("#{gem}") if (version.nil? or version.empty?)
-    end unless @build.gem_devel_dependencies.nil?
+    @build.gem_development_dependencies.each do |gem, version|
+      spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :development)
+    end unless @build.gem_development_dependencies.nil?
+    spec
+  end
+
+  def create_gem(spec, gembuilddir)
+    gem_task = Gem::PackageTask.new(spec)
+    bench = Benchmark.realtime do
+      gem_task.define
+      Rake::Task[:gem].reenable
+      Rake::Task[:gem].invoke
+      rm_r File.join("pkg", gembuilddir)
+    end
+    puts "Finished building in: #{bench}"
+  end
 
-    @build.gem_rdoc_options.each do |option|
-      s.rdoc_options << option
-    end unless @build.gem_rdoc_options.nil?
+  def create_default_gem
+    spec = create_default_gem_spec
+    create_gem(spec, "#{@build.project}-#{@build.gemversion}")
+  end
+
+  def unknown_gems_platform?(platform)
+    return true if platform.os == "unknown"
+    false
+  end
+
+  def create_platform_specific_gems
+    @build.gem_platform_dependencies.each do |platform, dependency_hash|
+      spec = create_default_gem_spec
+      pf = Gem::Platform.new(platform)
+      fail "
+        Platform: '#{platform}' is not recognized by rubygems.
+        This is probably an erroneous 'gem_platform_dependencies' entry!" if unknown_gems_platform?(pf)
+      spec.platform = pf
+      dependency_hash.each do |type, gems|
+        t = case type
+        when "gem_runtime_dependencies"
+          "runtime"
+        when "gem_development_dependencies"
+          "development"
+        else
+          fail "Platform specific gem dependency type must be 'gem_runtime_dependencies' or 'gem_development_dependencies', not '#{type}'"
+        end
+        gems.each do |gem, version|
+          spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => t)
+        end
+      end
+      create_gem(spec, "#{@build.project}-#{@build.gemversion}-#{platform}")
+    end
   end
 
   namespace :package do
-    gem_task = Gem::PackageTask.new(spec)
-    desc "Build a gem"
+    desc "Build a gem - All gems if platform specific"
     task :gem => [ "clean" ] do
-      bench = Benchmark.realtime do
-        gem_task.define
-        Rake::Task[:gem].invoke
-        rm_rf "pkg/#{@build.project}-#{@build.gemversion}"
-      end
-      if @build.benchmark
-        add_metrics({ :dist => 'gem', :bench => bench })
-        post_metrics
+      create_default_gem
+      if @build.gem_platform_dependencies
+        create_platform_specific_gems
       end
     end
   end