kpm 0.7.2 → 0.8.0

data/spec/kpm/remote/kaui_artifact_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe KPM::KillbillPluginArtifact do
-
   before(:all) do
     @logger       = Logger.new(STDOUT)
     @logger.level = Logger::INFO
@@ -16,15 +17,15 @@ describe KPM::KillbillPluginArtifact do
                                     KPM::BaseArtifact::KAUI_CLASSIFIER,
                                     'LATEST',
                                     dir)
-      info[:file_name].should == "kaui-standalone-#{info[:version]}.war"
-      info[:size].should == File.size(info[:file_path])
+      info[:file_name].should eq "kaui-standalone-#{info[:version]}.war"
+      info[:size].should eq File.size(info[:file_path])
     end
   end
 
   it 'should be able to list versions' do
     versions = KPM::KauiArtifact.versions.to_a
-    versions.size.should >= 2
-    versions[0].should == '0.0.1'
-    versions[1].should == '0.0.2'
+    expect(versions.size).to be >= 2
+    versions[0].should eq '0.0.1'
+    versions[1].should eq '0.0.2'
   end
 end

data/spec/kpm/remote/killbill_plugin_artifact_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe KPM::KillbillPluginArtifact do
-
   before(:all) do
     @logger       = Logger.new(STDOUT)
     @logger.level = Logger::INFO
@@ -22,12 +23,12 @@ describe KPM::KillbillPluginArtifact do
       info[:file_name].should be_nil
 
       files_in_dir = Dir[info[:file_path] + '/*']
-      files_in_dir.size.should == 1
-      files_in_dir[0].should == info[:file_path] + '/killbill-payment-test'
+      files_in_dir.size.should eq 1
+      files_in_dir[0].should eq info[:file_path] + '/killbill-payment-test'
 
-      File.read(info[:file_path] + '/killbill-payment-test/1.8.7/killbill.properties').should == "mainClass=PaymentTest::PaymentPlugin\nrequire=payment_test\npluginType=PAYMENT\n"
+      File.read(info[:file_path] + '/killbill-payment-test/1.8.7/killbill.properties').should eq "mainClass=PaymentTest::PaymentPlugin\nrequire=payment_test\npluginType=PAYMENT\n"
 
-      info[:bundle_dir].should == info[:file_path] + '/killbill-payment-test/1.8.7'
+      info[:bundle_dir].should eq info[:file_path] + '/killbill-payment-test/1.8.7'
     end
   end
 
@@ -43,8 +44,8 @@ describe KPM::KillbillPluginArtifact do
                                               'killbill-analytics',
                                               dir,
                                               sha1_file)
-      info[:file_name].should == "analytics-plugin-#{info[:version]}.jar"
-      info[:size].should == File.size(info[:file_path])
+      info[:file_name].should eq "analytics-plugin-#{info[:version]}.jar"
+      info[:size].should eq File.size(info[:file_path])
 
       check_yaml_for_resolved_latest_version(sha1_file, 'org.kill-bill.billing.plugin.java:analytics-plugin:jar', '3.0.0')
     end
@@ -66,9 +67,6 @@ describe KPM::KillbillPluginArtifact do
 
       check_yaml_for_resolved_latest_version(sha1_file, 'org.kill-bill.billing.plugin.ruby:logging-plugin:tar.gz', '3.0.0')
     end
-
-
-
   end
 
   it 'should be able to list versions' do
@@ -77,16 +75,16 @@ describe KPM::KillbillPluginArtifact do
     versions[:java].should_not be_nil
     versions[:java]['analytics-plugin'].should_not be_nil
     logging_plugin_versions = versions[:java]['analytics-plugin'].to_a
-    logging_plugin_versions.size.should >= 3
-    logging_plugin_versions[0].should == '0.6.0'
-    logging_plugin_versions[1].should == '0.7.0'
-    logging_plugin_versions[2].should == '0.7.1'
+    expect(logging_plugin_versions.size).to be >= 3
+    logging_plugin_versions[0].should eq '0.6.0'
+    logging_plugin_versions[1].should eq '0.7.0'
+    logging_plugin_versions[2].should eq '0.7.1'
 
     versions[:ruby].should_not be_nil
     versions[:ruby]['logging-plugin'].should_not be_nil
     logging_plugin_versions = versions[:ruby]['logging-plugin'].to_a
-    logging_plugin_versions.size.should >= 1
-    logging_plugin_versions[0].should == '1.7.0'
+    expect(logging_plugin_versions.size).to be >= 1
+    logging_plugin_versions[0].should eq '1.7.0'
   end
 
   private
@@ -95,17 +93,14 @@ describe KPM::KillbillPluginArtifact do
   # (we can't check against actual version because as we keep releasing those increment,
   # so the best we can do it check this is *not* LATEST and greater than current version at the time the test was written )
   def check_yaml_for_resolved_latest_version(sha1_file, key_prefix, minimum_version)
-
     sha1_checker = KPM::Sha1Checker.from_file(sha1_file)
 
-    keys = sha1_checker.all_sha1.keys.select { |k| k.start_with? key_prefix}
-    keys.size.should == 1
+    keys = sha1_checker.all_sha1.keys.select { |k| k.start_with? key_prefix }
+    keys.size.should eq 1
 
     parts = keys[0].split(':')
-    parts.size.should == 4
-    parts[3].should_not == 'LATEST'
-    parts[3].should  >= minimum_version
+    parts.size.should eq 4
+    parts[3].should_not eq 'LATEST'
+    expect(parts[3]).to be >= minimum_version
   end
-
-
 end

data/spec/kpm/remote/killbill_server_artifact_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe KPM::KillbillServerArtifact do
-
   before(:all) do
     @logger       = Logger.new(STDOUT)
     @logger.level = Logger::INFO
@@ -17,41 +18,41 @@ describe KPM::KillbillServerArtifact do
                                               KPM::BaseArtifact::KILLBILL_CLASSIFIER,
                                               'LATEST',
                                               dir)
-      info[:file_name].should == "killbill-profiles-killbill-#{info[:version]}.war"
-      info[:size].should == File.size(info[:file_path])
+      info[:file_name].should eq "killbill-profiles-killbill-#{info[:version]}.war"
+      info[:size].should eq File.size(info[:file_path])
     end
   end
 
   it 'should be able to list versions' do
     versions = KPM::KillbillServerArtifact.versions(KPM::BaseArtifact::KILLBILL_ARTIFACT_ID).to_a
-    versions.size.should >= 2
-    versions[0].should == '0.11.10'
-    versions[1].should == '0.11.11'
+    expect(versions.size).to be >= 2
+    versions[0].should eq '0.11.10'
+    versions[1].should eq '0.11.11'
   end
 
   it 'should get dependencies information' do
-    nexus_down = {:url => 'https://does.not.exist'}
+    nexus_down = { url: 'https://does.not.exist' }
 
     Dir.mktmpdir do |dir|
       sha1_file = "#{dir}/sha1.yml"
       info = KPM::KillbillServerArtifact.info('0.15.9', sha1_file)
-      info['killbill'].should == '0.15.9'
-      info['killbill-oss-parent'].should == '0.62'
-      info['killbill-api'].should == '0.27'
-      info['killbill-plugin-api'].should == '0.16'
-      info['killbill-commons'].should == '0.10'
-      info['killbill-platform'].should == '0.13'
-      KPM::Sha1Checker.from_file(sha1_file).killbill_info('0.15.9').should == info
+      info['killbill'].should eq '0.15.9'
+      info['killbill-oss-parent'].should eq '0.62'
+      info['killbill-api'].should eq '0.27'
+      info['killbill-plugin-api'].should eq '0.16'
+      info['killbill-commons'].should eq '0.10'
+      info['killbill-platform'].should eq '0.13'
+      KPM::Sha1Checker.from_file(sha1_file).killbill_info('0.15.9').should eq info
 
       # Verify the download is skipped gracefully when Nexus isn't reachable
       KPM::KillbillServerArtifact.info('0.15.9', sha1_file, false, nil, nexus_down)
 
       # Verify the download fails when Nexus isn't reachable and force_download is set
-      expect { KPM::KillbillServerArtifact.info('0.15.9', sha1_file, true, nil, nexus_down) }.to raise_error(SocketError)
+      expect { KPM::KillbillServerArtifact.info('0.15.9', sha1_file, true, nil, 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_killbill_info('0.15.9', nil)
-      expect { KPM::KillbillServerArtifact.info('0.15.9', sha1_file, false, nil, nexus_down) }.to raise_error(SocketError)
+      expect { KPM::KillbillServerArtifact.info('0.15.9', sha1_file, false, nil, nexus_down) }.to raise_error
     end
   end
 end

data/spec/kpm/remote/migrations_spec.rb

@@ -1,18 +1,19 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe KPM::Migrations, :skip_me_if_nil => ENV['TOKEN'].nil? do
+require 'spec_helper'
 
+describe KPM::Migrations, skip_me_if_nil: ENV['TOKEN'].nil? do
   context 'plugins' do
     it 'should be able to find migrations for a java plugin' do
       migrations = KPM::Migrations.new('analytics-plugin-3.0.2', nil, 'killbill/killbill-analytics-plugin', ENV['TOKEN']).migrations
       # No migration yet
-      migrations.size.should == 0
+      migrations.size.should eq 0
     end
 
     it 'should be able to find migrations for a ruby plugin' do
       migrations = KPM::Migrations.new('master', nil, 'killbill/killbill-cybersource-plugin', ENV['TOKEN']).migrations
       # No migration yet
-      migrations.size.should == 1
+      migrations.size.should eq 1
     end
   end
 
@@ -20,19 +21,19 @@ describe KPM::Migrations, :skip_me_if_nil => ENV['TOKEN'].nil? do
     it 'should be able to find migrations between two versions' do
       migrations = KPM::Migrations.new('killbill-0.16.3', 'killbill-0.16.4', 'killbill/killbill', ENV['TOKEN']).migrations
 
-      migrations.size.should == 1
-      migrations.first[:name].should == 'V20160324060345__revisit_payment_methods_indexes_509.sql'
-      migrations.first[:sql].should == "drop index payment_methods_active_accnt on payment_methods;\n"
+      migrations.size.should eq 1
+      migrations.first[:name].should eq 'V20160324060345__revisit_payment_methods_indexes_509.sql'
+      migrations.first[:sql].should eq "drop index payment_methods_active_accnt on payment_methods;\n"
 
-      KPM::Migrations.new('master', 'master', 'killbill/killbill', ENV['TOKEN']).migrations.size.should == 0
+      KPM::Migrations.new('master', 'master', 'killbill/killbill', ENV['TOKEN']).migrations.size.should eq 0
     end
 
     it 'should be able to find migrations for a given version' do
       migrations = KPM::Migrations.new('killbill-0.16.4', nil, 'killbill/killbill', ENV['TOKEN']).migrations
 
-      migrations.size.should == 1
-      migrations.first[:name].should == 'V20160324060345__revisit_payment_methods_indexes_509.sql'
-      migrations.first[:sql].should == "drop index payment_methods_active_accnt on payment_methods;\n"
+      migrations.size.should eq 1
+      migrations.first[:name].should eq 'V20160324060345__revisit_payment_methods_indexes_509.sql'
+      migrations.first[:sql].should eq "drop index payment_methods_active_accnt on payment_methods;\n"
     end
   end
 end

data/spec/kpm/remote/nexus_facade_spec.rb

@@ -1,50 +1,55 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rexml/document'
 
 describe KPM::NexusFacade do
-
-  let(:coordinates_map){ {:version  => '0.1.4',
-                      :group_id => 'org.kill-bill.billing',
-                      :artifact_id => 'killbill-platform-osgi-api',
-                      :packaging => 'jar',
-                      :classifier => nil} }
-  let(:coordinates_with_classifier_map){ {:version  => '0.1.1',
-                      :group_id => 'org.kill-bill.billing',
-                      :artifact_id => 'killbill-platform-osgi-bundles-jruby',
-                      :packaging => 'jar',
-                      :classifier => 'javadoc'} }
-  let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map)}
-  let(:coordinates_with_classifier) { KPM::Coordinates.build_coordinates(coordinates_with_classifier_map)}
-  let(:nexus_remote) { described_class::RemoteFactory.create(nil, true)}
+  let(:coordinates_map) do
+    { version: '0.1.4',
+      group_id: 'org.kill-bill.billing',
+      artifact_id: 'killbill-platform-osgi-api',
+      packaging: 'jar',
+      classifier: nil }
+  end
+  let(:coordinates_with_classifier_map) do
+    { version: '0.1.1',
+      group_id: 'org.kill-bill.billing',
+      artifact_id: 'killbill-platform-osgi-bundles-jruby',
+      packaging: 'jar',
+      classifier: 'javadoc' }
+  end
+  let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
+  let(:coordinates_with_classifier) { KPM::Coordinates.build_coordinates(coordinates_with_classifier_map) }
+  let(:nexus_remote) { described_class::RemoteFactory.create(nil, true) }
 
   it 'when searching for artifacts' do
     response = nil
-    expect{  response = nexus_remote.search_for_artifacts(coordinates) }.not_to raise_exception
-    expect(REXML::Document.new(response).elements["//artifactId"].text).to eq(coordinates_map[:artifact_id])
+    expect { response = nexus_remote.search_for_artifacts(coordinates) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements['//artifactId'].text).to eq(coordinates_map[:artifact_id])
   end
 
   it 'when searching for artifact with classifier' do
     response = nil
-    expect{  response = nexus_remote.search_for_artifacts(coordinates_with_classifier) }.not_to raise_exception
-    expect(REXML::Document.new(response).elements["//artifactId"].text).to eq(coordinates_with_classifier_map[:artifact_id])
+    expect { response = nexus_remote.search_for_artifacts(coordinates_with_classifier) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements['//artifactId'].text).to eq(coordinates_with_classifier_map[:artifact_id])
   end
 
   it 'when getting artifact info' do
     response = nil
-    expect{  response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
-    expect(REXML::Document.new(response).elements["//version"].text).to eq(coordinates_map[:version])
+    expect { response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements['//version'].text).to eq(coordinates_map[:version])
   end
 
   it 'when getting artifact info with classifier' do
     response = nil
-    expect{  response = nexus_remote.get_artifact_info(coordinates_with_classifier) }.not_to raise_exception
-    expect(REXML::Document.new(response).elements["//version"].text).to eq(coordinates_with_classifier_map[:version])
+    expect { response = nexus_remote.get_artifact_info(coordinates_with_classifier) }.not_to raise_exception
+    expect(REXML::Document.new(response).elements['//version'].text).to eq(coordinates_with_classifier_map[:version])
   end
 
   it 'when pull artifact' do
     response = nil
     destination = Dir.mktmpdir('artifact')
-    expect{  response = nexus_remote.pull_artifact(coordinates,destination) }.not_to raise_exception
+    expect { response = nexus_remote.pull_artifact(coordinates, destination) }.not_to raise_exception
     destination = File.join(File.expand_path(destination), response[:file_name])
     expect(File.exist?(destination)).to be_true
   end
@@ -52,9 +57,8 @@ describe KPM::NexusFacade do
   it 'when pull artifact with classifier' do
     response = nil
     destination = Dir.mktmpdir('artifact')
-    expect{  response = nexus_remote.pull_artifact(coordinates_with_classifier,destination) }.not_to raise_exception
+    expect { response = nexus_remote.pull_artifact(coordinates_with_classifier, destination) }.not_to raise_exception
     destination = File.join(File.expand_path(destination), response[:file_name])
     expect(File.exist?(destination)).to be_true
   end
-
-end
+end

data/spec/kpm/remote/tenant_config_spec.rb

@@ -1,24 +1,29 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe KPM::TenantConfig do
   include_context 'connection_setup'
 
-  let(:value) {"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<catalog>\n    <effectiveDate>2017-04-25T15:57:43Z</effectiveDate>\n    <catalogName>DEFAULT</catalogName>\n    <recurringBillingMode>IN_ADVANCE</recurringBillingMode>\n    <currencies/>\n    <units/>\n    <products/>\n    <rules>\n        <changePolicy>\n            <changePolicyCase>\n                <policy>IMMEDIATE</policy>\n            </changePolicyCase>\n        </changePolicy>\n        <changeAlignment>\n            <changeAlignmentCase>\n                <alignment>START_OF_BUNDLE</alignment>\n            </changeAlignmentCase>\n        </changeAlignment>\n        <cancelPolicy>\n            <cancelPolicyCase>\n                <policy>IMMEDIATE</policy>\n            </cancelPolicyCase>\n        </cancelPolicy>\n        <createAlignment>\n            <createAlignmentCase>\n                <alignment>START_OF_BUNDLE</alignment>\n            </createAlignmentCase>\n        </createAlignment>\n        <billingAlignment>\n            <billingAlignmentCase>\n                <alignment>ACCOUNT</alignment>\n            </billingAlignmentCase>\n        </billingAlignment>\n        <priceList>\n            <priceListCase>\n                <toPriceList>DEFAULT</toPriceList>\n            </priceListCase>\n        </priceList>\n    </rules>\n    <plans/>\n    <priceLists>\n        <defaultPriceList name=\"DEFAULT\">\n            <plans/>\n        </defaultPriceList>\n    </priceLists>\n</catalog>\n"}
-  let(:key) {'CATALOG_RSPEC'}
-
-  let(:user) {'KPM Tenant Spec'}
-  let(:tenant_config_class) { described_class.new([killbill_api_key,killbill_api_secrets],
-                                             [killbill_user, killbill_password],url,logger)}
-  let(:options){{
-        :username => killbill_user,
-        :password => killbill_password,
-        :api_key => killbill_api_key,
-        :api_secret => killbill_api_secrets
-      }}
-                                             
+  let(:value) { "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<catalog>\n    <effectiveDate>2017-04-25T15:57:43Z</effectiveDate>\n    <catalogName>DEFAULT</catalogName>\n    <recurringBillingMode>IN_ADVANCE</recurringBillingMode>\n    <currencies/>\n    <units/>\n    <products/>\n    <rules>\n        <changePolicy>\n            <changePolicyCase>\n                <policy>IMMEDIATE</policy>\n            </changePolicyCase>\n        </changePolicy>\n        <changeAlignment>\n            <changeAlignmentCase>\n                <alignment>START_OF_BUNDLE</alignment>\n            </changeAlignmentCase>\n        </changeAlignment>\n        <cancelPolicy>\n            <cancelPolicyCase>\n                <policy>IMMEDIATE</policy>\n            </cancelPolicyCase>\n        </cancelPolicy>\n        <createAlignment>\n            <createAlignmentCase>\n                <alignment>START_OF_BUNDLE</alignment>\n            </createAlignmentCase>\n        </createAlignment>\n        <billingAlignment>\n            <billingAlignmentCase>\n                <alignment>ACCOUNT</alignment>\n            </billingAlignmentCase>\n        </billingAlignment>\n        <priceList>\n            <priceListCase>\n                <toPriceList>DEFAULT</toPriceList>\n            </priceListCase>\n        </priceList>\n    </rules>\n    <plans/>\n    <priceLists>\n        <defaultPriceList name=\"DEFAULT\">\n            <plans/>\n        </defaultPriceList>\n    </priceLists>\n</catalog>\n" }
+  let(:key) { 'CATALOG_RSPEC' }
+
+  let(:user) { 'KPM Tenant Spec' }
+  let(:tenant_config_class) do
+    described_class.new([killbill_api_key, killbill_api_secret],
+                        [killbill_user, killbill_password], url, logger)
+  end
+  let(:options) do
+    {
+      username: killbill_user,
+      password: killbill_password,
+      api_key: killbill_api_key,
+      api_secret: killbill_api_secret
+    }
+  end
+
   describe '#initialize' do
     context 'when creating an instance of tenant config class' do
-
       it 'when initialized with defaults' do
         expect(described_class.new).to be_an_instance_of(KPM::TenantConfig)
       end
@@ -26,33 +31,29 @@ describe KPM::TenantConfig do
       it 'when initialized with options' do
         tenant_config_class.should be_an_instance_of(KPM::TenantConfig)
         expect(tenant_config_class.instance_variable_get(:@killbill_api_key)).to eq(killbill_api_key)
-        expect(tenant_config_class.instance_variable_get(:@killbill_api_secrets)).to eq(killbill_api_secrets)
+        expect(tenant_config_class.instance_variable_get(:@killbill_api_secret)).to eq(killbill_api_secret)
         expect(tenant_config_class.instance_variable_get(:@killbill_user)).to eq(killbill_user)
         expect(tenant_config_class.instance_variable_get(:@killbill_password)).to eq(killbill_password)
         expect(tenant_config_class.instance_variable_get(:@killbill_url)).to eq(url)
-
       end
-
     end
+  end
 
-  end                                           
-  
   describe '#export' do
     it 'when retrieving tenant configuration' do
       KillBillClient.url = url
 
-      #Add a new tenant config
+      # Add a new tenant config
       tenant_config = KillBillClient::Model::Tenant.upload_tenant_user_key_value(key, value, user, nil, nil, options)
       expect(tenant_config.key).to eq(key)
-      
-      #get created tenant config
+
+      # get created tenant config
       export_file = tenant_config_class.export(key)
       expect(File.exist?(export_file)).to be_true
       expect(File.readlines(export_file).grep(/#{key}/)).to be_true
-      
-      #remove created tenant config
+
+      # remove created tenant config
       KillBillClient::Model::Tenant.delete_tenant_user_key_value(key, user, nil, nil, options)
-      
     end
   end
-end
+end

data/spec/kpm/remote/tomcat_manager_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe KPM::TomcatManager do
-
   before(:all) do
     @logger = Logger.new(STDOUT)
     @logger.level = Logger::INFO

data/spec/kpm/unit/actions_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe KPM::NexusFacade::Actions do
+  subject { described_class.new({}, nil, logger) }
+  let(:logger) { Logger.new(STDOUT) }
+  let(:nexus_mock) { double(KPM::NexusFacade::NexusApiCallsV2) }
+
+  before do
+    KPM::NexusFacade::NexusApiCallsV2.stub(:new).and_return(nexus_mock)
+  end
+
+  context 'when Nexus throws a non-retryable exception' do
+    it 'never retries' do
+      calls = 0
+      expect do
+        subject.send(:retry_exceptions, 'foo') do
+          calls += 1
+          raise StandardError, '404'
+        end
+      end.to raise_error(StandardError)
+      expect(calls).to eq(1)
+    end
+  end
+
+  context 'when Nexus throws a retryable exception' do
+    it 'retries until giving up' do
+      calls = 0
+      expect do
+        subject.send(:retry_exceptions, 'foo') do
+          calls += 1
+          raise KPM::NexusFacade::UnexpectedStatusCodeException, 503
+        end
+      end.to raise_error(StandardError)
+      expect(calls).to eq(3)
+    end
+  end
+
+  context 'when networking is flaky' do
+    it 'retries until call succeeds' do
+      calls = 0
+      expect(subject.send(:retry_exceptions, 'foo') do
+        calls += 1
+        raise OpenSSL::SSL::SSLErrorWaitReadable if calls < 2
+
+        true
+      end).to be_true
+      expect(calls).to eq(2)
+    end
+  end
+end