kpm 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4a3f0861e0df1db63bfb5647ed60ebd1a7c4d3
-  data.tar.gz: d8b938a6b66539fec064abb4a67bc94f81f64bab
+  metadata.gz: af4823a1ad26ca690e372df3596841ae7fa54ee9
+  data.tar.gz: ade7725741e69b929bfa0fd9d47d6fa6326f4695
 SHA512:
-  metadata.gz: 2a6a89efadce6b7fa7610a0927f0d15a38b83886b1aa29071995bb723532dd0777b5941ee9aadc4b7513fad446eae5b02fb3f00ede6a62bffa76568201062eba
-  data.tar.gz: e33e8482b67584e8328c7f26f17626e7ef98a8dbadb42e8e4daca404205fc8229af19c8bd41aaf02b82771bc5aeaf1baf762a52335427c42526414b5537406eb
+  metadata.gz: 92361d67b9abc0bd2da406fc460481aa8b74176cddf5d4b5b11381428750fe1b417ac0b5bb2796512e52e65963427793cd293dfbf56d53f02672f82b6b0430d2
+  data.tar.gz: b9f1727cdd593dfb48fb4b5c6ef16e2caf272141253100b8566ee7a808b9c74577e652f5742863deb3804bfacb13ff793a37927f151b4bccbbaa895d0ca9f1b1

data/kpm.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'highline', '~> 1.6.21'
   s.add_dependency 'nexus_cli', '~> 4.1.0'
   s.add_dependency 'thor', '~> 0.19.1'
+  s.add_dependency 'rubyzip', '~>1.2.0'
 
   s.add_development_dependency 'rake', '>= 10.0.0', '< 11.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'

data/lib/kpm/base_artifact.rb

@@ -37,7 +37,7 @@ module KPM
     class << self
       def pull(logger, group_id, artifact_id, packaging='jar', classifier=nil, version='LATEST', 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, destination_path, is_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, nil, destination_path, false, sha1_file, force_download, verify_sha1, overrides, ssl_verify)
       end
 
       def pull_from_fs(logger, file_path, destination_path=nil)
@@ -57,9 +57,10 @@ module KPM
 
       protected
 
-      def pull_and_put_in_place(logger, coordinate_map, destination_path=nil, skip_top_dir=true, sha1_file=nil, force_download=false, verify_sha1=true, overrides={}, ssl_verify=true)
+      def pull_and_put_in_place(logger, coordinate_map, plugin_name, destination_path=nil, skip_top_dir=true, sha1_file=nil, force_download=false, verify_sha1=true, overrides={}, ssl_verify=true)
         # Build artifact info
         artifact_info = artifact_info(logger, coordinate_map, overrides, ssl_verify)
+        artifact_info[:plugin_name] = plugin_name
         populate_fs_info(artifact_info, destination_path)
 
         # Update with resolved version in case 'LATEST' was passed
@@ -73,9 +74,12 @@ module KPM
           # We need to do a bit of magic to make sure that artifact_info[:bundle_dir] is correctly populated when we bail early
           if artifact_info[:is_tgz] && coordinate_map[:artifact_id] != 'killbill-platform-osgi-bundles-defaultbundles'
             plugin_dir = File.split(artifact_info[:dir_name])[0]
-            plugins_manager = PluginsManager.new(plugin_dir, logger)
-            artifact_id = coordinates.split(':')[1]
-            plugin_name = plugins_manager.guess_plugin_name(artifact_id)
+            plugin_name = artifact_info[:plugin_name]
+            unless plugin_name
+              plugins_manager = PluginsManager.new(plugin_dir, logger)
+              artifact_id = coordinates.split(':')[1]
+              plugin_name = plugins_manager.guess_plugin_name(artifact_id)
+            end
             if plugin_name.nil?
               logger.warn("Failed to guess plugin_name for #{coordinates}: artifact_info[:bundle_dir] will not be populated correctly")
             else
@@ -139,6 +143,19 @@ module KPM
         # Unclear if this is even possible
         return false if artifact_info[:sha1].nil?
 
