kpm 0.10.6 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d067585651d10d1377daef5f789c6fede0463b1f8c77f27441dc014afd29de
-  data.tar.gz: 70fed604e143d6ff2a8447d65aaae4037e4b6b45c8a9c83aadbce1f978b9f203
+  metadata.gz: 8511e401669df3cf28d9ff916b158764238109c34e818a8221ee598c11d78750
+  data.tar.gz: cc284e39cf1c3d5b2cf7ece8fc7cbc38d2853016c666378ff1127a6761d5a04d
 SHA512:
-  metadata.gz: 488cb74c64870f6e01654cf47c6b3cab6f5fe86c482e50ec7a7fb5beacfedcc985a1d1a47555670a71b5a69e6de0ac30e2dc1e1bf55a7fbf8492dbf9dd20e6a6
-  data.tar.gz: b2c3fe934618af88d9708760b7c0c656976937f19e51ef3af3257ec45e084a48e8e843255f3b60ac9a74aacadc0c6d2607378b71ba9b41a4552624d597810757
+  metadata.gz: 7f6e3965bfb2e4c32707d845add23ff06fe7eb7d3bd4550d94863f2ffa207049c578ba90dff1cac3d1609427a3a6ae010582e7fa8cec309a151e7fd1e595f18e
+  data.tar.gz: 031a2b0f7da148e24b7a13ff90e6c023d3d381040d7de8161389ca9ac523487b64540ab6174c2d1aab2d110bcf19d6af4291b28eade76c4f2d6317303ae7c662

data/.gitignore

@@ -2,12 +2,10 @@ Gemfile.lock
 pkg
 packaging/tmp
 packaging/vendor
+kpm-*-linux-x86.tar.gz
 kpm-*-linux-x86_64.tar.gz
-kpm-*-osx-arm64.tar.gz
 kpm-*-osx.tar.gz
-kpm-*-noarch.tar.gz
-portable-ruby-*.tar.gz
-jruby-dist-*-bin.tar.gz
+traveling-ruby-*.tar.gz
 *.asc
 .rakeTasks
 pom.xml.versionsBackup

data/install_example.yml

@@ -7,11 +7,6 @@ killbill:
     java:
       - name: analytics-plugin
         version: 0.6.0
-    ruby:
-      - name: logging-plugin
-        version: LATEST
-      - name: zendesk-plugin
-        version: 1.3.0
   nexus:
     ssl_verify: false
     url: https://oss.sonatype.org

data/lib/kpm/base_artifact.rb

@@ -25,10 +25,6 @@ module KPM
     KILLBILL_JAVA_PLUGIN_PACKAGING  = 'jar'
     KILLBILL_JAVA_PLUGIN_CLASSIFIER = nil
 
-    KILLBILL_RUBY_PLUGIN_GROUP_ID   = 'org.kill-bill.billing.plugin.ruby'
-    KILLBILL_RUBY_PLUGIN_PACKAGING  = 'tar.gz'
-    KILLBILL_RUBY_PLUGIN_CLASSIFIER = nil
-
     KAUI_GROUP_ID    = 'org.kill-bill.billing.kaui'
     KAUI_ARTIFACT_ID = 'kaui-standalone'
     KAUI_PACKAGING   = 'war'

data/lib/kpm/base_installer.rb

@@ -79,7 +79,7 @@ module KPM
                                             :group_id => group_id, :artifact_id => artifact_id, :packaging => packaging, :classifier => classifier))
     end
 
-    def install_plugin(plugin_key, raw_kb_version = nil, specified_group_id = nil, specified_artifact_id = nil, specified_packaging = nil, specified_classifier = nil, specified_version = nil, bundles_dir = nil, specified_type = nil, force_download = false, verify_sha1 = true, verify_jruby_jar = false)
+    def install_plugin(plugin_key, raw_kb_version = nil, specified_group_id = nil, specified_artifact_id = nil, specified_packaging = nil, specified_classifier = nil, specified_version = nil, bundles_dir = nil, specified_type = nil, force_download = false, verify_sha1 = true)
       # plugin_key needs to exist
       raise ArgumentError, 'Aborting installation: User needs to specify a pluginKey' if plugin_key.nil?
 
@@ -94,7 +94,6 @@ module KPM
       # If there is no entry in plugins_directory.yml and the group_id is not the killbill default group_id, the key provided must be a user key and must have a namespace
       if looked_up_artifact_id.nil? &&
          specified_group_id != KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID &&
-         specified_group_id != KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID &&
          plugin_key.split(':').size == 1
         raise ArgumentError, "Aborting installation: pluginKey = #{plugin_key} does not exist in plugin_directory.yml so format of the key must have a user namespace (e.g namespace:key)"
       end
@@ -114,14 +113,7 @@ module KPM
         version = specified_version || looked_up_version || LATEST_VERSION
         destination = plugins_dir.join('java').join(artifact_id).join(version)
       else
-
-        warn_if_jruby_jar_missing(bundles_dir) if verify_jruby_jar
-
-        group_id = specified_group_id || looked_up_group_id || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID
-        packaging = specified_packaging || looked_up_packaging || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING
-        classifier = specified_classifier || looked_up_classifier || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER
-        version = specified_version || looked_up_version || LATEST_VERSION
-        destination = plugins_dir.join('ruby')
+        raise ArgumentError, "Aborting installation: plugin type #{type} unsupported"
       end
       sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
       plugins_manager = PluginsManager.new(plugins_dir, @logger)
@@ -178,7 +170,7 @@ module KPM
         plugin_name = name.nil? ? Utils.get_plugin_name_from_file_path(file_path) : name
         destination = plugins_dir.join('java').join(plugin_name).join(version)
       else
-        destination = plugins_dir.join('ruby')
+        raise ArgumentError, "Aborting installation: plugin type #{type} unsupported"
       end
 
       artifact_info = KPM::KillbillPluginArtifact.pull_from_fs(@logger, file_path, destination)
@@ -245,10 +237,6 @@ module KPM
                         info.merge('status' => (info[:skipped] ? 'UP_TO_DATE' : 'INSTALLED'),
                                    :group_id => group_id, :artifact_id => artifact_id, :packaging => packaging, :classifier => classifier))
 
-      # The special JRuby bundle needs to be called jruby.jar
-      # TODO .first - code smell
-      File.rename Dir.glob("#{destination}/killbill-platform-osgi-bundles-jruby-*.jar").first, destination.join('jruby.jar') unless info[:skipped]
-
       info
     end
 
@@ -281,35 +269,5 @@ module KPM
       plugins_manager = PluginsManager.new(plugins_dir, @logger)
       plugins_manager.set_active(artifact_info[:bundle_dir])
     end
-
-    def warn_if_jruby_jar_missing(bundles_dir)
-      platform_dir = bundles_dir.join('platform')
-      jruby_jar = platform_dir.join('jruby.jar')
-      if !File.exist?(jruby_jar)
-        @logger.warn("  Missing installation for jruby.jar under #{platform_dir}. This is required for ruby plugin installation")
-      else
-        version = extract_jruby_jar_version(jruby_jar)
-        if version
-          @logger.info("  Detected jruby.jar version #{version}")
-        else
-          @logger.warn("  Failed to detect jruby.jar version for #{jruby_jar}")
-        end
-      end
-    end
-
-    def extract_jruby_jar_version(jruby_jar)
-      selected_entries = Zip::File.open(jruby_jar) do |zip_file|
-        zip_file.select do |entry|
-          entry.name == 'META-INF/maven/org.kill-bill.billing/killbill-platform-osgi-bundles-jruby/pom.properties'
-        end
-      end
-
-      if selected_entries && selected_entries.size == 1
-        zip_entry = selected_entries[0]
-        content = zip_entry.get_input_stream.read
-        return content.split("\n").select { |e| e.start_with?('version') }[0].split('=')[1]
-      end
-      nil
-    end
   end
 end

data/lib/kpm/installer.rb

@@ -127,7 +127,6 @@ module KPM
 
     def install_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
       install_java_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
-      install_ruby_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
     end
 
     def install_java_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
@@ -135,20 +134,7 @@ module KPM
 
       infos = []
       @config['plugins']['java'].each do |plugin|
-        infos << install_plugin(plugin['name'], raw_kb_version, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], bundles_dir, 'java', force_download, verify_sha1, false)
-      end
-
-      infos
-    end
-
-    def install_ruby_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
-      return if @config['plugins'].nil? || @config['plugins']['ruby'].nil?
-
-      verify_jruby_jar = true
-      infos = []
-      @config['plugins']['ruby'].each do |plugin|
-        infos << install_plugin(plugin['name'], raw_kb_version, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], bundles_dir, 'ruby', force_download, verify_sha1, verify_jruby_jar)
-        verify_jruby_jar = false
+        infos << install_plugin(plugin['name'], raw_kb_version, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], bundles_dir, 'java', force_download, verify_sha1)
       end
 
       infos

data/lib/kpm/killbill_plugin_artifact.rb

@@ -8,15 +8,15 @@ module KPM
     class << self
       def pull(logger, group_id, artifact_id, packaging = 'jar', classifier = nil, version = 'LATEST', plugin_name = nil, destination_path = nil, sha1_file = nil, force_download = false, verify_sha1 = true, overrides = {}, ssl_verify = true)
         coordinate_map = { group_id: group_id, artifact_id: artifact_id, packaging: packaging, classifier: classifier, version: version }
-        pull_and_put_in_place(logger, coordinate_map, plugin_name, destination_path, ruby_plugin_and_should_skip_top_dir?(group_id, artifact_id), sha1_file, force_download, verify_sha1, overrides, ssl_verify)
+        pull_and_put_in_place(logger, coordinate_map, plugin_name, destination_path, false, sha1_file, force_download, verify_sha1, overrides, ssl_verify)
       end
 
       def versions(overrides = {}, ssl_verify = true)
-        plugins = { java: {}, ruby: {} }
+        plugins = { java: {} }
 
         nexus = nexus_remote(overrides, ssl_verify)
 
-        [[:java, KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID], [:ruby, KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID]].each do |type_and_group_id|
+        [[:java, KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID]].each do |type_and_group_id|
           response = REXML::Document.new nexus.search_for_artifacts(type_and_group_id[1])
           response.elements.each('searchNGResponse/data/artifact') do |element|
             artifact_id = element.elements['artifactId'].text
@@ -27,15 +27,6 @@ module KPM
 
         plugins
       end
-
-      protected
-
-      # Magic methods...
-
-      def ruby_plugin_and_should_skip_top_dir?(group_id, artifact_id)
-        # The second check is for custom ruby plugins
-        group_id == KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID || artifact_id.include?('plugin')
-      end
     end
   end
 end

data/lib/kpm/nexus_helper/nexus_api_calls_v2.rb

@@ -147,7 +147,7 @@ module KPM
         case response.code
         when '200'
           response.body
-        when '301', '302', '307'
+        when '301', '307'
           location = response['Location']
           logger.debug { "Following redirect to #{location}" }
 

data/lib/kpm/plugins_directory.rb

@@ -31,12 +31,11 @@ module KPM
       return nil if plugin.nil?
 
       type = plugin[:type]
-      is_ruby = type == :ruby
 
-      group_id    = plugin[:group_id] || (is_ruby ? KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID : KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID)
+      group_id    = plugin[:group_id] || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID
       artifact_id = plugin[:artifact_id] || "#{plugin_key}-plugin"
-      packaging   = plugin[:packaging] || (is_ruby ? KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING : KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING)
-      classifier  = plugin[:classifier] || (is_ruby ? KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER : KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER)
+      packaging   = plugin[:packaging] || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING
+      classifier  = plugin[:classifier] || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER
 
       if raw_kb_version == 'LATEST'
         version = 'LATEST'

data/lib/kpm/plugins_directory.yml

@@ -13,7 +13,7 @@
   :versions:
     :0.18: 4.2.5
     :0.20: 6.0.1
-    :0.22: 7.2.7
+    :0.22: 7.2.3
 :avatax:
   :type: :java
   :versions:

data/lib/kpm/tasks.rb

@@ -187,8 +187,7 @@ module KPM
                                                 options[:destination],
                                                 'java',
                                                 options[:force_download],
-                                                options[:verify_sha1],
-                                                false)
+                                                options[:verify_sha1])
                      else
                        installer.install_plugin_from_fs(plugin_key, options[:from_source_file], nil, options[:version], options[:destination], 'java')
                      end
@@ -196,72 +195,6 @@ module KPM
           say "Artifact has been retrieved and can be found at path: #{response[:file_path]}", :green
         end
 
-        method_option :group_id,
-                      type: :string,
-                      default: KillbillPluginArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID,
-                      desc: 'The plugin artifact group-id'
-        method_option :artifact_id,
-                      type: :string,
-                      default: nil,
-                      desc: 'The plugin artifact id'
-        method_option :version,
-                      type: :string,
-                      default: nil,
-                      desc: 'The plugin artifact version'
-        method_option :packaging,
-                      type: :string,
-                      default: KillbillPluginArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING,
-                      desc: 'The plugin artifact packaging'
-        method_option :classifier,
-                      type: :string,
-                      default: KillbillPluginArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER,
-                      desc: 'The plugin artifact classifier'
-        method_option :from_source_file,
-                      type: :string,
-                      default: nil,
-                      desc: 'Specify the ruby plugin archive that should be used for the installation.'
-        method_option :destination,
-                      type: :string,
-                      default: nil,
-                      desc: 'A different folder other than the current working directory.'
-        method_option :force_download,
-                      type: :boolean,
-                      default: false,
-                      desc: 'Force download of the artifact even if it exists'
-        method_option :sha1_file,
-                      type: :string,
-                      default: nil,
-                      desc: 'Location of the sha1 file'
-        method_option :verify_sha1,
-                      type: :boolean,
-                      default: true,
-                      desc: 'Validates sha1 sum'
-        desc 'install_ruby_plugin plugin-key <kb-version>', 'Pulls a ruby plugin and installs it under the specified destination. If the kb-version has been specified, it is used to download the matching plugin artifact version; if not, it uses the specified plugin version or if null, the LATEST one.'
-        def install_ruby_plugin(plugin_key, kb_version = 'LATEST')
-          installer = BaseInstaller.new(logger,
-                                        options[:overrides],
-                                        options[:ssl_verify])
-
-          response = if options[:from_source_file].nil?
-                       installer.install_plugin(plugin_key,
-                                                kb_version,
-                                                options[:group_id],
-                                                options[:artifact_id],
-                                                options[:packaging],
-                                                options[:classifier],
-                                                options[:version],
-                                                options[:destination],
-                                                'ruby',
-                                                options[:force_download],
-                                                options[:verify_sha1],
-                                                true)
-                     else
-                       installer.install_plugin_from_fs(plugin_key, options[:from_source_file], nil, nil, options[:destination], 'ruby')
-                     end
-
-          say "Artifact has been retrieved and can be found at path: #{response[:file_path]}", :green
-        end
-
         method_option :destination,
                       type: :string,
                       default: nil,
@@ -647,8 +580,7 @@ module KPM
           logger.error e.backtrace.join("\n") unless e.is_a?(Interrupt)
         end
 
-        map pull_ruby_plugin: :install_ruby_plugin,
-            pull_java_plugin: :install_java_plugin
+        map pull_java_plugin: :install_java_plugin
 
         private
 

data/lib/kpm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KPM
-  VERSION = '0.10.6'
+  VERSION = '0.11.0'
 end

data/packaging/Gemfile

@@ -3,4 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'kpm', '~> VERSION'
-gem 'rake'
+
+group :development do
+  gem 'rake'
+end

data/packaging/kpm.sh

@@ -11,4 +11,4 @@ unset BUNDLE_IGNORE_CONFIG
 
 # Run the actual app using the bundled Ruby interpreter, with Bundler activated.
 # See https://github.com/phusion/traveling-ruby/issues/58
-exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -rreadline $SELFDIR/lib/vendor/*ruby/2.*/bin/kpm $@
+exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -rreadline $SELFDIR/lib/vendor/ruby/2.*/bin/kpm $@

data/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.kill-bill.billing.installer</groupId>
     <artifactId>kpm</artifactId>
-    <version>0.10.6</version>
+    <version>0.11.0</version>
     <packaging>pom</packaging>
     <name>KPM</name>
     <description>KPM: the Kill Bill Package Manager</description>
@@ -147,6 +147,11 @@
                         </goals>
                         <configuration>
                             <artifacts>
+                                <artifact>
+                                    <file>kpm-${project.version}-linux-x86.tar.gz</file>
+                                    <type>tar.gz</type>
+                                    <classifier>linux-x86</classifier>
+                                </artifact>
                                 <artifact>
                                     <file>kpm-${project.version}-linux-x86_64.tar.gz</file>
                                     <type>tar.gz</type>
@@ -157,16 +162,6 @@
                                     <type>tar.gz</type>
                                     <classifier>osx</classifier>
                                 </artifact>
-                                <artifact>
-                                    <file>kpm-${project.version}-osx-arm64.tar.gz</file>
-                                    <type>tar.gz</type>
-                                    <classifier>osx-arm64</classifier>
-                                </artifact>
-                                <artifact>
-                                    <file>kpm-${project.version}-noarch.tar.gz</file>
-                                    <type>tar.gz</type>
-                                    <classifier>noarch</classifier>
-                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

data/release.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+set -e
+
+BUNDLE=${BUNDLE-"bundle exec"}
+MVN=${MVN-"mvn"}
+
+if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
+  echo 'Unable to release: make sure to use GNU tar'
+  exit 1
+fi
+
+# See TRAVELING_RUBY_VERSION in tasks/package.rake
+if [[ "$(ruby --version 2>&1 | tail -1 | awk '{print $2}')" != 2.2.2* ]]; then
+  echo 'Ruby version 2.2.2 is required'
+  exit 1
+fi
+
+VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
+if [[ -z "$NO_RELEASE" && "$VERSION" != "$(ruby -r./lib/kpm/version.rb -e "print KPM::VERSION")" ]]; then
+  echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
+  exit 1
+fi
+
+if [[ -z "$NO_RELEASE" ]]; then
+  echo 'Pushing the gem to Rubygems'
+  $BUNDLE rake release
+fi
+
+# Wait for the gem to be propagated
+sleep 15
+
+$BUNDLE rake package
+
+if [[ -z "$NO_RELEASE" ]]; then
+  GOAL=gpg:sign-and-deploy-file
+  REPOSITORY_ID=ossrh-releases
+  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+  REPO_VERSION=$VERSION
+else
+  GOAL=deploy:deploy-file
+  REPOSITORY_ID=sonatype-nexus-snapshots
+  URL=https://oss.sonatype.org/content/repositories/snapshots/
+  REPO_VERSION="$VERSION-SNAPSHOT"
+fi
+
+echo "Pushing artifacts to Maven Central"
+$MVN $GOAL \
+     -DgroupId=org.kill-bill.billing.installer \
+     -DartifactId=kpm \
+     -Dversion=$REPO_VERSION \
+     -Dpackaging=tar.gz \
+     -DrepositoryId=$REPOSITORY_ID \
+     -Durl=$URL \
+     -Dfile=kpm-$VERSION-linux-x86_64.tar.gz \
+     -Dclassifier=linux-x86_64 \
+     -Dfiles=kpm-$VERSION-linux-x86.tar.gz,kpm-$VERSION-osx.tar.gz \
+     -Dclassifiers=linux-x86,osx \
+     -Dtypes=tar.gz,tar.gz \
+     -DpomFile=pom.xml

data/spec/kpm/remote/installer_spec.rb

@@ -63,12 +63,6 @@ describe KPM::Installer do
                                                   }, {
                                                     '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'
                                                   }]
                                                 }
                                               },
@@ -85,10 +79,7 @@ describe KPM::Installer do
       installer.install
       check_installation(plugins_dir, kb_webapp_path, kaui_webapp_path)
 
-      # 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)
-      expect(info[:bundle_dir]).to eq plugins_dir + '/plugins/ruby/killbill-payment-test/1.8.7'
-
+      # Finally verify that for (well behaved) java plugins, skipping the install will still correctly return the `:bundle_dir`
       info = installer.install_plugin('analytics', nil, nil, nil, nil, nil, '0.7.1', plugins_dir)
       expect(info[:bundle_dir]).to eq plugins_dir + '/plugins/java/analytics-plugin/0.7.1'
     end
@@ -105,10 +96,7 @@ describe KPM::Installer do
       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/java/stripe-plugin/7.0.0'
     ].each do |dir|
       expect(File.directory?(dir)).to be_truthy
     end
@@ -116,11 +104,9 @@ describe KPM::Installer do
     [
       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'
+      plugins_dir + '/plugins/java/stripe-plugin/7.0.0/stripe-plugin-7.0.0.jar'
     ].each do |file|
       expect(File.file?(file)).to be_truthy
     end
@@ -129,7 +115,7 @@ describe KPM::Installer do
       JSON.parse(f.read)
     end
 
-    expect(plugin_identifiers.size).to eq 3
+    expect(plugin_identifiers.size).to eq 2
 
     expect(plugin_identifiers['analytics']['plugin_name']).to eq 'analytics-plugin'
     expect(plugin_identifiers['analytics']['group_id']).to eq 'org.kill-bill.billing.plugin.java'
@@ -144,12 +130,5 @@ describe KPM::Installer do
     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/killbill_plugin_artifact_spec.rb

@@ -8,30 +8,6 @@ describe KPM::KillbillPluginArtifact do
     @logger.level = Logger::INFO
   end
 
-  # This test makes sure the top level directory is correctly verify_is_skipped
-  it 'should be able to download and verify .tar.gz ruby artifacts' do
-    # Use the payment-test-plugin as a test, as it is fairly small (2.5M)
-    group_id    = 'org.kill-bill.billing.plugin.ruby'
-    artifact_id = 'payment-test-plugin'
-    packaging   = 'tar.gz'
-    classifier  = nil
-    version     = '1.8.7'
-    plugin_name = 'killbill-payment-test'
-
-    Dir.mktmpdir do |dir|
-      info = KPM::KillbillPluginArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, plugin_name, dir)
-      expect(info[:file_name]).to be_nil
-
-      files_in_dir = Dir[info[:file_path] + '/*']
-      expect(files_in_dir.size).to eq 1
-      expect(files_in_dir[0]).to eq info[:file_path] + '/killbill-payment-test'
-
-      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"
-
-      expect(info[:bundle_dir]).to eq info[:file_path] + '/killbill-payment-test/1.8.7'
-    end
-  end
-
   it 'should be able to download and verify artifacts' do
     Dir.mktmpdir do |dir|
       sha1_file = dir + '/sha1.yml'
@@ -49,24 +25,6 @@ describe KPM::KillbillPluginArtifact do
 
       check_yaml_for_resolved_latest_version(sha1_file, 'org.kill-bill.billing.plugin.java:analytics-plugin:jar', '3.0.0')
     end
-
-    Dir.mktmpdir do |dir|
-      sha1_file = dir + '/sha1.yml'
-      info = KPM::KillbillPluginArtifact.pull(@logger,
-                                              KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID,
-                                              'logging-plugin',
-                                              KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING,
-                                              KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER,
-                                              'LATEST',
-                                              'killbill-analytics',
-                                              dir,
-                                              sha1_file)
-
-      # No file name - since we untar'ed it
-      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
   end
 
   it 'should be able to list versions' do
@@ -79,12 +37,6 @@ describe KPM::KillbillPluginArtifact do
     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'
-
-    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
-    expect(logging_plugin_versions[0]).to eq '1.7.0'
   end
 
   private

data/tasks/package.rake

@@ -9,50 +9,33 @@ PACKAGE_NAME = 'kpm'
 require './lib/kpm/version'
 VERSION = KPM::VERSION
 
-# See https://www.jruby.org/download
-JRUBY_VERSION = '9.3.4.0'
-# See https://github.com/Homebrew/homebrew-portable-ruby/releases
-HOMEBREW_PORTABLE_RUBY_VERSION = '2.6.8_1'
+# See https://traveling-ruby.s3-us-west-2.amazonaws.com/list.html
+TRAVELING_RUBY_VERSION = '20150715-2.2.2'
 
 # Remove unused files to reduce package size
 GEMS_PATH = 'packaging/vendor/ruby/*/gems/*/'
 REMOVE_FILES = %w[test tests spec README* CHANGE* Change* COPYING* LICENSE* MIT-LICENSE* doc docs examples ext/*/Makefile .gitignore .travis.yml].freeze
 REMOVE_EXTENSIONS = %w[*.md *.c *.h *.rl extconf.rb *.java *.class *.so *.o].freeze
 
-NOARCH_TARGET = 'noarch'
-LINUX_X86_TARGET = 'x86_64_linux'
-OSX_X86_TARGET = 'el_capitan'
-OSX_ARM_TARGET = 'arm64_big_sur'
-
 desc 'Package your app'
-task package: %w[package:noarch package:linux:x86_64 package:osx:x86_64 package:osx:arm64]
+task package: %w[package:linux:x86 package:linux:x86_64 package:osx]
 
 namespace :package do
-  desc 'Package KPM (noarch)'
-  task noarch: [:bundle_install, "packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz"] do
-    create_package(NOARCH_TARGET, 'noarch')
-  end
-
   namespace :linux do
-    desc 'Package KPM for Linux x86_64'
-    task x86_64: [:bundle_install, "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{LINUX_X86_TARGET}.bottle.tar.gz"] do
-      ensure_ruby_version
-      create_package(LINUX_X86_TARGET, 'linux-x86_64')
+    desc 'Package KPM for Linux x86'
+    task x86: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
+      create_package('linux-x86')
     end
-  end
 
-  namespace :osx do
-    desc 'Package KPM for OSX x86_64'
-    task x86_64: [:bundle_install, "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_X86_TARGET}.bottle.tar.gz"] do
-      ensure_ruby_version
-      create_package(OSX_X86_TARGET, 'osx')
+    desc 'Package KPM for Linux x86_64'
+    task x86_64: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
+      create_package('linux-x86_64')
     end
+  end
 
-    desc 'Package KPM for OSX arm64'
-    task arm64: [:bundle_install, "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_ARM_TARGET}.bottle.tar.gz"] do
-      ensure_ruby_version
-      create_package(OSX_ARM_TARGET, 'osx-arm64')
-    end
+  desc 'Package KPM for OS X'
+  task osx: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
+    create_package('osx')
   end
 
   desc 'Install gems to local directory'
@@ -60,12 +43,15 @@ namespace :package do
     # abort if version packaging does not exist on repository
     abort "KPM #{VERSION} does not exists in the repository." unless gem_exists?
 
+    # Note! Must match TRAVELING_RUBY_VERSION above
+    expected_ruby_version = TRAVELING_RUBY_VERSION.split('-')[-1]
+    abort "You can only 'bundle install' using Ruby #{expected_ruby_version}, because that's what Traveling Ruby uses." if RUBY_VERSION !~ /#{Regexp.quote(expected_ruby_version)}/
     sh 'rm -rf packaging/tmp'
     sh 'mkdir -p packaging/tmp'
     sh 'cp packaging/Gemfile packaging/tmp/'
     sh "sed -i 's/VERSION/#{VERSION}/g' packaging/tmp/Gemfile"
 
-    sh 'rm -rf packaging/vendor/ruby/2.*/bundler' # if multiple clones of same repo, may load in wrong one
+    sh "rm -rf packaging/vendor/ruby/#{expected_ruby_version}/bundler" # if multiple clones of same repo, may load in wrong one
 
     Bundler.with_clean_env do
       sh 'cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development'
@@ -94,42 +80,28 @@ namespace :package do
   end
 end
 
-file "packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz" do
-  download_noarch_runtime
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
+  download_runtime('linux-x86')
 end
 
-file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{LINUX_X86_TARGET}.bottle.tar.gz" do
-  download_portable_runtime(LINUX_X86_TARGET)
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
+  download_runtime('linux-x86_64')
 end
 
-file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_X86_TARGET}.bottle.tar.gz" do
-  download_portable_runtime(OSX_X86_TARGET)
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
+  download_runtime('osx')
 end
 
-file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_ARM_TARGET}.bottle.tar.gz" do
-  download_portable_runtime(OSX_ARM_TARGET)
-end
-
-def create_package(target, package_dir_suffix)
-  pom_version = %r{<version>(.*)</version>}.match(File.read("#{__dir__}/../pom.xml"))[1]
-  package_dir = "#{PACKAGE_NAME}-#{pom_version}-#{package_dir_suffix}"
+def create_package(target)
+  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
   sh "rm -rf #{package_dir}"
   sh "mkdir -p #{package_dir}/lib/ruby"
-  if target == NOARCH_TARGET
-    sh "tar -xzf packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz -C #{package_dir}/lib/ruby --strip-components 1"
-  else
-    sh "tar -xzf packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{target}.bottle.tar.gz -C #{package_dir}/lib/ruby --strip-components 2"
-  end
+  sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
 
   sh "cp packaging/kpm.sh #{package_dir}/kpm"
   sh "chmod +x packaging/kpm.sh #{package_dir}/kpm"
 
   sh "cp -pR packaging/vendor #{package_dir}/lib/"
-  if target == NOARCH_TARGET
-    # Need to tweak a few things to make it work with JRuby
-    sh "cp #{package_dir}/lib/ruby/bin/jruby #{package_dir}/lib/ruby/bin/ruby"
-    sh "mv #{package_dir}/lib/vendor/ruby #{package_dir}/lib/vendor/jruby"
-  end
 
   sh "cp packaging/Gemfile* #{package_dir}/lib/vendor/"
   sh "sed -i 's/VERSION/#{VERSION}/g' #{package_dir}/lib/vendor/Gemfile"
@@ -142,14 +114,9 @@ def create_package(target, package_dir_suffix)
   sh "rm -rf #{package_dir}"
 end
 
-def download_noarch_runtime
-  sh 'mkdir -p packaging && cd packaging && curl -L -O --fail ' \
-     "https://repo1.maven.org/maven2/org/jruby/jruby-dist/#{JRUBY_VERSION}/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz"
-end
-
-def download_portable_runtime(target)
+def download_runtime(target)
   sh 'mkdir -p packaging && cd packaging && curl -L -O --fail ' \
-     "https://github.com/Homebrew/homebrew-portable-ruby/releases/download/#{HOMEBREW_PORTABLE_RUBY_VERSION}/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{target}.bottle.tar.gz"
+     "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
 end
 
 def gem_exists?
@@ -159,9 +126,3 @@ def gem_exists?
   specification = YAML.load(response)
   specification.instance_of?(Gem::Specification)
 end
-
-def ensure_ruby_version
-  # Note! Must match HOMEBREW_PORTABLE_RUBY_VERSION above
-  expected_ruby_version = HOMEBREW_PORTABLE_RUBY_VERSION.split('_')[0]
-  abort "You can only 'bundle install' using Ruby #{expected_ruby_version}, because that's what homebrew-portable-ruby uses." if RUBY_VERSION !~ /#{Regexp.quote(expected_ruby_version)}/
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.11.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.88.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.88.0
 description: A package manager for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables:
@@ -182,6 +168,7 @@ files:
 - packaging/bundler-config
 - packaging/kpm.sh
 - pom.xml
+- release.sh
 - spec/kpm/remote/base_artifact_spec.rb
 - spec/kpm/remote/base_installer_spec.rb
 - spec/kpm/remote/cloudsmith_api_calls_spec.rb
@@ -236,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Kill Bill package manager.