packaging 0.99.7 → 0.99.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 46e55ad6f9e33b16ba9d656d472bc04474d552a3706b71a27bdd3fbe6a7f7b8f
-  data.tar.gz: 19d40ca8ea8133dcedcd5e6fd88d8b3147931b40502d090642a3ff20b119a0b3
+SHA1:
+  metadata.gz: 4cbd88661ae8bf7e3d08d448d27d95a8a64d20d1
+  data.tar.gz: 54d14387f8a01f1fc30634ae69041c870ab44beb
 SHA512:
-  metadata.gz: bf847e28588f88f047ad148887a1e935c63be3d460b8e01e5e770f182acaf6eb474172753d5768e1b3680e5bd9decdc1f153050438d110db3aa7a0e8eb85a9d0
-  data.tar.gz: d0860a017f6374ef1e67f0bf99aee1bc28d38b05a0411c8380f13e85004d6b7b5e33c7d0c51cecdaa5e4c4a0b78483211decb61526410e6fc2c343cc90521ac9
+  metadata.gz: 8f71ab93cb1fbeeecf1aa75eee13c792012b61d7599ceaeb6528a9917dad77dea6c6d695bd4a37096f97926f555808a9ac423048713338dea988ddaddbebf8ab
+  data.tar.gz: 8aaea48f7b0a9bcd16d5550fe89e5cf6d0ace3dc021d1c3af7b70e9b10a1291bb13a59e9acb89fc1890a821f332da548b97e2ee5478928dfab3ad3db1294bb79

data/lib/packaging/platforms.rb

