packaging 0.99.22 → 0.99.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f26c4fec0596139e33fe002da08fbc19ec2f2fab6c8ef9c75f749a2d9d1190
-  data.tar.gz: a2131546cf1267363eaf5fd8c04442c175db4838d94ffac17314211a97369d56
+  metadata.gz: 8b0d6c25b216fc87def324998fbe08b683065edfc8e98bc5448b748799a2b9a7
+  data.tar.gz: ab5c52319e75b74c772d395cffe9c6c043b76b9966d875420af99c9547a75be1
 SHA512:
-  metadata.gz: 4c182e09c68cdc4702a0c49281b25fea6f831d56e7991c7d505b066b5747e04e8fb99aca8bca75e75a22689c10186e36877b9b53db8c682b0f756d4e7923bd38
-  data.tar.gz: ea467e1d97249f126d2260f6f5bce5c96882231ea5ea91816c1e3376ce49b44cdb5d3511c543a334e45d6091be903b5944c5ba0aa2c3baca0131de4ea5dc7ad6
+  metadata.gz: 1e21ac37c6e6c7d84920c55897a4c07b07e58168d6efb9c00cf82cd1878e17129c11633ec1af282768e69e44a946e1e072f23e78fb4f8b366636ac6dd1849aec
+  data.tar.gz: 3adb0a5f3cf580b9bba67f382dd04c9cad17926984d13ee658d65296ad08e3830f6b9b171f30009bf7563ccb1595227ea4ffc21567839a10082649372df9a1ca

data/lib/packaging/gem.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Pkg::Gem
   class << self
     # This is preserved because I don't want to update the deprecated code path
@@ -15,10 +16,25 @@ 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)
+      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
+    rescue => e
+      puts "Uh oh, something went wrong searching for gem '#{gem_name}':"
+      puts e
+      puts "Perhaps you're shipping gem '#{gem_name}' for the first time? Congrats!"
+      return false
+    end
+
     # Ship a Ruby gem file to rubygems.org. Requires the existence
     # 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)
+        puts "#{file} has already been shipped to rubygems, skipping . . ."
+        return
+      end
       Pkg::Util::File.file_exists?("#{ENV['HOME']}/.gem/credentials", :required => true)
       gem_push_command = "gem push #{file}"
       gem_push_command << " --host #{options[:host]}" if options[:host]

data/spec/lib/packaging/gem_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe 'Pkg::Gem' do
+  describe '#shipped_to_rubygems?' do
+    let(:gem_data) {
+      [
+        {"authors"=>"Puppet Labs",
+         "built_at"=>"2018-12-17T00:00:00.000Z",
+         "created_at"=>"2018-12-18T17:31:50.852Z",
+         "description"=>"Puppet, an automated configuration management tool",
+         "downloads_count"=>32750,
+         "metadata"=>{},
+         "number"=>"6.1.0",
+         "summary"=>"Puppet, an automated configuration management tool",
+         "platform"=>"ruby",
+         "rubygems_version"=>"> 1.3.1",
+         "ruby_version"=>">= 2.3.0",
+         "prerelease"=>false,
+         "licenses"=>[],
+         "requirements"=>[],
+         "sha"=>"71ecec1f554cd7a7f23abf1523e4f0f15fb8ddbc973201234d0cc2a889566373"},
+        {"authors"=>"Puppet Labs",
+          "built_at"=>"2019-01-14T00:00:00.000Z",
+          "created_at"=>"2019-01-15T15:25:25.183Z",
+          "description"=>"Puppet, an automated configuration management tool",
+          "downloads_count"=>540,
+          "metadata"=>{},
+          "number"=>"6.0.5",
+          "summary"=>"Puppet, an automated configuration management tool",
+          "platform"=>"ruby",
+          "rubygems_version"=>"> 1.3.1",
+          "ruby_version"=>">= 2.3.0",
+          "prerelease"=>false,
+          "licenses"=>[],
+          "requirements"=>[],
+          "sha"=>"76811bcf4c5ab75470dd6ae5eea552347767748bd80136cac74261336b208916"},
+        {"authors"=>"Puppet Labs",
+          "built_at"=>"2018-10-31T00:00:00.000Z",
+          "created_at"=>"2018-11-01T17:07:19.274Z",
+          "description"=>"Puppet, an automated configuration management tool",
+          "downloads_count"=>71808,
+          "metadata"=>{},
+          "number"=>"6.0.4",
+          "summary"=>"Puppet, an automated configuration management tool",
+          "platform"=>"ruby",
+          "rubygems_version"=>"> 1.3.1",
+          "ruby_version"=>">= 2.3.0",
+          "prerelease"=>false,
+          "licenses"=>[],
+          "requirements"=>[],
+          "sha"=>"203e8b529d37260115ab7e804e607dde5e543144331b40c3c4a77c2d33445026"},
+        {"authors"=>"Puppet Labs",
+          "built_at"=>"2018-10-31T00:00:00.000Z",
+          "created_at"=>"2018-11-01T17:07:10.268Z",
+          "description"=>"Puppet, an automated configuration management tool",
+          "downloads_count"=>1179,
+          "metadata"=>{},
+          "number"=>"6.0.4",
+          "summary"=>"Puppet, an automated configuration management tool",
+          "platform"=>"x86-mingw32",
+          "rubygems_version"=>"> 1.3.1",
+          "ruby_version"=>">= 2.3.0",
+          "prerelease"=>false,
+          "licenses"=>[],
+          "requirements"=>[],
+          "sha"=>"e57ef7d537aaf66343615d7413d1ff759cc2b6ae95cc90514dd8f3caf0f08cb1"}
+      ]
+    }
+    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
+    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
+    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
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.22
+  version: 0.99.23
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -141,6 +141,7 @@ files:
 - spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/repo_spec.rb
@@ -232,6 +233,7 @@ test_files:
 - spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/repo_spec.rb