kpm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c4a2af61cc4abb65b686a98e4cced0845bc310
-  data.tar.gz: 376118a4f0b8110189a67314b827967bcf895b97
+  metadata.gz: 4006872829cb16464b5567e8ab5d1f58cdb62867
+  data.tar.gz: 5b1db83cc94abdf91430b0fcfe2882616b826d75
 SHA512:
-  metadata.gz: ad9acead1e4809fe5d06765cbf3d0d85cc33954a61883ffc929b55fc979c331f441a6630505f0d70a1cdb859b9d3b7ec23f2742415c4e40fcb9282aff468f6c6
-  data.tar.gz: a02faaf79cf0eb6ba9228f7683eaef41702085b5193d3eb32011959db29a2b26d8ef3efb8a7a526dbc46ccedfe4c4bde0e8c1739b86941ede714b72b50b3745f
+  metadata.gz: 541bedab598e86c0a1b09d0a6b64a166525acff629ddef683dac996810f9b1ebd26036ce4d3ea53e1fde85b36c39e1a0b02a2b95bc6583a404712dfbad67a89c
+  data.tar.gz: 9ae353b4d8de4a27444ec8116ba6ed1ae8de7da408b2a0249a86d3497a46455b85d4939713e8b109a84e9b01ce0e9b59a21bf82bc79de2322c23c9ea2f78c04a

data/lib/kpm/base_artifact.rb

@@ -171,6 +171,9 @@ module KPM
           nexus_info = nexus_remote(overrides, ssl_verify).get_artifact_info(coordinates)
         rescue NexusCli::ArtifactMalformedException => e
           raise NexusCli::NexusCliError.new("Invalid coordinates #{coordinate_map}")
+        rescue NexusCli::NexusCliError => e
+          logger.warn("Unable to retrieve coordinates #{coordinate_map}")
+          raise e
         end
 
         xml = REXML::Document.new(nexus_info)

data/lib/kpm/base_installer.rb

@@ -68,17 +68,16 @@ module KPM
 
       # plugin_key needs to exist
       if plugin_key.nil?
-        @logger.warn('Aborting installation: User needs to specify a pluginKey')
-        return nil
+        raise ArgumentError.new 'Aborting installation: User needs to specify a pluginKey'
       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)
-      return if !validate_installation_arg(plugin_key, 'artifact_id', specified_artifact_id, looked_up_artifact_id)
-      return if !validate_installation_arg(plugin_key, 'packaging', specified_packaging, looked_up_packaging)
-      return if !validate_installation_arg(plugin_key, 'type', specified_type, looked_up_type)
-      return if !validate_installation_arg(plugin_key, 'classifier', specified_classifier, looked_up_classifier)
+      validate_installation_arg!(plugin_key, 'group_id', specified_group_id, looked_up_group_id)
+      validate_installation_arg!(plugin_key, 'artifact_id', specified_artifact_id, looked_up_artifact_id)
+      validate_installation_arg!(plugin_key, 'packaging', specified_packaging, looked_up_packaging)
+      validate_installation_arg!(plugin_key, 'type', specified_type, looked_up_type)
+      validate_installation_arg!(plugin_key, 'classifier', specified_classifier, looked_up_classifier)
 
 
       # 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
@@ -86,16 +85,14 @@ module KPM
           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
-        @logger.warn("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)")
-        return nil
+        raise ArgumentError.new "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
 
 
       # Specified parameters have always precedence except for the artifact_id (to map stripe to stripe-plugin)
       artifact_id = looked_up_artifact_id || specified_artifact_id
       if artifact_id.nil?
-        @logger.warn("Aborting installation: unable to lookup plugin #{specified_artifact_id}")
-        return nil
+        raise ArgumentError.new "Aborting installation: unable to lookup plugin #{specified_artifact_id}"
       end
 
       bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
@@ -124,7 +121,7 @@ module KPM
 
       # 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}
-      return if !validate_plugin_key(plugins_dir, plugin_key, coordinate_map)
+      validate_plugin_key!(plugins_dir, plugin_key, coordinate_map)
 
 
       @logger.debug("Installing plugin: group_id=#{group_id} artifact_id=#{artifact_id} packaging=#{packaging} classifier=#{classifier} version=#{version} destination=#{destination}")
@@ -182,8 +179,7 @@ module KPM
 
       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 name or plugin key = #{plugin_name_or_key}");
-        return
+        raise ArgumentError.new "Cannot uninstall plugin: Unknown plugin name or plugin key = #{plugin_name_or_key}"
       end
 
       modified = plugins_manager.uninstall(plugin_name, plugin_version || :all)
@@ -233,24 +229,22 @@ module KPM
 
     private
 
-    def validate_installation_arg(plugin_key, arg_type, specified_arg, looked_up_arg)
+    def validate_installation_arg!(plugin_key, arg_type, specified_arg, looked_up_arg)
 
       # If nothing was specified, or if we don't find anything from the lookup, nothing to validate against
       if specified_arg.nil? || looked_up_arg.nil?
-        return true
+        return
       end
 
       if specified_arg.to_s != looked_up_arg.to_s
-        @logger.warn("Aborting installation for plugin_key #{plugin_key}: specified value #{specified_arg} for #{arg_type} does not match looked_up value #{looked_up_arg}")
-        return false
+        raise ArgumentError.new "Aborting installation for plugin_key #{plugin_key}: specified value #{specified_arg} for #{arg_type} does not match looked_up value #{looked_up_arg}"
       end
-
-      true
     end
 
-    def validate_plugin_key(plugins_dir, plugin_key, coordinate_map)
+    def validate_plugin_key!(plugins_dir, plugin_key, coordinate_map)
       plugins_manager = PluginsManager.new(plugins_dir, @logger)
-      return plugins_manager.validate_plugin_identifier_key(plugin_key, coordinate_map)
+      res = plugins_manager.validate_plugin_identifier_key(plugin_key, coordinate_map)
+      raise ArgumentError.new "Failed to validate plugin key #{plugin_key}" if !res
     end
 
     def update_plugin_identifier(plugins_dir, plugin_key, type, coordinate_map, artifact_info)

data/lib/kpm/installer.rb

@@ -8,13 +8,34 @@ module KPM
     def self.from_file(config_path=nil, logger=nil)
       if config_path.nil?
         # Install Kill Bill, Kaui and the KPM plugin by default
-        config = {'killbill' => {'version' => 'LATEST', 'plugins' => {'ruby' => [{'name' => 'kpm'}]}}, 'kaui' => {'version' => 'LATEST'}}
+        config = build_default_config
       else
         config = YAML::load_file(config_path)
       end
       Installer.new(config, logger)
     end
 
+    def self.build_default_config(all_kb_versions=nil)
+      all_kb_versions ||= KillbillServerArtifact.versions(KillbillServerArtifact::KILLBILL_ARTIFACT_ID,
+                                                          KillbillServerArtifact::KILLBILL_PACKAGING,
+                                                          KillbillServerArtifact::KILLBILL_CLASSIFIER,
+                                                          nil,
+                                                          true).to_a
+      latest_stable_version = Gem::Version.new('0.0.0')
+      all_kb_versions.each do |kb_version|
+        version = Gem::Version.new(kb_version) rescue nil
+        next if version.nil?
+
+        major, minor, patch, pre = version.segments
+        next if !pre.nil? || minor.nil? || minor.to_i.odd?
+
+        latest_stable_version = version if version > latest_stable_version
+      end
+
+      # Note: we assume no unstable version of Kaui is published today
+      {'killbill' => {'version' => latest_stable_version.to_s, 'plugins' => {'ruby' => [{'name' => 'kpm'}]}}, 'kaui' => {'version' => 'LATEST'}}
+    end
+
     def initialize(raw_config, logger=nil)
       @config = raw_config['killbill']
       @kaui_config = raw_config['kaui']

data/lib/kpm/plugins_directory.yml

@@ -13,7 +13,7 @@
   :versions:
     :0.14: 0.1.0
     :0.15: 0.2.1
-    :0.16: 0.3.0
+    :0.16: 0.3.2
   :require:
     - :org.killbill.billing.plugin.adyen.merchantAccount
     - :org.killbill.billing.plugin.adyen.username
@@ -57,7 +57,7 @@
   :versions:
     :0.14: 1.0.0
     :0.15: 3.3.0
-    :0.16: 4.0.6
+    :0.16: 4.0.7
   :stable_version: 0.0.4
   :require:
     - :login
@@ -94,6 +94,7 @@
   :versions:
     :0.15: 0.0.2
     :0.16: 0.0.5
+    :0.17: 1.0.0
 :litle:
   :type: :ruby
   :versions:
@@ -119,7 +120,7 @@
   :versions:
     :0.14: 2.0.0
     :0.15: 3.0.0
-    :0.16: 4.1.3
+    :0.16: 4.1.5
   :stable_version: 2.0.0
   :require:
   - :signature
@@ -148,6 +149,7 @@
     :0.14: 1.0.0
     :0.15: 2.0.0
     :0.16: 3.0.3
+    :0.17: 4.0.0
   :stable_version: 2.0.0
   :require:
   - :api_secret_key

data/lib/kpm/tasks.rb

@@ -3,12 +3,20 @@ require 'logger'
 require 'thor'
 require 'pathname'
 
+require 'kpm/version'
+
 module KPM
   module Tasks
     def self.included(base)
       base.send :include, ::Thor::Actions
       base.class_eval do
 
+
+        desc 'KPM version', 'Return current KPM version.'
+        def version
+          say "KPM version #{KPM::VERSION}"
+        end
+
         class_option :overrides,
                      :type    => :hash,
                      :default => nil,

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/kpm/remote/base_installer_spec.rb

@@ -39,6 +39,20 @@ describe KPM::BaseInstaller do
     end
   end
 
+  it 'should raise an exception when plugin does not exist' do
+    Dir.mktmpdir do |dir|
+      bundles_dir = dir + '/bundles'
+      installer = KPM::BaseInstaller.new(@logger)
+
+      begin
+        installer.install_plugin('invalid', nil, nil, nil, nil, nil, '1.2.3', bundles_dir)
+        fail "Should not succeed to install invalid plugin"
+      rescue ArgumentError => e
+      end
+    end
+  end
+
+
   private
 
   def check_installation(plugins_dir)

data/spec/kpm/remote/migrations_spec.rb

@@ -18,7 +18,7 @@ describe KPM::Migrations do
 
   context 'killbill' do
     it 'should be able to find migrations between two versions' do
-      migrations = KPM::Migrations.new('work-for-release-0.16.3', 'work-for-release-0.16.4', 'killbill/killbill', ENV['TOKEN']).migrations
+      migrations = KPM::Migrations.new('killbill-0.16.3', 'killbill-0.16.4', 'killbill/killbill', ENV['TOKEN']).migrations
 
       migrations.size.should == 1
       migrations.first[:name].should == 'V20160324060345__revisit_payment_methods_indexes_509.sql'
@@ -28,7 +28,7 @@ describe KPM::Migrations do
     end
 
     it 'should be able to find migrations for a given version' do
-      migrations = KPM::Migrations.new('work-for-release-0.16.4', nil, 'killbill/killbill', ENV['TOKEN']).migrations
+      migrations = KPM::Migrations.new('killbill-0.16.4', nil, 'killbill/killbill', ENV['TOKEN']).migrations
 
       migrations.size.should == 1
       migrations.first[:name].should == 'V20160324060345__revisit_payment_methods_indexes_509.sql'

data/spec/kpm/unit/installer_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe KPM::Installer do
+
+  context 'when no config file is specified' do
+    let(:all_kb_versions) { %w(0.15.0 0.15.1 0.15.10 0.15.11-SNAPSHOT 0.15.2 0.15.3 0.16.0 0.16.1 0.16.10 0.16.11 0.16.12-SNAPSHOT 0.16.2 0.16.3 0.17.0 0.17.1 0.17.2 0.17.2-SNAPSHOT 0.17.3-SNAPSHOT) }
+
+    it 'finds the right stable versions' do
+      config = KPM::Installer.build_default_config(all_kb_versions)
+      config['killbill'].should_not be_nil
+      config['killbill']['version'].should == '0.16.11'
+
+      config['kaui'].should_not be_nil
+      config['kaui']['version'].should == 'LATEST'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -146,6 +146,7 @@ files:
 - spec/kpm/remote/tomcat_manager_spec.rb
 - spec/kpm/unit/base_artifact_spec.rb
 - spec/kpm/unit/inspector_spec.rb
+- spec/kpm/unit/installer_spec.rb
 - spec/kpm/unit/plugins_directory_spec.rb
 - spec/kpm/unit/plugins_manager_spec.rb
 - spec/kpm/unit/sha1_checker_spec.rb
@@ -178,20 +179,4 @@ rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Kill Bill package manager.
-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/migrations_spec.rb
-- spec/kpm/remote/tomcat_manager_spec.rb
-- spec/kpm/unit/base_artifact_spec.rb
-- spec/kpm/unit/inspector_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/kpm/unit/uninstaller_spec.rb
-- spec/spec_helper.rb
+test_files: []