packaging 0.99.1 → 0.99.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ae6398f2a9568e9a9d75426480aa85940ac5df1
-  data.tar.gz: d1e290e42fb8c1604ad1b18d938bb7b7567cd11a
+  metadata.gz: b096423bbbe6f7b90a9ad4eae12da125c056733c
+  data.tar.gz: 370b0e6f7c4869871a187ef12396a1728f3ba193
 SHA512:
-  metadata.gz: 32df3b1cc9f5f1ec0bc2a41438aa27f2f49bd67d200790d42df368251138eaa90b4d0de76d508e72eb3041beff8dc8aeb5d2e2c4a6f0af157335ac0484a2ccea
-  data.tar.gz: bea38c34983114bd4b445390233da4b0677fb8404e7dd819fec1ba766cb5eeae4bd4e18af68eee0d436671c45953e63db0058e288e84027b335892b009aa2f17
+  metadata.gz: d634374753ae4ad76adecc223002f66b2796f6b265aae22145a570f52f90c9f0179d647beac93dca131e0c300c99a52aea59ad10ff632fd5db92aef3bc1838e7
+  data.tar.gz: a095f56daa4e019ef33fbc71505d31e7bb83f066a116e87eca86eb111474b21e2ba3f21b54582db6449327ed223493421a0560435aad4f3df87ae038ce8ab381

data/lib/packaging/platforms.rb

@@ -135,6 +135,14 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
         signature_format: 'v4',
         repo: true,
       },
+      'f27' => {
+        architectures: ['x86_64'],
+        source_architecture: 'SRPMS',
+        package_format: 'rpm',
+        source_package_formats: ['src.rpm'],
+        signature_format: 'v4',
+        repo: true,
+      },
       '25' => {
         architectures: ['i386', 'x86_64'],
         source_architecture: 'SRPMS',
@@ -151,6 +159,14 @@ module Pkg::Platforms # rubocop:disable Metrics/ModuleLength
         signature_format: 'v4',
         repo: true,
       },
+      '27' => {
+        architectures: ['x86_64'],
+        source_architecture: 'SRPMS',
+        package_format: 'rpm',
+        source_package_formats: ['src.rpm'],
+        signature_format: 'v4',
+        repo: true,
+      },
     },
 
     'osx' => {

data/lib/packaging/retrieve.rb

@@ -8,9 +8,37 @@ module Pkg::Retrieve
   # --directory-prefix = where to save to disk (defaults to ./)
   # --reject = Reject all hits that match the supplied regex
 
-  def default_wget(local_target, url)
+  def default_wget_command(local_target, url, additional_options = {})
+    default_options = {
+      'quiet' => true,
+      'recursive' => true,
+      'no-parent' => true,
+      'no-host-directories' => true,
+      'level' => 0,
+      'cut-dirs' => 3,
+      'directory-prefix' => local_target,
+      'reject' => "'index*'",
+    }
+    options = default_options.merge(additional_options)
     wget = Pkg::Util::Tool.check_tool('wget')
-    wget_command = "#{wget} --quiet --recursive --no-parent --no-host-directories --level=0 --cut-dirs 3 --directory-prefix=#{local_target} --reject 'index*' #{url}"
+    wget_command = wget
+    options.each do |option, value|
+      next unless value
+      if value.is_a?(TrueClass)
+        wget_command << " --#{option}"
+      else
+        wget_command << " --#{option}=#{value}"
+      end
+    end
+    wget_command << " #{url}"
+    return wget_command
+  end
+
+  # NOTE: When supplying additional options, if you want your value to be
+  # quoted (e.g. --reject='index*'), you must include the quotes as part of
+  # your string (e.g. {'reject' => "'index*'"}).
+  def default_wget(local_target, url, additional_options = {})
+    wget_command = default_wget_command(local_target, url, additional_options)
     puts "Executing #{wget_command} . . ."
     %x(#{wget_command})
   end
@@ -20,7 +48,7 @@ module Pkg::Retrieve
     unless Pkg::Config.foss_platforms
       fail "FOSS_ONLY specified, but I don't know anything about FOSS_PLATFORMS. Retrieve cancelled."
     end
-    default_wget(local_target, "#{build_url}/artifacts/#{Pkg::Config.ref}.yaml")
+    default_wget(local_target, "#{build_url}/artifacts/", { 'level' => 1 })
     yaml_path = File.join(local_target, "#{Pkg::Config.ref}.yaml")
     unless File.readable?(yaml_path)
       fail "Couldn't read #{Pkg::Config.ref}.yaml, which is necessary for FOSS_ONLY. Retrieve cancelled."

data/lib/packaging/util/net.rb

@@ -351,7 +351,18 @@ module Pkg::Util::Net
       tarball_name = File.basename(tarball).gsub('.tar.gz', '')
       Pkg::Util::Net.rsync_to(tarball, host, '/tmp')
       appendix = Pkg::Util.rand_string
-      Pkg::Util::Net.remote_ssh_cmd(host, "#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ; git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ; cd /tmp/#{Pkg::Config.project}-#{appendix} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake package:bootstrap")
+      command = <<-DOC
+#{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ;
+git clone --recursive /tmp/#{tarball_name} /tmp/#{Pkg::Config.project}-#{appendix} ;
+cd /tmp/#{Pkg::Config.project}-#{appendix} ;
+bundle_prefix= ;
+if [[ -r Gemfile ]]; then
+  source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install --path .bundle/gems ;
+  bundle_prefix='bundle exec' ;
+fi ;
+$bundle_prefix rake package:bootstrap
+DOC
+      Pkg::Util::Net.remote_ssh_cmd(host, command)
       "/tmp/#{Pkg::Config.project}-#{appendix}"
     end
 

data/spec/lib/packaging/retrieve_spec.rb

@@ -28,6 +28,44 @@ describe 'Pkg::Retrieve' do
     allow(Pkg::Util::Serialization).to receive(:load_yaml).and_return(platform_data)
   end
 
+  describe '#default_wget_command' do
+    let(:options) { [
+      "--quiet",
+      "--recursive",
+      "--no-parent",
+      "--no-host-directories",
+      "--level=0",
+      "--cut-dirs=3",
+      "--directory-prefix=#{local_target}",
+      "--reject='index*",
+    ] }
+    before :each do
+      allow(Pkg::Util::Tool).to receive(:check_tool).with('wget').and_return('wget')
+    end
+    context 'when no options passed' do
+      it 'should include default options' do
+        options.each do |option|
+          expect(Pkg::Retrieve.default_wget_command(local_target, build_url)).to include(option)
+        end
+      end
+    end
+    context 'when options are passed' do
+      it 'should add to existing options' do
+        options.push('--convert-links')
+        options.each do |option|
+          expect(Pkg::Retrieve.default_wget_command(local_target, build_url, {'convert-links' => true})).to include(option)
+        end
+      end
+      it 'should replace default values' do
+        options.push('--level=1').delete('--level=0')
+        expect(Pkg::Retrieve.default_wget_command(local_target, build_url, {'level' => 1})).to_not include('--level=0')
+        options.each do |option|
+          expect(Pkg::Retrieve.default_wget_command(local_target, build_url, {'level' => 1})).to include(option)
+        end
+      end
+    end
+  end
+
   describe '#foss_only_retrieve' do
     it 'should fail without foss_platforms' do
       allow(Pkg::Config).to receive(:foss_platforms).and_return(nil)

data/tasks/nightly_repos.rake

@@ -21,7 +21,16 @@ namespace :pl do
       remote_repo   = Pkg::Util::Net.remote_bootstrap(signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(signing_server, Pkg::Config)
       Pkg::Util::Net.rsync_to('repos', signing_server, remote_repo)
-      Pkg::Util::Net.remote_ssh_cmd(signing_server, "cd #{remote_repo} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}")
+      rake_command = <<-DOC
+cd #{remote_repo} ;
+bundle_prefix= ;
+if [[ -r Gemfile ]]; then
+  source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install --path .bundle/gems;
+  bundle_prefix='bundle exec';
+fi ;
+$bundle_prefix rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}
+DOC
+      Pkg::Util::Net.remote_ssh_cmd(signing_server, rake_command)
       Pkg::Util::Net.rsync_from("#{remote_repo}/repos/", signing_server, target)
       Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm -rf #{remote_repo}")
       Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm #{build_params}")

data/tasks/sign.rake

@@ -216,7 +216,16 @@ namespace :pl do
       remote_repo   = Pkg::Util::Net.remote_bootstrap(Pkg::Config.signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(Pkg::Config.signing_server, Pkg::Config)
       Pkg::Util::Net.rsync_to('pkg', Pkg::Config.signing_server, remote_repo)
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "cd #{remote_repo} ; source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install; bundle exec rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}")
+      rake_command = <<-DOC
+cd #{remote_repo} ;
+bundle_prefix= ;
+if [[ -r Gemfile ]]; then
+  source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install --path .bundle/gems;
+  bundle_prefix='bundle exec';
+fi ;
+$bundle_prefix rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}
+DOC
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, rake_command)
       Pkg::Util::Net.rsync_from("#{remote_repo}/pkg/", Pkg::Config.signing_server, "pkg/")
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm #{build_params}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.1
+  version: 0.99.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec