killbill-kpm 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +5 -5
  3. data/Jarfile +2 -2
  4. data/Jarfile.lock +20 -15
  5. data/VERSION +1 -1
  6. data/killbill-kpm.gemspec +2 -2
  7. data/lib/kpm/application.rb +6 -5
  8. data/lib/kpm/listener.rb +1 -1
  9. data/lib/kpm/plugins_installer.rb +4 -3
  10. data/pom.xml +1 -1
  11. metadata +8 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf312eaaf52cbc0a4cd5fc3bdbbfaafa53e3dabe
4
- data.tar.gz: 886adff6649f40aef3ba0a6a74126e860de27abd
3
+ metadata.gz: e89fd4ad4896d3f25a62ebd462d95070417371a6
4
+ data.tar.gz: 07acd03d35897d8c45bbaf0a84b70d472ef49a6a
5
5
  SHA512:
6
- metadata.gz: 3719f03224e15bd5a2132a1b8582af474c7e7f2e1dd55b73bf0e6bfd1f69d0b61182c2a673bd15acad4eb89885314d2a0676c31a8a74d9d322730c9af3179db8
7
- data.tar.gz: f8bdf8c19542f90a695b242effca8cc2b47e7380bea9f9939709838366f436fe629f3489a9b4ab7eb52a9980a24c9dbcd9eb11eb09678a9c8c926b0a2bf73526
6
+ metadata.gz: 024f6c3e54a61cf32cd106af0a8fb09f2a85c0b28b3cc0fc00846a61c43fb521dccc55eda5722c03663ffb18d7ce09db4e3c29a1e669128b1e1184dbd386c050
7
+ data.tar.gz: e3b66783251e29a47a31f82419e4f5b60621fa4d9f8b5e0cfde12f4d51dfd1ddd84e6a78c5d4388da1f02874c595a852c66251773fdd435153e9df53fac3f6dd
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- killbill-kpm (0.0.3)
5
- killbill (~> 6.5.0)
6
- kpm (~> 0.1.2)
4
+ killbill-kpm (0.0.4)
5
+ killbill (~> 7.0.0)
6
+ kpm (~> 0.1.3)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
@@ -30,12 +30,12 @@ GEM
30
30
  json (1.8.3-java)
31
31
  jsonpath (0.5.8)
32
32
  multi_json
33
- killbill (6.5.0)
33
+ killbill (7.0.0)
34
34
  rack (>= 1.5.2)
35
35
  sinatra (~> 1.3.4)
36
36
  typhoeus (~> 0.6.9)
37
37
  tzinfo (~> 1.2.0)
38
- kpm (0.1.2)
38
+ kpm (0.1.3)
39
39
  highline (~> 1.6.21)
40
40
  nexus_cli (~> 4.1.0)
41
41
  thor (~> 0.19.1)
data/Jarfile CHANGED
@@ -1,4 +1,4 @@
1
- jar 'org.kill-bill.billing:killbill-api', '0.30'
1
+ jar 'org.kill-bill.billing:killbill-api', '0.32'
2
2
  jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
3
3
  jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
4
4
  jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
@@ -6,6 +6,6 @@ jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
6
6
  jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
7
7
  jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
8
8
  jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
9
- jar 'org.kill-bill.billing:killbill-util:tests', '0.14.0'
9
+ jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
10
10
  jar 'org.mockito:mockito-all', '1.10.19'
11
11
  jar 'javax.servlet:javax.servlet-api', '3.1.0'
data/Jarfile.lock CHANGED
@@ -1,4 +1,4 @@
1
- org.kill-bill.billing:killbill-api:jar:0.30
1
+ org.kill-bill.billing:killbill-api:jar:0.32
2
2
  com.fasterxml.jackson.core:jackson-annotations:jar:2.4.3
3
3
  joda-time:joda-time:jar:2.3
4
4
  org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.18
@@ -8,7 +8,7 @@ org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.18
8
8
  org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.18
9
9
  org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.18
10
10
  org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.18
11
- org.kill-bill.billing:killbill-util:jar:tests:0.14.0
11
+ org.kill-bill.billing:killbill-util:jar:tests:0.15.10
12
12
  com.fasterxml.jackson.core:jackson-databind:jar:2.4.3
13
13
  com.fasterxml.jackson.core:jackson-core:jar:2.4.3
14
14
  com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.3
@@ -24,7 +24,9 @@ javax.mail:mail:jar:1.4.1
24
24
  javax.activation:activation:jar:1.1
25
25
  org.apache.shiro:shiro-core:jar:1.2.3
26
26
  commons-beanutils:commons-beanutils:jar:1.8.3
27
+ commons-logging:commons-logging:jar:1.1.1
27
28
  org.apache.shiro:shiro-ehcache:jar:1.2.3
29
+ net.sf.ehcache:ehcache-core:jar:2.5.0
28
30
  org.apache.shiro:shiro-guice:jar:1.2.3
29
31
  com.google.guava:guava:jar:r09
30
32
  com.google.inject:guice:jar:3.0
@@ -32,25 +34,28 @@ aopalliance:aopalliance:jar:1.0
32
34
  com.google.inject.extensions:guice-multibindings:jar:3.0
33
35
  org.jdbi:jdbi:jar:2.62
34
36
  org.joda:joda-money:jar:0.9
35
- org.kill-bill.billing:killbill-internal-api:jar:0.14.0
36
- org.kill-bill.billing:killbill-platform-api:jar:0.2
37
- org.kill-bill.billing:killbill-platform-base:jar:0.2
37
+ org.kill-bill.billing:killbill-internal-api:jar:0.15.10
38
+ org.kill-bill.billing:killbill-platform-api:jar:0.15
39
+ org.kill-bill.billing:killbill-platform-base:jar:0.15
38
40
  com.google.code.findbugs:annotations:jar:3.0.0
39
41
  org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
40
- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.2
42
+ org.kill-bill.billing:killbill-platform-osgi-api:jar:0.15
41
43
  org.osgi:org.osgi.core:jar:5.0.0
42
- org.kill-bill.commons:killbill-clock:jar:0.3
43
- org.kill-bill.commons:killbill-concurrent:jar:0.3
44
- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.3
45
- org.kill-bill.commons:killbill-jdbi:jar:0.3
46
- com.h2database:h2:jar:1.4.186
44
+ org.kill-bill.billing:killbill-platform-osgi:jar:0.15
47
45
  javax.inject:javax.inject:jar:1
48
- org.kill-bill.commons:killbill-locker:jar:0.3
49
- org.kill-bill.commons:killbill-queue:jar:0.3
50
- org.kill-bill.commons:killbill-xmlloader:jar:0.3
46
+ org.apache.felix:org.apache.felix.framework:jar:4.4.1
47
+ org.osgi:org.osgi.compendium:jar:5.0.0
48
+ org.kill-bill.commons:killbill-clock:jar:0.11
49
+ org.kill-bill.commons:killbill-concurrent:jar:0.11
50
+ org.kill-bill.commons:killbill-embeddeddb-common:jar:0.11
51
+ org.kill-bill.commons:killbill-jdbi:jar:0.11
52
+ com.h2database:h2:jar:1.4.186
53
+ org.kill-bill.commons:killbill-locker:jar:0.11
54
+ org.kill-bill.commons:killbill-queue:jar:0.11
55
+ org.kill-bill.commons:killbill-xmlloader:jar:0.11
51
56
  org.skife.config:config-magic:jar:0.14
52
57
  org.slf4j:jcl-over-slf4j:jar:1.7.12
53
58
  org.slf4j:slf4j-api:jar:1.7.12
54
- org.weakref:jmxutils:jar:1.12
59
+ org.weakref:jmxutils:jar:1.18
55
60
  org.mockito:mockito-all:jar:1.10.19
56
61
  javax.servlet:javax.servlet-api:jar:3.1.0
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.3
1
+ 0.0.4
data/killbill-kpm.gemspec CHANGED
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
22
22
 
23
23
  s.rdoc_options << '--exclude' << '.'
24
24
 
25
- s.add_dependency 'killbill', '~> 6.5.0'
26
- s.add_dependency 'kpm', '~> 0.1.2'
25
+ s.add_dependency 'killbill', '~> 7.0.0'
26
+ s.add_dependency 'kpm', '~> 0.1.3'
27
27
 
28
28
  s.add_development_dependency 'jbundler', '~> 0.4.3'
29
29
  s.add_development_dependency 'rake', '>= 10.0.0'
data/lib/kpm/application.rb CHANGED
@@ -44,13 +44,14 @@ post '/plugins/killbill-kpm/plugins', :provides => 'json' do
44
44
  File.open(plugin_path, 'w') do |file|
45
45
  file.write(request.body.read)
46
46
  end
47
- ::KPM::PluginsInstaller.instance.install_from_fs plugin_path,
48
- params[:name],
47
+ ::KPM::PluginsInstaller.instance.install_from_fs params[:key],
48
+ plugin_path,
49
49
  params[:version],
50
50
  type
51
51
  end
52
52
  else
53
- info = ::KPM::PluginsInstaller.instance.install params[:artifact_id] || params[:name],
53
+ info = ::KPM::PluginsInstaller.instance.install params[:key],
54
+ params[:artifact_id],
54
55
  params[:version],
55
56
  params[:group_id],
56
57
  params[:packaging],
@@ -68,7 +69,7 @@ end
68
69
 
69
70
  # Uninstall a plugin
70
71
  delete '/plugins/killbill-kpm/plugins', :provides => 'json' do
