kpm 0.7.0 → 0.8.2

data/lib/kpm/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'rubygems/package'
 require 'zlib'
@@ -7,7 +9,7 @@ module KPM
     class << self
       TAR_LONGLINK = '././@LongLink'
 
-      def unpack_tgz(tar_gz_archive, destination, skip_top_dir=false)
+      def unpack_tgz(tar_gz_archive, destination, skip_top_dir = false)
         top_dir = nil
         Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_archive)) do |tar|
           dest = nil
@@ -20,17 +22,17 @@ module KPM
 
             if entry.directory?
               File.delete dest if File.file? dest
-              FileUtils.mkdir_p dest, :mode => entry.header.mode, :verbose => false
+              FileUtils.mkdir_p dest, mode: entry.header.mode, verbose: false
             elsif entry.file?
               FileUtils.rm_rf dest if File.directory? dest
-              FileUtils.mkdir_p File.dirname(dest), :verbose => false
-              File.open dest, "wb" do |f|
+              FileUtils.mkdir_p File.dirname(dest), verbose: false
+              File.open dest, 'wb' do |f|
                 f.print entry.read
               end
-              FileUtils.chmod entry.header.mode, dest, :verbose => false
+              FileUtils.chmod entry.header.mode, dest, verbose: false
               current_dir = File.dirname(dest)
               # In case there are two top dirs, keep the last one by convention
-              top_dir = current_dir if (top_dir.nil? || top_dir.size >= current_dir.size)
+              top_dir = current_dir if top_dir.nil? || top_dir.size >= current_dir.size
             elsif entry.header.typeflag == '2' # Symlink
               File.symlink entry.header.linkname, dest
             end
@@ -48,9 +50,7 @@ module KPM
         file_names = []
         Gem::Package::TarReader.new(Zlib::GzipReader.open(tar_gz_archive)) do |tar|
           tar.each do |entry|
-            if entry.file?
-              file_names.push entry.full_name
-            end
+            file_names.push entry.full_name if entry.file?
           end
         end
 
@@ -62,17 +62,17 @@ module KPM
         ver = get_version_from_file_path(file_path)
         ext = File.extname(base)
 
-        name = base.gsub(ext,'')
+        name = base.gsub(ext, '')
         if ver.nil?
           # this will remove SNAPSHOT and any dash that appear before it (ex --SNAPSHOT).
-          name = name.gsub(/((-+){,1}SNAPSHOT){,1}/,'')
+          name = name.gsub(/((-+){,1}SNAPSHOT){,1}/, '')
           last_dash = name.rindex('-')
           name = name[0..last_dash] unless last_dash.nil?
         else
-          name = name.gsub(ver,'')
+          name = name.gsub(ver, '')
         end
 
-        name = name[0..name.length-2] if name[-1].match(/[a-zA-z]/).nil?
+        name = name[0..name.length - 2] if name[-1].match(/[a-zA-z]/).nil?
         name
       end
 
@@ -84,7 +84,6 @@ module KPM
 
         ver[0]
       end
-
     end
   end
 end

data/lib/kpm/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module KPM
-  VERSION = '0.7.0'
+  VERSION = '0.8.2'
 end

data/packaging/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'kpm', '~> VERSION'

data/pom.xml

@@ -26,7 +26,7 @@
   <groupId>org.kill-bill.billing.installer</groupId>
   <artifactId>kpm</artifactId>
   <packaging>pom</packaging>
-  <version>0.7.0</version>
+  <version>0.8.2</version>
   <name>KPM</name>
   <url>http://github.com/killbill/killbill-cloud</url>
   <description>KPM: the Kill Bill Package Manager</description>

data/spec/kpm/remote/base_artifact_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe KPM::BaseArtifact do
-
   before(:all) do
     @logger       = Logger.new(STDOUT)
     @logger.level = Logger::INFO
@@ -25,6 +26,23 @@ describe KPM::BaseArtifact do
     end
   end
 
+  it 'should be able to handle download errors' do
+    nexus_down = { url: 'https://does.not.exist' }
+    Dir.mktmpdir do |dir|
+      sha1_file = "#{dir}/sha1.yml"
+      test_download dir, 'foo-oss.pom.xml', false, false, sha1_file
+      # Verify we skip the second time
+      test_download dir, 'foo-oss.pom.xml', true, false, sha1_file
+      # Verify the download is skipped gracefully when Nexus isn't reachable
+      test_download dir, 'foo-oss.pom.xml', true, false, sha1_file, nexus_down
+      # Verify the download fails when Nexus isn't reachable and force_download is set
+      expect { test_download dir, 'foo-oss.pom.xml', nil, true, sha1_file, nexus_down }.to raise_error
+      # Verify the download fails when Nexus isn't reachable and the Nexus cache is empty
+      KPM::Sha1Checker.from_file(sha1_file).cache_artifact_info('org.kill-bill.billing:killbill-oss-parent:pom:0.143.33', nil)
+      expect { test_download dir, 'foo-oss.pom.xml', nil, false, sha1_file, nexus_down }.to raise_error
+    end
+  end
+
   it 'should be able to download and verify generic .tar.gz artifacts' do
     # The artifact is not small unfortunately (23.7M)
     group_id    = 'org.kill-bill.billing'
@@ -38,11 +56,11 @@ describe KPM::BaseArtifact do
       info[:file_name].should be_nil
 
       files_in_dir = Dir[info[:file_path] + '/*']
-      files_in_dir.size.should == 20
+      files_in_dir.size.should eq 20
 
       File.file?(info[:file_path] + '/killbill-osgi-bundles-jruby-0.11.3.jar').should be_true
 
-      info[:bundle_dir].should == info[:file_path]
+      info[:bundle_dir].should eq info[:file_path]
     end
   end
 
