killbill-kpm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89fd4ad4896d3f25a62ebd462d95070417371a6
-  data.tar.gz: 07acd03d35897d8c45bbaf0a84b70d472ef49a6a
+  metadata.gz: 715d9f8fc066bae68d3d1e9a9ce01c771aaab8b7
+  data.tar.gz: 667e8cc8697f1035e345c1c4e1a86c2c757567c6
 SHA512:
-  metadata.gz: 024f6c3e54a61cf32cd106af0a8fb09f2a85c0b28b3cc0fc00846a61c43fb521dccc55eda5722c03663ffb18d7ce09db4e3c29a1e669128b1e1184dbd386c050
-  data.tar.gz: e3b66783251e29a47a31f82419e4f5b60621fa4d9f8b5e0cfde12f4d51dfd1ddd84e6a78c5d4388da1f02874c595a852c66251773fdd435153e9df53fac3f6dd
+  metadata.gz: 39f91520cd76ef82c8f07db0cea42a8134d7315d98901b80847708ca83e8194f1fffda6f42969b4b99ed9b42147fb1bbf6979046d2d041b3ea9399dbe1c4263f
+  data.tar.gz: b05c93f91b7b20034aa61587407779fd44a534677895a52fd1b60872ab9c2ff4ad12d1e17c18ffc1cbf9eec5a0ead7a7cfb9d6844325d2fe6e11d09777479be8

data/.travis.yml

@@ -3,6 +3,9 @@ language: ruby
 sudo: false
 cache: bundler
 