71
- modified = ::KPM::PluginsInstaller.instance.uninstall params[:name],
72
+ modified = ::KPM::PluginsInstaller.instance.uninstall params[:key],
72
73
  params[:version]
73
74
 
74
75
  if modified.empty?
@@ -80,7 +81,7 @@ end
80
81
 
81
82
  # Restart a plugin
82
83
  put '/plugins/killbill-kpm/plugins', :provides => 'json' do
83
- modified = ::KPM::PluginsInstaller.instance.restart params[:name],
84
+ modified = ::KPM::PluginsInstaller.instance.restart params[:key],
84
85
  params[:version]
85
86
 
86
87
  if modified.empty?
data/lib/kpm/listener.rb CHANGED
@@ -37,7 +37,7 @@ module KPM
37
37
  handle_event(command,
38
38
  event_json['pluginKey'],
39
39
  properties['pluginArtifactId'],
40
- properties['pluginVersion'],
40
+ event_json['pluginVersion'],
41
41
  properties['pluginGroupId'],
42
42
  properties['pluginPackaging'],
43
43
  properties['pluginClassifier'],
data/lib/kpm/plugins_installer.rb CHANGED
@@ -22,7 +22,7 @@ module KPM
22
22
 
23
23
  # If an earlier version of the plugin is installed, Kill Bill will only start the latest one (see org.killbill.billing.osgi.FileInstall)
24
24
  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)
25
- @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}")
25
+ @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}")
26
26
  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])
27
27
  if info.nil?
28
28
  @logger.warn("Error during installation of plugin #{specified_artifact_id}")
@@ -69,9 +69,10 @@ module KPM
69
69
  def notify_fs_change(plugin_key, path, state)
70
70
  return if path.nil?
71
71
 
72
- # Plugin name should be the directory name (path is something like /var/tmp/bundles/plugins/ruby/killbill-stripe/2.0.0)
72
+ # 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)
73
73
  fs_info = path.to_s.split('/')
74
74
  plugin_type = fs_info[-3].upcase
75
+ plugin_type = fs_info[-1].upcase unless %w(JAVA RUBY).include?(plugin_type)
75
76
 
76
77
  unless %w(JAVA RUBY).include?(plugin_type)
77
78
  @logger.warn("Invalid plugin type #{plugin_type} (path #{path}): Kill Bill won't be notified of new state #{state}")
@@ -85,7 +86,7 @@ module KPM
85
86
 
86
87
  plugin_name = fs_info[-2]
87
88
  plugin_version = fs_info[-1]
88
- @logger.info("Notifying Kill Bill: state=#{state} plugin_name=#{plugin_name} plugin_version=#{plugin_version} plugin_type=#{plugin_type}")
89
+ @logger.info("Notifying Kill Bill: state=#{state} plugin_key=#{plugin_key} plugin_name=#{plugin_name} plugin_version=#{plugin_version} plugin_type=#{plugin_type}")
89
90
  @kb_apis.plugins_info_api.notify_of_state_changed(state, plugin_key, plugin_name, plugin_version, plugin_type)
90
91
  end
91
92
 
data/pom.xml CHANGED
@@ -25,7 +25,7 @@
25
25
  <groupId>org.kill-bill.billing.plugin.ruby</groupId>
26
26
  <artifactId>kpm-plugin</artifactId>
27
27
  <packaging>pom</packaging>
28
- <version>0.0.3</version>
28
+ <version>0.0.4</version>
29
29
  <name>kpm-plugin</name>
30
30
  <url>http://github.com/killbill/killbill-kpm-plugin</url>
31
31
  <description>Kill Bill KPM plugin</description>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill-kpm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Killbill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-17 00:00:00.000000000 Z
11
+ date: 2015-12-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: killbill
@@ -16,12 +16,12 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 6.5.0
19
+ version: 7.0.0
20
20
  requirement: !ruby/object:Gem::Requirement
21
21
  requirements:
22
22
  - - ~>
23
23
  - !ruby/object:Gem::Version
24
- version: 6.5.0
24
+ version: 7.0.0
25
25
  prerelease: false
26
26
  type: :runtime
27
27
  - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.1.2
33
+ version: 0.1.3
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
36
  - - ~>
37
37
  - !ruby/object:Gem::Version
38
- version: 0.1.2
38
+ version: 0.1.3
39
39
  prerelease: false
40
40
  type: :runtime
41
41
  - !ruby/object:Gem::Dependency
@@ -130,10 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
130
130
  version: '0'
131
131
  requirements: []
132
132
  rubyforge_project:
133
- rubygems_version: 2.4.6
133
+ rubygems_version: 2.1.9
134
134
  signing_key:
135
135
  specification_version: 4
136
136
  summary: Kill Bill KPM plugin
137
- test_files:
138
- - spec/kpm/base_plugin_spec.rb
139
- - spec/spec_helper.rb
137
+ test_files: []