@@ -61,7 +61,7 @@ module Pkg
       'debian' => {
         '7' => {
           codename: 'wheezy',
-          architectures: ['i386', 'amd64'],
+          architectures: ['amd64', 'i386'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,
@@ -69,7 +69,7 @@ module Pkg
         },
         '8' => {
           codename: 'jessie',
-          architectures: ['i386', 'amd64', 'powerpc'],
+          architectures: ['amd64', 'i386', 'powerpc'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,
@@ -77,7 +77,7 @@ module Pkg
         },
         '9' => {
           codename: 'stretch',
-          architectures: ['i386', 'amd64'],
+          architectures: ['amd64', 'i386'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,
@@ -85,7 +85,7 @@ module Pkg
         },
         '10' => {
           codename: 'buster',
-          architectures: ['i386', 'amd64'],
+          architectures: ['amd64', 'i386'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,
@@ -95,7 +95,7 @@ module Pkg
 
       'el' => {
         '5' => {
-          architectures: ['i386', 'x86_64'],
+          architectures: ['x86_64', 'i386'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -103,7 +103,7 @@ module Pkg
           repo: true,
         },
         '6' => {
-          architectures: ['i386', 'x86_64', 's390x'],
+          architectures: ['x86_64', 'i386', 's390x'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -130,7 +130,7 @@ module Pkg
 
       'fedora' => {
         'f25' => {
-          architectures: ['i386', 'x86_64'],
+          architectures: ['x86_64', 'i386'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -162,7 +162,7 @@ module Pkg
           repo: true,
         },
         '25' => {
-          architectures: ['i386', 'x86_64'],
+          architectures: ['x86_64', 'i386'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -231,7 +231,7 @@ module Pkg
 
       'sles' => {
         '11' => {
-          architectures: ['i386', 'x86_64', 's390x'],
+          architectures: ['x86_64', 'i386', 's390x'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
@@ -264,7 +264,7 @@ module Pkg
       'ubuntu' => {
         '14.04' => {
           codename: 'trusty',
-          architectures: ['i386', 'amd64'],
+          architectures: ['amd64', 'i386'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,
@@ -272,7 +272,7 @@ module Pkg
         },
         '16.04' => {
           codename: 'xenial',
-          architectures: ['i386', 'amd64', 'ppc64el'],
+          architectures: ['amd64', 'i386', 'ppc64el'],
           source_architecture: 'source',
           package_format: 'deb',
           source_package_formats: DEBIAN_SOURCE_FORMATS,

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -1 +1 @@
-spec/fixtures/config/ext/../params.yaml
+../params.yaml

data/spec/fixtures/config/ext/project_data.yaml

@@ -1 +1 @@
-spec/fixtures/config/ext/../params.yaml
+../params.yaml

data/spec/lib/packaging/paths_spec.rb

@@ -6,7 +6,7 @@ describe 'Pkg::Paths' do
       ['artifacts/aix/6.1/PC1/ppc/puppet-agent-5.1.0.79.g782e03c-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
       ['pkg/el-7-x86_64/puppet-agent-4.99.0-1.el7.x86_64.rpm', 'el', '7'] => 'x86_64',
       ['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
-      ['http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial', 'ubuntu', '16.04'] => 'i386',
+      ['http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial', 'ubuntu', '16.04'] => 'amd64',
       ['pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb', 'ubuntu', '16.04'] => 'amd64',
       ['artifacts/deb/jessie/PC1/puppetserver_5.0.1.master.orig.tar.gz', 'debian', '8'] => 'source',
       ['artifacts/el/6/PC1/SRPMS/puppetserver-5.0.1.master-0.1SNAPSHOT.2017.08.18T0951.el6.src.rpm', 'el', '6'] => 'SRPMS'
@@ -27,9 +27,9 @@ describe 'Pkg::Paths' do
       'artifacts/el/6/products/x86_64/pe-r10k-2.5.4.3-1.el6.x86_64.rpm' => 'el-6-x86_64',
       'pkg/deb/trusty/pe-r10k_2.5.4.3-1trusty_amd64.deb' => 'ubuntu-14.04-amd64',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.noarch.rpm' => 'el-6-i386',
-      'pkg/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1_all.deb' => 'ubuntu-16.04-i386',
-      'pkg/pe/deb/xenial/super-trusty-package_1.0.0-1puppet1_all.deb' => 'ubuntu-16.04-i386',
-      'artifacts/deb/wheezy/PC1/puppetdb_4.3.1-1puppetlabs1_all.deb' => 'debian-7-i386',
+      'pkg/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1_all.deb' => 'ubuntu-16.04-amd64',
+      'pkg/pe/deb/xenial/super-trusty-package_1.0.0-1puppet1_all.deb' => 'ubuntu-16.04-amd64',
+      'artifacts/deb/wheezy/PC1/puppetdb_4.3.1-1puppetlabs1_all.deb' => 'debian-7-amd64',
       'pkg/el/7/PC1/x86_64/puppetdb-4.3.1-1.el7.noarch.rpm' => 'el-7-x86_64',
       'pkg/apple/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
       'artifacts/mac/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
@@ -37,7 +37,7 @@ describe 'Pkg::Paths' do
       'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb' => 'cumulus-2.2-amd64',
       'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
       'artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz' => 'ubuntu-16.04-source',
-      'http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial' => 'ubuntu-16.04-i386',
+      'http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial' => 'ubuntu-16.04-amd64',
       'http://builds.puppetlabs.lan/puppet-agent/0ce4e6a0448366e01537323bbab77f834d7035c7/repos/el/6/PC1/x86_64/' => 'el-6-x86_64',
       'http://builds.puppetlabs.lan/puppet-agent/0ce4e6a0448366e01537323bbab77f834d7035c7/repos/el/6/PC1/x86_64/' => 'el-6-x86_64',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.src.rpm' => 'el-6-SRPMS',

data/tasks/gem.rake

@@ -1,146 +1,149 @@
-if Pkg::Config.build_gem
-  require 'rubygems/package_task'
+require 'rubygems/package_task'
 
-  def glob_gem_files
-    gem_files = []
-    gem_excludes_file_list = []
-    gem_excludes_raw = Pkg::Config.gem_excludes.nil? ? [] : Pkg::Config.gem_excludes.split(' ')
-    gem_excludes_raw << 'ext/packaging'
-    gem_excludes_raw << 'pkg'
-    gem_excludes_raw.each do |exclude|
-      if File.directory?(exclude)
-        gem_excludes_file_list += FileList["#{exclude}/**/*"]
-      else
-        gem_excludes_file_list << exclude
-      end
-    end
-    files = FileList[Pkg::Config.gem_files.split(' ')]
-    files.each do |file|
-      if File.directory?(file)
-        gem_files += FileList["#{file}/**/*"]
-      else
-        gem_files << file
-      end
+def glob_gem_files
+  gem_files = []
+  gem_excludes_file_list = []
+  gem_excludes_raw = Pkg::Config.gem_excludes.nil? ? [] : Pkg::Config.gem_excludes.split(' ')
+  gem_excludes_raw << 'ext/packaging'
+  gem_excludes_raw << 'pkg'
+  gem_excludes_raw.each do |exclude|
+    if File.directory?(exclude)
+      gem_excludes_file_list += FileList["#{exclude}/**/*"]
+    else
+      gem_excludes_file_list << exclude
     end
-    gem_files -= gem_excludes_file_list
   end
-
-  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)
+  files = FileList[Pkg::Config.gem_files.split(' ')]
+  files.each do |file|
+    if File.directory?(file)
+      gem_files += FileList["#{file}/**/*"]
     else
-      spec.send("add_#{type}_dependency".to_sym, gem, version)
+      gem_files << file
     end
-    spec
   end
+  gem_files -= gem_excludes_file_list
+end
 
-  def create_default_gem_spec
-    spec = Gem::Specification.new do |s|
-      s.name = Pkg::Config.project                                     unless Pkg::Config.project.nil?
-      s.name = Pkg::Config.gem_name                                    unless Pkg::Config.gem_name.nil?
-      s.version = Pkg::Config.gemversion                               unless Pkg::Config.gemversion.nil?
-      s.author = Pkg::Config.author                                    unless Pkg::Config.author.nil?
-      s.email = Pkg::Config.email                                      unless Pkg::Config.email.nil?
-      s.homepage = Pkg::Config.homepage                                unless Pkg::Config.homepage.nil?
-      s.summary = Pkg::Config.summary                                  unless Pkg::Config.summary.nil?
-      s.summary = Pkg::Config.gem_summary                              unless Pkg::Config.gem_summary.nil?
-      s.description = Pkg::Config.description                          unless Pkg::Config.description.nil?
-      s.description = Pkg::Config.gem_description                      unless Pkg::Config.gem_description.nil?
-      s.files = glob_gem_files                                         unless glob_gem_files.nil?
-      s.executables = Pkg::Config.gem_executables                      unless Pkg::Config.gem_executables.nil?
-      s.require_path = Pkg::Config.gem_require_path                    unless Pkg::Config.gem_require_path.nil?
-      s.required_ruby_version = Pkg::Config.gem_required_ruby_version  unless Pkg::Config.gem_required_ruby_version.nil?
-      s.required_rubygems_version = Pkg::Config.gem_required_rubygems_version unless Pkg::Config.gem_required_rubygems_version.nil?
-      s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]   unless Pkg::Config.gem_test_files.nil?
-      s.rubyforge_project = Pkg::Config.gem_forge_project              unless Pkg::Config.gem_forge_project.nil?
-      Pkg::Config.gem_rdoc_options.each do |option|
-        s.rdoc_options << option
-      end unless Pkg::Config.gem_rdoc_options.nil?
-    end
-
-    Pkg::Config.gem_runtime_dependencies.each do |gem, version|
-      spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :runtime)
-    end unless Pkg::Config.gem_runtime_dependencies.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
 
-    Pkg::Config.gem_development_dependencies.each do |gem, version|
-      spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :development)
-    end unless Pkg::Config.gem_development_dependencies.nil?
-    spec
+def create_default_gem_spec
+  spec = Gem::Specification.new do |s|
+    s.name = Pkg::Config.project                                     unless Pkg::Config.project.nil?
+    s.name = Pkg::Config.gem_name                                    unless Pkg::Config.gem_name.nil?
+    s.version = Pkg::Config.gemversion                               unless Pkg::Config.gemversion.nil?
+    s.author = Pkg::Config.author                                    unless Pkg::Config.author.nil?
+    s.email = Pkg::Config.email                                      unless Pkg::Config.email.nil?
+    s.homepage = Pkg::Config.homepage                                unless Pkg::Config.homepage.nil?
+    s.summary = Pkg::Config.summary                                  unless Pkg::Config.summary.nil?
+    s.summary = Pkg::Config.gem_summary                              unless Pkg::Config.gem_summary.nil?
+    s.description = Pkg::Config.description                          unless Pkg::Config.description.nil?
+    s.description = Pkg::Config.gem_description                      unless Pkg::Config.gem_description.nil?
+    s.files = glob_gem_files                                         unless glob_gem_files.nil?
+    s.executables = Pkg::Config.gem_executables                      unless Pkg::Config.gem_executables.nil?
+    s.require_path = Pkg::Config.gem_require_path                    unless Pkg::Config.gem_require_path.nil?
+    s.required_ruby_version = Pkg::Config.gem_required_ruby_version  unless Pkg::Config.gem_required_ruby_version.nil?
+    s.required_rubygems_version = Pkg::Config.gem_required_rubygems_version unless Pkg::Config.gem_required_rubygems_version.nil?
+    s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]   unless Pkg::Config.gem_test_files.nil?
+    s.rubyforge_project = Pkg::Config.gem_forge_project              unless Pkg::Config.gem_forge_project.nil?
+    Pkg::Config.gem_rdoc_options.each do |option|
+      s.rdoc_options << option
+    end unless Pkg::Config.gem_rdoc_options.nil?
   end
 
-  def create_gem(spec, gembuilddir)
-    gem_files = glob_gem_files + FileList[(Pkg::Config.gem_test_files || '').split(' ')]
-    workdir = File.join(Pkg::Util::File.mktemp)
+  Pkg::Config.gem_runtime_dependencies.each do |gem, version|
+    spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :runtime)
+  end unless Pkg::Config.gem_runtime_dependencies.nil?
 
-    bench = Benchmark.realtime do
-      Pkg::Util::File.install_files_into_dir(gem_files, workdir)
+  Pkg::Config.gem_development_dependencies.each do |gem, version|
+    spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :development)
+  end unless Pkg::Config.gem_development_dependencies.nil?
+  spec
+end
 
-      cd workdir do
-        gem_task = Gem::PackageTask.new(spec)
-        gem_task.define
-        Rake::Task[:gem].reenable
-        Rake::Task[:gem].invoke
-        rm_rf File.join("pkg", gembuilddir)
-        mv Dir.glob("pkg/#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}*.gem"), File.join(Pkg::Config.project_root, "pkg")
-      end
-    end
+def create_gem(spec, gembuilddir)
+  gem_files = glob_gem_files + FileList[(Pkg::Config.gem_test_files || '').split(' ')]
+  workdir = File.join(Pkg::Util::File.mktemp)
 
-    rm_rf workdir
-    puts "Finished building in: #{bench}"
-  end
+  bench = Benchmark.realtime do
+    Pkg::Util::File.install_files_into_dir(gem_files, workdir)
 
-  def create_default_gem
-    spec = create_default_gem_spec
-    create_gem(spec, "#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}")
+    cd workdir do
+      gem_task = Gem::PackageTask.new(spec)
+      gem_task.define
+      Rake::Task[:gem].reenable
+      Rake::Task[:gem].invoke
+      rm_rf File.join("pkg", gembuilddir)
+      mv Dir.glob("pkg/#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}*.gem"), File.join(Pkg::Config.project_root, "pkg")
+    end
   end
 
-  def unknown_gems_platform?(platform)
-    return true if platform.os == "unknown"
-    false
-  end
+  rm_rf workdir
+  puts "Finished building in: #{bench}"
+end
+
+def create_default_gem
+  spec = create_default_gem_spec
+  create_gem(spec, "#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}")
+end
+
+def unknown_gems_platform?(platform)
+  return true if platform.os == "unknown"
+  false
+end
 
-  def create_platform_specific_gems
-    Pkg::Config.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
+def create_platform_specific_gems
+  Pkg::Config.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
-      create_gem(spec, "#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}-#{platform}")
     end
+    create_gem(spec, "#{Pkg::Config.gem_name}-#{Pkg::Config.gemversion}-#{platform}")
   end
+end
 
-  namespace :package do
-    desc "Build a gem - All gems if platform specific"
-    task :gem => ["clean"] do
-      mkdir_p File.join(Pkg::Config.project_root, "pkg")
-      create_default_gem
-      if Pkg::Config.gem_platform_dependencies
-        create_platform_specific_gems
-      end
+namespace :package do
+  desc "Build a gem - All gems if platform specific"
+  task :gem => ["clean"] do
+    unless Pkg::Config.build_gem
+      puts("The #{Pkg::Config.project} project does not build any gems! Passing through ...")
+      next
     end
-  end
 
-  # An alias task to simplify our remote logic in jenkins.rake
-  namespace :pl do
-    task :gem => "package:gem"
+    mkdir_p File.join(Pkg::Config.project_root, "pkg")
+    create_default_gem
+    if Pkg::Config.gem_platform_dependencies
+      create_platform_specific_gems
+    end
   end
 end
+
+# An alias task to simplify our remote logic in jenkins.rake
+namespace :pl do
+  task :gem => "package:gem"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.7
+  version: 0.99.8
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation