kpm 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8511e401669df3cf28d9ff916b158764238109c34e818a8221ee598c11d78750
-  data.tar.gz: cc284e39cf1c3d5b2cf7ece8fc7cbc38d2853016c666378ff1127a6761d5a04d
+  metadata.gz: 52403662d712a2a4e5d5f4858f9f5fdec00cfae193fb0fa584ac9e4ad0915b88
+  data.tar.gz: f44f9d18991344583ca2cf6edcea3973930396d8ed72781c6d178afa07c42e0f
 SHA512:
-  metadata.gz: 7f6e3965bfb2e4c32707d845add23ff06fe7eb7d3bd4550d94863f2ffa207049c578ba90dff1cac3d1609427a3a6ae010582e7fa8cec309a151e7fd1e595f18e
-  data.tar.gz: 031a2b0f7da148e24b7a13ff90e6c023d3d381040d7de8161389ca9ac523487b64540ab6174c2d1aab2d110bcf19d6af4291b28eade76c4f2d6317303ae7c662
+  metadata.gz: 3f1197e9c21b9ff52f6938a329af118434243e8fceb8145826139e00598f68c1ae9567347cc3d2e462ad2fe6d2e26bc116037b259698656207a61366eda24e28
+  data.tar.gz: 1b48ddb9aa45a443c2d5a2af4ea8b38b2b3e8dfb66dbffe44ab5b8249dedad13a1cb68398f3f0ed2cef668b7731cc1bfcbf6029ea1bf2b700def47a6e7c2fa7b

data/.gitignore

@@ -2,10 +2,12 @@ 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
-traveling-ruby-*.tar.gz
+kpm-*-noarch.tar.gz
+portable-ruby-*.tar.gz
+jruby-dist-*-bin.tar.gz
 *.asc
 .rakeTasks
 pom.xml.versionsBackup

data/README.adoc

@@ -26,10 +26,13 @@ Note that this installation method assumes `/bin/bash` to be available on your s
 === Through Rubygems
 image:https://img.shields.io/gem/v/kpm?color=blue&label=kpm[kpm]
 
-On Windows, you can install KPM via https://rubygems.org/gems/kpm[RubyGems.org]. For this, you need to first install Ruby. Ruby can be installed via https://rubyinstaller.org/[RubyInstaller]. Once installed, you can run the following command to install KPM:
+On Windows, you can install KPM via https://rubygems.org/gems/kpm[RubyGems.org]. For this, you need to first install Ruby 2.x.x. We recommend installing Ruby 2.7.7.
+
+Ruby can be installed via https://rubyinstaller.org/[RubyInstaller]. Once installed, you can run the following command to install KPM:
 [source,bash]
 gem install kpm 
 
+Note: KPM is not tested with Ruby 3.x.x or later versions.
 
 
 [[kpm-commands]]
@@ -38,24 +41,6 @@ gem install kpm
 [[kill-bill-installation]]
 === Kill Bill installation
 
-[[kpm-install]]
-==== kpm install
-
-`kpm install` (with no argument) will setup https://github.com/killbill/killbill[Kill Bill] and https://github.com/killbill/killbill-admin-ui-standalone[Kaui] in your current directory, including:
-
-* http://tomcat.apache.org/[Tomcat] (open-source Java web server)
-* The Kill Bill application (war) is installed in the `./webapps` directory
-* The Kill Bill UI (Kaui war) is installed in the `./webapps` directory
-* Default OSGI bundles are installed in the `/var/tmp/bundles` directory
-
-To start Kill Bill, simply run
-
-....
-./bin/catalina.sh run
-....
-
-You can then verify Kill Bill is running by going to http://127.0.0.1:8080/kaui.
-
 [[kpm-install-using-a-kpm.yml-file]]
 ==== kpm install Using A `kpm.yml` File
 

data/docker/docker-compose.ci.mysql.yml

@@ -3,7 +3,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.22.1
+    image: killbill/killbill:0.24.0
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:mysql://0.0.0.0:3306/killbill
@@ -16,6 +16,6 @@ services:
       - db
   db:
     network_mode: host
-    image: killbill/mariadb:0.22
+    image: killbill/mariadb:0.24
     environment:
       - MYSQL_ROOT_PASSWORD=root

data/kpm.gemspec

@@ -41,10 +41,10 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'highline', '~> 1.6.21'
-  s.add_dependency 'killbill-client', '~> 3.2'
-  s.add_dependency 'rubyzip', '~> 1.3.0'
-  s.add_dependency 'thor', '~> 0.19.1'
+  s.add_dependency 'highline', '>= 1.6.21', '< 2.1.0'
+  s.add_dependency 'killbill-client'
+  s.add_dependency 'rubyzip', '>= 1.3', '< 2.4'
+  s.add_dependency 'thor', '>= 0.19.1', '< 1.3.0'
 
   s.add_development_dependency 'gem-release', '~> 2.2'
   s.add_development_dependency 'rake', '~> 13.0'

data/lib/kpm/diagnostic_file.rb

@@ -23,15 +23,11 @@ module KPM
     ZIP_LOG_FILE = 'logs.zip'
 
     def initialize(config_file = nil, killbill_api_credentials = nil, killbill_credentials = nil, killbill_url = nil,
-                   database_name = nil, database_credentials = nil, database_host = nil, database_port = nil, kaui_web_path = nil,
+                   kaui_web_path = nil,
                    killbill_web_path = nil, bundles_dir = nil, logger = nil)
       @killbill_api_credentials = killbill_api_credentials
       @killbill_credentials = killbill_credentials
       @killbill_url = killbill_url
-      @database_name = database_name
-      @database_credentials = database_credentials
-      @database_host = database_host
-      @database_port = database_port
       @config_file = config_file
       @kaui_web_path = kaui_web_path
       @killbill_web_path = killbill_web_path
@@ -109,8 +105,8 @@ module KPM
       @logger.level = Logger::WARN
 
       account = KPM::Account.new(@config_file, @killbill_api_credentials, @killbill_credentials,
-                                 @killbill_url, @database_name,
-                                 @database_credentials, @database_host, @database_port, nil, @logger)
+                                 @killbill_url, nil,
+                                 nil, nil, nil, nil, @logger)
       export_file = account.export_data(account_id)
 
       final = TMP_DIR + File::Separator + ACCOUNT_FILE

data/lib/kpm/installer.rb

@@ -87,9 +87,9 @@ module KPM
                     end
       bundles_dir ||= DEFAULT_BUNDLES_DIR
 
-      help = nil
       unless @config.nil?
-        help = install_tomcat if @config['webapp_path'].nil?
+        raise ArgumentError, "Aborting installation, no webapp_path specified in config: #{@config}" if @config['webapp_path'].nil?
+
         install_killbill_server(@config['group_id'], @config['artifact_id'], @config['packaging'], @config['classifier'], @config['version'], @config['webapp_path'], bundles_dir, force_download, verify_sha1)
         install_plugins(bundles_dir, @config['version'], force_download, verify_sha1)
         install_default_bundles(bundles_dir, @config['default_bundles_version'], @config['version'], force_download, verify_sha1) unless @config['default_bundles'] == false
@@ -105,26 +105,11 @@ module KPM
         install_kaui(@kaui_config['group_id'], @kaui_config['artifact_id'], @kaui_config['packaging'], @kaui_config['classifier'], @kaui_config['version'], @kaui_config['webapp_path'], bundles_dir, force_download, verify_sha1)
       end
 
-      @trace_logger.add('help', nil, help)
       @trace_logger.to_json
     end
 
     private
 
-    def install_tomcat(dir = Dir.pwd)
-      # Download and unpack Tomcat
-      manager = KPM::TomcatManager.new(dir, @logger)
-      manager.download
-
-      # Update main config
-      root_war_path = manager.setup
-      @config['webapp_path'] = root_war_path
-      @kaui_config['webapp_path'] = Pathname.new(File.dirname(root_war_path)).join('kaui.war').to_s unless @kaui_config.nil?
-
-      # Help message
-      manager.help
-    end
-
     def install_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
       install_java_plugins(bundles_dir, raw_kb_version, force_download, verify_sha1)
     end

data/lib/kpm/kaui_artifact.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
-require 'set'
 
 module KPM
   class KauiArtifact < BaseArtifact
@@ -11,9 +10,9 @@ module KPM
 
         coordinates = KPM::Coordinates.build_coordinates(coordinate_map)
         response    = REXML::Document.new nexus_remote(overrides, ssl_verify).search_for_artifacts(coordinates)
-        versions    = SortedSet.new
+        versions    = []
         response.elements.each('searchNGResponse/data/artifact/version') { |element| versions << element.text }
-        versions
+        versions.sort!.uniq
       end
     end
   end

data/lib/kpm/killbill_plugin_artifact.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
-require 'set'
 
 module KPM
   class KillbillPluginArtifact < BaseArtifact
@@ -20,8 +19,9 @@ module KPM
           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
-            plugins[type_and_group_id[0]][artifact_id] ||= SortedSet.new
+            plugins[type_and_group_id[0]][artifact_id] ||= []
             plugins[type_and_group_id[0]][artifact_id] << element.elements['version'].text
+            plugins[type_and_group_id[0]][artifact_id].sort!.uniq!
           end
         end
 

data/lib/kpm/killbill_server_artifact.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
-require 'set'
 
 module KPM
   class KillbillServerArtifact < BaseArtifact
@@ -10,9 +9,9 @@ module KPM
         coordinate_map = { group_id: KPM::BaseArtifact::KILLBILL_GROUP_ID, artifact_id: artifact_id, packaging: packaging, classifier: classifier }
         coordinates = KPM::Coordinates.build_coordinates(coordinate_map)
         response    = REXML::Document.new nexus_remote(overrides, ssl_verify).search_for_artifacts(coordinates)
-        versions    = SortedSet.new
+        versions    = []
         response.elements.each('searchNGResponse/data/artifact/version') { |element| versions << element.text }
-        versions
+        versions.sort!.uniq
       end
 
       def info(version = 'LATEST', sha1_file = nil, force_download = false, verify_sha1 = true, overrides = {}, ssl_verify = true)

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', '307'
+        when '301', '302', '307'
           location = response['Location']
           logger.debug { "Following redirect to #{location}" }
 

data/lib/kpm/plugins_directory.yml

@@ -8,18 +8,22 @@
   :versions:
     :0.18: 0.5.26
     :0.20: 0.7.0
+    :0.22: 0.9.0
+    :0.24: 0.10.0
 :analytics:
   :type: :java
   :versions:
     :0.18: 4.2.5
     :0.20: 6.0.1
-    :0.22: 7.2.3
+    :0.22: 7.2.7
+    :0.24: 8.1.1
 :avatax:
   :type: :java
   :versions:
     :0.18: 0.4.1
     :0.20: 0.6.1
     :0.22: 0.8.4
+    :0.24: 0.9.0
 :cybersource:
   :type: :ruby
   :versions:
@@ -28,6 +32,7 @@
   :type: :java
   :versions:
     :0.22: 0.0.2
+    :0.24: 0.1.0
 :dwolla:
   :type: :java
   :versions:
@@ -39,6 +44,7 @@
     :0.18: 0.3.1
     :0.20: 0.5.1
     :0.22: 0.7.2
+    :0.24: 0.8.0
 :forte:
   :type: :java
   :versions:
@@ -73,6 +79,7 @@
   :artifact_id: payment-test-plugin
   :versions:
     :0.22: 7.0.4
+    :0.24: 8.0.0
 :securenet:
   :type: :ruby
   :versions:
@@ -80,4 +87,26 @@
 :stripe:
   :type: :java
   :versions:
-    :0.22: 7.3.1
+    :0.22: 7.3.3
+    :0.24: 8.0.2
+:braintree:
+  :type: :java
+  :versions:
+    :0.24: 1.0.0
+:catalog-test:
+  :type: :java
+  :versions:
+    :0.24: 0.5.1
+:gocardless:
+  :type: :java
+  :versions:
+    :0.24: 1.0.1
+:qualpay:
+  :type: :java
+  :versions:
+    :0.22: 0.0.1
+    :0.24: 1.0.0
+:invgrp:
+  :type: :java
+  :versions:
+    :0.24: 1.0.7

data/lib/kpm/tasks.rb

@@ -17,16 +17,6 @@ module KPM
           say "KPM version #{KPM::VERSION}"
         end
 
-        class_option :overrides,
-                     type: :hash,
-                     default: nil,
-                     desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
-
-        class_option :ssl_verify,
-                     type: :boolean,
-                     default: true,
-                     desc: 'Set to false to disable SSL Verification.'
-
         method_option :force_download,
                       type: :boolean,
                       default: false,
@@ -104,6 +94,14 @@ module KPM
                       type: :boolean,
                       default: true,
                       desc: 'Validate sha1 sum'
+        method_option :overrides,
+                      type: :hash,
+                      default: nil,
+                      desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
+        method_option :ssl_verify,
+                      type: :boolean,
+                      default: true,
+                      desc: 'Set to false to disable SSL Verification.'
         desc 'pull_kb_server_war <version>', 'Pulls Kill Bill server war and places it on your machine. If version was not specified it uses the latest released version.'
         def pull_kb_server_war(version = 'LATEST')
           installer = BaseInstaller.new(logger,
@@ -121,6 +119,14 @@ module KPM
           say "Artifact has been retrieved and can be found at path: #{response[:file_path]}", :green
         end
 
+        method_option :overrides,
+                      type: :hash,
+                      default: nil,
+                      desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
+        method_option :ssl_verify,
+                      type: :boolean,
+                      default: true,
+                      desc: 'Set to false to disable SSL Verification.'
         desc 'search_for_kb_server', 'Searches for all versions of Kill Bill server and prints them to the screen.'
         def search_for_kb_server
           say "Available versions: #{KillbillServerArtifact.versions(KillbillServerArtifact::KILLBILL_ARTIFACT_ID,
@@ -207,6 +213,14 @@ module KPM
                       type: :boolean,
                       default: true,
                       desc: 'Validates sha1 sum'
+        method_option :overrides,
+                      type: :hash,
+                      default: nil,
+                      desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
+        method_option :ssl_verify,
+                      type: :boolean,
+                      default: true,
+                      desc: 'Set to false to disable SSL Verification.'
         desc 'pull_defaultbundles <kb-version>', 'Pulls the default OSGI bundles and places it on your machine. If the kb-version has been specified, it is used to download the matching platform artifact; if not, it uses the latest released version.'
         def pull_defaultbundles(kb_version = 'LATEST')
           response = BaseInstaller.new(logger,
@@ -219,7 +233,14 @@ module KPM
                                                            options[:verify_sha1])
           say "Artifact has been retrieved and can be found at path: #{response[:file_path]}", :green
         end
-
+        method_option :overrides,
+                      type: :hash,
+                      default: nil,
+                      desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
+        method_option :ssl_verify,
+                      type: :boolean,
+                      default: true,
+                      desc: 'Set to false to disable SSL Verification.'
         desc 'search_for_plugins', 'Searches for all available plugins and prints them to the screen.'
         def search_for_plugins
           all_plugins = KillbillPluginArtifact.versions(options[:overrides], options[:ssl_verify])
@@ -251,6 +272,14 @@ module KPM
                       type: :boolean,
                       default: true,
                       desc: 'Validates sha1 sum'
+        method_option :overrides,
+                      type: :hash,
+                      default: nil,
+                      desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
+        method_option :ssl_verify,
+                      type: :boolean,
+                      default: true,
+                      desc: 'Set to false to disable SSL Verification.'
         desc 'pull_kaui_war <version>', 'Pulls Kaui war and places it on your machine. If version was not specified it uses the latest released version.'
         def pull_kaui_war(version = 'LATEST')
           response = KauiArtifact.pull(logger,
@@ -293,6 +322,14 @@ module KPM
                       type: :boolean,
                       default: false,
                       desc: 'Set the output format as JSON when true'
+        method_option :overrides,
+                      type: :hash,
+                      default: nil,
+                      desc: "A hashed list of overrides. Available options are 'url', 'repository', 'username', and 'password'."
+        method_option :ssl_verify,
+                      type: :boolean,
+                      default: true,
+                      desc: 'Set to false to disable SSL Verification.'
         desc 'info', 'Describe information about a Kill Bill version'
         def info
           versions_info = KillbillServerArtifact.info(options[:version],
@@ -525,22 +562,6 @@ module KPM
                       type: :string,
                       default: nil,
                       desc: 'Killbill URL ex. http://127.0.0.1:8080'
-        method_option :database_name,
-                      type: :string,
-                      default: nil,
-                      desc: 'DB name to connect'
-        method_option :database_credentials,
-                      type: :array,
-                      default: nil,
-                      desc: 'DB credentials <user> <password>'
-        method_option :database_host,
-                      type: :string,
-                      default: nil,
-                      desc: 'Database Host name'
-        method_option :database_port,
-                      type: :string,
-                      default: nil,
-                      desc: 'Database port'
         method_option :kaui_web_path,
                       type: :string,
                       default: nil,
@@ -563,17 +584,12 @@ module KPM
 
           raise Interrupt, '--killbill_credentials, required format -> <user> <password>' if options[:killbill_credentials] && options[:killbill_credentials].size != 2
 
-          raise Interrupt, '--database_credentials, required format -> <user> <password>' if options[:database_credentials] && options[:database_credentials].size != 2
-
-          raise Interrupt, '--database_credentials, please provide a valid database name' if options[:database_name] && options[:database_name] == :database_name.to_s
-
           raise Interrupt, '--kaui_web_path, please provide a valid kaui web path ' if options[:kaui_web_path] && options[:kaui_web_path] == :kaui_web_path.to_s
 
           raise Interrupt, '--killbill_web_path, please provide a valid killbill web path' if options[:killbill_web_path] && options[:killbill_web_path] == :killbill_web_path.to_s
 
           diagnostic = KPM::DiagnosticFile.new(options[:config_file], options[:killbill_api_credentials], options[:killbill_credentials],
-                                               options[:killbill_url], options[:database_name], options[:database_credentials],
-                                               options[:database_host], options[:database_port], options[:kaui_web_path], options[:killbill_web_path], options[:bundles_dir], logger)
+                                               options[:killbill_url], options[:kaui_web_path], options[:killbill_web_path], options[:bundles_dir], logger)
           diagnostic.export_data(options[:account_export], options[:log_dir])
         rescue StandardError => e
           logger.error "\e[91;1m#{e.message}\e[0m"

data/lib/kpm/version.rb

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

data/lib/kpm.rb

@@ -7,7 +7,6 @@ module KPM
   autoload :Formatter, 'kpm/formatter'
   autoload :Inspector, 'kpm/inspector'
   autoload :Sha1Checker, 'kpm/sha1_checker'
-  autoload :TomcatManager, 'kpm/tomcat_manager'
   autoload :KillbillServerArtifact, 'kpm/killbill_server_artifact'
   autoload :KillbillPluginArtifact, 'kpm/killbill_plugin_artifact'
   autoload :KauiArtifact, 'kpm/kaui_artifact'

data/packaging/Gemfile

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

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.11.0</version>
+    <version>0.11.2</version>
     <packaging>pom</packaging>
     <name>KPM</name>
     <description>KPM: the Kill Bill Package Manager</description>
@@ -147,11 +147,6 @@
                         </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>
@@ -162,6 +157,16 @@
                                     <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/tasks/package.rake

@@ -9,33 +9,50 @@ PACKAGE_NAME = 'kpm'
 require './lib/kpm/version'
 VERSION = KPM::VERSION
 
-# See https://traveling-ruby.s3-us-west-2.amazonaws.com/list.html
-TRAVELING_RUBY_VERSION = '20150715-2.2.2'
+# See https://www.jruby.org/download
+JRUBY_VERSION = '9.4.5.0'
+# See https://github.com/Homebrew/homebrew-portable-ruby/releases
+HOMEBREW_PORTABLE_RUBY_VERSION = '3.1.4'
 
 # 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:linux:x86 package:linux:x86_64 package:osx]
+task package: %w[package:noarch package:linux:x86_64 package:osx:x86_64 package:osx:arm64]
 
 namespace :package do
-  namespace :linux do
-    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
+  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/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
-      create_package('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')
     end
   end
 
-  desc 'Package KPM for OS X'
-  task osx: [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
-    create_package('osx')
+  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')
+    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
   end
 
   desc 'Install gems to local directory'
@@ -43,15 +60,12 @@ 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/#{expected_ruby_version}/bundler" # if multiple clones of same repo, may load in wrong one
+    sh 'rm -rf packaging/vendor/ruby/2.*/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'
@@ -80,28 +94,42 @@ namespace :package do
   end
 end
 
-file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
-  download_runtime('linux-x86')
+file "packaging/jruby-dist-#{JRUBY_VERSION}-bin.tar.gz" do
+  download_noarch_runtime
 end
 
-file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
-  download_runtime('linux-x86_64')
+file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{LINUX_X86_TARGET}.bottle.tar.gz" do
+  download_portable_runtime(LINUX_X86_TARGET)
 end
 
-file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
-  download_runtime('osx')
+file "packaging/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{OSX_X86_TARGET}.bottle.tar.gz" do
+  download_portable_runtime(OSX_X86_TARGET)
 end
 
-def create_package(target)
-  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+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}"
   sh "rm -rf #{package_dir}"
   sh "mkdir -p #{package_dir}/lib/ruby"
-  sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{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 "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"
@@ -114,9 +142,14 @@ def create_package(target)
   sh "rm -rf #{package_dir}"
 end
 
-def download_runtime(target)
+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)
   sh 'mkdir -p packaging && cd packaging && curl -L -O --fail ' \
-     "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+     "https://github.com/Homebrew/homebrew-portable-ruby/releases/download/#{HOMEBREW_PORTABLE_RUBY_VERSION}/portable-ruby-#{HOMEBREW_PORTABLE_RUBY_VERSION}.#{target}.bottle.tar.gz"
 end
 
 def gem_exists?
@@ -126,3 +159,9 @@ 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,71 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +126,20 @@ 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:
@@ -159,7 +191,6 @@ files:
 - lib/kpm/system_helpers/system_proxy.rb
 - lib/kpm/tasks.rb
 - lib/kpm/tenant_config.rb
-- lib/kpm/tomcat_manager.rb
 - lib/kpm/trace_logger.rb
 - lib/kpm/uninstaller.rb
 - lib/kpm/utils.rb
@@ -168,7 +199,6 @@ 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
@@ -181,7 +211,6 @@ files:
 - spec/kpm/remote/nexus_facade_spec.rb
 - spec/kpm/remote/tenant_config_spec.rb
 - spec/kpm/remote/tenant_config_spec.yml
-- spec/kpm/remote/tomcat_manager_spec.rb
 - spec/kpm/unit/actions_spec.rb
 - spec/kpm/unit/base_artifact_spec.rb
 - spec/kpm/unit/cpu_information_spec.rb
@@ -223,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Kill Bill package manager.

data/lib/kpm/tomcat_manager.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require 'pathname'
-require 'net/http'
-require 'uri'
-
-module KPM
-  class TomcatManager
-    DOWNLOAD_URL = 'https://s3.amazonaws.com/kb-binaries/apache-tomcat-7.0.42.tar.gz'
-
-    def initialize(tomcat_dir, logger)
-      @tomcat_dir = Pathname.new(tomcat_dir)
-      @logger = logger
-    end
-
-    def download
-      uri = URI.parse(DOWNLOAD_URL)
-
-      path = nil
-      Dir.mktmpdir do |dir|
-        file = Pathname.new(dir).join('tomcat.tar.gz')
-
-        @logger.info "Starting download of #{DOWNLOAD_URL} to #{file}"
-        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
-          File.open(file, 'wb+') do |f|
-            http.get(uri.path) do |body|
-              f.write(body)
-            end
-          end
-        end
-
-        path = Utils.unpack_tgz(file.to_s, @tomcat_dir, true)
-      end
-
-      @logger.info "Successful installation of #{DOWNLOAD_URL} to #{path}"
-      path
-    end
-
-    def setup
-      # Remove default webapps
-      %w[ROOT docs examples host-manager manager].each do |webapp|
-        FileUtils.rm_rf(@tomcat_dir.join('webapps').join(webapp))
-      end
-
-      # Update Root.xml
-      root_xml_dir = @tomcat_dir.join('conf').join('Catalina').join('localhost')
-      FileUtils.mkdir_p(root_xml_dir)
-      File.write(root_xml_dir.join('ROOT.xml'), '<Context></Context>')
-
-      # Setup default properties
-      setenv_sh_path = @tomcat_dir.join('bin').join('setenv.sh')
-
-      File.write(setenv_sh_path, "export CATALINA_OPTS=\"$CATALINA_OPTS #{default_java_properties}\"")
-
-      @tomcat_dir.join('webapps').join('ROOT.war').to_s
-    end
-
-    def help
-      "Tomcat installed at #{@tomcat_dir}
-Start script: #{@tomcat_dir.join('bin').join('startup.sh')}
-Stop script: #{@tomcat_dir.join('bin').join('shutdown.sh')}
-Logs: #{@tomcat_dir.join('logs')}"
-    end
-
-    private
-
-    def default_java_properties
-      <<HEREDOC.gsub(/\s+/, ' ').strip
-      -server
-      -showversion
-      -XX:+PrintCommandLineFlags
-      -XX:+UseCodeCacheFlushing
-      -XX:PermSize=512m
-      -XX:MaxPermSize=1G
-      -Xms1G
-      -Xmx2G
-      -XX:+CMSClassUnloadingEnabled
-      -XX:-OmitStackTraceInFastThrow
-      -XX:+UseParNewGC
-      -XX:+UseConcMarkSweepGC
-      -XX:+CMSConcurrentMTEnabled
-      -XX:+CMSParallelRemarkEnabled
-      -XX:+UseCMSInitiatingOccupancyOnly
-      -XX:CMSInitiatingOccupancyFraction=70
-      -XX:+ScavengeBeforeFullGC
-      -XX:+CMSScavengeBeforeRemark
-      -XX:NewSize=600m
-      -XX:MaxNewSize=900m
-      -XX:SurvivorRatio=10
-      -XX:+DisableExplicitGC
-      -Djava.security.egd=file:/dev/./urandom
-HEREDOC
-    end
-  end
-end

data/release.sh

@@ -1,60 +0,0 @@
-#!/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/tomcat_manager_spec.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe KPM::TomcatManager do
-  before(:all) do
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-  end
-
-  it 'should be able to download and unpack tomcat' do
-    Dir.mktmpdir do |dir|
-      manager = KPM::TomcatManager.new(dir, @logger)
-
-      tomcat_path = manager.download
-      expect(tomcat_path).not_to be_nil
-
-      root_war_path = manager.setup
-      expect(root_war_path).not_to be_nil
-    end
-  end
-end