kpm 0.8.0 → 0.10.1

data/spec/kpm/remote/base_artifact_spec.rb

@@ -36,10 +36,12 @@ describe KPM::BaseArtifact do
       # 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
+      expect { test_download dir, 'foo-oss.pom.xml', nil, true, sha1_file, nexus_down }.to raise_exception(SocketError, /(Failed to open TCP connection to does.not.exist:443|getaddrinfo)/)
       # 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
+      expect(KPM::Sha1Checker.from_file(sha1_file).artifact_info('org.kill-bill.billing:killbill-oss-parent:pom:0.143.33')).to_not be_nil
+      KPM::Sha1Checker.from_file(sha1_file).remove_entry!('org.kill-bill.billing:killbill-oss-parent:pom:0.143.33')
+      expect(KPM::Sha1Checker.from_file(sha1_file).artifact_info('org.kill-bill.billing:killbill-oss-parent:pom:0.143.33')).to be_nil
+      expect { test_download dir, 'foo-oss.pom.xml', nil, false, sha1_file, nexus_down }.to raise_exception(SocketError, /(Failed to open TCP connection to does.not.exist:443|getaddrinfo)/)
     end
   end
 
@@ -53,14 +55,14 @@ describe KPM::BaseArtifact do
 
     Dir.mktmpdir do |dir|
       info = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, dir)
-      info[:file_name].should be_nil
+      expect(info[:file_name]).to be_nil
 
       files_in_dir = Dir[info[:file_path] + '/*']
-      files_in_dir.size.should eq 20
+      expect(files_in_dir.size).to eq 20
 
-      File.file?(info[:file_path] + '/killbill-osgi-bundles-jruby-0.11.3.jar').should be_true
+      expect(File.file?(info[:file_path] + '/killbill-osgi-bundles-jruby-0.11.3.jar')).to be_truthy
 
-      info[:bundle_dir].should eq info[:file_path]
+      expect(info[:bundle_dir]).to eq info[:file_path]
     end
   end
 
@@ -75,11 +77,11 @@ describe KPM::BaseArtifact do
 
     Dir.mktmpdir do |dir|
       first_take = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, dir)
-      File.file?(first_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.2.jar').should be_true
+      expect(File.file?(first_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.2.jar')).to be_truthy
 
       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
+      expect(File.file?(first_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.2.jar')).to be_falsey
+      expect(File.file?(second_take[:file_path] + '/killbill-platform-osgi-bundles-jruby-0.36.10.jar')).to be_truthy
     end
   end
 
@@ -87,8 +89,8 @@ describe KPM::BaseArtifact do
     path = filename.nil? ? dir : dir + '/' + filename
 
     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]
+    expect(info[:file_name]).to eq(filename.nil? ? "killbill-oss-parent-#{info[:version]}.pom" : filename)
+    expect(info[:skipped]).to eq verify_is_skipped
+    expect(info[:size]).to eq File.size(info[:file_path]) unless info[:skipped]
   end
 end

data/spec/kpm/remote/base_installer_spec.rb

@@ -65,7 +65,7 @@ describe KPM::BaseInstaller do
       { 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]
+      expect(KPM::Utils.get_plugin_name_from_file_path(test[:file_path])).to eq test[:expected]
     end
   end
 
@@ -76,16 +76,16 @@ describe KPM::BaseInstaller do
 
     plugin_identifiers = read_plugin_identifiers(plugins_dir)
 
-    plugin_identifiers.size.should eq 1
+    expect(plugin_identifiers.size).to eq 1
 
-    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'
+    expect(plugin_identifiers['analytics']['plugin_name']).to eq 'analytics-plugin'
+    expect(plugin_identifiers['analytics']['group_id']).to eq 'org.kill-bill.billing.plugin.java'
+    expect(plugin_identifiers['analytics']['artifact_id']).to eq 'analytics-plugin'
+    expect(plugin_identifiers['analytics']['packaging']).to eq 'jar'
+    expect(plugin_identifiers['analytics']['version']).to eq '0.7.1'
+    expect(plugin_identifiers['analytics']['language']).to eq 'java'
 
-    File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt').should be_false
+    expect(File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt')).to be_falsey
   end
 
   def check_uninstallation(plugins_dir)
@@ -93,9 +93,9 @@ describe KPM::BaseInstaller do
 
     plugin_identifiers = read_plugin_identifiers(plugins_dir)
 
-    plugin_identifiers.size.should eq 0
+    expect(plugin_identifiers.size).to eq 0
 
-    File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt').should be_true
+    expect(File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt')).to be_truthy
   end
 
   def common_checks(plugins_dir)
@@ -107,14 +107,14 @@ describe KPM::BaseInstaller do
       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
+      expect(File.directory?(dir)).to be_truthy
     end
 
     [
       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
+      expect(File.file?(file)).to be_truthy
     end
   end
 

data/spec/kpm/remote/cloudsmith_api_calls_spec.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rexml/document'
+
+describe KPM::NexusFacade, skip_me_if_nil: ENV['CLOUDSMITH_TOKEN'].nil? do
+  let(:logger) do
+    logger = ::Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    logger
+  end
+  let(:coordinates_map) do
+    { version: '0.22.21-20210319.010242-1',
+      group_id: 'org.kill-bill.billing',
+      artifact_id: 'killbill',
+      packaging: 'pom',
+      classifier: nil }
+  end
+  let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
+  let(:nexus_remote) { described_class::CloudsmithApiCalls.new({ :url => "https://dl.cloudsmith.io/#{ENV['CLOUDSMITH_TOKEN']}/#{ENV['CLOUDSMITH_ORG']}/#{ENV['CLOUDSMITH_REPO']}/maven" }, true, logger) }
+
+  it {
+    # Not implemented
+    expect { nexus_remote.search_for_artifacts(coordinates) }.to raise_exception(NoMethodError, 'Cloudsmith has no search support')
+  }
+
+  # Upload as: cloudsmith push maven -v --group-id com.mycompany.app --artifact-id my-app --packaging pom --version 1.2.3 org/repo my-app-1.2.3.pom
+  # <project>
+  #   <modelVersion>4.0.0</modelVersion>
+  #   <groupId>com.mycompany.app</groupId>
+  #   <artifactId>my-app</artifactId>
+  #   <version>1.2.3</version>
+  #   <packaging>pom</packaging>
+  # </project>
+  context 'when pulling release artifact' do
+    let(:coordinates_map) do
+      { version: '1.2.3',
+        group_id: 'com.mycompany.app',
+        artifact_id: 'my-app',
+        packaging: 'pom',
+        classifier: nil }
+    end
+    let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
+
+    it {
+      response = nil
+      expect { response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
+      parsed_doc = REXML::Document.new(response)
+      expect(parsed_doc.elements['//version'].text).to eq('1.2.3')
+      expect(parsed_doc.elements['//repositoryPath'].text).to eq('/com/mycompany/app/1.2.3/my-app-1.2.3.pom')
+      expect(parsed_doc.elements['//snapshot'].text).to eq('false')
+    }
+
+    it {
+      response = nil
+      destination = Dir.mktmpdir('artifact')
+      expect { response = nexus_remote.pull_artifact(coordinates, destination) }.not_to raise_exception
+      destination = File.join(File.expand_path(destination), response[:file_name])
+      parsed_pom = REXML::Document.new(File.read(destination))
+      expect(parsed_pom.elements['//groupId'].text).to eq('com.mycompany.app')
+      expect(parsed_pom.elements['//artifactId'].text).to eq('my-app')
+      expect(parsed_pom.elements['//version'].text).to eq('1.2.3')
+    }
+  end
+
+  # File uploaded twice (the first doesn't have any <properties>)
+  # <project>
+  #   <modelVersion>4.0.0</modelVersion>
+  #   <groupId>com.mycompany.app</groupId>
+  #   <artifactId>my-app</artifactId>
+  #   <version>1.2.4-SNAPSHOT</version>
+  #   <packaging>pom</packaging>
+  #   <properties>
+  #     <for-kpm>true</for-kpm>
+  #   </properties>
+  # </project>
+  context 'when pulling SNAPSHOT artifact' do
+    let(:coordinates_map) do
+      { version: '1.2.4-SNAPSHOT',
+        group_id: 'com.mycompany.app',
+        artifact_id: 'my-app',
+        packaging: 'pom',
+        classifier: nil }
+    end
+    let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
+
+    it {
+      response = nil
+      expect { response = nexus_remote.get_artifact_info(coordinates) }.not_to raise_exception
+      parsed_doc = REXML::Document.new(response)
+      expect(parsed_doc.elements['//version'].text).to eq('1.2.4-SNAPSHOT')
+      expect(parsed_doc.elements['//repositoryPath'].text).to eq('/com/mycompany/app/1.2.4-SNAPSHOT/my-app-1.2.4-SNAPSHOT.pom')
+      expect(parsed_doc.elements['//snapshot'].text).to eq('true')
+    }
+
+    it {
+      response = nil
+      destination = Dir.mktmpdir('artifact')
+      expect { response = nexus_remote.pull_artifact(coordinates, destination) }.not_to raise_exception
+      destination = File.join(File.expand_path(destination), response[:file_name])
+      parsed_pom = REXML::Document.new(File.read(destination))
+      expect(parsed_pom.elements['//groupId'].text).to eq('com.mycompany.app')
+      expect(parsed_pom.elements['//artifactId'].text).to eq('my-app')
+      expect(parsed_pom.elements['//version'].text).to eq('1.2.4-SNAPSHOT')
+      # Verify that if multiple SNAPSHOTs are uploaded, the last one is downloaded (the first one doesn't have <properties>)
+      expect(parsed_pom.elements['//properties/for-kpm'].text).to eq('true')
+    }
+  end
+end

data/spec/kpm/remote/github_api_calls_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rexml/document'
+
+describe KPM::NexusFacade, skip_me_if_nil: ENV['TOKEN'].nil? do
+  let(:logger) do
+    logger = ::Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    logger
+  end
+  let(:coordinates_map) do
+    { version: '1.1.9',
+      group_id: 'org.kill-bill.billing.thirdparty',
+      artifact_id: 'qualpay-java-client',
+      packaging: 'pom',
+      classifier: nil }
+  end
+  let(:coordinates) { KPM::Coordinates.build_coordinates(coordinates_map) }
+  let(:nexus_remote) { described_class::GithubApiCalls.new({ :url => 'https://maven.pkg.github.com/killbill/qualpay-java-client', :token => ENV['TOKEN'] }, true, logger) }
+
+  it {
+    # Not implemented
+    expect { nexus_remote.search_for_artifacts(coordinates) }.to raise_exception(NoMethodError, 'GitHub Packages has no search support')
+  }
+
+  it {
+    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])
+  }
+
+  it {
+    response = nil
+    destination = Dir.mktmpdir('artifact')
+    expect { response = nexus_remote.pull_artifact(coordinates, destination) }.not_to raise_exception
+    destination = File.join(File.expand_path(destination), response[:file_name])
+    expect(File.read(destination)).to match(/qualpay-java-client/)
+  }
+end

data/spec/kpm/remote/installer_spec.rb

@@ -23,8 +23,8 @@ describe KPM::Installer do
       response = nil
       expect { response = installer.install }.to_not raise_exception
       response = JSON[response]
-      response['help'].should be_nil
-      response['killbill']['status'].should eq 'INSTALLED'
+      expect(response['help']).to be_nil
+      expect(response['killbill']['status']).to eq 'INSTALLED'
     end
   end
 
@@ -42,8 +42,8 @@ describe KPM::Installer do
       response = nil
       expect { response = installer.install }.to_not raise_exception
       response = JSON[response]
-      response['help'].should be_nil
-      response['kaui']['status'].should eq 'INSTALLED'
+      expect(response['help']).to be_nil
+      expect(response['kaui']['status']).to eq 'INSTALLED'
     end
   end
 
@@ -60,17 +60,16 @@ describe KPM::Installer do
                                                   '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'
-                                                  },
-                                                             {
-                                                               'name' => 'stripe',
-                                                               'version' => '3.0.3'
-                                                             }]
+                                                  }]
                                                 }
                                               },
                                               'kaui' => {
@@ -88,10 +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 eq plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7'
+      expect(info[:bundle_dir]).to 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 eq plugins_dir + '/plugins/java/analytics-plugin/0.7.1'
+      expect(info[:bundle_dir]).to eq plugins_dir + '/plugins/java/analytics-plugin/0.7.1'
     end
   end
 
@@ -105,12 +104,13 @@ describe KPM::Installer do
       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',
-      plugins_dir + '/plugins/ruby/killbill-stripe'
+      plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7'
     ].each do |dir|
-      File.directory?(dir).should be_true
+      expect(File.directory?(dir)).to be_truthy
     end
 
     [
@@ -119,36 +119,37 @@ describe KPM::Installer do
       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
+      expect(File.file?(file)).to be_truthy
     end
 
     plugin_identifiers = File.open(plugins_dir + '/plugins/plugin_identifiers.json', 'r') do |f|
       JSON.parse(f.read)
     end
 
-    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['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'
-
-    plugin_identifiers['stripe']['plugin_name'].should eq 'killbill-stripe'
-    plugin_identifiers['stripe']['group_id'].should eq 'org.kill-bill.billing.plugin.ruby'
-    plugin_identifiers['stripe']['artifact_id'].should eq 'stripe-plugin'
-    plugin_identifiers['stripe']['packaging'].should eq 'tar.gz'
-    plugin_identifiers['stripe']['version'].should eq '3.0.3'
-    plugin_identifiers['stripe']['language'].should eq 'ruby'
+    expect(plugin_identifiers.size).to eq 3
+
+    expect(plugin_identifiers['analytics']['plugin_name']).to eq 'analytics-plugin'
+    expect(plugin_identifiers['analytics']['group_id']).to eq 'org.kill-bill.billing.plugin.java'
+    expect(plugin_identifiers['analytics']['artifact_id']).to eq 'analytics-plugin'
+    expect(plugin_identifiers['analytics']['packaging']).to eq 'jar'
+    expect(plugin_identifiers['analytics']['version']).to eq '0.7.1'
+    expect(plugin_identifiers['analytics']['language']).to eq 'java'
+
+    expect(plugin_identifiers['stripe']['plugin_name']).to eq 'stripe-plugin'
+    expect(plugin_identifiers['stripe']['group_id']).to eq 'org.kill-bill.billing.plugin.java'
+    expect(plugin_identifiers['stripe']['artifact_id']).to eq 'stripe-plugin'
+    expect(plugin_identifiers['stripe']['packaging']).to eq 'jar'
+    expect(plugin_identifiers['stripe']['version']).to eq '7.0.0'
+    expect(plugin_identifiers['stripe']['language']).to eq 'java'
+
+    expect(plugin_identifiers['payment-test-plugin']['plugin_name']).to eq 'killbill-payment-test'
+    expect(plugin_identifiers['payment-test-plugin']['group_id']).to eq 'org.kill-bill.billing.plugin.ruby'
+    expect(plugin_identifiers['payment-test-plugin']['artifact_id']).to eq 'payment-test-plugin'
+    expect(plugin_identifiers['payment-test-plugin']['packaging']).to eq 'tar.gz'
+    expect(plugin_identifiers['payment-test-plugin']['version']).to eq '1.8.7'
+    expect(plugin_identifiers['payment-test-plugin']['language']).to eq 'ruby'
   end
 end

data/spec/kpm/remote/kaui_artifact_spec.rb

@@ -17,15 +17,15 @@ describe KPM::KillbillPluginArtifact do
                                     KPM::BaseArtifact::KAUI_CLASSIFIER,
                                     'LATEST',
                                     dir)
-      info[:file_name].should eq "kaui-standalone-#{info[:version]}.war"
-      info[:size].should eq File.size(info[:file_path])
+      expect(info[:file_name]).to eq "kaui-standalone-#{info[:version]}.war"
+      expect(info[:size]).to eq File.size(info[:file_path])
     end
   end
 
   it 'should be able to list versions' do
     versions = KPM::KauiArtifact.versions.to_a
     expect(versions.size).to be >= 2
-    versions[0].should eq '0.0.1'
-    versions[1].should eq '0.0.2'
+    expect(versions[0]).to eq '0.0.1'
+    expect(versions[1]).to eq '0.0.2'
   end
 end

data/spec/kpm/remote/killbill_plugin_artifact_spec.rb

@@ -20,15 +20,15 @@ describe KPM::KillbillPluginArtifact do
 
     Dir.mktmpdir do |dir|
       info = KPM::KillbillPluginArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, plugin_name, dir)
-      info[:file_name].should be_nil
+      expect(info[:file_name]).to be_nil
 
       files_in_dir = Dir[info[:file_path] + '/*']
-      files_in_dir.size.should eq 1
-      files_in_dir[0].should eq info[:file_path] + '/killbill-payment-test'
+      expect(files_in_dir.size).to eq 1
+      expect(files_in_dir[0]).to eq info[:file_path] + '/killbill-payment-test'
 
-      File.read(info[:file_path] + '/killbill-payment-test/1.8.7/killbill.properties').should eq "mainClass=PaymentTest::PaymentPlugin\nrequire=payment_test\npluginType=PAYMENT\n"
+      expect(File.read(info[:file_path] + '/killbill-payment-test/1.8.7/killbill.properties')).to eq "mainClass=PaymentTest::PaymentPlugin\nrequire=payment_test\npluginType=PAYMENT\n"
 
-      info[:bundle_dir].should eq info[:file_path] + '/killbill-payment-test/1.8.7'
+      expect(info[:bundle_dir]).to eq info[:file_path] + '/killbill-payment-test/1.8.7'
     end
   end
 
@@ -44,8 +44,8 @@ describe KPM::KillbillPluginArtifact do
                                               'killbill-analytics',
                                               dir,
                                               sha1_file)
-      info[:file_name].should eq "analytics-plugin-#{info[:version]}.jar"
-      info[:size].should eq File.size(info[:file_path])
+      expect(info[:file_name]).to eq "analytics-plugin-#{info[:version]}.jar"
+      expect(info[:size]).to 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
@@ -63,7 +63,7 @@ describe KPM::KillbillPluginArtifact do
                                               sha1_file)
 
       # No file name - since we untar'ed it
-      info[:file_name].should be_nil
+      expect(info[:file_name]).to be_nil
 
       check_yaml_for_resolved_latest_version(sha1_file, 'org.kill-bill.billing.plugin.ruby:logging-plugin:tar.gz', '3.0.0')
     end
@@ -72,19 +72,19 @@ describe KPM::KillbillPluginArtifact do
   it 'should be able to list versions' do
     versions = KPM::KillbillPluginArtifact.versions
 
-    versions[:java].should_not be_nil
-    versions[:java]['analytics-plugin'].should_not be_nil
+    expect(versions[:java]).not_to be_nil
+    expect(versions[:java]['analytics-plugin']).not_to be_nil
     logging_plugin_versions = versions[:java]['analytics-plugin'].to_a
     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'
+    expect(logging_plugin_versions[0]).to eq '0.6.0'
+    expect(logging_plugin_versions[1]).to eq '0.7.0'
+    expect(logging_plugin_versions[2]).to eq '0.7.1'
 
-    versions[:ruby].should_not be_nil
-    versions[:ruby]['logging-plugin'].should_not be_nil
+    expect(versions[:ruby]).not_to be_nil
+    expect(versions[:ruby]['logging-plugin']).not_to be_nil
     logging_plugin_versions = versions[:ruby]['logging-plugin'].to_a
     expect(logging_plugin_versions.size).to be >= 1
-    logging_plugin_versions[0].should eq '1.7.0'
+    expect(logging_plugin_versions[0]).to eq '1.7.0'
   end
 
   private
@@ -96,11 +96,11 @@ describe KPM::KillbillPluginArtifact do
     sha1_checker = KPM::Sha1Checker.from_file(sha1_file)
 
     keys = sha1_checker.all_sha1.keys.select { |k| k.start_with? key_prefix }
-    keys.size.should eq 1
+    expect(keys.size).to eq 1
 
     parts = keys[0].split(':')
-    parts.size.should eq 4
-    parts[3].should_not eq 'LATEST'
+    expect(parts.size).to eq 4
+    expect(parts[3]).not_to eq 'LATEST'
     expect(parts[3]).to be >= minimum_version
   end
 end