packaging 0.99.52 → 0.99.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7c227cbeba14dc0855f6fb8b897081580b8b710a661ab792db6d4dcf600ea26
-  data.tar.gz: b25fae598151d2faa560e503a4a881e1468b66f4d2d8251d0e0a04bb4759f376
+  metadata.gz: 56a523006ca46cba872305d8cab5c36e6fd2028f1d4e4f49d056c2068563b697
+  data.tar.gz: dea3247fde29b5021c580d7f46787dbd2b1c3afb5c27f15c5f7edc5442bb563b
 SHA512:
-  metadata.gz: 435a2b4cad3511f946be4a9d3198f6208b0d1a0202bd7fc324562f873babfd2e870255b00b5f759385517c2af1fced97067f1f7bccacc375077c81b786dae79c
-  data.tar.gz: e8379a185e8ffba43d1ae98f07925b6a36f080f570fb041f0d9c245996d5261aa39cd36d76200e31cabaa906273275de9f550991950850a8b14ef4a4ea979f4f
+  metadata.gz: b51e67a3c0ed94bba73cc93a1612b405394d338a20b9ef6e343a8120b406d04ba1fc8306ff70a6a79d176b5b8143674dd1e5519b31f348ffbc16b9517b05342f
+  data.tar.gz: 4cfedab9f6a7a3de112d23669d91e0d5cdace6b8636bc0df9b71e51c989b0799034eb024a7ec6a94d2346a96f315ac74ffdbaf43d91d3fc34a4e7bb148af1f54

data/lib/packaging/gem.rb

@@ -16,10 +16,10 @@ module Pkg::Gem
       Pkg::Util::Ship.ship_pkgs(["#{file}*"], Pkg::Config.gem_host, Pkg::Config.gem_path, platform_independent: true)
     end
 
-    def shipped_to_rubygems?(gem_name, gem_version)
+    def shipped_to_rubygems?(gem_name, gem_version, gem_platform)
       gem_data = JSON.parse(`curl https://rubygems.org/api/v1/versions/#{gem_name}.json`)
-      gem_versions = gem_data.map { |version| version['number'] }
-      return gem_versions.include? gem_version
+      gem = gem_data.select { |data| data['number'] == gem_version && data['platform'] == gem_platform }
+      return !gem.empty?
     rescue => e
       puts "Uh oh, something went wrong searching for gem '#{gem_name}':"
       puts e
@@ -31,7 +31,15 @@ module Pkg::Gem
     # of a ~/.gem/credentials file or else rubygems.org won't have
     # any idea who you are.
     def ship_to_rubygems(file, options = {})
-      if shipped_to_rubygems?(Pkg::Config.gem_name, Pkg::Config.gemversion)
+      # rubygems uses 'ruby' as the platform when it's not a platform-specific
+      # gem
+      platform = file.match(/\w+-(?:\d+(?:\.)?)+-(.*)\.gem$/)
+      unless platform.nil?
+        gem_platform = platform[1]
+      end
+      gem_platform ||= 'ruby'
+
+      if shipped_to_rubygems?(Pkg::Config.gem_name, Pkg::Config.gemversion, gem_platform)
         puts "#{file} has already been shipped to rubygems, skipping . . ."
         return
       end

data/spec/lib/packaging/gem_spec.rb

@@ -68,15 +68,19 @@ describe 'Pkg::Gem' do
     }
     it 'returns true if gem version has already been shipped' do
       allow(JSON).to receive(:parse).and_return(gem_data)
-      expect(Pkg::Gem.shipped_to_rubygems?('puppet', '6.0.5')).to be true
+      expect(Pkg::Gem.shipped_to_rubygems?('puppet', '6.0.5', 'ruby')).to be true
+    end
+    it 'returns false if the platform doesn\'t match' do
+      allow(JSON).to receive(:parse).and_return(gem_data)
+      expect(Pkg::Gem.shipped_to_rubygems?('puppet', '6.0.5', 'x64-mingw32')).to be false
     end
     it 'returns false if gem version has not already been shipped' do
       allow(JSON).to receive(:parse).and_return(gem_data)
-      expect(Pkg::Gem.shipped_to_rubygems?('puppet', '6.0.9')).to be false
+      expect(Pkg::Gem.shipped_to_rubygems?('puppet', '6.0.9', 'ruby')).to be false
     end
     it 'returns false if gem is not found at all on rubygems' do
-      expect { Pkg::Gem.shipped_to_rubygems?('totally-not-a-real-gem', '9.9.9') }.to_not raise_error
-      expect(Pkg::Gem.shipped_to_rubygems?('totally-not-a-real-gem', '9.9.9')).to be false
+      expect { Pkg::Gem.shipped_to_rubygems?('totally-not-a-real-gem', '9.9.9', 'ruby') }.to_not raise_error
+      expect(Pkg::Gem.shipped_to_rubygems?('totally-not-a-real-gem', '9.9.9', 'ruby')).to be false
     end
   end
 end

data/tasks/jenkins.rake

@@ -271,7 +271,7 @@ namespace :pl do
       begin
         Rake::Task["pl:update_release_metrics"].invoke
       rescue => e
-        puts "Uh oh! Something went wrong updating release-metrics:\n#{e}\nPlease add this release manually. Proceeding..."
+        fail "Error updating release-metrics:\n#{e}\nYou will need to add this release manually."
       end
     end
 

metadata

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