From 0602102fbdf19ae83c104fd7cfe7453e96e46d75 Mon Sep 17 00:00:00 2001 From: fern-support <126544928+fern-support@users.noreply.github.com> Date: Thu, 4 Dec 2025 21:21:55 -0500 Subject: [PATCH 1/3] change custom gemfile placement --- .fernignore | 3 ++- Gemfile | 2 +- custom.gemfile.rb => Gemfile.custom | 11 ++------ Gemfile.lock | 42 +++++++++++++---------------- 4 files changed, 24 insertions(+), 34 deletions(-) rename custom.gemfile.rb => Gemfile.custom (73%) diff --git a/.fernignore b/.fernignore index 8f821eb2..7f524b35 100644 --- a/.fernignore +++ b/.fernignore @@ -6,7 +6,8 @@ test/ .github/workflows README.md lib/square/file_param.rb -custom.gemfile.rb +Gemfile.custom +custom.gemspec.rb # Pagination is currently broken for endpoints where the page token is not submitted via a query param # Manually fixed pagination bugs in: diff --git a/Gemfile b/Gemfile index f608cd29..29b144d7 100644 --- a/Gemfile +++ b/Gemfile @@ -19,5 +19,5 @@ group :test, :development do end # Load custom Gemfile configuration if it exists -custom_gemfile = File.join(__dir__, "custom.gemfile.rb") +custom_gemfile = File.join(__dir__, "Gemfile.custom") eval_gemfile(custom_gemfile) if File.exist?(custom_gemfile) diff --git a/custom.gemfile.rb b/Gemfile.custom similarity index 73% rename from custom.gemfile.rb rename to Gemfile.custom index b716cff7..6e901090 100644 --- a/custom.gemfile.rb +++ b/Gemfile.custom @@ -7,15 +7,8 @@ # overwritten by the generator. # Example usage: -# gem 'custom-gem', '~> 1.0' -# -# group :development do -# gem 'debug-gem', '~> 2.0' +# group :test, :development do +# gem 'custom-gem', '~> 2.0' # end # Add your custom gem dependencies here - -group :test, :development do - gem 'mutex_m' - gem 'base64' -end diff --git a/Gemfile.lock b/Gemfile.lock index 42dded3b..e07efec6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,9 +9,9 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - apimatic_core (0.3.20) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) + apimatic_core (0.3.21) apimatic_core_interfaces (~> 0.2.0) certifi (~> 2018.1, >= 2018.01.18) faraday-multipart (~> 1.0) @@ -28,12 +28,11 @@ GEM faraday-net_http_persistent (~> 2.0) faraday-retry (~> 2.0) ast (2.4.3) - base64 (0.3.0) bigdecimal (3.3.1) certifi (2018.01.18) coderay (1.1.3) - connection_pool (2.5.4) - crack (1.0.0) + connection_pool (2.5.5) + crack (1.0.1) bigdecimal rexml faraday (2.14.0) @@ -49,28 +48,27 @@ GEM faraday (>= 0.8) faraday-multipart (1.1.1) multipart-post (~> 2.0) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) + faraday-net_http (3.4.2) + net-http (~> 0.5) faraday-net_http_persistent (2.3.1) faraday (~> 2.5) net-http-persistent (>= 4.0.4, < 5) faraday-retry (2.3.2) faraday (~> 2.0) hashdiff (1.2.1) - json (2.15.1) + json (2.17.1) language_server-protocol (3.17.0.5) lint_roller (1.1.0) logger (1.7.0) method_source (1.1.0) - minitest (5.26.0) + minitest (5.26.2) minitest-proveit (1.0.0) minitest (> 5, < 7) minitest-rg (5.3.0) minitest (~> 5.0) multipart-post (2.4.1) - mutex_m (0.3.0) - net-http (0.6.0) - uri + net-http (0.8.0) + uri (>= 0.11.1) net-http-persistent (4.0.6) connection_pool (~> 2.2, >= 2.2.4) nokogiri (1.18.10-aarch64-linux-gnu) @@ -90,20 +88,20 @@ GEM nokogiri (1.18.10-x86_64-linux-musl) racc (~> 1.4) parallel (1.27.0) - parser (3.3.9.0) + parser (3.3.10.0) ast (~> 2.4.1) racc prism (1.6.0) pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (6.0.2) + public_suffix (7.0.0) racc (1.8.1) rainbow (3.1.1) - rake (13.3.0) + rake (13.3.1) regexp_parser (2.11.3) rexml (3.4.4) - rubocop (1.81.1) + rubocop (1.81.7) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -114,7 +112,7 @@ GEM rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.47.1) + rubocop-ast (1.48.0) parser (>= 3.3.7.2) prism (~> 1.4) rubocop-minitest (0.38.2) @@ -125,12 +123,12 @@ GEM unicode-display_width (3.2.0) unicode-emoji (~> 4.1) unicode-emoji (4.1.0) - uri (1.0.4) - webmock (3.25.1) + uri (1.1.1) + webmock (3.26.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - zlib (3.2.1) + zlib (3.2.2) PLATFORMS aarch64-linux-gnu @@ -143,11 +141,9 @@ PLATFORMS x86_64-linux-musl DEPENDENCIES - base64 minitest (~> 5.20, ~> 5.16) minitest-proveit (~> 1.0) minitest-rg - mutex_m pry rake (~> 13.0) rubocop (~> 1.21) From a2873c2ed1b225df1a3e9771b842381f1d96267c Mon Sep 17 00:00:00 2001 From: fern-support <126544928+fern-support@users.noreply.github.com> Date: Thu, 4 Dec 2025 21:25:58 -0500 Subject: [PATCH 2/3] add gems back to custom gemfile --- Gemfile.custom | 5 +++++ Gemfile.lock | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Gemfile.custom b/Gemfile.custom index 6e901090..1acb80a7 100644 --- a/Gemfile.custom +++ b/Gemfile.custom @@ -12,3 +12,8 @@ # end # Add your custom gem dependencies here + +group :test, :development do + gem 'mutex_m' + gem 'base64' +end diff --git a/Gemfile.lock b/Gemfile.lock index e07efec6..59ea5bfd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,7 @@ GEM faraday-net_http_persistent (~> 2.0) faraday-retry (~> 2.0) ast (2.4.3) + base64 (0.3.0) bigdecimal (3.3.1) certifi (2018.01.18) coderay (1.1.3) @@ -67,6 +68,7 @@ GEM minitest-rg (5.3.0) minitest (~> 5.0) multipart-post (2.4.1) + mutex_m (0.3.0) net-http (0.8.0) uri (>= 0.11.1) net-http-persistent (4.0.6) @@ -141,9 +143,11 @@ PLATFORMS x86_64-linux-musl DEPENDENCIES + base64 minitest (~> 5.20, ~> 5.16) minitest-proveit (~> 1.0) minitest-rg + mutex_m pry rake (~> 13.0) rubocop (~> 1.21) From 5bee81fbfb85a6ecb66d1c9264aa9c6eb80592e9 Mon Sep 17 00:00:00 2001 From: fern-support <126544928+fern-support@users.noreply.github.com> Date: Thu, 4 Dec 2025 21:26:45 -0500 Subject: [PATCH 3/3] Update fernignore for test paths --- .fernignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.fernignore b/.fernignore index 7f524b35..6ee53ed0 100644 --- a/.fernignore +++ b/.fernignore @@ -2,7 +2,8 @@ lib/square_legacy/ lib/square_legacy.rb Rakefile .gitignore -test/ +test/square_legacy +test/square/integration .github/workflows README.md lib/square/file_param.rb