+before_script:
+  - bundle exec jbundle install
+
 script: 'bundle exec rake spec'
 
 notifications:

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    killbill-kpm (0.0.4)
-      killbill (~> 7.0.0)
-      kpm (~> 0.1.3)
+    killbill-kpm (0.0.5)
+      killbill (~> 7.0)
+      kpm (~> 0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -11,11 +11,20 @@ GEM
     activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     chozo (0.6.1)
       activesupport (>= 3.2.0)
       hashie (>= 2.0.2)
       multi_json (>= 1.3.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
+    equalizer (0.0.11)
     ethon (0.8.0)
       ffi (>= 1.3.0)
     extlib (0.9.16)
@@ -24,9 +33,13 @@ GEM
     highline (1.6.21)
     httpclient (2.2.5)
     i18n (0.7.0)
-    jbundler (0.4.3)
-      maven-tools (~> 0.32.1)
-      ruby-maven (~> 3.0.4)
+    ice_nine (0.11.1)
+    jar-dependencies (0.3.1)
+    jbundler (0.9.2)
+      bundler (~> 1.5)
+      jar-dependencies (~> 0.2)
+      maven-tools (~> 1.0.10)
+      ruby-maven (~> 3.3, >= 3.3.3)
     json (1.8.3-java)
     jsonpath (0.5.8)
       multi_json
@@ -35,11 +48,12 @@ GEM
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
-    kpm (0.1.3)
+    kpm (0.1.4)
       highline (~> 1.6.21)
       nexus_cli (~> 4.1.0)
       thor (~> 0.19.1)
-    maven-tools (0.32.5)
+    maven-tools (1.0.13)
+      virtus (~> 1.0)
     multi_json (1.11.2)
     nexus_cli (4.1.0)
       activesupport (~> 3.2.0)
@@ -62,9 +76,9 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    ruby-maven (3.0.4.1.4)
-      maven-tools (~> 0.32.3)
-      thor (>= 0.14.6, < 2.0)
+    ruby-maven (3.3.8)
+      ruby-maven-libs (~> 3.3.1)
+    ruby-maven-libs (3.3.3)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -76,12 +90,17 @@ GEM
       ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  jbundler (~> 0.4.3)
+  jbundler (~> 0.9.2)
   killbill-kpm!
   rake (>= 10.0.0)
   rspec (~> 2.12.0)

data/Jarfile.lock

@@ -1,61 +1,61 @@
-org.kill-bill.billing:killbill-api:jar:0.32
-com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
-joda-time:joda-time:jar:2.3
-org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
-org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
-org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
-org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
-org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
-org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
-org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
-org.kill-bill.billing:killbill-util:jar:tests:0.15.10
-com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
-com.fasterxml.jackson.core:jackson-core:jar:2.4.3
-com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
-com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
-com.samskivert:jmustache:jar:1.5
-io.dropwizard.metrics:metrics-core:jar:3.1.1
-io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
-net.sf.ehcache:ehcache:jar:2.9.1
-org.antlr:stringtemplate:jar:3.2.1
-antlr:antlr:jar:2.7.7
-org.apache.commons:commons-email:jar:1.2
-javax.mail:mail:jar:1.4.1
-javax.activation:activation:jar:1.1
-org.apache.shiro:shiro-core:jar:1.2.3
-commons-beanutils:commons-beanutils:jar:1.8.3
-commons-logging:commons-logging:jar:1.1.1
-org.apache.shiro:shiro-ehcache:jar:1.2.3
-net.sf.ehcache:ehcache-core:jar:2.5.0
-org.apache.shiro:shiro-guice:jar:1.2.3
-com.google.guava:guava:jar:r09
-com.google.inject:guice:jar:3.0
-aopalliance:aopalliance:jar:1.0
-com.google.inject.extensions:guice-multibindings:jar:3.0
-org.jdbi:jdbi:jar:2.62
-org.joda:joda-money:jar:0.9
-org.kill-bill.billing:killbill-internal-api:jar:0.15.10
-org.kill-bill.billing:killbill-platform-api:jar:0.15
-org.kill-bill.billing:killbill-platform-base:jar:0.15
-com.google.code.findbugs:annotations:jar:3.0.0
-org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
-org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
-org.osgi:org.osgi.core:jar:5.0.0
-org.kill-bill.billing:killbill-platform-osgi:jar:0.15
-javax.inject:javax.inject:jar:1
-org.apache.felix:org.apache.felix.framework:jar:4.4.1
-org.osgi:org.osgi.compendium:jar:5.0.0
-org.kill-bill.commons:killbill-clock:jar:0.11
-org.kill-bill.commons:killbill-concurrent:jar:0.11
-org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
-org.kill-bill.commons:killbill-jdbi:jar:0.11
-com.h2database:h2:jar:1.4.186
-org.kill-bill.commons:killbill-locker:jar:0.11
-org.kill-bill.commons:killbill-queue:jar:0.11
-org.kill-bill.commons:killbill-xmlloader:jar:0.11
-org.skife.config:config-magic:jar:0.14
-org.slf4j:jcl-over-slf4j:jar:1.7.12
-org.slf4j:slf4j-api:jar:1.7.12
-org.weakref:jmxutils:jar:1.18
-org.mockito:mockito-all:jar:1.10.19
-javax.servlet:javax.servlet-api:jar:3.1.0
+---
+:runtime:
+- io.dropwizard.metrics:metrics-core:jar:3.1.1
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
+- com.fasterxml.jackson.core:jackson-core:jar:2.4.3
+- joda-time:joda-time:jar:2.3
+- org.weakref:jmxutils:jar:1.18
+- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.18
+- commons-beanutils:commons-beanutils:jar:1.8.3
+- org.kill-bill.billing:killbill-internal-api:jar:0.15.10
+- org.kill-bill.commons:killbill-xmlloader:jar:0.11
+- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
+- com.google.inject:guice:jar:3.0
+- org.osgi:org.osgi.core:jar:5.0.0
+- org.slf4j:slf4j-api:jar:1.7.12
+- com.samskivert:jmustache:jar:1.5
+- org.kill-bill.billing:killbill-util:jar:tests:0.15.10
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
+- org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
+- com.h2database:h2:jar:1.4.186
+- javax.activation:activation:jar:1.1
+- org.skife.config:config-magic:jar:0.14
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
+- org.mockito:mockito-all:jar:1.10.19
+- org.apache.commons:commons-email:jar:1.2
+- antlr:antlr:jar:2.7.7
+- aopalliance:aopalliance:jar:1.0
+- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
+- org.antlr:stringtemplate:jar:3.2.1
+- org.kill-bill.commons:killbill-clock:jar:0.11
+- javax.mail:mail:jar:1.4.1
+- org.kill-bill.billing:killbill-platform-base:jar:0.15
+- io.dropwizard.metrics:metrics-ehcache:jar:3.1.1
+- org.slf4j:jcl-over-slf4j:jar:1.7.12
+- org.jdbi:jdbi:jar:2.62
+- org.kill-bill.billing:killbill-platform-api:jar:0.15
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.15
+- org.apache.felix:org.apache.felix.framework:jar:4.4.1
+- org.joda:joda-money:jar:0.9
+- org.kill-bill.commons:killbill-jdbi:jar:0.11
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
+- org.apache.shiro:shiro-core:jar:1.2.3
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
+- com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
+- com.google.guava:guava:jar:r09
+- org.kill-bill.commons:killbill-locker:jar:0.11
+- org.osgi:org.osgi.compendium:jar:5.0.0
+- org.kill-bill.commons:killbill-queue:jar:0.11
+- javax.servlet:javax.servlet-api:jar:3.1.0
+- org.kill-bill.commons:killbill-concurrent:jar:0.11
+- org.apache.shiro:shiro-ehcache:jar:1.2.3
+- javax.inject:javax.inject:jar:1
+- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
+- com.google.inject.extensions:guice-multibindings:jar:3.0
+- net.sf.ehcache:ehcache:jar:2.9.1
+- org.kill-bill.billing:killbill-api:jar:0.32
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
+- org.apache.shiro:shiro-guice:jar:1.2.3
+- com.google.code.findbugs:annotations:jar:3.0.0

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/killbill-kpm.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 7.0.0'
-  s.add_dependency 'kpm', '~> 0.1.3'
+  s.add_dependency 'killbill', '~> 7.0'
+  s.add_dependency 'kpm', '~> 0.1.4'
 
-  s.add_development_dependency 'jbundler', '~> 0.4.3'
+  s.add_development_dependency 'jbundler', '~> 0.9.2'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
 end

data/lib/kpm/listener.rb

@@ -3,13 +3,16 @@ require 'nexus_cli'
 module KPM
   class Listener < Killbill::Plugin::Notification
 
+
     def start_plugin
       super
-
       ::KPM::PluginsInstaller.instance.initialize!(@root, @conf_dir, @kb_apis, @logger)
+      # We don't know yet
+      @kb_version = nil
     end
 
     def on_event(event)
+
       return unless [:BROADCAST_SERVICE].include?(event.event_type)
 
       unless ::KPM::PluginsInstaller.instance.initialized?
@@ -47,11 +50,28 @@ module KPM
 
     private
 
+    def get_kb_version
+      return  @kb_version if @kb_version
+
+      nodes_info = @kb_apis.killbill_nodes_api.get_nodes_info
+      if nodes_info.nil? || nodes_info.empty?
+        @logger.warn("Unable to retrieve node info")
+      end
+
+      # This is incorrect, we need to find the entry for our node, but we don't seem to know who we are -:(
+      # (The will break in rolling upgrade scenario)
+      @kb_version = nodes_info[0].killbill_version
+
+      @logger.info("KPM plugin extracted killbill version #{@kb_version}")
+
+      @kb_version
+    end
+
     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'
-        ::KPM::PluginsInstaller.instance.install(plugin_key, artifact_id, version, group_id, packaging, classifier, type, force_download)
+        ::KPM::PluginsInstaller.instance.install(plugin_key, get_kb_version, artifact_id, version, group_id, packaging, classifier, type, force_download)
       elsif command == 'UNINSTALL_PLUGIN'
         ::KPM::PluginsInstaller.instance.uninstall(plugin_key, version)
       else

data/lib/kpm/plugins_installer.rb

@@ -21,13 +21,13 @@ 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(plugin_key, 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, kb_version, 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 plugin_key=#{plugin_key} 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(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])
+      info = @installer.install_plugin(plugin_key, kb_version, 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 #{specified_artifact_id}")
       else
-        path = info[:bundle_dir] || info[:dir_name]
+        path = info[:bundle_dir]
         notify_fs_change(plugin_key, path, :NEW_VERSION)
       end
       info
@@ -69,23 +69,20 @@ module KPM
     def notify_fs_change(plugin_key, path, state)
       return if path.nil?
 
+      @logger.info("notify_fs_change: plugin_key = #{plugin_key}, path=#{path}, state=#{state}")
+
       # Plugin name should be the directory name (path is something like /var/tmp/bundles/plugins/ruby/killbill-stripe/2.0.0 or /var/tmp/bundles/plugins/ruby)
       fs_info = path.to_s.split('/')
       plugin_type = fs_info[-3].upcase
-      plugin_type = fs_info[-1].upcase unless %w(JAVA RUBY).include?(plugin_type)
+      plugin_name = fs_info[-2]
+      plugin_version = fs_info[-1]
 
-      unless %w(JAVA RUBY).include?(plugin_type)
-        @logger.warn("Invalid plugin type #{plugin_type} (path #{path}): Kill Bill won't be notified of new state #{state}")
-        return
-      end
 
       if @kb_apis.nil?
         @logger.warn("APIs not configured: Kill Bill won't be notified of new state #{state}")
         return
       end
 
-      plugin_name = fs_info[-2]
-      plugin_version = fs_info[-1]
       @logger.info("Notifying Kill Bill: state=#{state} plugin_key=#{plugin_key} plugin_name=#{plugin_name} plugin_version=#{plugin_version} plugin_type=#{plugin_type}")
       @kb_apis.plugins_info_api.notify_of_state_changed(state, plugin_key, plugin_name, plugin_version, plugin_type)
     end

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.4</version>
+    <version>0.0.5</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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -44,12 +44,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.9.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.9.2
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -130,8 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Kill Bill KPM plugin
-test_files: []
+test_files:
+- spec/kpm/base_plugin_spec.rb
+- spec/spec_helper.rb