packaging 0.99.49 → 0.99.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bf2734bf72e5f9bad6d03c640d28ce516c05b1a5163b20ebf385676e829ae6
-  data.tar.gz: f54bbad1bd7b25f0e92cd7527de1e03513b557fa4e31db0751f23cd9139d30a6
+  metadata.gz: ad409cc1cd10d0f72e9a6e63ba13c32db7b610e3477c691763bb78f949364fd1
+  data.tar.gz: d97ee866c371abf36817b33a4cacfcdf9863b76de9d9e46cd8e9f2f4bd39b117
 SHA512:
-  metadata.gz: 272b2c612425b4ee0226063c54d7bbbfeb5d5de4162050eb716c3acff4f65282741c528ab9f7290e4a987dae436c268632c7d7556eba9bea77c9feb05f9fc1c2
-  data.tar.gz: 5995160e79dbf3258fe5e212cd646bee4f9f9bdfc19acdb4780c02f3acea628408f504fbffbca42b7e4ff98600893a37a87d0ecb6e90834c0e4b68f3a73f6109
+  metadata.gz: 56f4a038ca5cc5fc4495b9302fc86b1902c5581981d1963097457058f51996163bf76491977037deb2cddea4c0e9248075dab6db329d1c2ff3ba23c4254a7fba
+  data.tar.gz: 57c6b4f35809ee6164f243d6f23056f1538347d452124c2d0f714978fa19bd0413c35e723f1fa8f4232546e69db3327d21ee09aed75992866399a3249783d281

data/lib/packaging/util/version.rb

@@ -50,12 +50,20 @@ module Pkg::Util::Version
       end
     end
 
+    def extended_dash_version
+      Pkg::Util::Git.describe(['--tags', '--dirty', '--abbrev=7'])
+    end
+
     # This version is used for gems and platform types that do not support
     # dashes in the package version
     def dot_version(version = Pkg::Config.version)
       version.tr('-', '.')
     end
 
+    def extended_dot_version
+      dot_version(extended_dash_version)
+    end
+
     # Given a version, reformat it to be appropriate for a final package
     # version. This means we need to add a `0.` before the release version
     # for non-final builds

data/tasks/gem.rake

@@ -127,23 +127,33 @@ def create_platform_specific_gems
   end
 end
 
+def package_gem
+  unless Pkg::Config.build_gem
+    puts "The #{Pkg::Config.project} project does not build any gems! Passing through ..."
+    return
+  end
+
+  mkdir_p File.join(Pkg::Config.project_root, "pkg")
+  create_default_gem
+  if Pkg::Config.gem_platform_dependencies
+    create_platform_specific_gems
+  end
+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
+    package_gem
+  end
 
-    mkdir_p File.join(Pkg::Config.project_root, "pkg")
-    create_default_gem
-    if Pkg::Config.gem_platform_dependencies
-      create_platform_specific_gems
-    end
+  task :nightly_gem => ["clean"] do
+    Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
+    package_gem
   end
 end
 
 # An alias task to simplify our remote logic in jenkins.rake
 namespace :pl do
   task :gem => "package:gem"
+  task :nightly_gem => "package:nightly_gem"
 end

data/tasks/ship.rake

@@ -248,6 +248,23 @@ namespace :pl do
         end
       end
     end
+
+    desc "Remotely link nightly shipped gems to latest versions on #{Pkg::Config.gem_host}"
+    task :link_nightly_shipped_gems_to_latest do
+      Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
+
+      remote_path = Pkg::Config.nonfinal_gem_path
+      gems = FileList['pkg/*.gem'].map! { |path| path.gsub!('pkg/', '') }
+      command = %(cd #{remote_path}; )
+
+      command += gems.map! do |gem_name|
+        %(sudo ln -sf #{gem_name} #{gem_name.gsub(Pkg::Config.gemversion, 'latest')})
+      end.join(';')
+
+      command += %(; sync)
+
+      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
+    end
   end
 
   desc "Ship mocked rpms to #{Pkg::Config.yum_staging_server}"
@@ -630,20 +647,27 @@ namespace :pl do
       # building to. Once we move the Metadata about the output location in
       # to one source of truth we can refactor this to use that to search
       #                                           -Sean P. M. 08/12/16
-      packages = Dir["#{local_dir}/windows/*"]
-      ['x86', 'x64'].each do |arch|
-        package_version = Pkg::Util::Git.describe.tr('-', '.')
-        package_filename = File.join(local_dir, 'windows', "#{Pkg::Config.project}-#{package_version}-#{arch}.msi")
-        link_filename = File.join(local_dir, 'windows', "#{Pkg::Config.project}-#{arch}.msi")
-
-        next unless !packages.include?(link_filename) && packages.include?(package_filename)
-        # Dear future code spelunkers:
-        # Using symlinks instead of hard links causes failures when we try
-        # to set these files to be immutable. Also be wary of whether the
-        # linking utility you're using expects the source path to be relative
-        # to the link target or pwd.
-        #
-        FileUtils.ln(package_filename, link_filename)
+
+      {
+        'windows' => ['x86', 'x64'],
+        'windowsfips' => ['x64']
+      }.each_pair do |platform, archs|
+        packages = Dir["#{local_dir}/#{platform}/*"]
+
+        archs.each do |arch|
+          package_version = Pkg::Util::Git.describe.tr('-', '.')
+          package_filename = File.join(local_dir, platform, "#{Pkg::Config.project}-#{package_version}-#{arch}.msi")
+          link_filename = File.join(local_dir, platform, "#{Pkg::Config.project}-#{arch}.msi")
+
+          next unless !packages.include?(link_filename) && packages.include?(package_filename)
+          # Dear future code spelunkers:
+          # Using symlinks instead of hard links causes failures when we try
+          # to set these files to be immutable. Also be wary of whether the
+          # linking utility you're using expects the source path to be relative
+          # to the link target or pwd.
+          #
+          FileUtils.ln(package_filename, link_filename)
+        end
       end
 
       Pkg::Util::Execution.retry_on_fail(times: 3) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.49
+  version: 0.99.50
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -244,28 +244,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/repo_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging_spec.rb