killbill-kpm 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5860636c6cb6473ffdc32d5ad5c4a2e91bda42a
-  data.tar.gz: 1364e392d7a9ccbffb5ff9a2f4dda014da3379bb
+  metadata.gz: bf312eaaf52cbc0a4cd5fc3bdbbfaafa53e3dabe
+  data.tar.gz: 886adff6649f40aef3ba0a6a74126e860de27abd
 SHA512:
-  metadata.gz: 249e93822be2c99cecd08fb2a66b680db7f8b86607c54d27700cb2b0948f0dafc82e8403835d19f04c4c46bea8fedd415e4fb05018ad7b38a9b15d23553cc28a
-  data.tar.gz: 9b9278b66d6e77d81483bd27960bdc66fc9f25b01a47c98f4bf07b969685857a414876be6c5d41d78262959d7e839a898d018c164780dba82efcdea15406651d
+  metadata.gz: 3719f03224e15bd5a2132a1b8582af474c7e7f2e1dd55b73bf0e6bfd1f69d0b61182c2a673bd15acad4eb89885314d2a0676c31a8a74d9d322730c9af3179db8
+  data.tar.gz: f8bdf8c19542f90a695b242effca8cc2b47e7380bea9f9939709838366f436fe629f3489a9b4ab7eb52a9980a24c9dbcd9eb11eb09678a9c8c926b0a2bf73526

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+#gem 'kpm', :github => 'killbill/killbill-cloud'
+#gem 'killbill', :github => 'killbill/killbill-plugin-framework-ruby'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    killbill-kpm (0.0.2)
-      killbill (~> 6.2)
-      kpm (~> 0.1)
+    killbill-kpm (0.0.3)
+      killbill (~> 6.5.0)
+      kpm (~> 0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -30,12 +30,12 @@ GEM
     json (1.8.3-java)
     jsonpath (0.5.8)
       multi_json
-    killbill (6.2.0)
+    killbill (6.5.0)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
-    kpm (0.1.0)
+    kpm (0.1.2)
       highline (~> 1.6.21)
       nexus_cli (~> 4.1.0)
       thor (~> 0.19.1)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/killbill-kpm.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 6.2'
-  s.add_dependency 'kpm', '~> 0.1'
+  s.add_dependency 'killbill', '~> 6.5.0'
+  s.add_dependency 'kpm', '~> 0.1.2'
 
   s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rake', '>= 10.0.0'

data/lib/kpm/listener.rb

@@ -28,16 +28,14 @@ module KPM
 
       @logger.info "Received #{event.event_type} event: service=#{service} command=#{command} event=#{event_json}"
 
-      return if !validate_inputs(command, properties, Proc.new { |command, properties, property_name|
-                                          if properties[property_name].nil?
-                                            @logger.info("Cannot run #{command}: missing property #{property_name}")
-                                            return false
-                                          end
-                                        })
+      # pluginKey is the only mandatory property
+      if event_json['pluginKey'].nil?
+        @logger.info("Cannot run #{command}: missing pluginKey property")
+        return false
+      end
 
       handle_event(command,
-                   properties['pluginKey'],
-                   properties['pluginName'],
+                   event_json['pluginKey'],
                    properties['pluginArtifactId'],
                    properties['pluginVersion'],
                    properties['pluginGroupId'],
@@ -49,36 +47,18 @@ module KPM
 
     private
 
-    # Check for mandatory properties
-    def validate_inputs(command, properties, proc_validation)
-      # For installation we allow either to pass the pluginKey (entry in plugins_directory.yml), or the full pluginGroupId/pluginArtifactId/pluginVersion/pluginType
-      if command == 'INSTALL_PLUGIN'
-        if properties['pluginKey'].nil?
-          proc_validation.call(command, properties, 'pluginGroupId')
-          proc_validation.call(command, properties, 'pluginArtifactId')
-          proc_validation.call(command, properties, 'pluginVersion')
-          proc_validation.call(command, properties, 'pluginType')
-        end
-        return true
-      elsif command == 'UNINSTALL_PLUGIN'
-        proc_validation.call(command, properties, 'pluginName')
-        return true
-      end
-    end
-
-    def handle_event(command, plugin_key, plugin_name, artifact_id, version=nil, group_id=nil, packaging=nil, classifier=nil, type=nil, force_download=false)
-      @logger.info "handle_event command=#{command}, plugin_key=#{plugin_key}, plugin_name=#{plugin_name}, artifact_id=#{artifact_id}, version=#{version}, group_id=#{group_id}, packaging=#{packaging}, classifier=#{classifier}, type=#{type}, force_download=#{force_download}"
+    def handle_event(command, plugin_key, artifact_id, version=nil, group_id=nil, packaging=nil, classifier=nil, type=nil, force_download=false)
+      @logger.info "handle_event command=#{command}, plugin_key=#{plugin_key}, artifact_id=#{artifact_id}, version=#{version}, group_id=#{group_id}, packaging=#{packaging}, classifier=#{classifier}, type=#{type}, force_download=#{force_download}"
 
       if command == 'INSTALL_PLUGIN'
-        plugin_key_or_artifact_id = plugin_key ? plugin_key : artifact_id
-        ::KPM::PluginsInstaller.instance.install(plugin_key_or_artifact_id, version, group_id, packaging, classifier, type, force_download)
+        ::KPM::PluginsInstaller.instance.install(plugin_key, artifact_id, version, group_id, packaging, classifier, type, force_download)
       elsif command == 'UNINSTALL_PLUGIN'
-        ::KPM::PluginsInstaller.instance.uninstall(plugin_name, version)
+        ::KPM::PluginsInstaller.instance.uninstall(plugin_key, version)
       else
         @logger.warn("Ignoring unsupported command #{command}")
       end
     rescue NexusCli::ArtifactNotFoundException
-      @logger.warn("Unable to #{command} #{plugin_name}: artifact was not found in Nexus")
+      @logger.warn("Unable to #{command} for plugin_key=#{plugin_key}: artifact was not found in Nexus")
     end
 
     def properties_to_hash(properties)

data/lib/kpm/plugins_installer.rb

@@ -21,33 +21,34 @@ module KPM
     end
 
     # If an earlier version of the plugin is installed, Kill Bill will only start the latest one (see org.killbill.billing.osgi.FileInstall)
-    def install(specified_artifact_id, specified_version=nil, specified_group_id=nil, specified_packaging=nil, specified_classifier=nil, specified_type=nil, force_download=false)
+    def install(plugin_key, specified_artifact_id, specified_version=nil, specified_group_id=nil, specified_packaging=nil, specified_classifier=nil, specified_type=nil, force_download=false)
       @logger.info("Instructed to install artifact_id=#{specified_artifact_id} version=#{specified_version} group_id=#{specified_group_id} packaging=#{specified_packaging} classifier=#{specified_classifier} type=#{specified_type} force_download=#{force_download}")
-      info = @installer.install_plugin(specified_group_id, specified_artifact_id, specified_packaging, specified_classifier, specified_version, @bundles_dir, specified_type, force_download, @glob_config[:kpm][:verify_sha1])
+      info = @installer.install_plugin(plugin_key, specified_group_id, specified_artifact_id, specified_packaging, specified_classifier, specified_version, @bundles_dir, specified_type, force_download, @glob_config[:kpm][:verify_sha1])
       if info.nil?
-        @logger.warn("Error during installation of plugin #{artifact_id}")
+        @logger.warn("Error during installation of plugin #{specified_artifact_id}")
       else
-        path = info[:bundle_dir] ? info[:bundle_dir] : info[:dir_name]
-        notify_fs_change(path, :NEW_VERSION)
+        path = info[:bundle_dir] || info[:dir_name]
+        notify_fs_change(plugin_key, path, :NEW_VERSION)
       end
       info
     end
 
-    def install_from_fs(file_path, name, version, type)
-      @logger.info("Instructed to install file_path=#{file_path} name=#{name} version=#{version} type=#{type}")
-      info = @installer.install_plugin_from_fs(file_path, name, version, @bundles_dir, type)
+    def install_from_fs(plugin_key, file_path, version, type)
+      @logger.info("Instructed to install file_path=#{file_path} plugin_key=#{plugin_key} version=#{version} type=#{type}")
+      info = @installer.install_plugin_from_fs(plugin_key, file_path, plugin_key, version, @bundles_dir, type)
       if info.nil?
-        @logger.warn("Error during installation of plugin #{name}")
+        @logger.warn("Error during installation of plugin #{plugin_key}")
       else
-        notify_fs_change(info[:bundle_dir], :NEW_VERSION)
+        path = info[:bundle_dir] || info[:dir_name]
+        notify_fs_change(plugin_key, path, :NEW_VERSION)
       end
       info
     end
 
-    def uninstall(plugin_name, version=nil)
-      modified = @manager.uninstall(plugin_name, version || :all)
+    def uninstall(plugin_key, version=nil)
+      modified = @installer.uninstall_plugin(plugin_key, version || :all, @bundles_dir)
       modified.each do |path|
-        notify_fs_change(path, :DISABLED)
+        notify_fs_change(plugin_key, path, :DISABLED)
       end
     end
 
@@ -65,7 +66,7 @@ module KPM
 
     private
 
-    def notify_fs_change(path, state)
+    def notify_fs_change(plugin_key, path, state)
       return if path.nil?
 
       # Plugin name should be the directory name (path is something like /var/tmp/bundles/plugins/ruby/killbill-stripe/2.0.0)
@@ -85,7 +86,7 @@ module KPM
       plugin_name = fs_info[-2]
       plugin_version = fs_info[-1]
       @logger.info("Notifying Kill Bill: state=#{state} plugin_name=#{plugin_name} plugin_version=#{plugin_version} plugin_type=#{plugin_type}")
-      @kb_apis.plugins_info_api.notify_of_state_changed(state, plugin_name, plugin_version, plugin_type)
+      @kb_apis.plugins_info_api.notify_of_state_changed(state, plugin_key, plugin_name, plugin_version, plugin_type)
     end
 
     def configure!(config_file)

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>kpm-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <name>kpm-plugin</name>
     <url>http://github.com/killbill/killbill-kpm-plugin</url>
     <description>Kill Bill KPM plugin</description>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-kpm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 6.5.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 6.5.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency