kpm 0.10.5 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9494301ca44d5d736b5451e958d0e6f16abc4c5aa9c0965b82aa2827f869ce84
-  data.tar.gz: bd60d65f4870ef85cf896d532d0b81e97985f38611c2472a51dd509cf7eed49d
+  metadata.gz: 92f89695b531e939275ac653417d228d51b897570504418032418797a56674bf
+  data.tar.gz: acd577c2a29a56c50c0daeacb09a62f7fcf6068650d1ba8ed2e527d6f9db2962
 SHA512:
-  metadata.gz: 38bd4cc2f8f9b546b3fe733723cd54049b5c0c5547b2861247a8b8ee6e023753f1ef650bf4e7d8b80a36d2f7b387e0c337a25188978ca5b73714760ce5a3dddc
-  data.tar.gz: ca87e6f189fa9f7ea5a171fcd7ed75f0dc9ed6bbd52ab0c646bff97b65f2fd180f864561180129ab796922429aa94c5cdbccf7021a7ac14482b030ff4df44d26
+  metadata.gz: c44713659fe2517572916f45722df1d6ae7b8d639cb24b227ba161386e104df0c2dcf3f38f7a735cfe0f399cbe5d791dc5802cda6a8a73ec791c5ba9853adfd7
+  data.tar.gz: fd47e470a0df6c75785383a45857a93909ff44d4464136a57ad3f4d27e9331a2b9d31cb4a08834885ee099292a7df5ea6ee9417bfa94fa3c93801114c3af15d3

data/README.adoc

@@ -38,24 +38,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/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/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 'highline', '>= 1.6.21', '< 2.1.0'
   s.add_dependency 'killbill-client', '~> 3.2'
-  s.add_dependency 'rubyzip', '~> 1.3.0'
-  s.add_dependency 'thor', '~> 0.19.1'
+  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/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

@@ -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,29 +105,13 @@ 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)
-      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 +119,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', '307'
+        when '301', '302', '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

@@ -80,4 +80,4 @@
 :stripe:
   :type: :java
   :versions:
-    :0.22: 7.3.1
+    :0.22: 7.3.3

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.5'
+  VERSION = '0.11.1'
 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/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.kill-bill.billing.installer</groupId>
     <artifactId>kpm</artifactId>
-    <version>0.10.5</version>
+    <version>0.11.1</version>
     <packaging>pom</packaging>
     <name>KPM</name>
     <description>KPM: the Kill Bill Package Manager</description>

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.11.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-12-21 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
@@ -42,30 +48,42 @@ dependencies:
   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
@@ -173,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
@@ -194,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

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/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