klogger 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0700da90894071658bc94f54991b6d7609edcf61
-  data.tar.gz: f4413d2732673f71d5d72828490004a4a0cdd391
+  metadata.gz: 810f50cd7068a8ee2b806df06e61c4bbc00a8262
+  data.tar.gz: 8df861f3a791eb43fa3db096573caa16a47c6959
 SHA512:
-  metadata.gz: e057e421d8fb3d843b967358b27282dcdaceab23c761bb76af5967fff3396f521185a9b2698449f814dc54e58a9decea0c65b4adbbe0617dddcfa3bb365c59bf
-  data.tar.gz: 34eda518dc262b43f175a40869ddcb84ab22199a7db73158fc472abcc3b6582eba3972ebdd7db4060a544a8efa476362ea8778b4bcdddc113db91e2f59f96399
+  metadata.gz: 17d157ebb18ccb4eaf0dd9764a03f84df386cee00e8a4c82b9609924031a7f53d275f64375b730f794e2734ab75458c6d9baf50717246f46aabb9aa48582a05e
+  data.tar.gz: e1937dfaacaaa369fbcba8e3a48e5a193d244ccf166034f8eb3733826f60584e3b384bd0a2a7163ebbf02e821a98426116c4e108d8fc3f66479e81ec081119b1

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.swp
 .bundle
 .config
 coverage
@@ -18,16 +19,15 @@ _yardoc
 doc/
 
 .jbundler
-Jarfile.lock
-Gemfile.lock
-
-# Build directory
-/klogger/
 
 # Config file
 klogger.yml
 
 .DS_Store
 
-.idea
-*.asc
+target
+pom.xml.asc
+
+.idea/
+
+Gemfile.head.lock

data/.travis.yml

@@ -1,19 +1,38 @@
 language: ruby
 
+sudo: false
+cache: bundler
+
+script: 'bundle exec rake spec'
+
 notifications:
   email:
     - kill-bill-commits@googlegroups.com
 
+env:
+  global:
+    - JRUBY_OPTS='-J-Xmx1024M'
+
 rvm:
-  - jruby-19mode
-  - jruby-20mode
+  - jruby-1.7.19
+  - jruby-20mode # latest 1.7.x
   - jruby-head
 
+gemfile:
+  - Gemfile
+  - Gemfile.head
+
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 
 matrix:
   allow_failures:
     - rvm: jruby-head
+    - jdk: oraclejdk8
+    - gemfile: Gemfile.head
+  fast_finish: true
+
+after_success:
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "<settings><servers><server><id>sonatype-nexus-snapshots</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml && MVN="mvn --settings $HOME/settings.xml" NO_RELEASE=1 travis_retry travis_wait bash release.sh | egrep -v "Download|Install|Upload" ; rm -f ~/settings.xml'

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.head

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'killbill', :github => 'killbill/killbill-plugin-framework-ruby', :ref => 'HEAD'

data/Gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    klogger (2.0.0)
+      cinch (~> 2.0.3)
+      jruby-openssl (~> 0.9.6)
+      killbill (~> 4.0.0)
+      mail (~> 2.5.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    cinch (2.0.12)
+    diff-lcs (1.1.3)
+    ethon (0.7.3)
+      ffi (>= 1.3.0)
+    ffi (1.9.8-java)
+    jbundler (0.4.3)
+      maven-tools (~> 0.32.1)
+      ruby-maven (~> 3.0.4)
+    jruby-openssl (0.9.7-java)
+    killbill (4.0.0)
+      rack (>= 1.5.2)
+      sinatra (~> 1.3.4)
+      typhoeus (~> 0.6.9)
+      tzinfo (~> 1.2.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    maven-tools (0.32.5)
+    mime-types (1.25.1)
+    polyglot (0.3.5)
+    rack (1.6.1)
+    rack-protection (1.5.3)
+      rack
+    rake (10.4.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    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)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    thor (0.19.1)
+    thread_safe (0.3.5-java)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  jbundler (~> 0.4.3)
+  klogger!
+  rack (>= 1.5.2)
+  rake (>= 10.0.0)
+  rspec (~> 2.12.0)

data/Jarfile

@@ -1,6 +1,9 @@
-jar 'org.kill-bill.billing:killbill-api', '0.8.2'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.6.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.6.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.6.4'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.9.1'
-jar 'javax.servlet:javax.servlet-api', '3.0.1'
+jar 'org.kill-bill.billing:killbill-api', '0.14'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.9'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-routing', '0.9'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.13.7'
+jar 'org.mockito:mockito-all', '1.10.19'
+jar 'javax.servlet:javax.servlet-api', '3.1.0'

data/Jarfile.lock

@@ -0,0 +1,58 @@
+org.kill-bill.billing:killbill-api:jar:0.14
+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.9
+org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.9
+org.kill-bill.billing.plugin:killbill-plugin-api-routing:jar:0.9
+org.kill-bill.billing:killbill-util:jar:tests:0.13.7
+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.13.7
+org.kill-bill.billing:killbill-platform-api:jar:0.2
+org.kill-bill.billing:killbill-platform-base:jar:0.2
+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.2
+org.osgi:org.osgi.core:jar:5.0.0
+org.kill-bill.commons:killbill-clock:jar:0.3
+org.kill-bill.commons:killbill-concurrent:jar:0.3
+org.kill-bill.commons:killbill-embeddeddb-common:jar:0.3
+org.kill-bill.commons:killbill-jdbi:jar:0.3
+com.h2database:h2:jar:1.4.186
+javax.inject:javax.inject:jar:1
+org.kill-bill.commons:killbill-locker:jar:0.3
+org.kill-bill.commons:killbill-queue:jar:0.3
+org.kill-bill.commons:killbill-xmlloader:jar:0.3
+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.12
+org.mockito:mockito-all:jar:1.10.19
+javax.servlet:javax.servlet-api:jar:3.1.0
+org.bouncycastle:bcpkix-jdk15on:jar:1.50
+org.bouncycastle:bcprov-jdk15on:jar:1.50

data/README.md

@@ -1,6 +1,3 @@
-[![Build Status](https://travis-ci.org/killbill/killbill-logging-plugin.png)](https://travis-ci.org/killbill/killbill-logging-plugin)
-[![Code Climate](https://codeclimate.com/github/killbill/killbill-logging-plugin.png)](https://codeclimate.com/github/killbill/killbill-logging-plugin)
-
 killbill-logging-plugin
 =======================
 
@@ -8,12 +5,25 @@ Plugin to log Kill Bill events to Syslog, IRC, emails, ...
 
 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%22logging-plugin%22) with coordinates `org.kill-bill.billing.plugin.ruby:logging-plugin`.
 
+Kill Bill compatibility
+-----------------------
+
+| Plugin version | Kill Bill version |
+| -------------: | ----------------: |
+| 2.x.y          | 0.14.z            |
+
 Configuration
 -------------
 
-The plugin expects a `klogger.yml` configuration file containing the following:
-
 ```
+curl -v \
+     -X POST \
+     -u admin:password \
+     -H 'X-Killbill-ApiKey: bob' \
+     -H 'X-Killbill-ApiSecret: lazar' \
+     -H 'X-Killbill-CreatedBy: admin' \
+     -H 'Content-Type: text/plain' \
+     -d '
 syslog:
   :enabled: true
   :ident: 'klogger'
@@ -22,7 +32,7 @@ syslog:
 
 irc:
   :enabled: true
-  :channels: ['#killbilling']
+  :channels: ['#killbillio']
   :nick: 'klogger'
   :server: 'irc.freenode.org'
   :port: 6667
@@ -39,7 +49,6 @@ email:
   :password: 'password'
   :authentication: 'plain'
   :enable_starttls_auto: true
+' \
+     http://127.0.0.1:8080/1.0/kb/tenants/uploadPluginConfig/killbill-logger
 ```
-
-By default, the plugin will look at the plugin directory root (where `killbill.properties` is located) to find this file.
-Alternatively, set the Kill Bill system property `-Dorg.killbill.billing.osgi.bundles.jruby.conf.dir=/my/directory` to specify another location.

data/VERSION

@@ -1 +1 @@
-1.7.0
+2.0.0

data/klogger.gemspec

@@ -12,25 +12,26 @@ Gem::Specification.new do |s|
 
   s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://kill-bill.org'
+  s.homepage = 'http://killbill.io'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.0.0'
+  s.add_dependency 'killbill', '~> 4.0.0'
+
   s.add_dependency 'cinch', '~> 2.0.3'
   s.add_dependency 'mail', '~> 2.5.3'
   if defined?(JRUBY_VERSION)
     # Required to avoid errors like java.lang.NoClassDefFoundError: org/bouncycastle/asn1/DERBoolean
-    s.add_dependency 'jruby-openssl', '~> 0.9.4'
+    s.add_dependency 'jruby-openssl', '~> 0.9.6'
   end
 
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rack', '>= 1.5.2'
   s.add_development_dependency 'rspec', '~> 2.12.0'

data/lib/klogger.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'pathname'
 require 'psych'
 
 require 'killbill'
@@ -20,69 +21,112 @@ module Klogger
 
     def initialize(*args)
       super(*args)
-      @enabled_modules = []
+
+      @config_key_name = "PLUGIN_CONFIG_killbill-logger".to_sym
+      @enabled_modules = {}
     end
 
     def start_plugin
-      configure_modules
-      @enabled_modules.each do |m|
-        begin
-          m.start_plugin
-        rescue => e
-          @logger.warn "Unable to start module #{m.class}: #{e.message}"
-        end
-      end
-
       super
 
+      @global_config = global_configuration
       @logger.info "Klogger::KloggerPlugin started"
     end
 
     def on_event(event)
-      @enabled_modules.each do |m|
-        begin
-          m.on_event(event)
-        rescue => e
-          @logger.warn "Unable to send event to module #{m.class}: #{e.message}"
-        end
+      tenant_id = tenant(event)
+
+      if (event.event_type == :TENANT_CONFIG_CHANGE || event.event_type == :TENANT_CONFIG_DELETION) &&
+          event.meta_data.to_sym == @config_key_name
+        @enabled_modules[tenant_id] = nil
       end
+      configure_modules(tenant_id) if @enabled_modules[tenant_id].nil?
+
+      dispatch_event(event, tenant_id)
     end
 
     def stop_plugin
       super
 
-      @enabled_modules.each do |m|
-        begin
-          m.stop_plugin
-        rescue => e
-          @logger.warn "Unable to stop module #{m.class}: #{e.message}"
-        end
-      end
-
+      @enabled_modules.keys.each { |kb_tenant_id| stop_modules(kb_tenant_id) }
       @logger.info "Klogger::KloggerPlugin stopped"
     end
 
     private
 
-    def configure_modules
-      # Parse the config file
-      begin
-        @config = Psych.load_file("#{@conf_dir}/klogger.yml")
-      rescue Errno::ENOENT
-        @logger.warn "Unable to find the config file #{@conf_dir}/klogger.yml"
-        return
-      end
+    def configure_modules(kb_tenant_id)
+      @enabled_modules[kb_tenant_id] ||= []
+
+      stop_modules(kb_tenant_id)
+
+      tenant_config = @global_config.merge(tenant_configuration(kb_tenant_id))
 
       # Instantiate each module
-      @config.each do |kmodule, config|
+      tenant_config.each do |kmodule, config|
         next unless config[:enabled]
 
         module_klass = MODULES[kmodule.to_sym]
         next unless module_klass
 
-        @logger.info "Module #{module_klass} enabled"
-        @enabled_modules << module_klass.send('new', config, @logger)
+        @logger.info "Module #{module_klass} enabled for tenant #{kb_tenant_id}"
+        @enabled_modules[kb_tenant_id] << module_klass.send('new', config, @logger)
+      end
+
+      start_modules(kb_tenant_id)
+    end
+
+    def tenant_configuration(kb_tenant_id)
+      return {} if kb_tenant_id.nil? || kb_tenant_id == :monotenant
+      context = @kb_apis.create_context(kb_tenant_id)
+      values = @kb_apis.tenant_user_api.get_tenant_values_for_key(@config_key_name, context)
+      values && values[0] ? Psych.load(values[0]) : {}
+    end
+
+    def global_configuration
+      config_file = "#{@conf_dir}/klogger.yml"
+      return {} unless Pathname.new(config_file).file?
+
+      begin
+        Psych.load_file(config_file)
+      rescue
+        @logger.warn "Unable to parse the config file #{config_file}"
+        {}
+      end
+    end
+
+    def dispatch_event(event, kb_tenant_id)
+      @enabled_modules[kb_tenant_id].each do |m|
+        begin
+          m.on_event(event)
+        rescue => e
+          @logger.warn "Unable to send event to module #{m.class}: #{e.message}"
+        end
+      end
+    end
+
+    def start_modules(kb_tenant_id)
+      @enabled_modules[kb_tenant_id].each do |m|
+        begin
+          m.start_plugin
+        rescue => e
+          @logger.warn "Unable to start module #{m.class}: #{e.message}"
+        end
       end
     end
+
+    def stop_modules(kb_tenant_id)
+      @enabled_modules[kb_tenant_id].each do |m|
+        begin
+          m.stop_plugin
+        rescue => e
+          @logger.warn "Unable to stop module #{m.class}: #{e.message}"
+        end
+      end
+      @enabled_modules[kb_tenant_id] = []
+    end
+
+    def tenant(event)
+      event.tenant_id.nil? ? :monotenant : event.tenant_id
+    end
   end
 end

data/pom.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ~ Copyright 2010-2013 Ning, Inc.
+~ Copyright 2014-2015 The Billing Project, LLC
 ~
-~  Ning licenses this file to you under the Apache License, version 2.0
+~  The Billing Project licenses this file to you under the Apache License, version 2.0
 ~  (the "License"); you may not use this file except in compliance with the
 ~  License.  You may obtain a copy of the License at:
 ~
@@ -25,7 +26,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>logging-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.7.0</version>
+    <version>2.0.0</version>
     <name>logging-plugin</name>
     <url>http://github.com/killbill/killbill-logging-plugin</url>
     <description>Plugin to log Kill Bill events</description>

data/release.sh

@@ -1,41 +1,61 @@
 set -e
 
-if [ "GNU" != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
-  echo "Unable to release: make sure to use GNU tar"
+BUNDLE=${BUNDLE-"bundle exec"}
+MVN=${MVN-"mvn"}
+
+if [ 'GNU' != "$(tar --help | grep GNU | head -1 | awk '{print $1}')" ]; then
+  echo 'Unable to release: make sure to use GNU tar'
   exit 1
 fi
 
 if $(ruby -e'require "java"'); then
   # Good
-  echo "Detected JRuby"
+  echo 'Detected JRuby'
 else
-  echo "Unable to release: make sure to use JRuby"
+  echo 'Unable to release: make sure to use JRuby'
   exit 1
 fi
 
 VERSION=`grep -E '<version>([0-9]+\.[0-9]+\.[0-9]+)</version>' pom.xml | sed 's/[\t \n]*<version>\(.*\)<\/version>[\t \n]*/\1/'`
-if [ "$VERSION" != "$(cat $PWD/VERSION)" ]; then
-  echo "Unable to release: make sure the versions in pom.xml and VERSION match"
+if [[ -z "$NO_RELEASE" && "$VERSION" != "$(cat $PWD/VERSION)" ]]; then
+  echo 'Unable to release: make sure the versions in pom.xml and VERSION match'
   exit 1
 fi
 
-echo "Cleaning up"
-rake killbill:clean ; rake build
+echo 'Cleaning up'
+$BUNDLE rake killbill:clean
+
+echo 'Building gem'
+$BUNDLE rake build
 
-echo "Pushing the gem to Rubygems"
-rake release
+if [[ -z "$NO_RELEASE" ]]; then
+  echo 'Pushing the gem to Rubygems'
+  $BUNDLE rake release
+fi
 
-echo "Building artifact"
-rake killbill:package
+echo 'Building artifact'
+$BUNDLE rake killbill:package
 
 ARTIFACT="$PWD/pkg/klogger-$VERSION.tar.gz"
 echo "Pushing $ARTIFACT to Maven Central"
-mvn gpg:sign-and-deploy-file \
-    -DgroupId=org.kill-bill.billing.plugin.ruby \
-    -DartifactId=logging-plugin \
-    -Dversion=$VERSION \
-    -Dpackaging=tar.gz \
-    -DrepositoryId=ossrh-releases \
-    -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ \
-    -Dfile=$ARTIFACT \
-    -DpomFile=pom.xml
+
+if [[ -z "$NO_RELEASE" ]]; then
+  GOAL=gpg:sign-and-deploy-file
+  REPOSITORY_ID=ossrh-releases
+  URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+else
+  GOAL=deploy:deploy-file
+  REPOSITORY_ID=sonatype-nexus-snapshots
+  URL=https://oss.sonatype.org/content/repositories/snapshots/
+  VERSION="$VERSION-SNAPSHOT"
+fi
+
+$MVN $GOAL \
+     -DgroupId=org.kill-bill.billing.plugin.ruby \
+     -DartifactId=logging-plugin \
+     -Dversion=$VERSION \
+     -Dpackaging=tar.gz \
+     -DrepositoryId=$REPOSITORY_ID \
+     -Durl=$URL \
+     -Dfile=$ARTIFACT \
+     -DpomFile=pom.xml

data/spec/klogger/integration_spec.rb

@@ -6,25 +6,39 @@ class String
   end
 end
 
+class FakeJavaTenantUserApi
+
+  attr_accessor :per_tenant_config
+
+  def initialize(per_tenant_config = {})
+    @per_tenant_config = per_tenant_config
+  end
+
+  def get_tenant_values_for_key(key, context)
+    result = @per_tenant_config[context.tenant_id.to_s]
+    result ? [result] : nil
+  end
+end
+
 class MockEvent
-  def get_event_type
+  def event_type
     'InvoiceCreationEvent'
   end
 
-  def get_object_type
+  def object_type
     'INVOICE'
   end
 
-  def get_object_id
-    '1234'
+  def object_id
+    SecureRandom.uuid
   end
 
-  def get_account_id
-    '11-22-33'
+  def account_id
+    SecureRandom.uuid
   end
 
-  def get_tenant_id
-    '1100-998'
+  def tenant_id
+    SecureRandom.uuid
   end
 end
 
@@ -47,6 +61,10 @@ email:
       @plugin.logger = Logger.new(STDOUT)
       @plugin.conf_dir = File.dirname(file)
 
+      @tenant_api     = FakeJavaTenantUserApi.new
+      svcs            = {:tenant_user_api => @tenant_api}
+      @plugin.kb_apis = Killbill::Plugin::KillbillApi.new('klogger', svcs)
+
       # Start the plugin here - since the config file will be deleted
       @plugin.start_plugin
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klogger
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -58,12 +58,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.6
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -72,12 +72,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -131,7 +131,10 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.head
+- Gemfile.lock
 - Jarfile
+- Jarfile.lock
 - NEWS
 - README.md
 - Rakefile
@@ -147,7 +150,7 @@ files:
 - release.sh
 - spec/klogger/integration_spec.rb
 - spec/spec_helper.rb
-homepage: http://kill-bill.org
+homepage: http://killbill.io
 licenses:
 - Apache License (2.0)
 metadata: {}
@@ -173,6 +176,4 @@ rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Plugin to log Kill Bill events.
-test_files:
-- spec/klogger/integration_spec.rb
-- spec/spec_helper.rb
+test_files: []