@@ -62,19 +80,15 @@ describe KPM::BaseArtifact do
       second_take = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, second_bundle_version, dir)
       File.file?(first_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.2.jar').should be_false
       File.file?(second_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.10.jar').should be_true
-
     end
   end
 
-
-  def test_download(dir, filename=nil, verify_is_skipped=false, force_download=false)
+  def test_download(dir, filename = nil, verify_is_skipped = false, force_download = false, sha1_file = nil, overrides = {})
     path = filename.nil? ? dir : dir + '/' + filename
 
-    info = KPM::BaseArtifact.pull(@logger, 'org.kill-bill.billing', 'killbill-oss-parent', 'pom', nil, 'LATEST', path, nil, force_download, true, {}, true)
-    info[:file_name].should == (filename.nil? ? "killbill-oss-parent-#{info[:version]}.pom" : filename)
-    info[:skipped].should == verify_is_skipped
-    if !info[:skipped]
-      info[:size].should == File.size(info[:file_path])
-    end
+    info = KPM::BaseArtifact.pull(@logger, 'org.kill-bill.billing', 'killbill-oss-parent', 'pom', nil, '0.143.33', path, sha1_file, force_download, true, overrides, true)
+    info[:file_name].should eq(filename.nil? ? "killbill-oss-parent-#{info[:version]}.pom" : filename)
+    info[:skipped].should eq verify_is_skipped
+    info[:size].should eq File.size(info[:file_path]) unless info[:skipped]
   end
 end

data/spec/kpm/remote/base_installer_spec.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 
 describe KPM::BaseInstaller do
-
   before(:all) do
     @logger = Logger.new(STDOUT)
     @logger.level = Logger::INFO
@@ -13,7 +14,7 @@ describe KPM::BaseInstaller do
       bundles_dir = dir + '/bundles'
       installer = KPM::BaseInstaller.new(@logger)
 
-      info = installer.install_plugin('analytics', nil, nil, nil, nil, nil, '0.7.1', bundles_dir)
+      installer.install_plugin('analytics', nil, nil, nil, nil, nil, '0.7.1', bundles_dir)
 
       check_installation(bundles_dir)
 
@@ -46,23 +47,23 @@ describe KPM::BaseInstaller do
 
       begin
         installer.install_plugin('invalid', nil, nil, nil, nil, nil, '1.2.3', bundles_dir)
-        fail "Should not succeed to install invalid plugin"
-      rescue ArgumentError => e
+        raise 'Should not succeed to install invalid plugin'
+      rescue ArgumentError
+        # Expected
       end
     end
   end
 
   it 'should extract plugin name from file path' do
-
     [
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-1.0.0.jar', :expected => 'xxx'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-bar-1.0.0.jar', :expected => 'xxx-foo-bar'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.0.0.jar', :expected => 'xxx-foo'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.0.0-SNAPSHOT.jar', :expected => 'xxx-foo'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.0.jar', :expected => 'xxx-foo'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-1.jar', :expected => 'xxx-foo'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-abc-SNAPSHOT.jar', :expected => 'xxx-foo'},
-      {:file_path => '/Somewhere/xxx-foo/target/xxx-foo-abc.jar', :expected => 'xxx-foo'}
+      { file_path: '/Somewhere/xxx-foo/target/xxx-1.0.0.jar', expected: 'xxx' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-bar-1.0.0.jar', expected: 'xxx-foo-bar' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-1.0.0.jar', expected: 'xxx-foo' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-1.0.0-SNAPSHOT.jar', expected: 'xxx-foo' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-1.0.jar', expected: 'xxx-foo' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-1.jar', expected: 'xxx-foo' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-abc-SNAPSHOT.jar', expected: 'xxx-foo' },
+      { file_path: '/Somewhere/xxx-foo/target/xxx-foo-abc.jar', expected: 'xxx-foo' }
     ].each do |test|
       KPM::Utils.get_plugin_name_from_file_path(test[:file_path]).should eq test[:expected]
     end
@@ -75,14 +76,14 @@ describe KPM::BaseInstaller do
 
     plugin_identifiers = read_plugin_identifiers(plugins_dir)
 
-    plugin_identifiers.size.should == 1
+    plugin_identifiers.size.should eq 1
 
-    plugin_identifiers['analytics']['plugin_name'].should == 'analytics-plugin'
-    plugin_identifiers['analytics']['group_id'].should == 'org.kill-bill.billing.plugin.java'
-    plugin_identifiers['analytics']['artifact_id'].should == 'analytics-plugin'
-    plugin_identifiers['analytics']['packaging'].should == 'jar'
-    plugin_identifiers['analytics']['version'].should == '0.7.1'
-    plugin_identifiers['analytics']['language'].should == 'java'
+    plugin_identifiers['analytics']['plugin_name'].should eq 'analytics-plugin'
+    plugin_identifiers['analytics']['group_id'].should eq 'org.kill-bill.billing.plugin.java'
+    plugin_identifiers['analytics']['artifact_id'].should eq 'analytics-plugin'
+    plugin_identifiers['analytics']['packaging'].should eq 'jar'
+    plugin_identifiers['analytics']['version'].should eq '0.7.1'
+    plugin_identifiers['analytics']['language'].should eq 'java'
 
     File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt').should be_false
   end
@@ -92,26 +93,26 @@ describe KPM::BaseInstaller do
 
     plugin_identifiers = read_plugin_identifiers(plugins_dir)
 
-    plugin_identifiers.size.should == 0
+    plugin_identifiers.size.should eq 0
 
     File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt').should be_true
   end
 
   def common_checks(plugins_dir)
     [
-        plugins_dir,
-        plugins_dir + '/plugins',
-        plugins_dir + '/plugins/java',
-        plugins_dir + '/plugins/java/analytics-plugin',
-        plugins_dir + '/plugins/java/analytics-plugin/0.7.1',
-        plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp',
+      plugins_dir,
+      plugins_dir + '/plugins',
+      plugins_dir + '/plugins/java',
+      plugins_dir + '/plugins/java/analytics-plugin',
+      plugins_dir + '/plugins/java/analytics-plugin/0.7.1',
+      plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp'
     ].each do |dir|
       File.directory?(dir).should be_true
     end
 
     [
-        plugins_dir + '/plugins/plugin_identifiers.json',
-        plugins_dir + '/plugins/java/analytics-plugin/0.7.1/analytics-plugin-0.7.1.jar'
+      plugins_dir + '/plugins/plugin_identifiers.json',
+      plugins_dir + '/plugins/java/analytics-plugin/0.7.1/analytics-plugin-0.7.1.jar'
     ].each do |file|
       File.file?(file).should be_true
     end

data/spec/kpm/remote/installer_spec.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 
 describe KPM::Installer do
-
   before(:all) do
     @logger       = Logger.new(STDOUT)
     @logger.level = Logger::INFO
@@ -12,15 +13,15 @@ describe KPM::Installer do
     Dir.mktmpdir do |dir|
       kb_webapp_path   = dir + '/KB_ROOT.war'
       installer        = KPM::Installer.new({
-                                                'killbill' => {
-                                                    'webapp_path' => kb_webapp_path
-                                                }
+                                              'killbill' => {
+                                                'webapp_path' => kb_webapp_path
+                                              }
                                             },
                                             @logger)
 
       # No exception
       response = nil
-      expect{ response = installer.install }.to_not raise_exception
+      expect { response = installer.install }.to_not raise_exception
       response = JSON[response]
       response['help'].should be_nil
       response['killbill']['status'].should eq 'INSTALLED'
@@ -31,15 +32,15 @@ describe KPM::Installer do
     Dir.mktmpdir do |dir|
       kaui_webapp_path = dir + '/KAUI_ROOT.war'
       installer        = KPM::Installer.new({
-                                                'kaui' => {
-                                                    'webapp_path' => kaui_webapp_path
-                                                }
+                                              'kaui' => {
+                                                'webapp_path' => kaui_webapp_path
+                                              }
                                             },
                                             @logger)
 
       # No exception
       response = nil
-      expect{ response = installer.install }.to_not raise_exception
+      expect { response = installer.install }.to_not raise_exception
       response = JSON[response]
       response['help'].should be_nil
       response['kaui']['status'].should eq 'INSTALLED'
@@ -52,28 +53,28 @@ describe KPM::Installer do
       kaui_webapp_path = dir + '/KAUI_ROOT.war'
       plugins_dir      = dir + '/bundles'
       installer        = KPM::Installer.new({
-                                                'killbill' => {
-                                                    'webapp_path' => kb_webapp_path,
-                                                    'plugins_dir' => plugins_dir,
-                                                    'plugins' => {
-                                                        'java' => [{
-                                                                       'name' => 'analytics',
-                                                                       'version' => '0.7.1'
-                                                                   }],
-                                                        'ruby' => [{
-                                                                       'name' => 'payment-test-plugin',
-                                                                       'artifact_id' => 'payment-test-plugin',
-                                                                       'group_id' => 'org.kill-bill.billing.plugin.ruby',
-                                                                       'version' => '1.8.7'
-                                                                   },
-                                                                   {
-                                                                       'name' => 'stripe'
-                                                                   }]
-                                                    }
-                                                },
-                                                'kaui' => {
-                                                    'webapp_path' => kaui_webapp_path
+                                              'killbill' => {
+                                                'webapp_path' => kb_webapp_path,
+                                                'plugins_dir' => plugins_dir,
+                                                'plugins' => {
+                                                  'java' => [{
+                                                    'name' => 'analytics',
+                                                    'version' => '0.7.1'
+                                                  }, {
+                                                    'name' => 'stripe',
+                                                    'version' => '7.0.0'
+                                                  }],
+                                                  'ruby' => [{
+                                                    'name' => 'payment-test-plugin',
+                                                    'artifact_id' => 'payment-test-plugin',
+                                                    'group_id' => 'org.kill-bill.billing.plugin.ruby',
+                                                    'version' => '1.8.7'
+                                                  }]
                                                 }
+                                              },
+                                              'kaui' => {
+                                                'webapp_path' => kaui_webapp_path
+                                              }
                                             },
                                             @logger)
 
@@ -86,11 +87,10 @@ describe KPM::Installer do
 
       # Finally verify that for both (well behaved) ruby and java plugin, skipping the install will still correctly return the `:bundle_dir`
       info = installer.install_plugin('payment-test-plugin', nil, 'org.kill-bill.billing.plugin.ruby', 'payment-test-plugin', nil, nil, '1.8.7', plugins_dir)
-      info[:bundle_dir].should == plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7'
-
+      info[:bundle_dir].should eq plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7'
 
-      info = installer.install_plugin('analytics', nil, nil, nil,  nil, nil, '0.7.1', plugins_dir)
-      info[:bundle_dir].should == plugins_dir + '/plugins/java/analytics-plugin/0.7.1'
+      info = installer.install_plugin('analytics', nil, nil, nil, nil, nil, '0.7.1', plugins_dir)
+      info[:bundle_dir].should eq plugins_dir + '/plugins/java/analytics-plugin/0.7.1'
     end
   end
 
@@ -98,27 +98,29 @@ describe KPM::Installer do
 
   def check_installation(plugins_dir, kb_webapp_path, kaui_webapp_path)
     [
-        plugins_dir,
-        plugins_dir + '/platform',
-        plugins_dir + '/plugins',
-        plugins_dir + '/plugins/java',
-        plugins_dir + '/plugins/java/analytics-plugin',
-        plugins_dir + '/plugins/java/analytics-plugin/0.7.1',
-        plugins_dir + '/plugins/ruby',
-        plugins_dir + '/plugins/ruby/killbill-payment-test',
-        plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7',
-        plugins_dir + '/plugins/ruby/killbill-stripe'
+      plugins_dir,
+      plugins_dir + '/platform',
+      plugins_dir + '/plugins',
+      plugins_dir + '/plugins/java',
+      plugins_dir + '/plugins/java/analytics-plugin',
+      plugins_dir + '/plugins/java/analytics-plugin/0.7.1',
+      plugins_dir + '/plugins/java/stripe-plugin',
+      plugins_dir + '/plugins/java/stripe-plugin/7.0.0',
+      plugins_dir + '/plugins/ruby',
+      plugins_dir + '/plugins/ruby/killbill-payment-test',
+      plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7'
     ].each do |dir|
       File.directory?(dir).should be_true
     end
 
     [
-        kb_webapp_path,
-        kaui_webapp_path,
-        plugins_dir + '/platform/jruby.jar',
-        plugins_dir + '/plugins/plugin_identifiers.json',
-        plugins_dir + '/plugins/java/analytics-plugin/0.7.1/analytics-plugin-0.7.1.jar',
-        plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7/killbill.properties'
+      kb_webapp_path,
+      kaui_webapp_path,
+      plugins_dir + '/platform/jruby.jar',
+      plugins_dir + '/plugins/plugin_identifiers.json',
+      plugins_dir + '/plugins/java/analytics-plugin/0.7.1/analytics-plugin-0.7.1.jar',
+      plugins_dir + '/plugins/java/stripe-plugin/7.0.0/stripe-plugin-7.0.0.jar',
+      plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7/killbill.properties'
     ].each do |file|
       File.file?(file).should be_true
     end
@@ -127,27 +129,27 @@ describe KPM::Installer do
       JSON.parse(f.read)
     end
 
-    plugin_identifiers.size.should == 3
-
-    plugin_identifiers['analytics']['plugin_name'].should == 'analytics-plugin'
-    plugin_identifiers['analytics']['group_id'].should == 'org.kill-bill.billing.plugin.java'
-    plugin_identifiers['analytics']['artifact_id'].should == 'analytics-plugin'
-    plugin_identifiers['analytics']['packaging'].should == 'jar'
-    plugin_identifiers['analytics']['version'].should == '0.7.1'
-    plugin_identifiers['analytics']['language'].should == 'java'
-
-    plugin_identifiers['payment-test-plugin']['plugin_name'].should == 'killbill-payment-test'
-    plugin_identifiers['payment-test-plugin']['group_id'].should == 'org.kill-bill.billing.plugin.ruby'
-    plugin_identifiers['payment-test-plugin']['artifact_id'].should == 'payment-test-plugin'
-    plugin_identifiers['payment-test-plugin']['packaging'].should == 'tar.gz'
-    plugin_identifiers['payment-test-plugin']['version'].should == '1.8.7'
-    plugin_identifiers['payment-test-plugin']['language'].should == 'ruby'
-
-    plugin_identifiers['stripe']['plugin_name'].should == 'killbill-stripe'
-    plugin_identifiers['stripe']['group_id'].should == 'org.kill-bill.billing.plugin.ruby'
-    plugin_identifiers['stripe']['artifact_id'].should == 'stripe-plugin'
-    plugin_identifiers['stripe']['packaging'].should == 'tar.gz'
-    plugin_identifiers['stripe']['version'].should >= '4.0.0'
-    plugin_identifiers['stripe']['language'].should == 'ruby'
+    plugin_identifiers.size.should eq 3
+
+    plugin_identifiers['analytics']['plugin_name'].should eq 'analytics-plugin'
+    plugin_identifiers['analytics']['group_id'].should eq 'org.kill-bill.billing.plugin.java'
+    plugin_identifiers['analytics']['artifact_id'].should eq 'analytics-plugin'
+    plugin_identifiers['analytics']['packaging'].should eq 'jar'
+    plugin_identifiers['analytics']['version'].should eq '0.7.1'
+    plugin_identifiers['analytics']['language'].should eq 'java'
+
+    plugin_identifiers['stripe']['plugin_name'].should eq 'stripe-plugin'
+    plugin_identifiers['stripe']['group_id'].should eq 'org.kill-bill.billing.plugin.java'
+    plugin_identifiers['stripe']['artifact_id'].should eq 'stripe-plugin'
+    plugin_identifiers['stripe']['packaging'].should eq 'jar'
+    plugin_identifiers['stripe']['version'].should eq '7.0.0'
+    plugin_identifiers['stripe']['language'].should eq 'java'
+
+    plugin_identifiers['payment-test-plugin']['plugin_name'].should eq 'killbill-payment-test'
+    plugin_identifiers['payment-test-plugin']['group_id'].should eq 'org.kill-bill.billing.plugin.ruby'
+    plugin_identifiers['payment-test-plugin']['artifact_id'].should eq 'payment-test-plugin'
+    plugin_identifiers['payment-test-plugin']['packaging'].should eq 'tar.gz'
+    plugin_identifiers['payment-test-plugin']['version'].should eq '1.8.7'
+    plugin_identifiers['payment-test-plugin']['language'].should eq 'ruby'
   end
 end