killbill-client 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d79717bdfdce7cb7b3b91ff83405cff0695c1b
-  data.tar.gz: 20cda0a4d54728a6ef3c01eacdab24dc480b91c1
+  metadata.gz: bc0cb0821172a8b139995e9ce22d57c2e349ea5c
+  data.tar.gz: 28cfe0861830615b3a03219191054047e10680e6
 SHA512:
-  metadata.gz: a5934cc70e770fbbf965f1a4c1e839a5254e3cce41254aea835de37634e4dcf705ec662d5d31f459eea95eff2bb8a1234d1fc160ab82c300619bb807f08ae468
-  data.tar.gz: 7946963faa0b28e8526c11a79da9a4fadb28d4a990d0948bd37867da47d372e0fc87039d20b8cd8ef4ed2181ca3a9618aa06c6d3cb5cf926e3705a419cc31b8a
+  metadata.gz: d54c5903d5a5bf5a157d6798223d00d4b02aebd0d84be8121cd54898e13353cc290c4247613a44c1deed9b9dc8983f4703e222627dcd58401e68f101fdf1fd9d
+  data.tar.gz: 7ffde046dcaf4f470b605cde726d583c0cb0fca9873a52d22f7f09f5a95cf399e7f20593fd19656e66c843a171b269d9da240386657b9a370c4a77f9d91fde9e

data/lib/killbill_client/models/nodes_info.rb

@@ -17,34 +17,34 @@ module KillBillClient
         end
 
 
-        def start_plugin(plugin_key, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=10, sleep_sec=1)
+        def start_plugin(plugin_key, plugin_version=nil, plugin_props=[], local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=15, sleep_sec=1)
 
           proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_key, plugin_version, "RUNNING")
 
-          trigger_node_command_wait_for_plugin_command_completion(:START_PLUGIN, plugin_key, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+          trigger_node_command_wait_for_plugin_command_completion(:START_PLUGIN, plugin_key, plugin_version, plugin_props, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
         end
 
-        def stop_plugin(plugin_key, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=10, sleep_sec=1)
+        def stop_plugin(plugin_key, plugin_version=nil, plugin_props=[], local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=15, sleep_sec=1)
 
           proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_key, plugin_version, "STOPPED")
 
-          trigger_node_command_wait_for_plugin_command_completion(:STOP_PLUGIN, plugin_key, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+          trigger_node_command_wait_for_plugin_command_completion(:STOP_PLUGIN, plugin_key, plugin_version, plugin_props, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
         end
 
 
-        def install_plugin(plugin_key, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=20, sleep_sec=1)
+        def install_plugin(plugin_key, plugin_version=nil, plugin_props=[], local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=30, sleep_sec=1)
 
           proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_key, plugin_version, nil)
 
-          trigger_node_command_wait_for_plugin_command_completion(:INSTALL_PLUGIN, plugin_key, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+          trigger_node_command_wait_for_plugin_command_completion(:INSTALL_PLUGIN, plugin_key, plugin_version, plugin_props, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
         end
 
-        def uninstall_plugin(plugin_key, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=10, sleep_sec=1)
+        def uninstall_plugin(plugin_key, plugin_version=nil, plugin_props=[], local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=15, sleep_sec=1)
 
           is_negate = true # We are looking for absence of plugin_info from result (after plugin got successfully uninstalled)
           proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_key, plugin_version, nil, is_negate)
 
-          trigger_node_command_wait_for_plugin_command_completion(:UNINSTALL_PLUGIN, plugin_key, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+          trigger_node_command_wait_for_plugin_command_completion(:UNINSTALL_PLUGIN, plugin_key, plugin_version, plugin_props, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
         end
 
 
@@ -61,7 +61,7 @@ module KillBillClient
 
         private
 
-        def trigger_node_command_wait_for_plugin_command_completion(node_command_type, plugin_key, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+        def trigger_node_command_wait_for_plugin_command_completion(node_command_type, plugin_key, plugin_version, plugin_props, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
           # Idempotency : Check if already installed
           res = proc_condition.call
           return res if res
@@ -72,6 +72,9 @@ module KillBillClient
           node_command.node_command_properties = []
           node_command.node_command_properties << {:key => 'pluginKey', :value => plugin_key} if plugin_key
           node_command.node_command_properties << {:key => 'pluginVersion', :value => plugin_version} if plugin_version
+          plugin_props.each do |e|
+            node_command.node_command_properties << e
+          end
 
           KillBillClient::Model::NodesInfo.trigger_node_command(node_command, local_node_only, user, reason, comment, options)
 
@@ -85,6 +88,11 @@ module KillBillClient
             res = true
             node_infos.each do |info|
               raw_node_res = info.plugins_info.find do |e|
+                if e.plugin_key == plugin_key
+                  if KillBillClient.logger
+                    KillBillClient.log :info, 'NodesInfo  -> check for plugin command completion version_check=%s, state_check=%s' % [(plugin_version.nil? && e.is_selected_for_start) || plugin_version == e.plugin_version, state.nil? || e.state == state]
+                  end
+                end
                 e.plugin_key == plugin_key && ((plugin_version.nil? && e.is_selected_for_start) || plugin_version == e.plugin_version) && (state.nil? ||  e.state == state)
               end
               node_res = is_negate ? !raw_node_res : raw_node_res
@@ -96,6 +104,9 @@ module KillBillClient
         end
 
         def wait_for_plugin_command_completion(command, plugin, timeout_sec, sleep_sec)
+          if KillBillClient.logger
+            KillBillClient.log :info, 'NodesInfo wait for plugin command %s, plugin =%s' % [command, plugin]
+          end
           begin
             Timeout::timeout(timeout_sec) do
               while true do

data/lib/killbill_client/version.rb

@@ -1,7 +1,7 @@
 module KillBillClient
   module Version
     MAJOR = 0
-    MINOR = 28
+    MINOR = 29
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,65 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  prerelease: false
-  type: :development
 description: An API client library for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -185,26 +185,33 @@ homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Kill Bill client library.
-test_files: []
+test_files:
+- spec/killbill_client/base_uri_spec.rb
+- spec/killbill_client/model_relation_spec.rb
+- spec/killbill_client/remote/api_spec.rb
+- spec/killbill_client/remote/model_spec.rb
+- spec/killbill_client/resource_spec.rb
+- spec/killbill_client/resources_spec.rb
+- spec/spec_helper.rb