packaging 0.99.5 → 0.99.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e28e28af482a06291f1f585ede34b6426cb3d3
-  data.tar.gz: 14a563722d00b01bf7237c6395193195f71e8206
+  metadata.gz: ba97fcaafa8f44758ff46728fc92b8a9deba25c0
+  data.tar.gz: 8237f37fa5bf175ca83a5b0585d5ff3cd4290c86
 SHA512:
-  metadata.gz: a667b0640aa6361ddb3b7343404102c8461d290ed4f2651fe1b489b85d04a3dc0f5a4d75fa36f6aa186f8cd3191c8d1fdfe306a05d3219e977e40ad3505087f7
-  data.tar.gz: 1fd1370fc99e8bafc3881847bd2f909aa6a1d4f8971c654393f62484bf45b2970dec5ec6e0668bdafb8debb37858efe2f812208c409c6252ac57b7836b00482e
+  metadata.gz: 574e7666a242a85dacee420f6170b1415f1fec4efa89822c440fb6b2bba352778f671b51cd056a337f265813157a158f3ad915a1b2f89d92f6cb8aa1fb2ad3d6
+  data.tar.gz: 1f0154a3631c4400be640c2a93db32225cafb872f57e176b85c66b7baa8f952775dc61a7a1354d986877641398ddeb7642c561ac7a0de05450efd692516e92b8

data/lib/packaging/tar.rb

@@ -14,6 +14,10 @@ module Pkg
       @files    = Pkg::Config.files
       @target   = File.join(Pkg::Config.project_root, "pkg", "#{@project}-#{@version}.tar.gz")
 
+      # If the user did not specify any files, then archive the entire working directory
+      # instead
+      @files ||= Dir.glob('*')
+
       # We require that the excludes list be a string (which is space
       # separated, we hope)(deprecated) or an array.
       #
@@ -30,6 +34,11 @@ module Pkg
         @excludes = []
       end
 
+      # If the user has specified things to exclude via config file, they will be
+      # honored by the tar class, but we also always exclude the packaging repo
+      # and 'pkg' directory.
+      @excludes += ['pkg', 'ext/packaging']
+
       # On the other hand, support for explicit templates started with Arrays,
       # so that's all we support.
       #

data/lib/packaging/util/net.rb

@@ -294,9 +294,13 @@ module Pkg::Util::Net
     #     e.g. 'agent' if only searching for 'puppet'.
     def remote_create_latest_symlink(package_name, dir, platform_ext, options = {})
       ls_cmd = "ls -1 *.#{platform_ext} | grep -v latest | grep -v rc | grep #{package_name} "
+
+      # store this in a separate var to avoid side affects
+      full_package_name = String.new(package_name)
+
       if options[:arch]
         ls_cmd << "| grep #{options[:arch]}"
-        package_name << "-#{options[:arch]}"
+        full_package_name << "-#{options[:arch]}"
       end
       if options[:excludes]
         options[:excludes].each do |excl|
@@ -312,11 +316,11 @@ module Pkg::Util::Net
         pushd '#{dir}'
         link_target=$(#{ls_cmd})
         if [ -z "$link_target" ] ; then
-          echo "Unable to find a link target for '#{package_name}' in '#{dir}'; skipping link creation"
+          echo "Unable to find a link target for '#{full_package_name}' in '#{dir}'; skipping link creation"
           exit 0
         fi
         echo "creating link to '$link_target'"
-        ln -sf "$link_target" #{package_name}-latest.#{platform_ext}
+        ln -sf "$link_target" #{full_package_name}-latest.#{platform_ext}
       CMD
 
       _, err = Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, cmd, true)

data/lib/packaging/util/ship.rb

@@ -137,12 +137,8 @@ module Pkg::Util::Ship
     create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, remote_path, opts[:nonfinal])
 
     Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
-      # TODO remove the PC1 links when we no longer need to maintain them
-      # [written by Melissa, copied by Molly]
-      _, version, arch = Pkg::Platforms.parse_platform_tag(platform_tag)
-      Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', "/opt/downloads/mac/#{version}/PC1/#{arch}", 'dmg')
       # Create the latest symlink for the current supported repo
-      Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', Pkg::Paths.artifacts_path(platform_tag, remote_path), 'dmg')
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(platform_tag, remote_path), 'dmg')
     end
   end
 
@@ -157,15 +153,8 @@ module Pkg::Util::Ship
 
     create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, remote_path, opts[:nonfinal])
     # Create the symlinks for the latest supported repo
-    Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x64')
-    Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x86')
-
-    # We provide symlinks to the latest package in a given directory. This
-    # allows users to upgrade more easily to the latest version that we release
-    # TODO remove the links to PC1 when we no longer ship to that repo [written
-    # by Melissa, copied by Molly]
-    Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', '/opt/downloads/windows', 'msi', arch: 'x64')
-    Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', '/opt/downloads/windows', 'msi', arch: 'x86')
+    Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x64')
+    Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x86')
   end
 
   def ship_gem(local_staging_directory, remote_path, opts = {})

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

@@ -0,0 +1 @@
+../params.yaml

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

@@ -0,0 +1 @@
+../params.yaml

data/spec/lib/packaging/tar_spec.rb

@@ -20,34 +20,44 @@ describe "tar.rb" do
       "#{PROJECT_ROOT}/ext/debian/changelog.erb"
     ]
   end
+  before(:each) do
+    Pkg::Config.config_from_hash(
+      {
+        :templates      => templates,
+        :project        => project,
+        :version        => version,
+        :files          => files,
+        :project_root   => PROJECT_ROOT,
+        :packaging_root => "ext/packaging"
+      })
+  end
+
+  describe '#initialize' do
+    it 'should always mark ext/packaging and pkg directories as excluded files' do
+      Pkg::Config.tar_excludes = ['foo']
+      expect(Pkg::Tar.new.excludes).to eql(['foo', 'pkg', 'ext/packaging'])
+
+      Pkg::Config.tar_excludes = []
+      expect(Pkg::Tar.new.excludes).to eql(['pkg', 'ext/packaging'])
+    end
+
+    it 'should archive the entire project directory by default' do
+      Pkg::Config.files = nil
+      expect(Pkg::Tar.new.files).to eql(Dir.glob('*'))
+    end
+
+    it 'should archive the user-specified list of files' do
+      expect(Pkg::Tar.new.files).to eql(files)
+    end
+  end
 
   describe "#expand_templates" do
     it "should be invoked when Pkg::Config.templates is set" do
-      Pkg::Config.config_from_hash(
-        {
-          :templates      => templates,
-          :project        => project,
-          :version        => version,
-          :files          => files,
-          :project_root   => PROJECT_ROOT,
-          :packaging_root => "ext/packaging"
-        })
-
       Pkg::Tar.any_instance.should_receive(:expand_templates)
       Pkg::Tar.new
     end
 
     it "packaging templates should be filtered and paths should be expanded" do
-      Pkg::Config.config_from_hash(
-        {
-          :templates      => templates,
-          :project        => project,
-          :version        => version,
-          :files          => files,
-          :project_root   => PROJECT_ROOT,
-          :packaging_root => "ext/packaging"
-        })
-
       templates.each do |temp|
         if temp.is_a?(String)
           Dir.stub(:glob).with(File.join(PROJECT_ROOT, temp)).and_return(File.join(PROJECT_ROOT, temp))
@@ -62,17 +72,11 @@ describe "tar.rb" do
   end
 
   describe "#template" do
-    it "should handle hashes and strings correctly" do
-      Pkg::Config.config_from_hash(
-        {
-          :templates      => expanded_templates,
-          :project        => project,
-          :version        => version,
-          :files          => files,
-          :project_root   => PROJECT_ROOT,
-          :packaging_root => "ext/packaging"
-        })
+    before(:each) do
+      Pkg::Config.templates = expanded_templates
+    end
 
+    it "should handle hashes and strings correctly" do
       # Set up correct stubs and expectations
       expanded_templates.each do |temp|
         if temp.is_a?(String)
@@ -92,16 +96,6 @@ describe "tar.rb" do
     end
 
     it "should raise an error if the template source can't be found" do
-     Pkg::Config.config_from_hash(
-        {
-          :templates      => expanded_templates,
-          :project        => project,
-          :version        => version,
-          :files          => files,
-          :project_root   => PROJECT_ROOT,
-          :packaging_root => "ext/packaging"
-        })
-
       # Set up correct stubs and expectations
       expanded_templates.each do |temp|
         if temp.is_a?(String)

data/tasks/jenkins.rake

@@ -259,11 +259,14 @@ namespace :pl do
         ship_swix
         ship_tar
         ship_msi
+        ship_gem
       )
       tasks.map { |t| "pl:#{t}" }.each do |t|
         puts "Running #{t} . . ."
         Rake::Task[t].invoke
       end
+      # mark the build as successfully shipped
+      Rake::Task["pl:jenkins:ship"].invoke("shipped")
     end
 
     task :stage_nightlies => "pl:fetch" do

data/tasks/tar.rake

@@ -16,12 +16,6 @@ namespace :package do
     #
     tar.templates ||= Dir[File.join(Pkg::Config.project_root, "ext", "**", "*.erb")].select { |i| i !~ /ext\/packaging|ext\/osx/ }
 
-
-    # If the user has specified things to exclude via config file, they will be
-    # honored by the tar class, but we also always exclude the packaging repo.
-    #
-    tar.excludes << "ext/packaging"
-
     tar.pkg!
 
     puts "Wrote #{`pwd`.strip}/pkg/#{Pkg::Config.project}-#{Pkg::Config.version}.tar.gz"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.5
+  version: 0.99.6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-06-11 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.4.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation

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

@@ -1,2 +0,0 @@
----
-:apt_host: foo

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

@@ -1,2 +0,0 @@
----
-:apt_host: foo