killbill-client 3.3.1 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03e77573407a78aef2165e380bc7e1d0f672b53d
-  data.tar.gz: 27e12ebd3c57f128cdd181c16e77e19d4be9daa5
+  metadata.gz: b5092e81bd027f03e605324305a7d002e500af57
+  data.tar.gz: 132d0769150bfdaa56913ac9363a826e25a4787b
 SHA512:
-  metadata.gz: 88715661ffaa19c983d3c0ba9a091cbd4c8cd9a242675de0e44a43c8d9cbf6aad172620a1902d545c6d6ec0964cf161bcb5793b7f69f7a2cb50cc8315db2994b
-  data.tar.gz: 5d199dffd09feffc3a02c83b9e886c29ba84c6d8317603146eff9e931d708cb69aed72c763b9ac5c38de46ac6632ad697c9c4ce94ceee83128fe2cfbdddf3ad1
+  metadata.gz: 2898a7932bd29750e97aebbb2d814e850a8f0991a7be153d3cbb0da8d90d0880fc31852b704b893d733ee7be0f60e49576ddbda4860ceadcb1bfa2f4d0abdff4
+  data.tar.gz: f8710f1d73525c46938e6dceb3b81a2d7bf1795c02532b567f9fa94990540cdea4baf24f2a283be12ac86fa7144ddfaaf788b994aa55cb0ca8b226ac9bbc2adf

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "work-for-release-0.23.x"

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,29 @@
+name: "CodeQL"
+
+on:
+  - push
+  - workflow_dispatch
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/README.md

@@ -12,6 +12,7 @@ Kill Bill compatibility
 | 1.x.y          | 0.18.z            |
 | 2.x.y          | 0.20.z            |
 | 3.x.y          | 0.22.z            |
+| 4.x.y          | 0.24.z            |
 
 Installation
 ------------
@@ -25,7 +26,7 @@ gem install killbill-client
 Alternatively, add the dependency in your Gemfile:
 
 ```
-gem 'killbill-client', '~> 1.0'
+gem 'killbill-client'
 ```
 
 Authentication

data/killbill_client.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.8.6'
 
-  s.license = 'Apache License (2.0)'
+  s.license = 'Apache-2.0'
 
   s.author   = 'Killbill core team'
   s.email    = 'killbilling-users@googlegroups.com'
@@ -39,11 +39,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options << '--exclude' << '.'
 
-  if RUBY_VERSION < '2.0.0'
-    s.add_dependency 'json', '>= 1.2.0', '< 2.0.0'
-  end
-
   s.add_development_dependency 'gem-release', '~> 2.2'
-  s.add_development_dependency 'rake', '>= 10.0.0', '< 11.0.0'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.4'
 end

data/lib/killbill_client/models/account.rb

@@ -146,6 +146,7 @@ module KillBillClient
       def invoices(options = {})
         self.class.get "#{KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoices",
                        {
+                           :includeInvoiceComponents => true
                        },
                        options,
                        Invoice

data/lib/killbill_client/models/catalog.rb

@@ -7,43 +7,51 @@ module KillBillClient
       KILLBILL_API_CATALOG_PREFIX = "#{KILLBILL_API_PREFIX}/catalog"
 
       class << self
-        def simple_catalog(options = {})
+        def simple_catalog(account_id = nil, options = {})
           get "#{KILLBILL_API_CATALOG_PREFIX}",
-              {},
+              {
+                :accountId => account_id
+              },
               options
         end
 
-        def available_addons(base_product_name, options = {})
+        def available_addons(base_product_name, account_id = nil, options = {})
           get "#{KILLBILL_API_CATALOG_PREFIX}/availableAddons",
               {
-                  :baseProductName => base_product_name
+                  :baseProductName => base_product_name,
+                  :accountId => account_id
               },
               options,
               PlanDetail
         end
 
-        def available_base_plans(options = {})
+        def available_base_plans(account_id = nil, options = {})
           get "#{KILLBILL_API_CATALOG_PREFIX}/availableBasePlans",
-              {},
+              {
+                :accountId => account_id
+              },
               options,
               PlanDetail
         end
 
-        def get_tenant_catalog_versions(options = {})
+        def get_tenant_catalog_versions(account_id = nil, options = {})
 
           require_multi_tenant_options!(options, "Retrieving catalog versions is only supported in multi-tenant mode")
 
           get "#{KILLBILL_API_CATALOG_PREFIX}/versions",
-              {},
+              {
+                :accountId => account_id
+              },
               options
         end
 
-        def get_tenant_catalog_xml(requested_date = nil, options = {})
+        def get_tenant_catalog_xml(requested_date = nil, account_id = nil, options = {})
 
           require_multi_tenant_options!(options, "Retrieving a catalog is only supported in multi-tenant mode")
 
           params = {}
           params[:requestedDate] = requested_date if requested_date
+          params[:account_id] = account_id if account_id
 
           get "#{KILLBILL_API_CATALOG_PREFIX}/xml",
               params,
@@ -55,12 +63,13 @@ module KillBillClient
 
         end
 
-        def get_tenant_catalog_json(requested_date = nil, options = {})
+        def get_tenant_catalog_json(requested_date = nil, account_id = nil, options = {})
 
           require_multi_tenant_options!(options, "Retrieving a catalog is only supported in multi-tenant mode")
 
           params = {}
           params[:requestedDate] = requested_date if requested_date
+          params[:account_id] = account_id if account_id
 
           get KILLBILL_API_CATALOG_PREFIX,
               params,
@@ -139,7 +148,7 @@ module KillBillClient
                    :reason => reason,
                    :comment => comment,
                }.merge(options)
-          get_tenant_catalog_json(nil, options)
+          get_tenant_catalog_json(nil, nil, options)
         end
 
 

data/lib/killbill_client/version.rb

@@ -1,3 +1,3 @@
 module KillBillClient
-  VERSION = '3.3.1'
+  VERSION = '4.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -28,22 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -65,10 +59,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/CONTRIBUTING.md"
 - ".github/FUNDING.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
 - Gemfile
@@ -217,7 +212,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://www.killbilling.org
 licenses:
-- Apache License (2.0)
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options:

data/.circleci/config.yml

