killbill 8.3.6 → 9.2.0

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 (69) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +51 -0
  3. data/Gemfile.lock +4 -4
  4. data/Jarfile +11 -11
  5. data/Jarfile.lock +63 -57
  6. data/NEWS +2 -8
  7. data/README.md +1 -0
  8. data/gen_config/api.conf +2 -0
  9. data/lib/killbill/gen/api/account.rb +20 -20
  10. data/lib/killbill/gen/api/account_data.rb +15 -1
  11. data/lib/killbill/gen/api/block_price_override.rb +81 -0
  12. data/lib/killbill/gen/api/call_context.rb +8 -1
  13. data/lib/killbill/gen/api/catalog_entity.rb +7 -1
  14. data/lib/killbill/gen/api/catalog_user_api.rb +8 -0
  15. data/lib/killbill/gen/api/custom_field_user_api.rb +17 -0
  16. data/lib/killbill/gen/api/email_notification.rb +75 -0
  17. data/lib/killbill/gen/api/entitlement_api.rb +12 -6
  18. data/lib/killbill/gen/api/immutable_account_data.rb +1 -20
  19. data/lib/killbill/gen/api/invoice.rb +15 -1
  20. data/lib/killbill/gen/api/invoice_formatter.rb +15 -1
  21. data/lib/killbill/gen/api/invoice_item.rb +19 -1
  22. data/lib/killbill/gen/api/invoice_item_formatter.rb +19 -1
  23. data/lib/killbill/gen/api/migration_plan.rb +14 -1
  24. data/lib/killbill/gen/api/mutable_account_data.rb +15 -1
  25. data/lib/killbill/gen/api/mutable_static_catalog.rb +1 -8
  26. data/lib/killbill/gen/api/osgi_killbill.rb +8 -1
  27. data/lib/killbill/gen/api/overdue_api.rb +88 -0
  28. data/lib/killbill/gen/api/overdue_api_exception.rb +68 -0
  29. data/lib/killbill/gen/api/overdue_condition.rb +108 -0
  30. data/lib/killbill/gen/api/overdue_config.rb +58 -0
  31. data/lib/killbill/gen/api/overdue_state.rb +120 -0
  32. data/lib/killbill/gen/api/overdue_states_account.rb +72 -0
  33. data/lib/killbill/gen/api/payment_api.rb +192 -51
  34. data/lib/killbill/gen/api/plan.rb +14 -1
  35. data/lib/killbill/gen/api/plan_phase.rb +7 -1
  36. data/lib/killbill/gen/api/plan_phase_price_override.rb +20 -1
  37. data/lib/killbill/gen/api/price_list.rb +7 -1
  38. data/lib/killbill/gen/api/product.rb +7 -1
  39. data/lib/killbill/gen/api/require_gen.rb +131 -121
  40. data/lib/killbill/gen/api/security_api.rb +20 -0
  41. data/lib/killbill/gen/api/static_catalog.rb +1 -8
  42. data/lib/killbill/gen/api/tag_user_api.rb +12 -3
  43. data/lib/killbill/gen/api/tenant_context.rb +8 -1
  44. data/lib/killbill/gen/api/tier_price_override.rb +70 -0
  45. data/lib/killbill/gen/api/tiered_block_price_override.rb +87 -0
  46. data/lib/killbill/gen/api/unit.rb +7 -1
  47. data/lib/killbill/gen/api/usage.rb +14 -1
  48. data/lib/killbill/gen/api/usage_price_override.rb +83 -0
  49. data/lib/killbill/gen/plugin-api/catalog_plugin_api.rb +34 -0
  50. data/lib/killbill/gen/plugin-api/entitlement_context.rb +8 -8
  51. data/lib/killbill/gen/plugin-api/ext_bus_event.rb +8 -1
  52. data/lib/killbill/gen/plugin-api/invoice_payment_metadata.rb +115 -0
  53. data/lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb +64 -0
  54. data/lib/killbill/gen/plugin-api/notification_plugin_api_retry_exception.rb +64 -0
  55. data/lib/killbill/gen/plugin-api/payment_control_context.rb +14 -8
  56. data/lib/killbill/gen/plugin-api/prior_payment_control_result.rb +7 -1
  57. data/lib/killbill/gen/plugin-api/require_gen.rb +15 -12
  58. data/lib/killbill/gen/plugin-api/subscription_metadata.rb +8 -2
  59. data/lib/killbill/gen/plugin-api/versioned_plugin_catalog.rb +1 -8
  60. data/lib/killbill/helpers/active_merchant/active_record/models/response.rb +6 -21
  61. data/lib/killbill/helpers/active_merchant/killbill_spec_helper.rb +1 -1
  62. data/lib/killbill/helpers/active_merchant/payment_plugin.rb +12 -12
  63. data/lib/killbill/version.rb +1 -1
  64. data/spec/killbill/helpers/response_spec.rb +0 -7
  65. data/spec/killbill/helpers/test_response.rb +0 -4
  66. data/spec/killbill/killbillapi_spec.rb +1 -0
  67. metadata +17 -4
  68. data/.circleci/config.yml +0 -138
  69. data/lib/killbill/gen/api/refund.rb +0 -151
@@ -32,7 +32,7 @@ module Killbill
32
32
  class SubscriptionMetadata
33
33
 
34
34
 
35
- attr_accessor :action_type
35
+ attr_accessor :action_type, :bundle_external_key
36
36
 
37
37
  def initialize()
38
38
  end
@@ -40,13 +40,19 @@ module Killbill
40
40
  def to_java()
41
41
  # conversion for action_type [type = org.killbill.billing.notification.plugin.api.ActionType]
42
42
  @action_type = Java::org.killbill.billing.notification.plugin.api.ActionType.value_of( @action_type.to_s ) unless @action_type.nil?
43
- Java::org.killbill.billing.notification.plugin.api.SubscriptionMetadata.new(@action_type)
43
+
44
+ # conversion for bundle_external_key [type = java.lang.String]
45
+ @bundle_external_key = @bundle_external_key.to_s unless @bundle_external_key.nil?
46
+ Java::org.killbill.billing.notification.plugin.api.SubscriptionMetadata.new(@action_type, @bundle_external_key)
44
47
  end
45
48
 
46
49
  def to_ruby(j_obj)
47
50
  # conversion for action_type [type = org.killbill.billing.notification.plugin.api.ActionType]
48
51
  @action_type = j_obj.action_type
49
52
  @action_type = @action_type.to_s.to_sym unless @action_type.nil?
53
+
54
+ # conversion for bundle_external_key [type = java.lang.String]
55
+ @bundle_external_key = j_obj.bundle_external_key
50
56
  self
51
57
  end
52
58
 
@@ -34,7 +34,7 @@ module Killbill
34
34
 
35
35
  include org.killbill.billing.catalog.plugin.api.VersionedPluginCatalog
36
36
 
37
- attr_accessor :catalog_name, :recurring_billing_mode, :standalone_plugin_catalogs
37
+ attr_accessor :catalog_name, :standalone_plugin_catalogs
38
38
 
39
39
  def initialize()
40
40
  end
@@ -43,9 +43,6 @@ module Killbill
43
43
  # conversion for catalog_name [type = java.lang.String]
44
44
  @catalog_name = @catalog_name.to_s unless @catalog_name.nil?
45
45
 
46
- # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
47
- @recurring_billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @recurring_billing_mode.to_s ) unless @recurring_billing_mode.nil?
48
-
49
46
  # conversion for standalone_plugin_catalogs [type = java.lang.Iterable]
50
47
  tmp = java.util.ArrayList.new
51
48
  (@standalone_plugin_catalogs || []).each do |m|
@@ -61,10 +58,6 @@ module Killbill
61
58
  # conversion for catalog_name [type = java.lang.String]
62
59
  @catalog_name = j_obj.catalog_name
63
60
 
64
- # conversion for recurring_billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
65
- @recurring_billing_mode = j_obj.recurring_billing_mode
66
- @recurring_billing_mode = @recurring_billing_mode.to_s.to_sym unless @recurring_billing_mode.nil?
67
-
68
61
  # conversion for standalone_plugin_catalogs [type = java.lang.Iterable]
69
62
  @standalone_plugin_catalogs = j_obj.standalone_plugin_catalogs
70
63
  tmp = []
@@ -22,7 +22,6 @@ module Killbill
22
22
  # But regardless, for performance reasons, we want to set these timestamps ourselves
23
23
  # See ActiveRecord::Timestamp
24
24
  current_time = Time.now.utc
25
- remove_sensitive_data_and_compact(extra_params)
26
25
  model.new({
27
26
  :api_call => api_call,
28
27
  :kb_account_id => kb_account_id,
@@ -44,7 +43,7 @@ module Killbill
44
43
  :success => response.success?,
45
44
  :created_at => current_time,
46
45
  :updated_at => current_time
47
- }.merge!(extra_params))
46
+ }.merge!(extra_params.compact)) # Don't override with nil values
48
47
  end
49
48
 
50
49
  def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, amount_in_cents, currency, extra_params = {}, model = Response)
@@ -160,9 +159,9 @@ module Killbill
160
159
  def self.search_where_clause(t, search_key)
161
160
  # Exact matches only
162
161
  where_clause = t[:kb_payment_id].eq(search_key)
163
- .or(t[:kb_payment_transaction_id].eq(search_key))
164
- .or(t[:message].eq(search_key))
165
- .or(t[:authorization].eq(search_key))
162
+ .or(t[:kb_payment_transaction_id].eq(search_key))
163
+ .or(t[:message].eq(search_key))
164
+ .or(t[:authorization].eq(search_key))
166
165
 
167
166
  # Only search successful payments and refunds
168
167
  where_clause = where_clause.and(t[:success].eq(true))
@@ -198,7 +197,7 @@ module Killbill
198
197
  pagination = ::Killbill::Plugin::Model::Pagination.new
199
198
  pagination.current_offset = offset
200
199
  pagination.total_nb_records = self.count_by_sql(self.search_query(search_key, kb_tenant_id))
201
- pagination.max_nb_records = self.max_nb_records
200
+ pagination.max_nb_records = self.where(:success => true).count
202
201
  pagination.next_offset = (!pagination.total_nb_records.nil? && offset + limit >= pagination.total_nb_records) ? nil : offset + limit
203
202
  # Reduce the limit if the specified value is larger than the number of records
204
203
  actual_limit = [pagination.max_nb_records, limit].min
@@ -208,20 +207,6 @@ module Killbill
208
207
  pagination
209
208
  end
210
209
 
211
- def self.remove_sensitive_data_and_compact(extra_params)
212
- extra_params.compact!
213
- extra_params.delete_if { |k, _| sensitive_fields.include?(k) }
214
- end
215
-
216
- # Override in your plugin if needed
217
- def self.sensitive_fields
218
- []
219
- end
220
-
221
- def self.max_nb_records
222
- self.where(:success => true).count
223
- end
224
-
225
210
  # Override in your plugin if needed
226
211
  def txn_id
227
212
  authorization
@@ -304,4 +289,4 @@ module Killbill
304
289
  end
305
290
  end
306
291
  end
307
- end
292
+ end
@@ -41,7 +41,7 @@ module Killbill
41
41
  cc_last_name = (overrides.delete(:cc_last_name) || (set_defaults ? 'Doe' : nil))
42
42
  cc_type = (overrides.delete(:cc_type) || (set_defaults ? 'Visa' : nil))
43
43
  cc_exp_month = (overrides.delete(:cc_exp_month) || (set_defaults ? 12 : nil))
44
- cc_exp_year = (overrides.delete(:cc_exp_year) || (set_defaults ? 2020 : nil))
44
+ cc_exp_year = (overrides.delete(:cc_exp_year) || (set_defaults ? 2017 : nil))
45
45
  cc_last_4 = (overrides.delete(:cc_last_4) || (set_defaults ? 4242 : nil))
46
46
  address1 = (overrides.delete(:address1) || (set_defaults ? '5, oakriu road' : nil))
47
47
  address2 = (overrides.delete(:address2) || (set_defaults ? 'apt. 298' : nil))
@@ -49,15 +49,15 @@ module Killbill
49
49
  end
50
50
  end
51
51
 
52
- def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
52
+ def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
53
53
  gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
54
54
  gateway.authorize(amount_in_cents, payment_source, options)
55
55
  end
56
56
 
57
- dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
57
+ dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
58
58
  end
59
59
 
60
- def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
60
+ def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
61
61
  gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
62
62
  gateway.capture(amount_in_cents, linked_transaction.txn_id, options)
63
63
  end
@@ -69,18 +69,18 @@ module Killbill
69
69
  last_authorization
70
70
  end
71
71
 
72
- dispatch_to_gateways(:capture, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
72
+ dispatch_to_gateways(:capture, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc)
73
73
  end
74
74
 
75
- def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
75
+ def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
76
76
  gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
77
77
  gateway.purchase(amount_in_cents, payment_source, options)
78
78
  end
79
79
 
80
- dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
80
+ dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
81
81
  end
82
82
 
83
- def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context, extra_params = {})
83
+ def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
84
84
  gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