+        # If tgz artifact, check if expected exploded folder exists
+        if artifact_info[:is_tgz]
+          artifact_path = Pathname.new(artifact_info[:file_path])
+          if artifact_info[:plugin_name]
+            artifact_path = artifact_path.join(artifact_info[:plugin_name]).join(artifact_info[:version])
+          end
+          return false if !artifact_path.exist?
+        # Else, exit early if file_path does not exist or is a directory
+        elsif !File.exists?(artifact_info[:file_path]) ||
+              File.directory?(artifact_info[:file_path])
+          return false
+        end
+
         # Check entry in sha1_file if exists
         if sha1_file && File.exists?(sha1_file)
           sha1_checker = Sha1Checker.from_file(sha1_file)
@@ -146,15 +163,14 @@ module KPM
           return true if local_sha1 == artifact_info[:sha1]
         end
 
-        # If not using sha1_file mechanism, exit early if file_path does not exist or is a directory
-        if !File.exists?(artifact_info[:file_path]) ||
-            File.directory?(artifact_info[:file_path])
-          return false
+        if artifact_info[:is_tgz]
+          # tgz artifact seems to be installed, but is not in the sha1 file, so do not skip it
+          false
+        else
+          # Finally check if remote_sha1 matches what we have locally
+          local_sha1 = Digest::SHA1.file(artifact_info[:file_path]).hexdigest
+          local_sha1 == artifact_info[:sha1]
         end
-
-        # Finally check if remote_sha1 matches what we have locally
-        local_sha1 = Digest::SHA1.file(artifact_info[:file_path]).hexdigest
-        local_sha1 == artifact_info[:sha1]
       end
 
       def artifact_info(logger, coordinate_map, overrides={}, ssl_verify=true)
@@ -264,11 +280,6 @@ module KPM
 
       # Magic methods...
 
-      def is_ruby_plugin_and_should_skip_top_dir(group_id, artifact_id)
-        # The second check is for custom ruby plugins
-        group_id == KILLBILL_RUBY_PLUGIN_GROUP_ID || artifact_id.include?('plugin')
-      end
-
       def path_looks_like_a_directory(path)
         # It already is!
         return true if File.directory?(path)

data/lib/kpm/base_installer.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'zip'
 
 module KPM
   class BaseInstaller
@@ -7,10 +8,7 @@ module KPM
     SHA1_FILENAME = 'sha1.yml'
     DEFAULT_BUNDLES_DIR = Pathname.new('/var').join('tmp').join('bundles').to_s
 
-
-
-
-    def initialize(logger, nexus_config, nexus_ssl_verify)
+    def initialize(logger, nexus_config = nil, nexus_ssl_verify = nil)
       @logger = logger
       @nexus_config = nexus_config
       @nexus_ssl_verify = nexus_ssl_verify
@@ -61,17 +59,14 @@ module KPM
                              @nexus_ssl_verify)
     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)
+    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)
 
       # plugin_key needs to exist
       if plugin_key.nil?
-        @logger.warn("Aborting installation: User needs to specify a pluginKey")
+        @logger.warn('Aborting installation: User needs to specify a pluginKey')
         return nil
       end
 
-
       # Lookup artifact and perform validation against input
       looked_up_group_id, looked_up_artifact_id, looked_up_packaging, looked_up_classifier, looked_up_version, looked_up_type = KPM::PluginsDirectory.lookup(plugin_key, true, raw_kb_version)
       return if !validate_installation_arg(plugin_key, 'group_id', specified_group_id, looked_up_group_id)
@@ -109,6 +104,9 @@ 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
@@ -116,7 +114,8 @@ module KPM
         destination = plugins_dir.join('ruby')
       end
       sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
-
+      plugins_manager = PluginsManager.new(plugins_dir, @logger)
+      _, plugin_name = plugins_manager.get_plugin_key_and_name(plugin_key)
 
       # Before we do the install we verify that the entry we have in the plugin_identifiers.json matches our current request
       coordinate_map = {:group_id => group_id, :artifact_id => artifact_id, :packaging => packaging, :classifier => classifier}
@@ -130,6 +129,7 @@ module KPM
                                                        packaging,
                                                        classifier,
                                                        version,
+                                                       plugin_name,
                                                        destination,
                                                        sha1_file,
                                                        force_download,
@@ -168,20 +168,19 @@ module KPM
       artifact_info
     end
 
-    def uninstall_plugin(plugin_key, plugin_version=nil, bundles_dir=nil)
-
+    def uninstall_plugin(plugin_name_or_key, plugin_version=nil, bundles_dir=nil)
       bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
       plugins_dir = bundles_dir.join('plugins')
 
       plugins_manager = PluginsManager.new(plugins_dir, @logger)
 
-      plugin_name = plugins_manager.get_plugin_name_from_key(plugin_key)
+      plugin_key, plugin_name = plugins_manager.get_plugin_key_and_name(plugin_name_or_key)
       if plugin_name.nil?
-        @logger.warn("Cannot uninstall plugin: Unknown plugin_key = #{plugin_key}");
+        @logger.warn("Cannot uninstall plugin: Unknown plugin name or plugin key = #{plugin_name_or_key}");
         return
       end
 
-      modified = plugins_manager.uninstall(plugin_name, plugin_version)
+      modified = plugins_manager.uninstall(plugin_name, plugin_version || :all)
       plugins_manager.remove_plugin_identifier_key(plugin_key)
       modified
     end
@@ -262,5 +261,36 @@ 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.exists?(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

@@ -81,7 +81,7 @@ module KPM
 
       infos = []
       @config['plugins']['java'].each do |plugin|
-        infos << install_plugin(plugin['name'], nil, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], @config['plugins_dir'], 'java', force_download, verify_sha1)
+        infos << install_plugin(plugin['name'], nil, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], @config['plugins_dir'], 'java', force_download, verify_sha1, false)
       end
 
       infos
@@ -90,9 +90,11 @@ module KPM
     def install_ruby_plugins(force_download, verify_sha1)
       return if @config['plugins'].nil? or @config['plugins']['ruby'].nil?
 
+      verify_jruby_jar=true
       infos = []
       @config['plugins']['ruby'].each do |plugin|
-        infos << install_plugin(plugin['name'], nil, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], @config['plugins_dir'], 'ruby', force_download, verify_sha1)
+        infos << install_plugin(plugin['name'], nil, plugin['group_id'], plugin['artifact_id'], plugin['packaging'], plugin['classifier'], plugin['version'], @config['plugins_dir'], 'ruby', force_download, verify_sha1, verify_jruby_jar)
+        verify_jruby_jar=false
       end
 
       infos

data/lib/kpm/killbill_plugin_artifact.rb

@@ -4,6 +4,11 @@ require 'set'
 module KPM
   class KillbillPluginArtifact < BaseArtifact
     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, is_ruby_plugin_and_should_skip_top_dir(group_id, artifact_id), sha1_file, force_download, verify_sha1, overrides, ssl_verify)
+      end
+
       def versions(overrides={}, ssl_verify=true)
         plugins = {:java => {}, :ruby => {}}
 
@@ -20,6 +25,14 @@ module KPM
 
         plugins
       end
+
+      protected
+      # Magic methods...
+
+      def is_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/plugins_directory.rb

@@ -14,6 +14,11 @@ module KPM
       end
     end
 
+
+    def self.list_plugins(latest=false, kb_version)
+      all(latest).inject({}) { |out, (key, val)| out[key]=val[:versions][kb_version.to_sym] if val[:versions].key?(kb_version.to_sym) ; out}
+    end
+
     # Note: this API is used in Docker images (see kpm_generator.rb, careful when changing it!)
     def self.lookup(raw_plugin_key, latest=false, raw_kb_version=nil)
       plugin_key = raw_plugin_key.to_s.downcase

data/lib/kpm/plugins_manager.rb

@@ -89,7 +89,6 @@ module KPM
     end
 
     def remove_plugin_identifier_key(plugin_key)
-
       identifiers = read_plugin_identifiers
       # If key does not already exists we update it, if not nothing to do.
       if identifiers.has_key?(plugin_key)
@@ -100,14 +99,18 @@ module KPM
       identifiers
     end
 
-
-    def get_plugin_name_from_key(plugin_key)
+    def get_plugin_key_and_name(plugin_name_or_key)
       identifiers = read_plugin_identifiers
-      return nil if identifiers.nil? || !identifiers.has_key?(plugin_key)
-      identifiers[plugin_key]['plugin_name']
+      if identifiers.has_key?(plugin_name_or_key)
+        # It's a plugin key
+        [plugin_name_or_key, identifiers[plugin_name_or_key]['plugin_name']]
+      else
+        # Check it's already a plugin name
+        identifiers.each { |plugin_key, entry| return [plugin_key, plugin_name_or_key] if entry['plugin_name'] == plugin_name_or_key }
+        nil
+      end
     end
 
-
     def guess_plugin_name(artifact_id)
       return nil if artifact_id.nil?
       captures = artifact_id.scan(/(.*)-plugin/)

data/lib/kpm/tasks.rb

@@ -44,7 +44,7 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validate sha1 sum'
-        desc 'pull_kb_server_war version', 'Pulls Kill Bill server war from Sonatype and places it on your machine.'
+        desc 'pull_kb_server_war <version>', 'Pulls Kill Bill server war from Sonatype and places it on your machine. If version was not specified it uses the latest released version.'
         def pull_kb_server_war(version='LATEST')
           response = KillbillServerArtifact.pull(logger,
                                                  KillbillServerArtifact::KILLBILL_GROUP_ID,
@@ -82,7 +82,7 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        desc 'pull_kp_server_war version', 'Pulls Kill Pay server war from Sonatype and places it on your machine.'
+        desc 'pull_kp_server_war <version>', 'Pulls Kill Pay server war from Sonatype and places it on your machine. If version was not specified it uses the latest released version.'
         def pull_kp_server_war(version='LATEST')
           response = KillbillServerArtifact.pull(logger,
                                                  KillbillServerArtifact::KILLBILL_GROUP_ID,
@@ -108,6 +108,26 @@ module KPM
                                                                      options[:ssl_verify]).to_a.join(', ')}", :green
         end
 
+        method_option :group_id,
+                      :type    => :string,
+                      :default => KillbillPluginArtifact::KILLBILL_JAVA_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_JAVA_PLUGIN_PACKAGING,
+                      :desc    => 'The plugin artifact packaging'
+        method_option :classifier,
+                      :type    => :string,
+                      :default => KillbillPluginArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER,
+                      :desc    => 'The plugin artifact classifier'
         method_option :destination,
                       :type    => :string,
                       :default => nil,
@@ -124,23 +144,49 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        desc 'pull_java_plugin artifact_id', 'Pulls a java plugin from Sonatype and places it on your machine.'
-        def pull_java_plugin(artifact_id, version='LATEST')
-          response = KillbillPluginArtifact.pull(logger,
-                                                 KillbillPluginArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID,
-                                                 artifact_id,
-                                                 KillbillPluginArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING,
-                                                 KillbillPluginArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER,
-                                                 version,
-                                                 options[:destination],
-                                                 options[:sha1_file],
-                                                 options[:force_download],
-                                                 options[:verify_sha1],
-                                                 options[:overrides],
-                                                 options[:ssl_verify])
+        desc 'pull_java_plugin plugin-key <kb-version>', 'Pulls a java plugin from Sonatype 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 pull_java_plugin(plugin_key, kb_version='LATEST')
+
+          response = BaseInstaller.new(logger,
+                                       options[:overrides],
+                                       options[:ssl_verify]).install_plugin(plugin_key,
+                                                                            kb_version,
+                                                                            options[:group_id],
+                                                                            options[:artifact_id],
+                                                                            options[:packaging],
+                                                                            options[:classifier],
+                                                                            options[:version],
+                                                                            options[:destination],
+                                                                            'java',
+                                                                            options[:force_download],
+                                                                            options[:verify_sha1],
+                                                                            false)
           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 :destination,
                       :type    => :string,
                       :default => nil,
@@ -157,21 +203,24 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        desc 'pull_ruby_plugin artifact_id', 'Pulls a ruby plugin from Sonatype and places it on your machine.'
-        def pull_ruby_plugin(artifact_id, version='LATEST')
-          response = KillbillPluginArtifact.pull(logger,
-                                                 KillbillPluginArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID,
-                                                 artifact_id,
-                                                 KillbillPluginArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING,
-                                                 KillbillPluginArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER,
-                                                 version,
-                                                 options[:destination],
-                                                 options[:sha1_file],
-                                                 options[:force_download],
-                                                 options[:verify_sha1],
-                                                 options[:overrides],
-                                                 options[:ssl_verify])
+        desc 'pull_ruby_plugin plugin-key <kb-version>', 'Pulls a ruby plugin from Sonatype 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 pull_ruby_plugin(plugin_key, kb_version='LATEST')
+          response = BaseInstaller.new(logger,
+                                       options[:overrides],
+                                       options[:ssl_verify]).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)
           say "Artifact has been retrieved and can be found at path: #{response[:file_path]}", :green
+
         end
 
         method_option :destination,
@@ -186,7 +235,7 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        desc 'pull_defaultbundles', 'Pulls the default OSGI bundles from Sonatype and places it on your machine.'
+        desc 'pull_defaultbundles <kb-version>', 'Pulls the default OSGI bundles from Sonatype 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,
                                        options[:overrides],
@@ -230,7 +279,7 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        desc 'pull_kaui_war version', 'Pulls Kaui war from Sonatype and places it on your machine.'
+        desc 'pull_kaui_war <version>', 'Pulls Kaui war from Sonatype 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,
                                        KauiArtifact::KAUI_GROUP_ID,
@@ -258,11 +307,21 @@ module KPM
                       :desc => 'Kill Bill version'
         desc 'info', 'Describe information about a Kill Bill version'
         def info
-          info = KillbillServerArtifact.info(options[:version],
+
+          say "Fetching info for version #{options[:version]}...\n"
+
+          versions_info = KillbillServerArtifact.info(options[:version],
                                              options[:overrides],
                                              options[:ssl_verify])
+          say "Dependencies for version #{options[:version]}\n  " + (versions_info.map {|k,v| "#{k} #{v}"}).join("\n  "), :green
+          say "\n\n"
+
+          resolved_kb_version = versions_info['killbill']
+          kb_version = resolved_kb_version.split('.').slice(0,2).join(".")
+
+          plugins_info = KPM::PluginsDirectory.list_plugins(true, kb_version)
 
-          say "Dependencies for version #{options[:version]}\n  " + (info.map {|k,v| "#{k} #{v}"}).join("\n  "), :green
+          say "Known plugin for KB version #{options[:version]}\n  " + (plugins_info.map {|k,v| "#{k} #{v}"}).join("\n  "), :green
         end
 
         private

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

data/spec/kpm/remote/base_artifact_spec.rb

@@ -25,29 +25,6 @@ describe KPM::BaseArtifact do
     end
   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'
-
-    Dir.mktmpdir do |dir|
-      info = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, dir)
-      info[:file_name].should be_nil
-
-      files_in_dir = Dir[info[:file_path] + '/*']
-      files_in_dir.size.should == 1
-      files_in_dir[0].should == info[:file_path] + '/killbill-payment-test'
-
-      File.read(info[:file_path] + '/killbill-payment-test/1.8.7/killbill.properties').should == "mainClass=PaymentTest::PaymentPlugin\nrequire=payment_test\npluginType=PAYMENT\n"
-
-      info[:bundle_dir].should == info[:file_path] + '/killbill-payment-test/1.8.7'
-    end
-  end
-
   it 'should be able to download and verify generic .tar.gz artifacts' do
     # The artifact is not small unfortunately (23.7M)
     group_id    = 'org.kill-bill.billing'