@@ -1,277 +0,0 @@
-defaults: &defaults
-  working_directory: ~/repo
-  environment:
-    JRUBY_OPTS: --2.0 -J-Xmx1024M
-
-version: 2
-jobs:
-  build-ruby-2.2.2:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.6.0
-    steps:
-      - checkout
-      - restore_cache:
-          key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-      - run:
-          name: Install gem dependencies
-          command: |
-            source /usr/share/rvm/scripts/rvm
-            rvm use ruby-2.2.2
-            bundle install --jobs=4 --retry=3 --path=vendor/bundle
-      - save_cache:
-          paths:
-            - Gemfile.lock
-            - .bundle
-            - vendor/bundle
-          key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-
-  test-mysql-ruby-2.2.2:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.6.0
-      - image: killbill/killbill:0.21.9
-      - image: killbill/mariadb:0.21
-        environment:
-        - MYSQL_ROOT_PASSWORD=root
-    steps:
-      - checkout
-      - restore_cache:
-          key: v2-dependencies-ruby-2.2.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-      - run:
-          name: Setup DDL
-          command: |
-            set +e
-            count=0
-            until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-              printf '.'
-              sleep 5
-            done
-            set -e
-      - run:
-          name: Setup Kill Bill
-          command: |
-            set +e
-            count=0
-            until $(curl --output /dev/null --silent --fail http://127.0.0.1:8080/1.0/healthcheck); do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-
-              printf '.'
-              sleep 5
-            done
-            set -e
-            curl -v \
-                 -X POST \
-                 -u admin:password \
-                 -H 'Content-Type: application/json' \
-                 -H 'X-Killbill-CreatedBy: CircleCI' \
-                 -d '{"apiKey": "bob", "apiSecret": "lazar"}' \
-                 "http://127.0.0.1:8080/1.0/kb/tenants?useGlobalDefault=true"
-      - run:
-          name: Run tests
-          command: |
-            mkdir /tmp/test-results
-            source /usr/share/rvm/scripts/rvm
-            rvm use ruby-2.2.2
-            bundle exec rspec --format documentation \
-                              --out /tmp/test-results/rspec.txt \
-                              $(circleci tests glob "spec/**/*_spec.rb")
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-
-  build-ruby-2.4.2:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.6.0
-    steps:
-      - checkout
-      - restore_cache:
-          key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-      - run:
-          name: Install gem dependencies
-          command: |
-            source /usr/share/rvm/scripts/rvm
-            rvm use ruby-2.4.2
-            bundle install --jobs=4 --retry=3 --path=vendor/bundle
-      - save_cache:
-          paths:
-            - Gemfile.lock
-            - .bundle
-            - vendor/bundle
-          key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-
-  test-mysql-ruby-2.4.2:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.6.0
-      - image: killbill/killbill:0.21.9
-      - image: killbill/mariadb:0.21
-        environment:
-        - MYSQL_ROOT_PASSWORD=root
-    steps:
-      - checkout
-      - restore_cache:
-          key: v2-dependencies-ruby-2.4.2-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-      - run:
-          name: Setup DDL
-          command: |
-            set +e
-            count=0
-            until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-              printf '.'
-              sleep 5
-            done
-            set -e
-      - run:
-          name: Setup Kill Bill
-          command: |
-            set +e
-            count=0
-            until $(curl --output /dev/null --silent --fail http://127.0.0.1:8080/1.0/healthcheck); do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-
-              printf '.'
-              sleep 5
-            done
-            set -e
-            curl -v \
-                 -X POST \
-                 -u admin:password \
-                 -H 'Content-Type: application/json' \
-                 -H 'X-Killbill-CreatedBy: CircleCI' \
-                 -d '{"apiKey": "bob", "apiSecret": "lazar"}' \
-                 "http://127.0.0.1:8080/1.0/kb/tenants?useGlobalDefault=true"
-      - run:
-          name: Run tests
-          command: |
-            mkdir /tmp/test-results
-            source /usr/share/rvm/scripts/rvm
-            rvm use ruby-2.4.2
-            bundle exec rspec --format documentation \
-                              --out /tmp/test-results/rspec.txt \
-                              $(circleci tests glob "spec/**/*_spec.rb")
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-
-  build-jruby-9.1.14.0:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.6.0
-    steps:
-      - checkout
-      - restore_cache:
-          key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-      - run:
-          name: Install gem dependencies
-          command: |
-            source /usr/share/rvm/scripts/rvm
-            rvm use jruby-9.1.14.0
-            bundle install --jobs=4 --retry=3 --path=vendor/bundle
-      - save_cache:
-          paths:
-            - Gemfile.lock
-            - .bundle
-            - vendor/bundle
-          key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-
-  test-mysql-jruby-9.1.14.0:
-    <<: *defaults
-    docker:
-      - image: killbill/kbbuild:0.6.0
-      - image: killbill/killbill:0.21.9
-      - image: killbill/mariadb:0.21
-        environment:
-        - MYSQL_ROOT_PASSWORD=root
-    steps:
-      - checkout
-      - restore_cache:
-          key: v2-dependencies-jruby-9.1.14.0-{{ .Branch }}-{{ checksum "killbill_client.gemspec" }}
-      - run:
-          name: Setup DDL
-          command: |
-            set +e
-            count=0
-            until mysqladmin ping -h 127.0.0.1 -u root --password=root --silent; do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-              printf '.'
-              sleep 5
-            done
-            set -e
-      - run:
-          name: Setup Kill Bill
-          command: |
-            set +e
-            count=0
-            until $(curl --output /dev/null --silent --fail http://127.0.0.1:8080/1.0/healthcheck); do
-              if [[ "$count" == "25" ]]; then
-                exit 1
-              fi
-              (( count++ ))
-
-              printf '.'
-              sleep 5
-            done
-            set -e
-            curl -v \
-                 -X POST \
-                 -u admin:password \
-                 -H 'Content-Type: application/json' \
-                 -H 'X-Killbill-CreatedBy: CircleCI' \
-                 -d '{"apiKey": "bob", "apiSecret": "lazar"}' \
-                 "http://127.0.0.1:8080/1.0/kb/tenants?useGlobalDefault=true"
-      - run:
-          name: Run tests
-          command: |
-            mkdir /tmp/test-results
-            source /usr/share/rvm/scripts/rvm
-            rvm use jruby-9.1.14.0
-            bundle exec rspec --format documentation \
-                              --out /tmp/test-results/rspec.txt \
-                              $(circleci tests glob "spec/**/*_spec.rb")
-      - store_test_results:
-          path: /tmp/test-results
-      - store_artifacts:
-          path: /tmp/test-results
-          destination: test-results
-workflows:
-  version: 2
-  build-and-test:
-    jobs:
-      # Self-contained KPM
-      - build-ruby-2.2.2
-      # Kaui and other gems
-      - build-ruby-2.4.2
-      # Self-contained Kaui
-      - build-jruby-9.1.14.0
-      - test-mysql-ruby-2.2.2:
-          requires:
-            - build-ruby-2.2.2
-      - test-mysql-ruby-2.4.2:
-          requires:
-            - build-ruby-2.4.2
-      - test-mysql-jruby-9.1.14.0:
-          requires:
-            - build-jruby-9.1.14.0