From 81a1d29b481c2846fc5192855ffe46a31388210b Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Mon, 6 May 2024 09:37:15 +1000 Subject: [PATCH 01/14] add Gemfile.lock file for Snyk scan --- .gitignore | 1 - Gemfile.lock | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index e34dc540..d87ee591 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ spec/fixtures/cassettes spec/fixtures/credentials.yml coverage/** .yardoc/** -Gemfile.lock .ruby-version vendor/bundle/** pkg/** diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..a52bd06d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,162 @@ +PATH + remote: . + specs: + zendesk_api (3.0.5) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.7) + builder (3.2.4) + bump (0.10.0) + byebug (11.1.3) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml + crass (1.0.6) + diff-lcs (1.5.1) + drb (2.2.1) + erubi (1.12.0) + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (3.0.2) + hashdiff (1.1.0) + hashie (5.0.0) + i18n (1.14.4) + concurrent-ruby (~> 1.0) + inflection (1.0.0) + jaro_winkler (1.5.6) + json (2.7.2) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mini_mime (1.1.5) + mini_portile2 (2.8.6) + minitest (5.22.3) + multipart-post (2.4.0) + mutex_m (0.2.0) + nokogiri (1.15.6) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + public_suffix (5.0.5) + racc (1.7.3) + rack (3.0.10) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.2.1) + rexml (3.2.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + rubocop (0.79.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.7.0.1) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + scrub_rb (1.0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.6.1) + vcr (6.2.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.36) + +PLATFORMS + ruby + +DEPENDENCIES + actionpack (>= 5.2.4.6) + addressable (>= 2.8.0) + bump + byebug + jruby-openssl + json (>= 2.3.0) + mini_mime + rake + rspec (= 3.10.0) + rspec-core (= 3.10.1) + rspec-expectations (= 3.10.2) + rspec-mocks (= 3.10.2) + rspec-support (= 3.10.3) + rubocop (~> 0.79.0) + scrub_rb + vcr (~> 6.0) + webmock + yard + zendesk_api! + +BUNDLED WITH + 2.1.4 From 815dc57dadc65d3482e9b28c650925885fae58c6 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Mon, 6 May 2024 18:17:27 +1000 Subject: [PATCH 02/14] upgrade Ruby to version 3.1.0 --- .ruby-version | 2 +- Gemfile.lock | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.ruby-version b/.ruby-version index 49cdd668..fd2a0186 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 +3.1.0 diff --git a/Gemfile.lock b/Gemfile.lock index a52bd06d..0b7665d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,13 +55,12 @@ GEM diff-lcs (1.5.1) drb (2.2.1) erubi (1.12.0) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.0.2) + faraday-net_http (3.1.0) + net-http hashdiff (1.1.0) hashie (5.0.0) i18n (1.14.4) @@ -73,12 +72,12 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.6) minitest (5.22.3) multipart-post (2.4.0) mutex_m (0.2.0) - nokogiri (1.15.6) - mini_portile2 (~> 2.8.2) + net-http (0.4.1) + uri + nokogiri (1.16.4-arm64-darwin) racc (~> 1.4) parallel (1.24.0) parser (3.3.1.0) @@ -122,11 +121,11 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) scrub_rb (1.0.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (1.6.1) + uri (0.13.0) vcr (6.2.0) webmock (3.23.0) addressable (>= 2.8.0) @@ -135,7 +134,7 @@ GEM yard (0.9.36) PLATFORMS - ruby + arm64-darwin-23 DEPENDENCIES actionpack (>= 5.2.4.6) @@ -159,4 +158,4 @@ DEPENDENCIES zendesk_api! BUNDLED WITH - 2.1.4 + 2.3.3 From acd4e985ee0c9f0e83dc7113656f66779e61461f Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Tue, 7 May 2024 09:21:58 +1000 Subject: [PATCH 03/14] bundle lock --add-platform x86_64-linux --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 0b7665d3..4e809594 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,6 +79,8 @@ GEM uri nokogiri (1.16.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.4-x86_64-linux) + racc (~> 1.4) parallel (1.24.0) parser (3.3.1.0) ast (~> 2.4.1) @@ -135,6 +137,7 @@ GEM PLATFORMS arm64-darwin-23 + x86_64-linux DEPENDENCIES actionpack (>= 5.2.4.6) From 2d37ee5798c7cbba3b4d9599c5daf5bfc44576cd Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Tue, 7 May 2024 10:01:40 +1000 Subject: [PATCH 04/14] upgrade Robocop target version to 3.1 --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2a3baf2d..ddc38932 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ inherit_from: .rubocop_todo.yml AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.1 DisplayCopNames: true Exclude: - .git/**/* From db649a43b5c7ec77836f7921b59e7d57be69660d Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Tue, 7 May 2024 10:05:38 +1000 Subject: [PATCH 05/14] Upgrade Robocop --- Gemfile | 2 +- Gemfile.lock | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 969434e5..2b18d72c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem "yard" gem "json", ">= 2.3.0", platforms: :ruby gem "scrub_rb" -gem "rubocop", "~> 0.79.0", require: false # Handling of Ruby 2.7 syntax +gem "rubocop", "~> 1.63.0", require: false # Handling of Ruby 2.7 syntax group :test do gem "webmock" diff --git a/Gemfile.lock b/Gemfile.lock index 4e809594..0fd8602b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,8 +66,8 @@ GEM i18n (1.14.4) concurrent-ruby (~> 1.0) inflection (1.0.0) - jaro_winkler (1.5.6) json (2.7.2) + language_server-protocol (3.17.0.3) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -101,6 +101,7 @@ GEM nokogiri (~> 1.14) rainbow (3.1.1) rake (13.2.1) + regexp_parser (2.9.0) rexml (3.2.6) rspec (3.10.0) rspec-core (~> 3.10.0) @@ -115,18 +116,24 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) - rubocop (0.79.0) - jaro_winkler (~> 1.5.1) + rubocop (1.63.4) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) ruby-progressbar (1.13.0) scrub_rb (1.0.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (1.6.1) + unicode-display_width (2.5.0) uri (0.13.0) vcr (6.2.0) webmock (3.23.0) @@ -153,7 +160,7 @@ DEPENDENCIES rspec-expectations (= 3.10.2) rspec-mocks (= 3.10.2) rspec-support (= 3.10.3) - rubocop (~> 0.79.0) + rubocop (~> 1.63.0) scrub_rb vcr (~> 6.0) webmock From 93bdbdcd71afd6c2dbc4c28dfed6a5058a5f6a84 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Wed, 8 May 2024 16:02:37 +1000 Subject: [PATCH 06/14] use different gemfile for different Ruby versions --- .rubocop.yml | 2 +- .ruby-version | 2 +- Gemfile => Gemfile.ruby-2-7 | 2 +- Gemfile.lock => Gemfile.ruby-2-7.lock | 51 +++++++++++---------------- 4 files changed, 24 insertions(+), 33 deletions(-) rename Gemfile => Gemfile.ruby-2-7 (92%) rename Gemfile.lock => Gemfile.ruby-2-7.lock (79%) diff --git a/.rubocop.yml b/.rubocop.yml index ddc38932..2a3baf2d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ inherit_from: .rubocop_todo.yml AllCops: - TargetRubyVersion: 3.1 + TargetRubyVersion: 2.7 DisplayCopNames: true Exclude: - .git/**/* diff --git a/.ruby-version b/.ruby-version index fd2a0186..49cdd668 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.0 +2.7.6 diff --git a/Gemfile b/Gemfile.ruby-2-7 similarity index 92% rename from Gemfile rename to Gemfile.ruby-2-7 index 2b18d72c..969434e5 100644 --- a/Gemfile +++ b/Gemfile.ruby-2-7 @@ -8,7 +8,7 @@ gem "yard" gem "json", ">= 2.3.0", platforms: :ruby gem "scrub_rb" -gem "rubocop", "~> 1.63.0", require: false # Handling of Ruby 2.7 syntax +gem "rubocop", "~> 0.79.0", require: false # Handling of Ruby 2.7 syntax group :test do gem "webmock" diff --git a/Gemfile.lock b/Gemfile.ruby-2-7.lock similarity index 79% rename from Gemfile.lock rename to Gemfile.ruby-2-7.lock index 0fd8602b..5e2c96fa 100644 --- a/Gemfile.lock +++ b/Gemfile.ruby-2-7.lock @@ -42,7 +42,7 @@ GEM public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) builder (3.2.4) bump (0.10.0) byebug (11.1.3) @@ -55,31 +55,30 @@ GEM diff-lcs (1.5.1) drb (2.2.1) erubi (1.12.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.1.0) - net-http + faraday-net_http (3.0.2) hashdiff (1.1.0) hashie (5.0.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) inflection (1.0.0) + jaro_winkler (1.5.6) json (2.7.2) - language_server-protocol (3.17.0.3) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mini_mime (1.1.5) + mini_portile2 (2.8.6) minitest (5.22.3) - multipart-post (2.4.0) + multipart-post (2.4.1) mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.4-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.15.6) + mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.24.0) parser (3.3.1.0) @@ -101,7 +100,6 @@ GEM nokogiri (~> 1.14) rainbow (3.1.1) rake (13.2.1) - regexp_parser (2.9.0) rexml (3.2.6) rspec (3.10.0) rspec-core (~> 3.10.0) @@ -116,25 +114,19 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) - rubocop (1.63.4) - json (~> 2.3) - language_server-protocol (>= 3.17.0) + rubocop (0.79.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 3.3.0.2) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) + unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) scrub_rb (1.0.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) + unicode-display_width (1.6.1) vcr (6.2.0) webmock (3.23.0) addressable (>= 2.8.0) @@ -143,8 +135,7 @@ GEM yard (0.9.36) PLATFORMS - arm64-darwin-23 - x86_64-linux + ruby DEPENDENCIES actionpack (>= 5.2.4.6) @@ -160,7 +151,7 @@ DEPENDENCIES rspec-expectations (= 3.10.2) rspec-mocks (= 3.10.2) rspec-support (= 3.10.3) - rubocop (~> 1.63.0) + rubocop (~> 0.79.0) scrub_rb vcr (~> 6.0) webmock @@ -168,4 +159,4 @@ DEPENDENCIES zendesk_api! BUNDLED WITH - 2.3.3 + 2.1.4 From f37dd7ba949232e78c4af2b360a33bafbfe3e2b1 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Thu, 9 May 2024 17:04:19 +1000 Subject: [PATCH 07/14] use different gemfiles for different Ruby versions --- .github/workflows/main.yml | 25 ++- Gemfile.ruby-2-7 => Gemfile.2.7 | 0 Gemfile.ruby-2-7.lock => Gemfile.2.7.lock | 0 Gemfile.3.0 | 38 +++++ Gemfile.3.0.lock | 165 ++++++++++++++++++++ Gemfile.3.1 | 38 +++++ Gemfile.3.1.lock | 165 ++++++++++++++++++++ Gemfile.3.2 | 38 +++++ Gemfile.3.2.lock | 180 ++++++++++++++++++++++ Gemfile.3.3 | 38 +++++ Gemfile.3.3.lock | 180 ++++++++++++++++++++++ Gemfile.jruby-9.4 | 38 +++++ Gemfile.jruby-9.4.lock | 164 ++++++++++++++++++++ 13 files changed, 1065 insertions(+), 4 deletions(-) rename Gemfile.ruby-2-7 => Gemfile.2.7 (100%) rename Gemfile.ruby-2-7.lock => Gemfile.2.7.lock (100%) create mode 100644 Gemfile.3.0 create mode 100644 Gemfile.3.0.lock create mode 100644 Gemfile.3.1 create mode 100644 Gemfile.3.1.lock create mode 100644 Gemfile.3.2 create mode 100644 Gemfile.3.2.lock create mode 100644 Gemfile.3.3 create mode 100644 Gemfile.3.3.lock create mode 100644 Gemfile.jruby-9.4 create mode 100644 Gemfile.jruby-9.4.lock diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7fa6129e..db35bbca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,28 @@ jobs: with: bundler-cache: true ruby-version: ${{ matrix.ruby }} - - name: Test and Lint + + - name: Custom cache gems + uses: actions/cache@v2 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-${{ matrix.ruby }} + restore-keys: | + ${{ runner.os }}-gems-${{ matrix.ruby }} + + - name: Install gems run: | - bundle install - bundle exec rake - bundle exec rubocop + BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle install --jobs 4 --retry 3 --path vendor/bundle + + - name: Test + run: | + BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle exec rake + + - name: Lint + if: matrix.ruby == '2.7' + run: | + BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop + spec-live: name: Spec live if: github.repository == 'zendesk/zendesk_api_client_rb' diff --git a/Gemfile.ruby-2-7 b/Gemfile.2.7 similarity index 100% rename from Gemfile.ruby-2-7 rename to Gemfile.2.7 diff --git a/Gemfile.ruby-2-7.lock b/Gemfile.2.7.lock similarity index 100% rename from Gemfile.ruby-2-7.lock rename to Gemfile.2.7.lock diff --git a/Gemfile.3.0 b/Gemfile.3.0 new file mode 100644 index 00000000..6e34be80 --- /dev/null +++ b/Gemfile.3.0 @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem "jruby-openssl", platforms: :jruby +gem "mini_mime" +gem "rake" +gem "addressable", ">= 2.8.0" +gem "yard" +gem "json", ">= 2.3.0", platforms: :ruby +gem "scrub_rb" + +gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax + +group :test do + gem "webmock" + gem "vcr", "~> 6.0" + + # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 + # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 + # NOTE: This affects previous build re-runs because we don't store Gemfile.lock + gem "rspec-support", "3.10.3" + gem "rspec-core", "3.10.1" + gem "rspec-expectations", "3.10.2" + gem "rspec-mocks", "3.10.2" + gem "rspec", "3.10.0" + + # only used for uploads testing + gem "actionpack", ">= 5.2.4.6" +end + +group :dev do + gem "bump" +end + +group :dev, :test do + gem "byebug", platforms: :ruby +end + +gemspec diff --git a/Gemfile.3.0.lock b/Gemfile.3.0.lock new file mode 100644 index 00000000..23e2e0e7 --- /dev/null +++ b/Gemfile.3.0.lock @@ -0,0 +1,165 @@ +PATH + remote: . + specs: + zendesk_api (3.0.5) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.2.4) + bump (0.10.0) + byebug (11.1.3) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml + crass (1.0.6) + diff-lcs (1.5.1) + drb (2.2.1) + erubi (1.12.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (3.1.0) + net-http + hashdiff (1.1.0) + hashie (5.0.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + inflection (1.0.0) + json (2.7.2) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mini_mime (1.1.5) + minitest (5.22.3) + multipart-post (2.4.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.4-arm64-darwin) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + public_suffix (5.0.5) + racc (1.7.3) + rack (3.0.10) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.0) + rexml (3.2.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + rubocop (1.13.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + scrub_rb (1.0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + uri (0.13.0) + vcr (6.2.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.36) + +PLATFORMS + arm64-darwin-23 + +DEPENDENCIES + actionpack (>= 5.2.4.6) + addressable (>= 2.8.0) + bump + byebug + jruby-openssl + json (>= 2.3.0) + mini_mime + rake + rspec (= 3.10.0) + rspec-core (= 3.10.1) + rspec-expectations (= 3.10.2) + rspec-mocks (= 3.10.2) + rspec-support (= 3.10.3) + rubocop (~> 1.13.0) + scrub_rb + vcr (~> 6.0) + webmock + yard + zendesk_api! + +BUNDLED WITH + 2.2.33 diff --git a/Gemfile.3.1 b/Gemfile.3.1 new file mode 100644 index 00000000..6e34be80 --- /dev/null +++ b/Gemfile.3.1 @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem "jruby-openssl", platforms: :jruby +gem "mini_mime" +gem "rake" +gem "addressable", ">= 2.8.0" +gem "yard" +gem "json", ">= 2.3.0", platforms: :ruby +gem "scrub_rb" + +gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax + +group :test do + gem "webmock" + gem "vcr", "~> 6.0" + + # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 + # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 + # NOTE: This affects previous build re-runs because we don't store Gemfile.lock + gem "rspec-support", "3.10.3" + gem "rspec-core", "3.10.1" + gem "rspec-expectations", "3.10.2" + gem "rspec-mocks", "3.10.2" + gem "rspec", "3.10.0" + + # only used for uploads testing + gem "actionpack", ">= 5.2.4.6" +end + +group :dev do + gem "bump" +end + +group :dev, :test do + gem "byebug", platforms: :ruby +end + +gemspec diff --git a/Gemfile.3.1.lock b/Gemfile.3.1.lock new file mode 100644 index 00000000..e72aba21 --- /dev/null +++ b/Gemfile.3.1.lock @@ -0,0 +1,165 @@ +PATH + remote: . + specs: + zendesk_api (3.0.5) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.2.4) + bump (0.10.0) + byebug (11.1.3) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml + crass (1.0.6) + diff-lcs (1.5.1) + drb (2.2.1) + erubi (1.12.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (3.1.0) + net-http + hashdiff (1.1.0) + hashie (5.0.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + inflection (1.0.0) + json (2.7.2) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mini_mime (1.1.5) + minitest (5.22.3) + multipart-post (2.4.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.4-arm64-darwin) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + public_suffix (5.0.5) + racc (1.7.3) + rack (3.0.10) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.0) + rexml (3.2.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + rubocop (1.13.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + scrub_rb (1.0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + uri (0.13.0) + vcr (6.2.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.36) + +PLATFORMS + arm64-darwin-23 + +DEPENDENCIES + actionpack (>= 5.2.4.6) + addressable (>= 2.8.0) + bump + byebug + jruby-openssl + json (>= 2.3.0) + mini_mime + rake + rspec (= 3.10.0) + rspec-core (= 3.10.1) + rspec-expectations (= 3.10.2) + rspec-mocks (= 3.10.2) + rspec-support (= 3.10.3) + rubocop (~> 1.13.0) + scrub_rb + vcr (~> 6.0) + webmock + yard + zendesk_api! + +BUNDLED WITH + 2.3.26 diff --git a/Gemfile.3.2 b/Gemfile.3.2 new file mode 100644 index 00000000..6e34be80 --- /dev/null +++ b/Gemfile.3.2 @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem "jruby-openssl", platforms: :jruby +gem "mini_mime" +gem "rake" +gem "addressable", ">= 2.8.0" +gem "yard" +gem "json", ">= 2.3.0", platforms: :ruby +gem "scrub_rb" + +gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax + +group :test do + gem "webmock" + gem "vcr", "~> 6.0" + + # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 + # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 + # NOTE: This affects previous build re-runs because we don't store Gemfile.lock + gem "rspec-support", "3.10.3" + gem "rspec-core", "3.10.1" + gem "rspec-expectations", "3.10.2" + gem "rspec-mocks", "3.10.2" + gem "rspec", "3.10.0" + + # only used for uploads testing + gem "actionpack", ">= 5.2.4.6" +end + +group :dev do + gem "bump" +end + +group :dev, :test do + gem "byebug", platforms: :ruby +end + +gemspec diff --git a/Gemfile.3.2.lock b/Gemfile.3.2.lock new file mode 100644 index 00000000..64701360 --- /dev/null +++ b/Gemfile.3.2.lock @@ -0,0 +1,180 @@ +PATH + remote: . + specs: + zendesk_api (3.0.5) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.2.4) + bump (0.10.0) + byebug (11.1.3) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml + crass (1.0.6) + diff-lcs (1.5.1) + drb (2.2.1) + erubi (1.12.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (3.1.0) + net-http + hashdiff (1.1.0) + hashie (5.0.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + inflection (1.0.0) + json (2.7.2) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mini_mime (1.1.5) + minitest (5.22.3) + multipart-post (2.4.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.4-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.4-arm-linux) + racc (~> 1.4) + nokogiri (1.16.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86-linux) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-linux) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + public_suffix (5.0.5) + racc (1.7.3) + rack (3.0.10) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.0) + rexml (3.2.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + rubocop (1.13.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + scrub_rb (1.0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + uri (0.13.0) + vcr (6.2.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.36) + +PLATFORMS + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin + x86_64-linux + +DEPENDENCIES + actionpack (>= 5.2.4.6) + addressable (>= 2.8.0) + bump + byebug + jruby-openssl + json (>= 2.3.0) + mini_mime + rake + rspec (= 3.10.0) + rspec-core (= 3.10.1) + rspec-expectations (= 3.10.2) + rspec-mocks (= 3.10.2) + rspec-support (= 3.10.3) + rubocop (~> 1.13.0) + scrub_rb + vcr (~> 6.0) + webmock + yard + zendesk_api! + +BUNDLED WITH + 2.5.3 diff --git a/Gemfile.3.3 b/Gemfile.3.3 new file mode 100644 index 00000000..6e34be80 --- /dev/null +++ b/Gemfile.3.3 @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem "jruby-openssl", platforms: :jruby +gem "mini_mime" +gem "rake" +gem "addressable", ">= 2.8.0" +gem "yard" +gem "json", ">= 2.3.0", platforms: :ruby +gem "scrub_rb" + +gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax + +group :test do + gem "webmock" + gem "vcr", "~> 6.0" + + # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 + # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 + # NOTE: This affects previous build re-runs because we don't store Gemfile.lock + gem "rspec-support", "3.10.3" + gem "rspec-core", "3.10.1" + gem "rspec-expectations", "3.10.2" + gem "rspec-mocks", "3.10.2" + gem "rspec", "3.10.0" + + # only used for uploads testing + gem "actionpack", ">= 5.2.4.6" +end + +group :dev do + gem "bump" +end + +group :dev, :test do + gem "byebug", platforms: :ruby +end + +gemspec diff --git a/Gemfile.3.3.lock b/Gemfile.3.3.lock new file mode 100644 index 00000000..64701360 --- /dev/null +++ b/Gemfile.3.3.lock @@ -0,0 +1,180 @@ +PATH + remote: . + specs: + zendesk_api (3.0.5) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.2.4) + bump (0.10.0) + byebug (11.1.3) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml + crass (1.0.6) + diff-lcs (1.5.1) + drb (2.2.1) + erubi (1.12.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (3.1.0) + net-http + hashdiff (1.1.0) + hashie (5.0.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + inflection (1.0.0) + json (2.7.2) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mini_mime (1.1.5) + minitest (5.22.3) + multipart-post (2.4.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.4-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.4-arm-linux) + racc (~> 1.4) + nokogiri (1.16.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86-linux) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-linux) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + public_suffix (5.0.5) + racc (1.7.3) + rack (3.0.10) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.0) + rexml (3.2.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + rubocop (1.13.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + scrub_rb (1.0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + uri (0.13.0) + vcr (6.2.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.36) + +PLATFORMS + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin + x86_64-linux + +DEPENDENCIES + actionpack (>= 5.2.4.6) + addressable (>= 2.8.0) + bump + byebug + jruby-openssl + json (>= 2.3.0) + mini_mime + rake + rspec (= 3.10.0) + rspec-core (= 3.10.1) + rspec-expectations (= 3.10.2) + rspec-mocks (= 3.10.2) + rspec-support (= 3.10.3) + rubocop (~> 1.13.0) + scrub_rb + vcr (~> 6.0) + webmock + yard + zendesk_api! + +BUNDLED WITH + 2.5.3 diff --git a/Gemfile.jruby-9.4 b/Gemfile.jruby-9.4 new file mode 100644 index 00000000..6e34be80 --- /dev/null +++ b/Gemfile.jruby-9.4 @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem "jruby-openssl", platforms: :jruby +gem "mini_mime" +gem "rake" +gem "addressable", ">= 2.8.0" +gem "yard" +gem "json", ">= 2.3.0", platforms: :ruby +gem "scrub_rb" + +gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax + +group :test do + gem "webmock" + gem "vcr", "~> 6.0" + + # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 + # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 + # NOTE: This affects previous build re-runs because we don't store Gemfile.lock + gem "rspec-support", "3.10.3" + gem "rspec-core", "3.10.1" + gem "rspec-expectations", "3.10.2" + gem "rspec-mocks", "3.10.2" + gem "rspec", "3.10.0" + + # only used for uploads testing + gem "actionpack", ">= 5.2.4.6" +end + +group :dev do + gem "bump" +end + +group :dev, :test do + gem "byebug", platforms: :ruby +end + +gemspec diff --git a/Gemfile.jruby-9.4.lock b/Gemfile.jruby-9.4.lock new file mode 100644 index 00000000..f98e34d8 --- /dev/null +++ b/Gemfile.jruby-9.4.lock @@ -0,0 +1,164 @@ +PATH + remote: . + specs: + zendesk_api (3.0.5) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8-java) + builder (3.2.4) + bump (0.10.0) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal + rexml + crass (1.0.6) + diff-lcs (1.5.1) + drb (2.2.1) + erubi (1.12.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (3.1.0) + net-http + hashdiff (1.1.0) + hashie (5.0.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + inflection (1.0.0) + jruby-openssl (0.14.5-java) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mini_mime (1.1.5) + minitest (5.22.3) + multipart-post (2.4.1) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.4-java) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.1.0) + ast (~> 2.4.1) + racc + public_suffix (5.0.5) + racc (1.7.3-java) + rack (3.0.10) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.0) + rexml (3.2.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + rubocop (1.13.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + scrub_rb (1.0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + uri (0.13.0) + vcr (6.2.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + yard (0.9.36) + +PLATFORMS + universal-java-17 + +DEPENDENCIES + actionpack (>= 5.2.4.6) + addressable (>= 2.8.0) + bump + byebug + jruby-openssl + json (>= 2.3.0) + mini_mime + rake + rspec (= 3.10.0) + rspec-core (= 3.10.1) + rspec-expectations (= 3.10.2) + rspec-mocks (= 3.10.2) + rspec-support (= 3.10.3) + rubocop (~> 1.13.0) + scrub_rb + vcr (~> 6.0) + webmock + yard + zendesk_api! + +BUNDLED WITH + 2.3.26 From b940ed35f6d1b11f915d5abcf1d23786ada7183f Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Thu, 9 May 2024 17:18:50 +1000 Subject: [PATCH 08/14] fix live spec --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db35bbca..b2d92dbd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,7 @@ jobs: ruby-version: 3.1 - name: spec:live run: | - bundle install - bundle exec rake clean_live set_ci_credentials spec:live || - bundle exec rake clean_live && - bundle exec rspec spec/live --only-failures + BUNDLE_GEMFILE=Gemfile.3.1 bundle install --jobs 4 --retry 3 --path vendor/bundle + BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live set_ci_credentials spec:live || + BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live && + BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rspec spec/live --only-failures From ac590587afa591ccebc908af6d247cb391558734 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Thu, 9 May 2024 17:29:00 +1000 Subject: [PATCH 09/14] Move the contents of Gemfile to common.rb --- Gemfile.2.7 | 39 +-------------------------------------- Gemfile.3.0 | 39 +-------------------------------------- Gemfile.3.1 | 39 +-------------------------------------- Gemfile.3.2 | 39 +-------------------------------------- Gemfile.3.3 | 39 +-------------------------------------- Gemfile.jruby-9.4 | 39 +-------------------------------------- common.rb | 38 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 44 insertions(+), 228 deletions(-) create mode 100644 common.rb diff --git a/Gemfile.2.7 b/Gemfile.2.7 index 969434e5..c114c24e 100644 --- a/Gemfile.2.7 +++ b/Gemfile.2.7 @@ -1,38 +1 @@ -source 'https://rubygems.org' - -gem "jruby-openssl", platforms: :jruby -gem "mini_mime" -gem "rake" -gem "addressable", ">= 2.8.0" -gem "yard" -gem "json", ">= 2.3.0", platforms: :ruby -gem "scrub_rb" - -gem "rubocop", "~> 0.79.0", require: false # Handling of Ruby 2.7 syntax - -group :test do - gem "webmock" - gem "vcr", "~> 6.0" - - # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 - # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 - # NOTE: This affects previous build re-runs because we don't store Gemfile.lock - gem "rspec-support", "3.10.3" - gem "rspec-core", "3.10.1" - gem "rspec-expectations", "3.10.2" - gem "rspec-mocks", "3.10.2" - gem "rspec", "3.10.0" - - # only used for uploads testing - gem "actionpack", ">= 5.2.4.6" -end - -group :dev do - gem "bump" -end - -group :dev, :test do - gem "byebug", platforms: :ruby -end - -gemspec +eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.0 b/Gemfile.3.0 index 6e34be80..c114c24e 100644 --- a/Gemfile.3.0 +++ b/Gemfile.3.0 @@ -1,38 +1 @@ -source 'https://rubygems.org' - -gem "jruby-openssl", platforms: :jruby -gem "mini_mime" -gem "rake" -gem "addressable", ">= 2.8.0" -gem "yard" -gem "json", ">= 2.3.0", platforms: :ruby -gem "scrub_rb" - -gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax - -group :test do - gem "webmock" - gem "vcr", "~> 6.0" - - # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 - # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 - # NOTE: This affects previous build re-runs because we don't store Gemfile.lock - gem "rspec-support", "3.10.3" - gem "rspec-core", "3.10.1" - gem "rspec-expectations", "3.10.2" - gem "rspec-mocks", "3.10.2" - gem "rspec", "3.10.0" - - # only used for uploads testing - gem "actionpack", ">= 5.2.4.6" -end - -group :dev do - gem "bump" -end - -group :dev, :test do - gem "byebug", platforms: :ruby -end - -gemspec +eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.1 b/Gemfile.3.1 index 6e34be80..c114c24e 100644 --- a/Gemfile.3.1 +++ b/Gemfile.3.1 @@ -1,38 +1 @@ -source 'https://rubygems.org' - -gem "jruby-openssl", platforms: :jruby -gem "mini_mime" -gem "rake" -gem "addressable", ">= 2.8.0" -gem "yard" -gem "json", ">= 2.3.0", platforms: :ruby -gem "scrub_rb" - -gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax - -group :test do - gem "webmock" - gem "vcr", "~> 6.0" - - # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 - # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 - # NOTE: This affects previous build re-runs because we don't store Gemfile.lock - gem "rspec-support", "3.10.3" - gem "rspec-core", "3.10.1" - gem "rspec-expectations", "3.10.2" - gem "rspec-mocks", "3.10.2" - gem "rspec", "3.10.0" - - # only used for uploads testing - gem "actionpack", ">= 5.2.4.6" -end - -group :dev do - gem "bump" -end - -group :dev, :test do - gem "byebug", platforms: :ruby -end - -gemspec +eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.2 b/Gemfile.3.2 index 6e34be80..c114c24e 100644 --- a/Gemfile.3.2 +++ b/Gemfile.3.2 @@ -1,38 +1 @@ -source 'https://rubygems.org' - -gem "jruby-openssl", platforms: :jruby -gem "mini_mime" -gem "rake" -gem "addressable", ">= 2.8.0" -gem "yard" -gem "json", ">= 2.3.0", platforms: :ruby -gem "scrub_rb" - -gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax - -group :test do - gem "webmock" - gem "vcr", "~> 6.0" - - # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 - # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 - # NOTE: This affects previous build re-runs because we don't store Gemfile.lock - gem "rspec-support", "3.10.3" - gem "rspec-core", "3.10.1" - gem "rspec-expectations", "3.10.2" - gem "rspec-mocks", "3.10.2" - gem "rspec", "3.10.0" - - # only used for uploads testing - gem "actionpack", ">= 5.2.4.6" -end - -group :dev do - gem "bump" -end - -group :dev, :test do - gem "byebug", platforms: :ruby -end - -gemspec +eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.3 b/Gemfile.3.3 index 6e34be80..c114c24e 100644 --- a/Gemfile.3.3 +++ b/Gemfile.3.3 @@ -1,38 +1 @@ -source 'https://rubygems.org' - -gem "jruby-openssl", platforms: :jruby -gem "mini_mime" -gem "rake" -gem "addressable", ">= 2.8.0" -gem "yard" -gem "json", ">= 2.3.0", platforms: :ruby -gem "scrub_rb" - -gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax - -group :test do - gem "webmock" - gem "vcr", "~> 6.0" - - # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 - # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 - # NOTE: This affects previous build re-runs because we don't store Gemfile.lock - gem "rspec-support", "3.10.3" - gem "rspec-core", "3.10.1" - gem "rspec-expectations", "3.10.2" - gem "rspec-mocks", "3.10.2" - gem "rspec", "3.10.0" - - # only used for uploads testing - gem "actionpack", ">= 5.2.4.6" -end - -group :dev do - gem "bump" -end - -group :dev, :test do - gem "byebug", platforms: :ruby -end - -gemspec +eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.jruby-9.4 b/Gemfile.jruby-9.4 index 6e34be80..c114c24e 100644 --- a/Gemfile.jruby-9.4 +++ b/Gemfile.jruby-9.4 @@ -1,38 +1 @@ -source 'https://rubygems.org' - -gem "jruby-openssl", platforms: :jruby -gem "mini_mime" -gem "rake" -gem "addressable", ">= 2.8.0" -gem "yard" -gem "json", ">= 2.3.0", platforms: :ruby -gem "scrub_rb" - -gem "rubocop", "~> 1.13.0", require: false # Handling of Ruby 2.7 syntax - -group :test do - gem "webmock" - gem "vcr", "~> 6.0" - - # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 - # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 - # NOTE: This affects previous build re-runs because we don't store Gemfile.lock - gem "rspec-support", "3.10.3" - gem "rspec-core", "3.10.1" - gem "rspec-expectations", "3.10.2" - gem "rspec-mocks", "3.10.2" - gem "rspec", "3.10.0" - - # only used for uploads testing - gem "actionpack", ">= 5.2.4.6" -end - -group :dev do - gem "bump" -end - -group :dev, :test do - gem "byebug", platforms: :ruby -end - -gemspec +eval_gemfile('common.rb') \ No newline at end of file diff --git a/common.rb b/common.rb new file mode 100644 index 00000000..969434e5 --- /dev/null +++ b/common.rb @@ -0,0 +1,38 @@ +source 'https://rubygems.org' + +gem "jruby-openssl", platforms: :jruby +gem "mini_mime" +gem "rake" +gem "addressable", ">= 2.8.0" +gem "yard" +gem "json", ">= 2.3.0", platforms: :ruby +gem "scrub_rb" + +gem "rubocop", "~> 0.79.0", require: false # Handling of Ruby 2.7 syntax + +group :test do + gem "webmock" + gem "vcr", "~> 6.0" + + # Hardcoding these gems as the newer version makes the tests fail in Ruby 3 + # See https://github.com/zendesk/zendesk_api_client_rb/runs/5013748785?check_suite_focus=true#step:4:59 + # NOTE: This affects previous build re-runs because we don't store Gemfile.lock + gem "rspec-support", "3.10.3" + gem "rspec-core", "3.10.1" + gem "rspec-expectations", "3.10.2" + gem "rspec-mocks", "3.10.2" + gem "rspec", "3.10.0" + + # only used for uploads testing + gem "actionpack", ">= 5.2.4.6" +end + +group :dev do + gem "bump" +end + +group :dev, :test do + gem "byebug", platforms: :ruby +end + +gemspec From 5e3d67522e1a5be30d2d9e3d5e05e0cf37de5ca7 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Fri, 17 May 2024 14:10:38 +1000 Subject: [PATCH 10/14] Updated instructions in Readme how to use Gemfile --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5588f0da..ae461742 100644 --- a/README.md +++ b/README.md @@ -446,8 +446,8 @@ ZendeskAPI::AppInstallation.destroy!(client, :id => 123) See `.github/workflows/main.yml` to understand the CI process. ``` -bundle exec rake # Runs the tests -bundle exec rubocop # Runs the lint (use `--fix` for autocorrect) +BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rake # Runs the tests, assuming Ruby 2.7 is chosen +BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop # Runs the lint (use `--fix` for autocorrect), assuming Ruby 2.7 is chosen ``` ## Releasing a new gem version From 9b1903152501970b1bd3c64b966447dbdb3e7aee Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Mon, 20 May 2024 12:31:24 +1000 Subject: [PATCH 11/14] v3.0.6 --- CHANGELOG.md | 4 ++++ README.md | 2 +- lib/zendesk_api/version.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7b40b93..a747bf51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v3.0.6 + +Adding multiple Gemfile and Gemfile.lock files for differen Ruby versions so that Snyk can scan the repo for vulnerabilities. + ## v3.0.5 Adding CBP support to more endpoints. please see `cbp_support_spec.rb` for the complete list. diff --git a/README.md b/README.md index ae461742..70e32e60 100644 --- a/README.md +++ b/README.md @@ -454,7 +454,7 @@ BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop # Runs the lint (use `--fix` for 1. From updated master: `git checkout -b bump-vX.X.X`, according to [SemVer](https://semver.org) 2. Ensure the CHANGELOG is correct and updated, this is your last opportunity -3. Execute `bundle exec bump patch --tag # minor|major`, this bumps the version in a new commit, and adds the relative git tag +3. Execute `BUNDLE_GEMFILE=Gemfile.2.7 bundle exec bump patch --tag # minor|major`, this bumps the version in a new commit, and adds the relative git tag 4. Push to GitHub `git push origin vX.X.X -u && git push --tags` 5. Raise a PR ([example](https://github.com/zendesk/zendesk_api_client_rb/pull/540)) including the code diff ([example](https://github.com/zendesk/zendesk_api_client_rb/compare/v2.0.1...v3.0.0.rc1)) 6. Get it approved and merged diff --git a/lib/zendesk_api/version.rb b/lib/zendesk_api/version.rb index c13523a4..c583dcba 100644 --- a/lib/zendesk_api/version.rb +++ b/lib/zendesk_api/version.rb @@ -1,3 +1,3 @@ module ZendeskAPI - VERSION = "3.0.5" + VERSION = "3.0.6" end From f5a985994fd8382d960d6e8563ea20b121211790 Mon Sep 17 00:00:00 2001 From: Jin Huang <98715358+JinHuangAtZen@users.noreply.github.com> Date: Tue, 21 May 2024 09:27:04 +1000 Subject: [PATCH 12/14] Revert "Add Gemfile.lock for different Ruby versions" --- .github/workflows/main.yml | 33 ++----- .gitignore | 1 + common.rb => Gemfile | 0 Gemfile.2.7 | 1 - Gemfile.2.7.lock | 162 --------------------------------- Gemfile.3.0 | 1 - Gemfile.3.0.lock | 165 ---------------------------------- Gemfile.3.1 | 1 - Gemfile.3.1.lock | 165 ---------------------------------- Gemfile.3.2 | 1 - Gemfile.3.2.lock | 180 ------------------------------------- Gemfile.3.3 | 1 - Gemfile.3.3.lock | 180 ------------------------------------- Gemfile.jruby-9.4 | 1 - Gemfile.jruby-9.4.lock | 164 --------------------------------- README.md | 4 +- 16 files changed, 11 insertions(+), 1049 deletions(-) rename common.rb => Gemfile (100%) delete mode 100644 Gemfile.2.7 delete mode 100644 Gemfile.2.7.lock delete mode 100644 Gemfile.3.0 delete mode 100644 Gemfile.3.0.lock delete mode 100644 Gemfile.3.1 delete mode 100644 Gemfile.3.1.lock delete mode 100644 Gemfile.3.2 delete mode 100644 Gemfile.3.2.lock delete mode 100644 Gemfile.3.3 delete mode 100644 Gemfile.3.3.lock delete mode 100644 Gemfile.jruby-9.4 delete mode 100644 Gemfile.jruby-9.4.lock diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2d92dbd..7fa6129e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,28 +29,11 @@ jobs: with: bundler-cache: true ruby-version: ${{ matrix.ruby }} - - - name: Custom cache gems - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-${{ matrix.ruby }} - restore-keys: | - ${{ runner.os }}-gems-${{ matrix.ruby }} - - - name: Install gems - run: | - BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle install --jobs 4 --retry 3 --path vendor/bundle - - - name: Test - run: | - BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle exec rake - - - name: Lint - if: matrix.ruby == '2.7' + - name: Test and Lint run: | - BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop - + bundle install + bundle exec rake + bundle exec rubocop spec-live: name: Spec live if: github.repository == 'zendesk/zendesk_api_client_rb' @@ -69,7 +52,7 @@ jobs: ruby-version: 3.1 - name: spec:live run: | - BUNDLE_GEMFILE=Gemfile.3.1 bundle install --jobs 4 --retry 3 --path vendor/bundle - BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live set_ci_credentials spec:live || - BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live && - BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rspec spec/live --only-failures + bundle install + bundle exec rake clean_live set_ci_credentials spec:live || + bundle exec rake clean_live && + bundle exec rspec spec/live --only-failures diff --git a/.gitignore b/.gitignore index d87ee591..e34dc540 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ spec/fixtures/cassettes spec/fixtures/credentials.yml coverage/** .yardoc/** +Gemfile.lock .ruby-version vendor/bundle/** pkg/** diff --git a/common.rb b/Gemfile similarity index 100% rename from common.rb rename to Gemfile diff --git a/Gemfile.2.7 b/Gemfile.2.7 deleted file mode 100644 index c114c24e..00000000 --- a/Gemfile.2.7 +++ /dev/null @@ -1 +0,0 @@ -eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.2.7.lock b/Gemfile.2.7.lock deleted file mode 100644 index 5e2c96fa..00000000 --- a/Gemfile.2.7.lock +++ /dev/null @@ -1,162 +0,0 @@ -PATH - remote: . - specs: - zendesk_api (3.0.5) - faraday (> 2.0.0) - faraday-multipart - hashie (>= 3.5.2, < 6.0.0) - inflection - mini_mime - multipart-post (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.8) - builder (3.2.4) - bump (0.10.0) - byebug (11.1.3) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) - bigdecimal - rexml - crass (1.0.6) - diff-lcs (1.5.1) - drb (2.2.1) - erubi (1.12.0) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.0.2) - hashdiff (1.1.0) - hashie (5.0.0) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - inflection (1.0.0) - jaro_winkler (1.5.6) - json (2.7.2) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_mime (1.1.5) - mini_portile2 (2.8.6) - minitest (5.22.3) - multipart-post (2.4.1) - mutex_m (0.2.0) - nokogiri (1.15.6) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - public_suffix (5.0.5) - racc (1.7.3) - rack (3.0.10) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.2.1) - rexml (3.2.6) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (0.79.0) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.7.0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - scrub_rb (1.0.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (1.6.1) - vcr (6.2.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack (>= 5.2.4.6) - addressable (>= 2.8.0) - bump - byebug - jruby-openssl - json (>= 2.3.0) - mini_mime - rake - rspec (= 3.10.0) - rspec-core (= 3.10.1) - rspec-expectations (= 3.10.2) - rspec-mocks (= 3.10.2) - rspec-support (= 3.10.3) - rubocop (~> 0.79.0) - scrub_rb - vcr (~> 6.0) - webmock - yard - zendesk_api! - -BUNDLED WITH - 2.1.4 diff --git a/Gemfile.3.0 b/Gemfile.3.0 deleted file mode 100644 index c114c24e..00000000 --- a/Gemfile.3.0 +++ /dev/null @@ -1 +0,0 @@ -eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.0.lock b/Gemfile.3.0.lock deleted file mode 100644 index 23e2e0e7..00000000 --- a/Gemfile.3.0.lock +++ /dev/null @@ -1,165 +0,0 @@ -PATH - remote: . - specs: - zendesk_api (3.0.5) - faraday (> 2.0.0) - faraday-multipart - hashie (>= 3.5.2, < 6.0.0) - inflection - mini_mime - multipart-post (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.8) - builder (3.2.4) - bump (0.10.0) - byebug (11.1.3) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) - bigdecimal - rexml - crass (1.0.6) - diff-lcs (1.5.1) - drb (2.2.1) - erubi (1.12.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.1.0) - net-http - hashdiff (1.1.0) - hashie (5.0.0) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - inflection (1.0.0) - json (2.7.2) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_mime (1.1.5) - minitest (5.22.3) - multipart-post (2.4.1) - mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.4-arm64-darwin) - racc (~> 1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - public_suffix (5.0.5) - racc (1.7.3) - rack (3.0.10) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.2.1) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (1.13.0) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - ruby-progressbar (1.13.0) - scrub_rb (1.0.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) - vcr (6.2.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - arm64-darwin-23 - -DEPENDENCIES - actionpack (>= 5.2.4.6) - addressable (>= 2.8.0) - bump - byebug - jruby-openssl - json (>= 2.3.0) - mini_mime - rake - rspec (= 3.10.0) - rspec-core (= 3.10.1) - rspec-expectations (= 3.10.2) - rspec-mocks (= 3.10.2) - rspec-support (= 3.10.3) - rubocop (~> 1.13.0) - scrub_rb - vcr (~> 6.0) - webmock - yard - zendesk_api! - -BUNDLED WITH - 2.2.33 diff --git a/Gemfile.3.1 b/Gemfile.3.1 deleted file mode 100644 index c114c24e..00000000 --- a/Gemfile.3.1 +++ /dev/null @@ -1 +0,0 @@ -eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.1.lock b/Gemfile.3.1.lock deleted file mode 100644 index e72aba21..00000000 --- a/Gemfile.3.1.lock +++ /dev/null @@ -1,165 +0,0 @@ -PATH - remote: . - specs: - zendesk_api (3.0.5) - faraday (> 2.0.0) - faraday-multipart - hashie (>= 3.5.2, < 6.0.0) - inflection - mini_mime - multipart-post (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.8) - builder (3.2.4) - bump (0.10.0) - byebug (11.1.3) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) - bigdecimal - rexml - crass (1.0.6) - diff-lcs (1.5.1) - drb (2.2.1) - erubi (1.12.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.1.0) - net-http - hashdiff (1.1.0) - hashie (5.0.0) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - inflection (1.0.0) - json (2.7.2) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_mime (1.1.5) - minitest (5.22.3) - multipart-post (2.4.1) - mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.4-arm64-darwin) - racc (~> 1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - public_suffix (5.0.5) - racc (1.7.3) - rack (3.0.10) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.2.1) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (1.13.0) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - ruby-progressbar (1.13.0) - scrub_rb (1.0.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) - vcr (6.2.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - arm64-darwin-23 - -DEPENDENCIES - actionpack (>= 5.2.4.6) - addressable (>= 2.8.0) - bump - byebug - jruby-openssl - json (>= 2.3.0) - mini_mime - rake - rspec (= 3.10.0) - rspec-core (= 3.10.1) - rspec-expectations (= 3.10.2) - rspec-mocks (= 3.10.2) - rspec-support (= 3.10.3) - rubocop (~> 1.13.0) - scrub_rb - vcr (~> 6.0) - webmock - yard - zendesk_api! - -BUNDLED WITH - 2.3.26 diff --git a/Gemfile.3.2 b/Gemfile.3.2 deleted file mode 100644 index c114c24e..00000000 --- a/Gemfile.3.2 +++ /dev/null @@ -1 +0,0 @@ -eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.2.lock b/Gemfile.3.2.lock deleted file mode 100644 index 64701360..00000000 --- a/Gemfile.3.2.lock +++ /dev/null @@ -1,180 +0,0 @@ -PATH - remote: . - specs: - zendesk_api (3.0.5) - faraday (> 2.0.0) - faraday-multipart - hashie (>= 3.5.2, < 6.0.0) - inflection - mini_mime - multipart-post (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.8) - builder (3.2.4) - bump (0.10.0) - byebug (11.1.3) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) - bigdecimal - rexml - crass (1.0.6) - diff-lcs (1.5.1) - drb (2.2.1) - erubi (1.12.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.1.0) - net-http - hashdiff (1.1.0) - hashie (5.0.0) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - inflection (1.0.0) - json (2.7.2) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_mime (1.1.5) - minitest (5.22.3) - multipart-post (2.4.1) - mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.4-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.4-arm-linux) - racc (~> 1.4) - nokogiri (1.16.4-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.4-x86-linux) - racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - public_suffix (5.0.5) - racc (1.7.3) - rack (3.0.10) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.2.1) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (1.13.0) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - ruby-progressbar (1.13.0) - scrub_rb (1.0.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) - vcr (6.2.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - aarch64-linux - arm-linux - arm64-darwin - x86-linux - x86_64-darwin - x86_64-linux - -DEPENDENCIES - actionpack (>= 5.2.4.6) - addressable (>= 2.8.0) - bump - byebug - jruby-openssl - json (>= 2.3.0) - mini_mime - rake - rspec (= 3.10.0) - rspec-core (= 3.10.1) - rspec-expectations (= 3.10.2) - rspec-mocks (= 3.10.2) - rspec-support (= 3.10.3) - rubocop (~> 1.13.0) - scrub_rb - vcr (~> 6.0) - webmock - yard - zendesk_api! - -BUNDLED WITH - 2.5.3 diff --git a/Gemfile.3.3 b/Gemfile.3.3 deleted file mode 100644 index c114c24e..00000000 --- a/Gemfile.3.3 +++ /dev/null @@ -1 +0,0 @@ -eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.3.3.lock b/Gemfile.3.3.lock deleted file mode 100644 index 64701360..00000000 --- a/Gemfile.3.3.lock +++ /dev/null @@ -1,180 +0,0 @@ -PATH - remote: . - specs: - zendesk_api (3.0.5) - faraday (> 2.0.0) - faraday-multipart - hashie (>= 3.5.2, < 6.0.0) - inflection - mini_mime - multipart-post (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.8) - builder (3.2.4) - bump (0.10.0) - byebug (11.1.3) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) - bigdecimal - rexml - crass (1.0.6) - diff-lcs (1.5.1) - drb (2.2.1) - erubi (1.12.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.1.0) - net-http - hashdiff (1.1.0) - hashie (5.0.0) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - inflection (1.0.0) - json (2.7.2) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_mime (1.1.5) - minitest (5.22.3) - multipart-post (2.4.1) - mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.4-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.4-arm-linux) - racc (~> 1.4) - nokogiri (1.16.4-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.4-x86-linux) - racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - public_suffix (5.0.5) - racc (1.7.3) - rack (3.0.10) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.2.1) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (1.13.0) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - ruby-progressbar (1.13.0) - scrub_rb (1.0.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) - vcr (6.2.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - aarch64-linux - arm-linux - arm64-darwin - x86-linux - x86_64-darwin - x86_64-linux - -DEPENDENCIES - actionpack (>= 5.2.4.6) - addressable (>= 2.8.0) - bump - byebug - jruby-openssl - json (>= 2.3.0) - mini_mime - rake - rspec (= 3.10.0) - rspec-core (= 3.10.1) - rspec-expectations (= 3.10.2) - rspec-mocks (= 3.10.2) - rspec-support (= 3.10.3) - rubocop (~> 1.13.0) - scrub_rb - vcr (~> 6.0) - webmock - yard - zendesk_api! - -BUNDLED WITH - 2.5.3 diff --git a/Gemfile.jruby-9.4 b/Gemfile.jruby-9.4 deleted file mode 100644 index c114c24e..00000000 --- a/Gemfile.jruby-9.4 +++ /dev/null @@ -1 +0,0 @@ -eval_gemfile('common.rb') \ No newline at end of file diff --git a/Gemfile.jruby-9.4.lock b/Gemfile.jruby-9.4.lock deleted file mode 100644 index f98e34d8..00000000 --- a/Gemfile.jruby-9.4.lock +++ /dev/null @@ -1,164 +0,0 @@ -PATH - remote: . - specs: - zendesk_api (3.0.5) - faraday (> 2.0.0) - faraday-multipart - hashie (>= 3.5.2, < 6.0.0) - inflection - mini_mime - multipart-post (~> 2.0) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.8-java) - builder (3.2.4) - bump (0.10.0) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) - bigdecimal - rexml - crass (1.0.6) - diff-lcs (1.5.1) - drb (2.2.1) - erubi (1.12.0) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.1.0) - net-http - hashdiff (1.1.0) - hashie (5.0.0) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - inflection (1.0.0) - jruby-openssl (0.14.5-java) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_mime (1.1.5) - minitest (5.22.3) - multipart-post (2.4.1) - mutex_m (0.2.0) - net-http (0.4.1) - uri - nokogiri (1.16.4-java) - racc (~> 1.4) - parallel (1.24.0) - parser (3.3.1.0) - ast (~> 2.4.1) - racc - public_suffix (5.0.5) - racc (1.7.3-java) - rack (3.0.10) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.2.1) - regexp_parser (2.9.0) - rexml (3.2.6) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (1.13.0) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - ruby-progressbar (1.13.0) - scrub_rb (1.0.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.0) - vcr (6.2.0) - webmock (3.23.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) - -PLATFORMS - universal-java-17 - -DEPENDENCIES - actionpack (>= 5.2.4.6) - addressable (>= 2.8.0) - bump - byebug - jruby-openssl - json (>= 2.3.0) - mini_mime - rake - rspec (= 3.10.0) - rspec-core (= 3.10.1) - rspec-expectations (= 3.10.2) - rspec-mocks (= 3.10.2) - rspec-support (= 3.10.3) - rubocop (~> 1.13.0) - scrub_rb - vcr (~> 6.0) - webmock - yard - zendesk_api! - -BUNDLED WITH - 2.3.26 diff --git a/README.md b/README.md index 70e32e60..dacf2a29 100644 --- a/README.md +++ b/README.md @@ -446,8 +446,8 @@ ZendeskAPI::AppInstallation.destroy!(client, :id => 123) See `.github/workflows/main.yml` to understand the CI process. ``` -BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rake # Runs the tests, assuming Ruby 2.7 is chosen -BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop # Runs the lint (use `--fix` for autocorrect), assuming Ruby 2.7 is chosen +bundle exec rake # Runs the tests +bundle exec rubocop # Runs the lint (use `--fix` for autocorrect) ``` ## Releasing a new gem version From 0ce2c3e9bbd353f6641486dec309d5a7d712f7e3 Mon Sep 17 00:00:00 2001 From: Jin Huang Date: Tue, 21 May 2024 14:36:37 +1000 Subject: [PATCH 13/14] fix readme to revert incorrect instruction for Releasing a new gem version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dacf2a29..5588f0da 100644 --- a/README.md +++ b/README.md @@ -454,7 +454,7 @@ bundle exec rubocop # Runs the lint (use `--fix` for autocorrect) 1. From updated master: `git checkout -b bump-vX.X.X`, according to [SemVer](https://semver.org) 2. Ensure the CHANGELOG is correct and updated, this is your last opportunity -3. Execute `BUNDLE_GEMFILE=Gemfile.2.7 bundle exec bump patch --tag # minor|major`, this bumps the version in a new commit, and adds the relative git tag +3. Execute `bundle exec bump patch --tag # minor|major`, this bumps the version in a new commit, and adds the relative git tag 4. Push to GitHub `git push origin vX.X.X -u && git push --tags` 5. Raise a PR ([example](https://github.com/zendesk/zendesk_api_client_rb/pull/540)) including the code diff ([example](https://github.com/zendesk/zendesk_api_client_rb/compare/v2.0.1...v3.0.0.rc1)) 6. Get it approved and merged From 26f52778ad3b17e8d0f3a24bc0d6487267084d18 Mon Sep 17 00:00:00 2001 From: Fabio Vilela Date: Tue, 4 Jun 2024 14:10:31 +1000 Subject: [PATCH 14/14] Fix and Improve Live Specs --- spec/core/spec_helper.rb | 4 ++ spec/fixtures/zendesk.rb | 1 + spec/live/automation_spec.rb | 2 +- spec/live/brand_spec.rb | 4 +- spec/live/custom_status_spec.rb | 2 +- spec/live/dynamic_content/item_spec.rb | 6 +-- spec/live/dynamic_content/variant_spec.rb | 2 +- spec/live/identity_spec.rb | 2 +- spec/live/organization_spec.rb | 4 +- spec/live/topic_spec.rb | 13 ------ spec/live/user_field_spec.rb | 6 +-- spec/macros/resource_macros.rb | 53 +++++++++++------------ 12 files changed, 44 insertions(+), 55 deletions(-) diff --git a/spec/core/spec_helper.rb b/spec/core/spec_helper.rb index ffa278b5..8bf01c1f 100644 --- a/spec/core/spec_helper.rb +++ b/spec/core/spec_helper.rb @@ -156,6 +156,10 @@ def stub_json_request(verb, path_matcher, body = json, options = {}) c.default_cassette_options = { :record => :new_episodes, :decode_compressed_response => true, :serialize_with => :json, :preserve_exact_body_bytes => true } c.hook_into :webmock c.configure_rspec_metadata! + + # In CI this doesn't matter, since we start by deleting all the cassettes. + # In development, this helps debugging. + c.allow_http_connections_when_no_cassette = true end include WebMock::API diff --git a/spec/fixtures/zendesk.rb b/spec/fixtures/zendesk.rb index 9941d52f..58a6316e 100644 --- a/spec/fixtures/zendesk.rb +++ b/spec/fixtures/zendesk.rb @@ -30,6 +30,7 @@ def find_or_create_user(role) def topic VCR.use_cassette('valid_topic') do + @topic ||= client.topics.fetch.find { |t| t.name == "Test Topic" } @topic ||= client.topics.create( :name => "Test Topic", :description => "This is the body of a topic." diff --git a/spec/live/automation_spec.rb b/spec/live/automation_spec.rb index ffe5e6a7..45fdef6e 100644 --- a/spec/live/automation_spec.rb +++ b/spec/live/automation_spec.rb @@ -3,7 +3,7 @@ describe ZendeskAPI::Automation, :delete_after do def valid_attributes { - :title => "my test automation", + :title => "my test automation_ruby_sdk_test", :conditions => { :all => [{ :field => "status", :operator => "is", :value => "open" }] }, diff --git a/spec/live/brand_spec.rb b/spec/live/brand_spec.rb index 34f4258a..32e4b8bf 100644 --- a/spec/live/brand_spec.rb +++ b/spec/live/brand_spec.rb @@ -2,11 +2,11 @@ describe ZendeskAPI::Brand, :delete_after do def valid_attributes - { :name => "awesomesauce", :subdomain => "zendeskapi#{SecureRandom.hex(3)}" } + { :name => "awesomesauce_ruby_sdk_test", :subdomain => "zendeskapi#{SecureRandom.hex(3)}" } end it_should_be_creatable - it_should_be_updatable :name + it_should_be_updatable :name, "awesomesauce_ruby_sdk_updated_name" it_should_be_readable :brands # Deleted brands are still findable by id, but in the index action diff --git a/spec/live/custom_status_spec.rb b/spec/live/custom_status_spec.rb index 38d7bb8b..d52a2d7b 100644 --- a/spec/live/custom_status_spec.rb +++ b/spec/live/custom_status_spec.rb @@ -14,7 +14,7 @@ def valid_attributes end it_should_be_creatable - it_should_be_updatable :agent_label, 'New Agent Label' + it_should_be_updatable :agent_label, "ruby_sdk_test_agent_label_updated" it_should_be_updatable :end_user_label, 'New End User Label' it_should_be_updatable :description, 'New Description' it_should_be_updatable :end_user_description, 'New End User Description' diff --git a/spec/live/dynamic_content/item_spec.rb b/spec/live/dynamic_content/item_spec.rb index c62b63e0..91f938ae 100644 --- a/spec/live/dynamic_content/item_spec.rb +++ b/spec/live/dynamic_content/item_spec.rb @@ -3,14 +3,14 @@ describe ZendeskAPI::DynamicContent::Item, :delete_after do def valid_attributes { - :name => "Snowboard Problem", + :name => "Dynamic Content Item name Ruby SDK test", :default_locale_id => 1, - :content => "Snowboard Problem variant" + :content => "Ruby SDK test content" } end it_should_be_readable :dynamic_content, :items, :create => true it_should_be_creatable - it_should_be_updatable :name + it_should_be_updatable :name, 'Updated Dynamic Content Item name Ruby SDK test' it_should_be_deletable end diff --git a/spec/live/dynamic_content/variant_spec.rb b/spec/live/dynamic_content/variant_spec.rb index fad28093..f7fbe50e 100644 --- a/spec/live/dynamic_content/variant_spec.rb +++ b/spec/live/dynamic_content/variant_spec.rb @@ -6,7 +6,7 @@ def valid_attributes :locale_id => 2, :active => true, :default => false, - :content => 'Mon dieu!' + :content => 'Ruby SDK Test Variant Content' } end diff --git a/spec/live/identity_spec.rb b/spec/live/identity_spec.rb index fa18fedf..8a6fed74 100644 --- a/spec/live/identity_spec.rb +++ b/spec/live/identity_spec.rb @@ -2,7 +2,7 @@ describe ZendeskAPI::User::Identity, :delete_after do def valid_attributes - { :type => "email", :value => "abcdef@example.com" } + { :type => "email", :value => "ruby_sdk_test@example.com" } end under current_user do diff --git a/spec/live/organization_spec.rb b/spec/live/organization_spec.rb index ef2416c5..ed92194c 100644 --- a/spec/live/organization_spec.rb +++ b/spec/live/organization_spec.rb @@ -2,11 +2,11 @@ describe ZendeskAPI::Organization, :delete_after do def valid_attributes - { :name => "Awesome-O" } + { :name => 'organization_name_ruby_sdk_test' } end it_should_be_creatable - it_should_be_updatable :name + it_should_be_updatable :name, 'organization_name_ruby_sdk_test_updated' it_should_be_deletable it_should_be_readable :organizations, :create => true diff --git a/spec/live/topic_spec.rb b/spec/live/topic_spec.rb index 68f6a5f8..b8aeacea 100644 --- a/spec/live/topic_spec.rb +++ b/spec/live/topic_spec.rb @@ -1,19 +1,6 @@ require 'core/spec_helper' RSpec.describe ZendeskAPI::Topic do - # Cleanup topics (:delete_after doesn't work here) - before :all do - VCR.configure do |c| - @previous_allow_http_connections = c.allow_http_connections_when_no_cassette? - c.allow_http_connections_when_no_cassette = true - end - client.topics.fetch!.reject { |t| t == @topic }.map(&:destroy!) - ensure - VCR.configure do |c| - c.allow_http_connections_when_no_cassette = @previous_allow_http_connections - end - end - def valid_attributes { :name => "My Topic", diff --git a/spec/live/user_field_spec.rb b/spec/live/user_field_spec.rb index 54854325..e7dfd3d2 100644 --- a/spec/live/user_field_spec.rb +++ b/spec/live/user_field_spec.rb @@ -2,11 +2,11 @@ describe ZendeskAPI::UserField, :delete_after do def valid_attributes - { :type => "text", :title => "Age", :key => "age" } + { :type => "text", :title => "title_ruby_sdk_test", :key => 'ruby_sdk_test_key' } end - it_should_be_creatable - it_should_be_updatable :title, "key" it_should_be_deletable + it_should_be_creatable + it_should_be_updatable :title, "updated_title_ruby_sdk_test" it_should_be_readable :user_fields, :create => true end diff --git a/spec/macros/resource_macros.rb b/spec/macros/resource_macros.rb index 990340da..7ed1f7d3 100644 --- a/spec/macros/resource_macros.rb +++ b/spec/macros/resource_macros.rb @@ -21,26 +21,26 @@ def it_should_be_creatable(options = {}) before(:all) do VCR.use_cassette("#{described_class.to_s}_create") do - @object = described_class.create(client, valid_attributes.merge(default_options)) + @creatable_object = described_class.create!(client, valid_attributes.merge(default_options)) end end it "should have an id" do - expect(@object).to_not be_nil - expect(@object.send(:id)).to_not be_nil + expect(@creatable_object).to_not be_nil + expect(@creatable_object.send(:id)).to_not be_nil end it "should be findable", :unless => metadata[:not_findable] do options = default_options - options.merge!(:id => @object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource) - expect(described_class.find(client, options)).to eq(@object) + options.merge!(:id => @creatable_object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource) + expect(described_class.find(client, options)).to eq(@creatable_object) end after(:all) do - return unless @object.id + return unless @creatable_object.id VCR.use_cassette("#{described_class.to_s}_create_delete") do - @object.destroy + @creatable_object.destroy end end if metadata[:delete_after] end @@ -50,40 +50,38 @@ def it_should_be_updatable(attribute, value = "TESTDATA", extra = {}) context "update", :vcr do before(:all) do VCR.use_cassette("#{described_class.to_s}_update_create") do - @object = described_class.create(client, valid_attributes.merge(default_options)) + @updatable_object = described_class.create!(client, valid_attributes.merge(default_options)) end end before(:each) do - @object.send("#{attribute}=", value) - extra.each { |k, v| @object.send("#{k}=", v) } + @updatable_object.public_send("#{attribute}=", value) + extra.each { |k, v| @updatable_object.public_send("#{k}=", v) } end it "should be savable" do - expect(@object.save).to be(true) + expect(@updatable_object.save).to be(true), "Expected object to save, but it failed with errors: #{@updatable_object.errors&.full_messages&.join(', ')}" end context "after save" do before(:each) do - @object.save + @updatable_object.save end it "should keep attributes" do - expect(@object.send(attribute)).to eq(value) + expect(@updatable_object.send(attribute)).to eq(value) end it "should be findable", :unless => metadata[:not_findable] do options = default_options - options.merge!(:id => @object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource) - expect(described_class.find(client, options)).to eq(@object) + options.merge!(:id => @updatable_object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource) + expect(described_class.find(client, options)).to eq(@updatable_object) end end after(:all) do - return unless @object.id - VCR.use_cassette("#{described_class.to_s}_update_delete") do - @object.destroy + @updatable_object.destroy end end if metadata[:delete_after] end @@ -93,21 +91,20 @@ def it_should_be_deletable(options = {}) context "deletion", :vcr do before(:all) do if options[:object] - @object = options.delete(:object) + @deletable_object = options.delete(:object) else VCR.use_cassette("#{described_class.to_s}_delete_create") do - @object = described_class.create(client, valid_attributes.merge(default_options)) + @deletable_object = described_class.create!(client, valid_attributes.merge(default_options)) end end end it "should be destroyable" do |example| - expect(@object.destroy).to be(true) - expect(@object.destroyed?).to be(true) - + expect(@deletable_object.destroy).to be(true) + expect(@deletable_object.destroyed?).to be(true) if (!options.key?(:find) || options[:find]) && !example.metadata[:not_findable] opts = default_options - opts.merge!(:id => @object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource) + opts.merge!(:id => @deletable_object.id) unless described_class.ancestors.include?(ZendeskAPI::SingularResource) obj = described_class.find(client, opts) if options[:find] @@ -129,13 +126,13 @@ def it_should_be_readable(*args) context context_name, :vcr do before(:all) do VCR.use_cassette("#{described_class.to_s}_#{context_name}_create") do - @object = described_class.create!(client, valid_attributes.merge(default_options)) + @readable_object = described_class.create!(client, valid_attributes.merge(default_options)) end end if create after(:all) do VCR.use_cassette("#{described_class.to_s}_#{context_name}_delete") do - @object.destroy + @readable_object.destroy end end if create @@ -148,7 +145,7 @@ def it_should_be_readable(*args) object = nil result.all do |o| - object = o if @object == o + object = o if @readable_object == o end expect(object).to_not be_nil @@ -158,7 +155,7 @@ def it_should_be_readable(*args) end else expect(result).to_not be_nil - expect(result).to eq(@object) if create + expect(result).to eq(@readable_object) if create object = result end