data/spec/kpm/remote/base_installer_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+require 'json'
+
+describe KPM::BaseInstaller do
+
+  before(:all) do
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+  end
+
+  it 'should be able to uninstall via plugin key' do
+    Dir.mktmpdir do |dir|
+      bundles_dir = dir + '/bundles'
+      installer = KPM::BaseInstaller.new(@logger)
+
+      info = installer.install_plugin('analytics', nil, nil, nil, nil, nil, '0.7.1', bundles_dir)
+
+      check_installation(bundles_dir)
+
+      installer.uninstall_plugin('analytics', nil, bundles_dir)
+
+      check_uninstallation(bundles_dir)
+    end
+  end
+
+  # See https://github.com/killbill/killbill-cloud/issues/14
+  it 'should be able to uninstall via plugin name' do
+    Dir.mktmpdir do |dir|
+      bundles_dir = dir + '/bundles'
+      installer = KPM::BaseInstaller.new(@logger)
+
+      installer.install_plugin('analytics', nil, nil, nil, nil, nil, '0.7.1', bundles_dir)
+
+      check_installation(bundles_dir)
+
+      installer.uninstall_plugin('analytics-plugin', nil, bundles_dir)
+
+      check_uninstallation(bundles_dir)
+    end
+  end
+
+  private
+
+  def check_installation(plugins_dir)
+    common_checks(plugins_dir)
+
+    plugin_identifiers = read_plugin_identifiers(plugins_dir)
+
+    plugin_identifiers.size.should == 1
+
+    plugin_identifiers['analytics']['plugin_name'].should == 'analytics-plugin'
+    plugin_identifiers['analytics']['group_id'].should == 'org.kill-bill.billing.plugin.java'
+    plugin_identifiers['analytics']['artifact_id'].should == 'analytics-plugin'
+    plugin_identifiers['analytics']['packaging'].should == 'jar'
+    plugin_identifiers['analytics']['version'].should == '0.7.1'
+    plugin_identifiers['analytics']['language'].should == 'java'
+
+    File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt').should be_false
+  end
+
+  def check_uninstallation(plugins_dir)
+    common_checks(plugins_dir)
+
+    plugin_identifiers = read_plugin_identifiers(plugins_dir)
+
+    plugin_identifiers.size.should == 0
+
+    File.file?(plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp/disabled.txt').should be_true
+  end
+
+  def common_checks(plugins_dir)
+    [
+        plugins_dir,
+        plugins_dir + '/plugins',
+        plugins_dir + '/plugins/java',
+        plugins_dir + '/plugins/java/analytics-plugin',
+        plugins_dir + '/plugins/java/analytics-plugin/0.7.1',
+        plugins_dir + '/plugins/java/analytics-plugin/0.7.1/tmp',
+    ].each do |dir|
+      File.directory?(dir).should be_true
+    end
+
+    [
+        plugins_dir + '/plugins/plugin_identifiers.json',
+        plugins_dir + '/plugins/java/analytics-plugin/0.7.1/analytics-plugin-0.7.1.jar'
+    ].each do |file|
+      File.file?(file).should be_true
+    end
+  end
+
+  def read_plugin_identifiers(plugins_dir)
+    File.open(plugins_dir + '/plugins/plugin_identifiers.json', 'r') do |f|
+      JSON.parse(f.read)
+    end
+  end
+end

data/spec/kpm/remote/killbill_plugin_artifact_spec.rb

@@ -7,6 +7,30 @@ 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)
+      info[:file_name].should be_nil
+
+      files_in_dir = Dir[info[:file_path] + '/*']
+      files_in_dir.size.should == 1
+      files_in_dir[0].should == info[:file_path] + '/killbill-payment-test'
+
+      File.read(info[:file_path] + '/killbill-payment-test/1.8.7/killbill.properties').should == "mainClass=PaymentTest::PaymentPlugin\nrequire=payment_test\npluginType=PAYMENT\n"
+
+      info[:bundle_dir].should == 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'
@@ -16,6 +40,7 @@ describe KPM::KillbillPluginArtifact do
                                               KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING,
                                               KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER,
                                               'LATEST',
+                                              'killbill-analytics',
                                               dir,
                                               sha1_file)
       info[:file_name].should == "analytics-plugin-#{info[:version]}.jar"
@@ -32,6 +57,7 @@ describe KPM::KillbillPluginArtifact do
                                               KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING,
                                               KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER,
                                               'LATEST',
+                                              'killbill-analytics',
                                               dir,
                                               sha1_file)
 

metadata

@@ -1,91 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Kill Bill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nexus_cli
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
-  prerelease: false
+        version: 1.2.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  prerelease: false
-  type: :development
 description: A package manager for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables:
@@ -93,8 +107,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemrelease
-- .gitignore
+- ".gemrelease"
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -118,6 +132,7 @@ files:
 - lib/kpm/utils.rb
 - lib/kpm/version.rb
 - spec/kpm/remote/base_artifact_spec.rb
+- spec/kpm/remote/base_installer_spec.rb
 - spec/kpm/remote/installer_spec.rb
 - spec/kpm/remote/kaui_artifact_spec.rb
 - spec/kpm/remote/killbill_plugin_artifact_spec.rb
@@ -133,26 +148,39 @@ homepage: http://kill-bill.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Kill Bill package manager.
-test_files: []
+test_files:
+- spec/kpm/remote/base_artifact_spec.rb
+- spec/kpm/remote/base_installer_spec.rb
+- spec/kpm/remote/installer_spec.rb
+- spec/kpm/remote/kaui_artifact_spec.rb
+- spec/kpm/remote/killbill_plugin_artifact_spec.rb
+- spec/kpm/remote/killbill_server_artifact_spec.rb
+- spec/kpm/remote/tomcat_manager_spec.rb
+- spec/kpm/unit/base_artifact_spec.rb
+- spec/kpm/unit/plugins_directory_spec.rb
+- spec/kpm/unit/plugins_manager_spec.rb
+- spec/kpm/unit/sha1_checker_spec.rb
+- spec/kpm/unit/sha1_test.yml
+- spec/spec_helper.rb