kpm 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14627c006a8ca097ba3574e2a06329ee1c71b3d4
-  data.tar.gz: 790ba80f029ff28d86d0e91088a0327653cf39cc
+  metadata.gz: f5c4a2af61cc4abb65b686a98e4cced0845bc310
+  data.tar.gz: 376118a4f0b8110189a67314b827967bcf895b97
 SHA512:
-  metadata.gz: 45c071a90801caf7a6ec2e8a83d6edd0d1567fc63a2017bf5b7f9be91ec8834ab4cf1b3cc345ddeb8d219281d5697c927367af88367d856b09d14c77aa8e2e1a
-  data.tar.gz: 94dffb5a06040e48f83f70f27cc8d509798848c30b76a5672dbdda12641a4e1fc72ed819b905a8735af44d107da5b72cb85627ddcc70ffea8e1fcba6da08bb9a
+  metadata.gz: ad9acead1e4809fe5d06765cbf3d0d85cc33954a61883ffc929b55fc979c331f441a6630505f0d70a1cdb859b9d3b7ec23f2742415c4e40fcb9282aff468f6c6
+  data.tar.gz: a02faaf79cf0eb6ba9228f7683eaef41702085b5193d3eb32011959db29a2b26d8ef3efb8a7a526dbc46ccedfe4c4bde0e8c1739b86941ede714b72b50b3745f

data/README.md

@@ -50,11 +50,11 @@ To start Kill Bill, simply run
 
 You can then verify Kill Bill is running by going to http://127.0.0.1:8080/kaui.
 
-## Configuration
+## Using KPM
 
-You can configure the installation process using a kpm.yml file.
+### Custom Installation Through `kpm.yml` File
 
-For example:
+KPM allows you to specify a configuration file, `kpm.yml`, to describe what should be installed. The configuration file is a `yml`. The following shows the syntax of the `kpm.yml` file:
 
     killbill:
       version: 0.14.0
@@ -82,23 +82,94 @@ Common configuration options:
 
 There are many more options you can specify. Take a look at the configuration file used in the [Docker](https://github.com/killbill/killbill-cloud/blob/master/docker/templates/killbill/latest/kpm.yml.erb) image for example.
 
-## Internals and Advanced Commands
+### Custom Downloads
+
+You can also download specific versions/artifacts directly with the following commands -- bypassing the kpm.yml file:
+
+* `kpm pull_kaui_war <version>`
+* `kpm pull_kb_server_war <version>`
+* `kpm install_ruby_plugin plugin-key <kb-version>`
+* `kpm install_java_plugin plugin-key <kb-version>`
+
+For more details see `kpm help`.
+
+### Dev Mode
+
+If you are a developer and either modifying an existing plugin or creating a new plugin, KPM can be used to install the code of your plugin. Before we look at KPM commands, make sure you read the [Plugin Development Documentation](http://docs.killbill.io/0.16/plugin_development.html).
+
+Let 's assume we are modifying the code for the (ruby) cybersource plugin. You would have to first build the plugin package, and then you could use KPM to install the plugin. We suggest you specify a `plugin_key` with a namespace `dev:` to make it clear this is not a released version. Also in the case of `ruby`, the package already contains all the directory structure including the version, so only the location of the `tar.gz` needs to be specified.
+
+```
+> kpm install_ruby_plugin 'dev:cybersource' --from-source-file="<PATH_TO>/killbill-cybersource-3.3.0.tar.gz"
+```
+
+Let 's assume now that we are modifying the code for the (java) adyen plugin. The plugin first needs to be built using the `maven-bundle-plugin` to produce the OSGI jar under the `target` directory. Then, this `jar` can be installed but here we also need to specify a version since the archive does not embed any filesystem structure but only contains the binary (jar). The same applies with regard to the `plugin_key` where we suggest to specify a namespace `dev:`.
+
+```
+> kpm install_java_plugin 'dev:adyen' --from-source-file="<PATH_TO>/adyen-plugin-0.3.2-SNAPSHOT.jar" --version="0.3.2"
+```
+
+The command `kpm inspect` can be used to see what has been installed. In the case of `dev` plugin most info related to `GROUP ID`, `ARTIFACT ID`, `PACKAGING` and `SHA1` will be missing because no real download occured.
+
+
+Finally, when it is time to use a released version of a plugin, we first recommend to uninstall the `dev` version, by using the `kpm uninstall` command and using the `plugin_key` and then installing the released version. For instance the following sequence could happen:
+
+```
+> kpm inspect
+___________________________________________________________________________________________________________________________
+|          PLUGIN NAME |      PLUGIN KEY | TYPE | GROUP ID | ARTIFACT ID | PACKAGING | VERSIONS sha1=[], def=(*), del=(x) |
+___________________________________________________________________________________________________________________________
+| killbill-cybersource | dev:cybersource | ruby |      ??? |         ??? |       ??? |                      3.3.0[???](*) |
+|                adyen |       dev:adyen | java |      ??? |         ??? |       ??? |                      0.3.2[???](*) |
+___________________________________________________________________________________________________________________________
+
+> kpm uninstall 'dev:cybersource'
+Removing the following versions of the killbill-cybersource plugin: 3.3.0
+Done!
+
+> kpm inspect
+
+_____________________________________________________________________________________________________________
+| PLUGIN NAME | PLUGIN KEY | TYPE | GROUP ID | ARTIFACT ID | PACKAGING | VERSIONS sha1=[], def=(*), del=(x) |
+_____________________________________________________________________________________________________________
+|       adyen |  dev:adyen | java |      ??? |         ??? |       ??? |                      0.3.2[???](*) |
+_____________________________________________________________________________________________________________
+
+> kpm install_ruby_plugin cybersource
+[...]
+
+> kpm inspect
+_______________________________________________________________________________________________________________________________________________________
+|          PLUGIN NAME |  PLUGIN KEY | TYPE |                          GROUP ID |        ARTIFACT ID | PACKAGING | VERSIONS sha1=[], def=(*), del=(x) |
+_______________________________________________________________________________________________________________________________________________________
+| killbill-cybersource | cybersource | ruby | org.kill-bill.billing.plugin.ruby | cybersource-plugin |    tar.gz |                 4.0.2[e0901f..](*) |
+|                adyen |   dev:adyen | java |                               ??? |                ??? |       ??? |                      0.3.2[???](*) |
+_______________________________________________________________________________________________________________________________________________________
+
+```
+
+## Internals
+
+### Plugin Keys
+
+In the `kpm.yml` example provided above, the plugins are named using their `pluginKey` (the value for the `name` in the  `kpm.yml`) . The `pluginKey` is the identifier  for the plugin:
+* For plugins maintained by the Kill Bill team, this identifier matches the key in the [file based repository](https://github.com/killbill/killbill-cloud/blob/master/kpm/lib/kpm/plugins_directory.yml) of well-known plugins
+* For other plugins, this key is either specified when installing the plugin through api call, or default to the `pluginName`. For more information, please refer to the Plugin Developer Guide. 
 
 ### Caching
 
-KPM relies on the kpm.yml file to know what to install, and as it installs the pieces, it keeps track of what was installed so that if it is invoked again, it does not download again the same binaries:
+KPM relies on the `kpm.yml` file to know what to install, and as it installs the pieces, it keeps track of what was installed so that if it is invoked again, it does not download again the same binaries. The generic logic associated with that file is the following:
 
-* For the Kill Bill artifact itself, kpm will first extract the sha1 from the remote repository and compare with the current sha1 installed under the default `webapp_path`; if those are the same, the file is not downloaded again.
-* For the plugins, since some of those are downloaded as an archive (*.tgz) and then decompressed/expanded, kpm will use an internal file, `<plugins_dir>/sha1.yml` to keep track of the sha1 archive. If there is an entry and the sha1 matches, then the file is not downloaded again.
+1. When installing a binary (`war`, `jar`, `tar.gz`..), KPM will download both the binary and the `sha1` from the server, compute the `sha1` for the binary and compare the two (verify that binary indeed matches its remote `sha1`). Then, binary is installed and `sha1.yml` file is updated. The `sha1` entry in that `sha1.yml` file will now represent the local `sha1` version (note that for `tar.gz` binaries which have been uncompressed, the local `sha1` is not anymore easily recomputable).
+2. When attempting to download again the same binary, KPM will compare the value in the `sha1.yml` and the one on the remote server and if those match, it will not download the binary again.
 
-Note that you can override that behavior with the `--force-download` switch.
+There are some non standard scenario that could occur in case of users tampering with the data (or remove server unavailable):
 
-### Custom Downloads
+* Remote `sha1` is not available: Binary will be downloaded again (and no `sha1` check can be performed)
+* `sha1.yml` does not exist:  Binary will be downloaded again 
+* `sha1` entry in the `sha1.yml` exists but has the special value `SKIP` :  Binary will *not* be downloaded again 
+* Binary does not exist on the file system (or has been replaced with something else): KPM will ignore. Note that correct way to remove plugins is to use the `KPM uninstall` command.
 
-You can also download specific versions/artifacts directly with the following commands -- bypassing the kpm.yml file:
 
-* `kpm pull_kaui_war <version>`
-* `kpm pull_kb_server_war <version>`
-* `kpm pull_ruby_plugin <artifact_id>`
+Note that you can override that behavior with the `--force-download` switch.
 
-For more details see `kpm --help`.

data/bin/kpm

@@ -5,6 +5,6 @@ require 'kpm'
 begin
   KPM::Cli.start
 rescue => e
-  KPM.ui.say e.message, :red
+  KPM.ui.say "#{e.message}\n#{e.backtrace.join("\n")}", :red
   exit 1
-end
+end

data/lib/kpm/base_artifact.rb

@@ -140,37 +140,25 @@ module KPM
       end
 
       def skip_if_exists(artifact_info, coordinates, sha1_file)
-        # Unclear if this is even possible
+
+        # If there is no sha1 from the binary server, we don't skip
+        # (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
+        # If there is no such sha1_file, we don't skip
+        return false if sha1_file.nil? || !File.exists?(sha1_file)
 
-        # Check entry in sha1_file if exists
-        if sha1_file && File.exists?(sha1_file)
-          sha1_checker = Sha1Checker.from_file(sha1_file)
-          local_sha1 = sha1_checker.sha1(coordinates)
-          return true if local_sha1 == artifact_info[:sha1]
-        end
+        #
+        # At this point we have a valid sha1_file and a remote sha1
+        #
+        sha1_checker = Sha1Checker.from_file(sha1_file)
+        local_sha1 = sha1_checker.sha1(coordinates)
 
-        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
+        # If there is an entry in the sha1_file and it matches the remote, we can skip
+        # Also support convenient 'SKIP' keyword for allowing hacking deployments (dev mode)
+        return true if local_sha1 == artifact_info[:sha1] || local_sha1 == 'SKIP'
+
+        false
       end
 
       def artifact_info(logger, coordinate_map, overrides={}, ssl_verify=true)

data/lib/kpm/base_installer.rb

@@ -14,13 +14,16 @@ module KPM
       @nexus_ssl_verify = nexus_ssl_verify
     end
 
-    def install_killbill_server(specified_group_id=nil, specified_artifact_id=nil, specified_packaging=nil, specified_classifier=nil, specified_version=nil, specified_webapp_path=nil, force_download=false, verify_sha1=true)
+    def install_killbill_server(specified_group_id=nil, specified_artifact_id=nil, specified_packaging=nil, specified_classifier=nil, specified_version=nil, specified_webapp_path=nil,  bundles_dir=nil, force_download=false, verify_sha1=true)
       group_id = specified_group_id || KPM::BaseArtifact::KILLBILL_GROUP_ID
       artifact_id = specified_artifact_id || KPM::BaseArtifact::KILLBILL_ARTIFACT_ID
       packaging = specified_packaging || KPM::BaseArtifact::KILLBILL_PACKAGING
       classifier = specified_classifier || KPM::BaseArtifact::KILLBILL_CLASSIFIER
       version = specified_version || LATEST_VERSION
       webapp_path = specified_webapp_path || KPM::root
+      bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
+      sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
+
       @logger.debug("Installing Kill Bill server: group_id=#{group_id} artifact_id=#{artifact_id} packaging=#{packaging} classifier=#{classifier} version=#{version} webapp_path=#{webapp_path}")
       KPM::KillbillServerArtifact.pull(@logger,
                                        group_id,
@@ -29,20 +32,22 @@ module KPM
                                        classifier,
                                        version,
                                        webapp_path,
-                                       nil,
+                                       sha1_file,
                                        force_download,
                                        verify_sha1,
                                        @nexus_config,
                                        @nexus_ssl_verify)
     end
 
-    def install_kaui(specified_group_id=nil, specified_artifact_id=nil, specified_packaging=nil, specified_classifier=nil, specified_version=nil, specified_webapp_path=nil, force_download=false, verify_sha1=true)
+    def install_kaui(specified_group_id=nil, specified_artifact_id=nil, specified_packaging=nil, specified_classifier=nil, specified_version=nil, specified_webapp_path=nil,  bundles_dir=nil, force_download=false, verify_sha1=true)
       group_id = specified_group_id || KPM::BaseArtifact::KAUI_GROUP_ID
       artifact_id = specified_artifact_id || KPM::BaseArtifact::KAUI_ARTIFACT_ID
       packaging = specified_packaging || KPM::BaseArtifact::KAUI_PACKAGING
       classifier = specified_classifier || KPM::BaseArtifact::KAUI_CLASSIFIER
       version = specified_version || LATEST_VERSION
       webapp_path = specified_webapp_path || KPM::root
+      bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
+      sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
 
       @logger.debug("Installing Kaui: group_id=#{group_id} artifact_id=#{artifact_id} packaging=#{packaging} classifier=#{classifier} version=#{version} webapp_path=#{webapp_path}")
       KPM::KauiArtifact.pull(@logger,
@@ -52,7 +57,7 @@ module KPM
                              classifier,
                              version,
                              webapp_path,
-                             nil,
+                             sha1_file,
                              force_download,
                              verify_sha1,
                              @nexus_config,
@@ -153,7 +158,8 @@ module KPM
       plugins_dir = bundles_dir.join('plugins')
 
       if type.to_s == 'java'
-        destination = plugins_dir.join('java').join(name).join(version)
+        plugin_name = name.nil? ? Pathname.new(file_path).basename.to_s.split('-')[0] : name
+        destination = plugins_dir.join('java').join(plugin_name).join(version)
       else
         destination = plugins_dir.join('ruby')
       end

data/lib/kpm/installer.rb

@@ -31,15 +31,17 @@ module KPM
     end
 
     def install(force_download=false, verify_sha1=true)
+
+      bundles_dir = @config['plugins_dir'] || DEFAULT_BUNDLES_DIR
       help = nil
       unless @config.nil?
         help = install_tomcat if @config['webapp_path'].nil?
-        install_killbill_server(@config['group_id'], @config['artifact_id'], @config['packaging'], @config['classifier'], @config['version'], @config['webapp_path'], force_download, verify_sha1)
-        install_plugins(force_download, verify_sha1)
+        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, force_download, verify_sha1)
         unless @config['default_bundles'] == false
-          install_default_bundles(@config['plugins_dir'], @config['default_bundles_version'], @config['version'], force_download, verify_sha1)
+          install_default_bundles(bundles_dir, @config['default_bundles_version'], @config['version'], force_download, verify_sha1)
         end
-        clean_up_descriptors
+        clean_up_descriptors(bundles_dir)
       end
 
       unless @kaui_config.nil?
@@ -48,7 +50,7 @@ module KPM
           return
         end
 
-        install_kaui(@kaui_config['group_id'], @kaui_config['artifact_id'], @kaui_config['packaging'], @kaui_config['classifier'], @kaui_config['version'], @kaui_config['webapp_path'], force_download, verify_sha1)
+        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
 
       help
@@ -72,45 +74,45 @@ module KPM
       manager.help
     end
 
-    def install_plugins(force_download, verify_sha1)
-      install_java_plugins(force_download, verify_sha1)
-      install_ruby_plugins(force_download, verify_sha1)
+    def install_plugins(bundles_dir, force_download, verify_sha1)
+      install_java_plugins(bundles_dir, force_download, verify_sha1)
+      install_ruby_plugins(bundles_dir, force_download, verify_sha1)
     end
 
-    def install_java_plugins(force_download, verify_sha1)
+    def install_java_plugins(bundles_dir, force_download, verify_sha1)
       return if @config['plugins'].nil? or @config['plugins']['java'].nil?
 
       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, false)
+        infos << install_plugin(plugin['name'], nil, 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(force_download, verify_sha1)
+    def install_ruby_plugins(bundles_dir, 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, verify_jruby_jar)
+        infos << install_plugin(plugin['name'], nil, 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
       end
 
       infos
     end
 
-    def clean_up_descriptors
-      removed_plugins = clean_up_plugin_identifiers
-      clean_up_sha1s(removed_plugins)
+    def clean_up_descriptors(bundles_dir)
+      removed_plugins = clean_up_plugin_identifiers(bundles_dir)
+      clean_up_sha1s(removed_plugins, bundles_dir)
     end
 
-    def clean_up_plugin_identifiers
+    def clean_up_plugin_identifiers(bundles_dir)
       inspector = KPM::Inspector.new
-      installed_plugins = inspector.inspect(@config['plugins_dir'])
+      installed_plugins = inspector.inspect(bundles_dir)
 
-      plugins_installation_path = File.join(@config['plugins_dir'], 'plugins')
+      plugins_installation_path = File.join(bundles_dir, 'plugins')
       plugins_manager = KPM::PluginsManager.new(plugins_installation_path, @logger)
 
       plugin_identifiers = plugins_manager.read_plugin_identifiers
@@ -126,8 +128,8 @@ module KPM
       removed_identifiers
     end
 
-    def clean_up_sha1s(removed_plugins)
-      sha1checker = KPM::Sha1Checker.from_file(File.join(@config['plugins_dir'], KPM::BaseInstaller::SHA1_FILENAME))
+    def clean_up_sha1s(removed_plugins, plugins_dir)
+      sha1checker = KPM::Sha1Checker.from_file(File.join(plugins_dir, KPM::BaseInstaller::SHA1_FILENAME))
       removed_plugins.each do |removed|
         coordinates = KPM::Coordinates.build_coordinates(group_id: removed['group_id'],
                                                          artifact_id: removed['artifact_id'],

data/lib/kpm/plugins_directory.yml

@@ -24,7 +24,7 @@
   :versions:
     :0.14: 1.0.3
     :0.15: 2.0.1
-    :0.16: 3.0.1
+    :0.16: 3.0.2
   :stable_version: 2.0.2
 :avatax:
   :type: :java
@@ -41,7 +41,7 @@
   :type: :ruby
   :versions:
     :0.14: 0.0.1
-    :0.16: 0.2.0
+    :0.16: 0.2.1
   :stable_version: 0.1.0
   :require:
     - :merchant_id
@@ -57,7 +57,7 @@
   :versions:
     :0.14: 1.0.0
     :0.15: 3.3.0
-    :0.16: 4.0.0
+    :0.16: 4.0.6
   :stable_version: 0.0.4
   :require:
     - :login
@@ -119,7 +119,7 @@
   :versions:
     :0.14: 2.0.0
     :0.15: 3.0.0
-    :0.16: 4.1.1
+    :0.16: 4.1.3
   :stable_version: 2.0.0
   :require:
   - :signature
@@ -147,7 +147,7 @@
   :versions:
     :0.14: 1.0.0
     :0.15: 2.0.0
-    :0.16: 3.0.2
+    :0.16: 3.0.3
   :stable_version: 2.0.0
   :require:
   - :api_secret_key

data/lib/kpm/sha1_checker.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'yaml'
+require 'pathname'
 
 module KPM
   class Sha1Checker
@@ -28,8 +29,8 @@ module KPM
       @sha1_config['sha1']
     end
 
-    def add_or_modify_entry!(coordinates, sha1)
-      @sha1_config['sha1'][coordinates] = sha1
+    def add_or_modify_entry!(coordinates, remote_sha1)
+      @sha1_config['sha1'][coordinates] = remote_sha1
       save!
     end
 
@@ -53,6 +54,7 @@ module KPM
 
     def init!
       if !File.exists?(@sha1_file)
+        create_sha1_directory_if_missing
         init_config = {}
         init_config['sha1'] = {}
         File.open(@sha1_file, 'w') do |file|
@@ -62,6 +64,13 @@ module KPM
       reload!
     end
 
+    def create_sha1_directory_if_missing
+      sha1_dir = Pathname(@sha1_file).dirname
+      if ! File.directory?(sha1_dir)
+        Dir.mkdir(sha1_dir)
+      end
+    end
+
     def reload!
       @sha1_config = YAML::load_file(@sha1_file)
     end

data/lib/kpm/tasks.rb

@@ -142,6 +142,10 @@ module KPM
                       :type    => :string,
                       :default => KillbillPluginArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER,
                       :desc    => 'The plugin artifact classifier'
+        method_option :from_source_file,
+                      :type    => :string,
+                      :default => nil,
+                      :desc    => 'Specify the plugin jar that should be used for the installation.'
         method_option :destination,
                       :type    => :string,
                       :default => nil,
@@ -158,23 +162,31 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        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')
+        desc 'install_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 install_java_plugin(plugin_key, kb_version='LATEST')
+
+
+          installer = BaseInstaller.new(logger,
+                                        options[:overrides],
+                                        options[:ssl_verify])
+
+          if options[:from_source_file].nil?
+            response = installer.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)
+          else
+            response = installer.install_plugin_from_fs(plugin_key, options[:from_source_file], nil, options[:version], options[:destination], 'java')
+          end
 
-          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
 
@@ -201,6 +213,10 @@ module KPM
                       :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,
@@ -217,22 +233,29 @@ module KPM
                       :type    => :boolean,
                       :default => true,
                       :desc    => 'Validates sha1 sum'
-        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)
+        desc 'install_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 install_ruby_plugin(plugin_key, kb_version='LATEST')
+          installer = BaseInstaller.new(logger,
+                            options[:overrides],
+                            options[:ssl_verify])
+
+          if options[:from_source_file].nil?
+            response = 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
+            response = 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
@@ -365,6 +388,9 @@ module KPM
           inspector.format(all_plugins)
         end
 
+        map :pull_ruby_plugin => :install_ruby_plugin,
+            :pull_java_plugin => :install_java_plugin
+
         private
 
         def logger

data/lib/kpm/version.rb

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

data/spec/kpm/remote/base_artifact_spec.rb

@@ -10,16 +10,16 @@ describe KPM::BaseArtifact do
   it 'should be able to download and verify regular artifacts' do
     Dir.mktmpdir do |dir|
       test_download dir, 'foo-oss.pom.xml'
-      # Verify we skip the second time
-      test_download dir, 'foo-oss.pom.xml', true
+      # Verify we still don't skip the second time (sha1_file is null)
+      test_download dir, 'foo-oss.pom.xml', false
       # Verify the download happens when we set force_download
       test_download dir, 'foo-oss.pom.xml', false, true
     end
 
     Dir.mktmpdir do |dir|
       test_download dir, nil
-      # Verify we skip the second time
-      test_download dir, nil, true
+      # Verify we still don't skip the second time (sha1_file is null)
+      test_download dir, nil, false
       # Verify the download happens when we set force_download
       test_download dir, nil, false, true
     end

data/spec/kpm/remote/migrations_spec.rb

@@ -4,7 +4,7 @@ describe KPM::Migrations do
 
   context 'plugins' do
     it 'should be able to find migrations for a java plugin' do
-      migrations = KPM::Migrations.new('master', nil, 'killbill/killbill-analytics-plugin', ENV['TOKEN']).migrations
+      migrations = KPM::Migrations.new('analytics-plugin-3.0.2', nil, 'killbill/killbill-analytics-plugin', ENV['TOKEN']).migrations
       # No migration yet
       migrations.size.should == 0
     end
@@ -12,13 +12,13 @@ describe KPM::Migrations do
     it 'should be able to find migrations for a ruby plugin' do
       migrations = KPM::Migrations.new('master', nil, 'killbill/killbill-cybersource-plugin', ENV['TOKEN']).migrations
       # No migration yet
-      migrations.size.should == 0
+      migrations.size.should == 1
     end
   end
 
   context 'killbill' do
     it 'should be able to find migrations between two versions' do
-      migrations = KPM::Migrations.new('master', 'work-for-release-0.16.4', 'killbill/killbill', ENV['TOKEN']).migrations
+      migrations = KPM::Migrations.new('work-for-release-0.16.3', 'work-for-release-0.16.4', 'killbill/killbill', ENV['TOKEN']).migrations
 
       migrations.size.should == 1
       migrations.first[:name].should == 'V20160324060345__revisit_payment_methods_indexes_509.sql'

metadata

@@ -1,105 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kill Bill core team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.21
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.21
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nexus_cli
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !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
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
-  type: :development
-  prerelease: false
-  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
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !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:
@@ -107,8 +107,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemrelease"
-- ".gitignore"
+- .gemrelease
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -156,26 +156,26 @@ 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.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.6
+signing_key:
 specification_version: 4
 summary: Kill Bill package manager.
 test_files: