killbill-catalog-ruby-plugin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d285835070603d8b81b53d6b0d8c9da694d234bb
-  data.tar.gz: 57e5550dea43effdb5e40dcecb3949e2c18b4f05
+  metadata.gz: 85ec8d1d9d7a9929e6dc049f45fe9e683540ac2d
+  data.tar.gz: 6768f2182e88f8d4ef363bbc0bcc0fa86ee331f1
 SHA512:
-  metadata.gz: 72ff7f416d62919831953317a23e6bde17a6278b62e9e06c17d23a5f5f6b18db9e7141c125f6154e0f5f61ea2cb58f06aafef5ea8dac013c82e0975abee262ee
-  data.tar.gz: ca253872a50dd10c9f9a9ec0707aab59ff7263a339c4c251339ae2754fe9b7fffaf4c7c0d0a164e47ba025725b3a3ace9c5d499397988142b37a00defde0aae8
+  metadata.gz: 04728873ed516fa19951dcf64d54af9ba271b9fe6114607405a2da4c1058497f3414858ade59ea06575baf7a01c2b512dc270cac1fa7c1bb2611a2461be364aa
+  data.tar.gz: 577401272e41b9503a72510a8f6bf4a1e2d72f840fb02bbb080e23b9ce5b851399d311ba4433522269eb924cc1a37d49974046d2355c42cbba95f5f751052ab1

data/Gemfile

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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    killbill-catalog-ruby-plugin (0.1.0)
-      killbill (~> 7.0)
+    killbill-catalog-ruby-plugin (0.2.0)
+      killbill (~> 8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -17,9 +17,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     equalizer (0.0.11)
-    ethon (0.8.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
-    ffi (1.9.10-java)
+    ffi (1.9.14-java)
     ice_nine (0.11.1)
     jar-dependencies (0.3.1)
     jbundler (0.9.2)
@@ -27,14 +27,14 @@ GEM
       jar-dependencies (~> 0.2)
       maven-tools (~> 1.0.10)
       ruby-maven (~> 3.3, >= 3.3.3)
-    killbill (7.0.0)
+    killbill (8.3.1)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)
       tzinfo (~> 1.2.0)
     maven-tools (1.0.13)
       virtus (~> 1.0)
-    rack (1.6.4)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rake (10.4.2)
@@ -75,4 +75,4 @@ DEPENDENCIES
   rspec (~> 2.12.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/Jarfile

@@ -1,11 +1,12 @@
-jar 'org.kill-bill.billing:killbill-api', '0.32'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.18'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.18'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.15.10'
+jar 'org.kill-bill.billing:killbill-api', '0.50'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.23'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.23'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.18.0'
+jar 'org.kill-bill.billing:killbill-util', '0.18.0'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -1,61 +1,66 @@
 ---
 :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.fasterxml.jackson.core:jackson-databind:jar:2.4.5
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.23
+- org.kill-bill.billing:killbill-platform-api:jar:0.36.1
 - 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.kill-bill.commons:killbill-clock:jar:0.20
+- org.kill-bill.billing:killbill-util:jar:0.18.0
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.4.5
+- org.bouncycastle:bcpkix-jdk15on:jar:1.55
+- org.bouncycastle:bcprov-jdk15on:jar:1.55
+- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.23
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
 - com.h2database:h2:jar:1.4.186
+- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.5
 - 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.apache.commons:commons-email:jar:1.2
+- org.javassist:javassist:jar:3.19.0-GA
 - 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.zaxxer:HikariCP-java6:jar:2.3.7
+- org.slf4j:slf4j-api:jar:1.7.21
 - 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
+- org.slf4j:jcl-over-slf4j:jar:1.7.21
 - 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
+- com.fasterxml.jackson.core:jackson-core:jar:2.4.5
 - 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.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.23
 - 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
+- org.kill-bill.billing:killbill-internal-api:jar:0.18.0
+- org.kill-bill.billing:killbill-util:jar:tests:0.18.0
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.23
+- org.kill-bill.commons:killbill-jdbi:jar:0.20
 - com.google.guava:guava:jar:r09
-- org.kill-bill.commons:killbill-locker:jar:0.11
+- org.kill-bill.commons:killbill-queue:jar:0.20
 - org.osgi:org.osgi.compendium:jar:5.0.0
-- org.kill-bill.commons:killbill-queue:jar:0.11
-- org.kill-bill.commons:killbill-concurrent:jar:0.11
+- org.kill-bill.commons:killbill-xmlloader:jar:0.20
 - javax.servlet:javax.servlet-api:jar:3.1.0
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.36.1
 - org.apache.shiro:shiro-ehcache:jar:1.2.3
+- org.kill-bill.billing:killbill-platform-base:jar:0.36.1
 - javax.inject:javax.inject:jar:1
-- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.4.3
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.23
+- org.kill-bill.billing:killbill-api:jar:0.50
 - com.google.inject.extensions:guice-multibindings:jar:3.0
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.36.1
 - net.sf.ehcache:ehcache:jar:2.9.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.18
-- org.kill-bill.billing:killbill-api:jar:0.32
+- org.kill-bill.commons:killbill-locker:jar:0.20
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.20
 - org.apache.shiro:shiro-guice:jar:1.2.3
 - com.google.code.findbugs:annotations:jar:3.0.0
+- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.23
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.23
+- org.kill-bill.commons:killbill-concurrent:jar:0.20

data/README.md

@@ -4,3 +4,28 @@ killbill-catalog-ruby-plugin
 Plugin to highlight the use of the CatalogPluginApi from a ruby plugin.
 
 Release builds are available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.kill-bill.billing.plugin.ruby%22%20AND%20a%3A%22killbill-catalog-ruby-plugin%22) with coordinates `org.kill-bill.billing.plugin.ruby:killbill-catalog-ruby-plugin`.
+
+Kill Bill compatibility
+-----------------------
+
+| Plugin version | Kill Bill version |
+| -------------: | ----------------: |
+| 0.1.y          | 0.16.z            |
+| 0.2.y          | 0.18.z            |
+
+Usage
+-----
+
+You can verify Kill Bill can load up the demo Gold plan by creating a subscription:
+
+```
+curl -v
+     -u admin:password
+     -H "X-Killbill-ApiKey: bob"
+     -H "X-Killbill-ApiSecret: lazar"
+     -H "Content-Type: application/json"
+     -H "X-Killbill-CreatedBy: demo"
+     -X POST
+     --data-binary '{"accountId":"486a9a5f-b896-40c0-845a-a8c042992a32","productName":"Gold","productCategory":"BASE","billingPeriod":"MONTHLY","priceList":"DEFAULT"}'
+     "http://127.0.0.1:8080/1.0/kb/subscriptions"
+```

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/killbill-catalog-ruby-plugin.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 7.0'
+  s.add_dependency 'killbill', '~> 8.0'
 
   s.add_development_dependency 'jbundler', '~> 0.9.2'
   s.add_development_dependency 'rake', '>= 10.0.0'

data/lib/killbill-catalog-ruby-plugin/api.rb

@@ -64,7 +64,6 @@ module CatalogControlPluginModule
     def create_price_list(plans)
       p = Killbill::Plugin::Model::PriceList.new
       p.name = 'DEFAULT'
-      p.is_retired = false
       p.plans = plans
       p
     end
@@ -72,11 +71,9 @@ module CatalogControlPluginModule
     def create_product
       p = Killbill::Plugin::Model::Product.new
       p.name = 'Gold'
-      p.is_retired = false
       p.available = []
       p.included = []
       p.category = :BASE
-      #p.catalog_name =
       p.limits = []
       p
     end
@@ -86,10 +83,10 @@ module CatalogControlPluginModule
       p.initial_phases = []
       p.product = product
       p.name = 'gold-monthly'
-      p.is_retired = false
       p.final_phase = phase
       p.all_phases = [phase]
       p.recurring_billing_period = :MONTHLY
+      p.price_list_name = 'DEFAULT'
       p.plans_allowed_in_bundle = -1
       p
     end

data/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>killbill-catalog-ruby-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
     <name>killbill-catalog-ruby-plugin</name>
     <description></description>
     <scm>

data/release.sh

@@ -36,7 +36,7 @@ fi
 echo 'Building artifact'
 $BUNDLE rake killbill:package
 
-ARTIFACT="$PWD/pkg/killbill-catalog-ruby-$VERSION.tar.gz"
+ARTIFACT="$PWD/pkg/killbill-catalog-ruby-plugin-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
 
 if [[ -z "$NO_RELEASE" ]]; then

metadata

@@ -1,79 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: killbill-catalog-ruby-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: killbill
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '7.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
+  name: killbill
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jbundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '8.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
+  name: jbundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
+  name: rspec
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 description: Kill Bill Plugin to illustrate the use of the Catalog Plugin api.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Jarfile
@@ -95,23 +95,23 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Catalog Plugin