85
85
  authorization = linked_transaction.txn_id
86
86
 
@@ -99,18 +99,18 @@ module Killbill
99
99
  @transaction_model.find_candidate_transaction_for_void(kb_payment_id, context.tenant_id, linked_transaction_type)
100
100
  end
101
101
 
102
- dispatch_to_gateways(:void, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, nil, nil, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
102
+ dispatch_to_gateways(:void, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, nil, nil, properties, context, gateway_call_proc, linked_transaction_proc)
103
103
  end
104
104
 
105
- def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
105
+ def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
106
106
  gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
107
107
  gateway.credit(amount_in_cents, payment_source, options)
108
108
  end
109
109
 
110
- dispatch_to_gateways(:credit, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
110
+ dispatch_to_gateways(:credit, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
111
111
  end
112
112
 
113
- def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
113
+ def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
114
114
  gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
115
115
  gateway.refund(amount_in_cents, linked_transaction.txn_id, options)
116
116
  end
@@ -123,7 +123,7 @@ module Killbill
123
123
  transaction
124
124
  end
125
125
 
126
- dispatch_to_gateways(:refund, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
126
+ dispatch_to_gateways(:refund, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc)
127
127
  end
128
128
 
129
129
  def get_payment_info(kb_account_id, kb_payment_id, properties, context)
@@ -1,3 +1,3 @@
1
1
  module Killbill
2
- VERSION = '8.3.6'
2
+ VERSION = '9.2.0'
3
3
  end
@@ -135,13 +135,6 @@ describe Killbill::Plugin::ActiveMerchant::ActiveRecord::Response do
135
135
  ::Killbill::Test::TestResponse.from_kb_payment_id(::Killbill::Test::TestTransaction, kb_payment_id3, kb_tenant_id).size == 0
136
136
  end
137
137
 
138
- it 'should filter out sensitive parameter if specified' do
139
- extra_params = {:email => "test.test", :payer_id => "test"}
140
- ::Killbill::Test::TestResponse.send(:remove_sensitive_data_and_compact, extra_params)
141
- extra_params[:email].should be_nil
142
- extra_params[:payer_id].should == "test"
143
- end
144
-
145
138
  it 'should generate the right SQL query' do
146
139
  # Check count query (search query numeric)
147
140
  expected_query = "SELECT COUNT(DISTINCT #{q('test_responses')}.#{q('id')}) FROM #{q('test_responses')} WHERE (((#{q('test_responses')}.#{q('kb_payment_id')} = '1234' OR #{q('test_responses')}.#{q('kb_payment_transaction_id')} = '1234') OR #{q('test_responses')}.#{q('message')} = '1234') OR #{q('test_responses')}.#{q('authorization')} = '1234') AND #{q('test_responses')}.#{q('success')} = #{qtrue} AND #{q('test_responses')}.#{q('kb_tenant_id')} = '11-22-33'"
@@ -6,10 +6,6 @@ module Killbill #:nodoc:
6
6
 
7
7
  has_one :test_transaction
8
8
 
9
- def self.sensitive_fields
10
- [:email]
11
- end
12
-
13
9
  end
14
10
  end
15
11
  end
@@ -19,6 +19,7 @@ describe Killbill::Plugin do
19
19
  @account.locale="locale"
20
20
  @account.address1="address1"
21
21
  @account.time_zone=:UTC
22
+ @account.reference_time=DateTime.now
22
23
  @account.city="San Francisco"
23
24
 
24
25
  @context = @kb_apis.create_context
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.3.6
4
+ version: 9.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kill Bill core team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-27 00:00:00.000000000 Z
11
+ date: 2018-01-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -317,8 +317,8 @@ executables:
317
317
  extensions: []
318
318
  extra_rdoc_files: []
319
319
  files:
320
- - ".circleci/config.yml"
321
320
  - ".gitignore"
321
+ - ".travis.yml"
322
322
  - Gemfile
323
323
  - Gemfile.head
324
324
  - Gemfile.lock
@@ -380,6 +380,7 @@ files:
380
380
  - lib/killbill/gen/api/base_entitlement_with_add_ons_specifier.rb
381
381
  - lib/killbill/gen/api/billing_exception_base.rb
382
382
  - lib/killbill/gen/api/block.rb
383
+ - lib/killbill/gen/api/block_price_override.rb
383
384
  - lib/killbill/gen/api/blockable.rb
384
385
  - lib/killbill/gen/api/blocking_api_exception.rb
385
386
  - lib/killbill/gen/api/blocking_state.rb
@@ -410,6 +411,7 @@ files:
410
411
  - lib/killbill/gen/api/default_node_command_metadata.rb
411
412
  - lib/killbill/gen/api/dry_run_arguments.rb
412
413
  - lib/killbill/gen/api/duration.rb
414
+ - lib/killbill/gen/api/email_notification.rb
413
415
  - lib/killbill/gen/api/entitlement.rb
414
416
  - lib/killbill/gen/api/entitlement_ao_status_dry_run.rb
415
417
  - lib/killbill/gen/api/entitlement_api.rb
@@ -446,6 +448,12 @@ files:
446
448
  - lib/killbill/gen/api/node_info.rb
447
449
  - lib/killbill/gen/api/osgi_killbill.rb
448
450
  - lib/killbill/gen/api/osgi_plugin_properties.rb
451
+ - lib/killbill/gen/api/overdue_api.rb
452
+ - lib/killbill/gen/api/overdue_api_exception.rb
453
+ - lib/killbill/gen/api/overdue_condition.rb
454
+ - lib/killbill/gen/api/overdue_config.rb
455
+ - lib/killbill/gen/api/overdue_state.rb
456
+ - lib/killbill/gen/api/overdue_states_account.rb
449
457
  - lib/killbill/gen/api/pagination.rb
450
458
  - lib/killbill/gen/api/payment.rb
451
459
  - lib/killbill/gen/api/payment_api.rb
@@ -477,7 +485,6 @@ files:
477
485
  - lib/killbill/gen/api/rate.rb
478
486
  - lib/killbill/gen/api/record_id_api.rb
479
487
  - lib/killbill/gen/api/recurring.rb
480
- - lib/killbill/gen/api/refund.rb
481
488
  - lib/killbill/gen/api/require_gen.rb
482
489
  - lib/killbill/gen/api/rolled_up_unit.rb
483
490
  - lib/killbill/gen/api/rolled_up_usage.rb
@@ -504,11 +511,14 @@ files:
504
511
  - lib/killbill/gen/api/tenant_kv.rb
505
512
  - lib/killbill/gen/api/tenant_user_api.rb
506
513
  - lib/killbill/gen/api/tier.rb
514
+ - lib/killbill/gen/api/tier_price_override.rb
507
515
  - lib/killbill/gen/api/tiered_block.rb
516
+ - lib/killbill/gen/api/tiered_block_price_override.rb
508
517
  - lib/killbill/gen/api/unit.rb
509
518
  - lib/killbill/gen/api/unit_usage_record.rb
510
519
  - lib/killbill/gen/api/usage.rb
511
520
  - lib/killbill/gen/api/usage_api_exception.rb
521
+ - lib/killbill/gen/api/usage_price_override.rb
512
522
  - lib/killbill/gen/api/usage_record.rb
513
523
  - lib/killbill/gen/api/usage_user_api.rb
514
524
  - lib/killbill/gen/plugin-api/blocking_state_metadata.rb
@@ -522,8 +532,11 @@ files:
522
532
  - lib/killbill/gen/plugin-api/ext_bus_event.rb
523
533
  - lib/killbill/gen/plugin-api/gateway_notification.rb
524
534
  - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
535
+ - lib/killbill/gen/plugin-api/invoice_payment_metadata.rb
525
536
  - lib/killbill/gen/plugin-api/invoice_plugin_api.rb
537
+ - lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb
526
538
  - lib/killbill/gen/plugin-api/notification_plugin_api.rb
539
+ - lib/killbill/gen/plugin-api/notification_plugin_api_retry_exception.rb
527
540
  - lib/killbill/gen/plugin-api/on_failure_entitlement_result.rb
528
541
  - lib/killbill/gen/plugin-api/on_failure_payment_control_result.rb
529
542
  - lib/killbill/gen/plugin-api/on_success_entitlement_result.rb
data/.circleci/config.yml DELETED
@@ -1,138 +0,0 @@
1
- defaults: &defaults
2
- working_directory: ~/repo
3
- environment:
4
- JRUBY_OPTS: -J-Xmx1024M
5
-
6
- version: 2
7
- jobs:
8
- build-jruby-1.7.26:
9
- <<: *defaults
10
- docker:
11
- - image: killbill/kbbuild:0.5.0
12
- steps:
13
- - checkout
14
- - restore_cache:
15
- key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
16
- - run:
17
- name: Install gem dependencies
18
- command: |
19
- bundle install --jobs=4 --retry=3 --path=vendor/bundle
20
- bundle exec jbundle install
21
- - save_cache:
22
- paths:
23
- - ~/.m2
24
- - .bundle
25
- - .jbundler
26
- - vendor/bundle
27
- key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
28
-
29
- test-mysql-jruby-1.7.26:
30
- <<: *defaults
31
- docker:
32
- - image: killbill/kbbuild:0.5.0
33
- - image: killbill/mariadb:0.19
34
- environment:
35
- - MYSQL_ROOT_PASSWORD=root
36
- steps:
37
- - checkout
38
- - restore_cache:
39
- key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
40
- - run:
41
- name: Setup DDL
42
- command: |
43
- set +e
44
- count=0
45
- until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do
46
- if [[ "$count" == "25" ]]; then
47
- exit 1
48
- fi
49
- (( count++ ))
50
- printf '.'
51
- sleep 5
52
- done
53
- set -e
54
- mysql -h 127.0.0.1 -u root --password=root -e 'create database killbill_test;'
55
- - run:
56
- name: Run tests
57
- command: |
58
- mkdir /tmp/test-results
59
- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
60
- AR_ADAPTER='mariadb' AR_USERNAME='root' AR_PASSWORD='' AR_DATABASE='killbill_test' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
61
- - store_test_results:
62
- path: /tmp/test-results
63
- - store_artifacts:
64
- path: /tmp/test-results
65
- destination: test-results
66
-
67
- test-postgresql-jruby-1.7.26:
68
- <<: *defaults
69
- docker:
70
- - image: killbill/kbbuild:0.5.0
71
- - image: killbill/postgresql:0.19
72
- environment:
73
- - POSTGRES_PASSWORD=postgres
74
- steps:
75
- - checkout
76
- - restore_cache:
77
- key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
78
- - run:
79
- name: Setup DDL
80
- command: |
81
- set +e
82
- count=0
83
- until $(psql -h 127.0.0.1 -U postgres -p 5432 -l > /dev/null); do
84
- if [[ "$count" == "25" ]]; then
85
- exit 1
86
- fi
87
- (( count++ ))
88
- printf '.'
89
- sleep 5
90
- done
91
- set -e
92
- psql -h 127.0.0.1 -U postgres -p 5432 -c 'create database killbill_test;'
93
- - run:
94
- name: Run tests
95
- command: |
96
- mkdir /tmp/test-results
97
- AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
98
- AR_ADAPTER='postgresql' AR_USERNAME='postgres' AR_DATABASE='killbill_test' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
99
- - store_test_results:
100
- path: /tmp/test-results
101
- - store_artifacts:
102
- path: /tmp/test-results
103
- destination: test-results
104
-
105
- test-h2-jruby-1.7.26:
106
- <<: *defaults
107
- docker:
108
- - image: killbill/kbbuild:0.5.0
109
- steps:
110
- - checkout
111
- - restore_cache:
112
- key: v4-dependencies-jruby-1.7.26-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
113
- - run:
114
- name: Run tests
115
- command: |
116
- mkdir /tmp/test-results
117
- AR_ADAPTER='sqlite3' AR_DATABASE='test.db' bundle exec rake test:spec | tee /tmp/test-results/test.txt 2>&1
118
- AR_ADAPTER='sqlite3' AR_DATABASE='test.db' bundle exec rake test:remote:spec | tee /tmp/test-results/remote-test.txt 2>&1
119
- - store_test_results:
120
- path: /tmp/test-results
121
- - store_artifacts:
122
- path: /tmp/test-results
123
- destination: test-results
124
-
125
- workflows:
126
- version: 2
127
- build-and-test:
128
- jobs:
129
- - build-jruby-1.7.26
130
- #- test-mysql-jruby-1.7.26:
131
- # requires:
132
- # - build-jruby-1.7.26
133
- - test-postgresql-jruby-1.7.26:
134
- requires:
135
- - build-jruby-1.7.26
136
- - test-h2-jruby-1.7.26:
137
- requires:
138
- - build-jruby-1.7.26