killbill-client 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb18f53ec0f189873ead4aa108eb179a408e9ff0
-  data.tar.gz: dda47189a049314516f2e99ac59e9f4d78f7022e
+  metadata.gz: 4c05cca45d6b7e61f60a468ebbc61658fe6bcf8f
+  data.tar.gz: 09a5cb5b091bbd1db3e64a6ef26eff5651ed2b19
 SHA512:
-  metadata.gz: fcd13fd28cf9013264a615b6794b2cf8a8cf957ca686131ecc599402e779445dea9fdc7e0bf9af7d1367d62931f5825cf80c1da19d5925bfd989d3055d9aea39
-  data.tar.gz: 4193a5fe86f3a97160403070896bbc46e98ad0877ae72f24b7b99bdc9fcb6ae28a776f1510fc45f94cb0247ec71ed1098c8cc78119d676c2cf76273015e68cf7
+  metadata.gz: d3684e3a7b23f59c0df340c6b86eb2cf9b75f8e290d4d0609784a80b69480f78c50677619fa15b4ae539c85f11754925ef07f67cec59ad1b4d6abf603623f94b
+  data.tar.gz: 4df324054c188d5544d8bfd140f2c1dc2c61c6cbbae5058aea500aead6ff587be23c86e7b922d440203334ff7fee3c582bee67de052c622053f1d9241f336390

data/lib/killbill_client/models/catalog.rb

@@ -1,6 +1,6 @@
 module KillBillClient
   module Model
-    class Catalog < CatalogAttributesSimple
+    class Catalog < CatalogAttributes
 
       has_many :products, KillBillClient::Model::Product
 

data/lib/killbill_client/models/nodes_info.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module KillBillClient
   module Model
     class NodesInfo < NodeInfoAttributes
@@ -14,6 +16,38 @@ module KillBillClient
               options
         end
 
+
+        def start_plugin_wait_for_plugin_command_completion(plugin_name, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=10, sleep_sec=1)
+
+          proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_name, plugin_version, "RUNNING")
+
+          trigger_node_command_wait_for_plugin_command_completion(:START_PLUGIN, nil, plugin_name, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+        end
+
+        def stop_plugin_wait_for_plugin_command_completion(plugin_name, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=10, sleep_sec=1)
+
+          proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_name, plugin_version, "STOPPED")
+
+          trigger_node_command_wait_for_plugin_command_completion(:STOP_PLUGIN, nil, plugin_name, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+        end
+
+
+        def install_plugin_wait_for_plugin_command_completion(plugin_key, plugin_name, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=20, sleep_sec=1)
+
+          proc_condition = create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_name, plugin_version, nil)
+
+          trigger_node_command_wait_for_plugin_command_completion(:INSTALL_PLUGIN, plugin_key, plugin_name, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+        end
+
+        def uninstall_plugin_wait_for_plugin_command_completion(plugin_name, plugin_version=nil, local_node_only=false, user = nil, reason = nil, comment = nil, options = {}, timeout_sec=10, 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_name, plugin_version, nil, is_negate)
+
+          trigger_node_command_wait_for_plugin_command_completion(:UNINSTALL_PLUGIN, nil, plugin_name, plugin_version, local_node_only, user, reason, comment, options, timeout_sec, sleep_sec, &proc_condition)
+        end
+
+
         def trigger_node_command(node_command, local_node_only, user = nil, reason = nil, comment = nil, options = {})
           post KILLBILL_NODES_INFO_PREFIX,
                node_command.to_json,
@@ -25,6 +59,60 @@ module KillBillClient
                }.merge(options)
         end
 
+        private
+
+        def trigger_node_command_wait_for_plugin_command_completion(node_command_type, plugin_key, plugin_name, plugin_version, 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
+
+          node_command = KillBillClient::Model::NodeCommandAttributes.new
+          node_command.system_command_type = true
+          node_command.node_command_type = node_command_type
+          node_command.node_command_properties = []
+          node_command.node_command_properties << {:key => 'pluginName', :value => plugin_name} if plugin_name
+          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
+
+          KillBillClient::Model::NodesInfo.trigger_node_command(node_command, local_node_only, user, reason, comment, options)
+
+          wait_for_plugin_command_completion(node_command_type, plugin_key || plugin_name,timeout_sec, sleep_sec, &proc_condition)
+        end
+
+        def create_proc_condition_for_wait_for_plugin_command_completion(options, plugin_name, plugin_version, state=nil, is_negate=false)
+          proc_condition = Proc.new {
+            node_infos = KillBillClient::Model::NodesInfo.nodes_info(options)
+
+            res = true
+            node_infos.each do |info|
+              raw_node_res = info.plugins_info.find do |e|
+                e.plugin_name == plugin_name && ((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
+              res = res & node_res
+            end
+            res
+          }
+          proc_condition
+        end
+
+        def wait_for_plugin_command_completion(command, plugin, timeout_sec, sleep_sec)
+          begin
+            Timeout::timeout(timeout_sec) do
+              while true do
+                installed_plugin = yield
+                return installed_plugin if installed_plugin
+                sleep(sleep_sec)
+              end
+            end
+          rescue Timeout::Error => e
+            if KillBillClient.logger
+              KillBillClient.log :info, 'Reached timeout after %s sec: command=%s, plugin=%s' % [timeout_sec, command, plugin]
+            end
+            raise e
+          end
+        end
+
       end
 
     end

data/lib/killbill_client/version.rb

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

metadata

@@ -1,65 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-12 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
@@ -89,7 +89,6 @@ files:
 - lib/killbill_client/models/gen/bundle_attributes.rb
 - lib/killbill_client/models/gen/bundle_timeline_attributes.rb
 - lib/killbill_client/models/gen/catalog_attributes.rb
-- lib/killbill_client/models/gen/catalog_attributes_simple.rb
 - lib/killbill_client/models/gen/combo_hosted_payment_page_attributes.rb
 - lib/killbill_client/models/gen/combo_payment_transaction_attributes.rb
 - lib/killbill_client/models/gen/credit_attributes.rb
@@ -186,26 +185,26 @@ 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.4.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Kill Bill client library.
 test_files:

data/lib/killbill_client/models/gen/catalog_attributes_simple.rb

@@ -1,35 +0,0 @@
-#############################################################################################
-#                                                                                           #
-#                   Copyright 2010-2013 Ning, Inc.                                          #
-#                   Copyright 2014 Groupon, Inc.                                            #
-#                   Copyright 2014 The Billing Project, LLC                                 #
-#                                                                                           #
-#      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:                                   #
-#                                                                                           #
-#          http://www.apache.org/licenses/LICENSE-2.0                                       #
-#                                                                                           #
-#      Unless required by applicable law or agreed to in writing, software                  #
-#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
-#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
-#      License for the specific language governing permissions and limitations              #
-#      under the License.                                                                   #
-#                                                                                           #
-#############################################################################################
-
-
-#
-#                       DO NOT EDIT!!!
-#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
-#
-
-
-module KillBillClient
-  module Model
-    class CatalogAttributesSimple < Resource
-      attribute :name
-      attribute :products
-    end
-  end
-end