diff --git a/Gemfile.d/rubocop.rb b/Gemfile.d/rubocop.rb index b2e670d363d..926d765187a 100644 --- a/Gemfile.d/rubocop.rb +++ b/Gemfile.d/rubocop.rb @@ -27,7 +27,7 @@ group :test do gem "mime-types-data", "~> 3.2023", require: false rubocop_canvas_path = "gems/rubocop-canvas" - if File.dirname(Bundler.default_gemfile) == __dir__ + if File.dirname(@gemfile) == __dir__ rubocop_canvas_path = "../#{rubocop_canvas_path}" end diff --git a/Gemfile.d/rubocop.rb.lock b/Gemfile.d/rubocop.rb.lock index 96b7e2a6a5f..8418a21e510 100644 --- a/Gemfile.d/rubocop.rb.lock +++ b/Gemfile.d/rubocop.rb.lock @@ -2,9 +2,10 @@ PATH remote: ../gems/rubocop-canvas specs: rubocop-canvas (1.0.0) - activesupport (>= 6.0) + activesupport (~> 7.0.4) jira_ref_parser (= 1.0.1) - outrigger (~> 3.0) + outrigger (~> 3.0, >= 3.0.1) + railties (~> 7.0.4) rubocop (~> 1.19) rubocop-rails (~> 2.19) @@ -57,8 +58,14 @@ GEM mini_mime (1.1.2) minitest (5.18.0) multi_xml (0.6.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) outrigger (3.0.1) activerecord (>= 6.0, < 7.1) railties (>= 6.0, < 7.1) @@ -68,7 +75,7 @@ GEM racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -117,7 +124,10 @@ GEM rubocop (~> 1.33) rubocop-capybara (~> 2.17) ruby-progressbar (1.11.0) + sqlite3 (1.6.2-aarch64-linux) sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -125,10 +135,12 @@ GEM zeitwerk (2.6.8) PLATFORMS + aarch64-linux arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES - activerecord (~> 7.0.4) gergich (= 2.1.1) mime-types-data (~> 3.2023) rubocop-canvas! @@ -139,4 +151,4 @@ DEPENDENCIES rubocop-rspec (= 2.19.0) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/Gemfile.rails70.lock.partial b/Gemfile.rails70.lock.partial index 82ed4bf0584..3a3b06594c0 100644 --- a/Gemfile.rails70.lock.partial +++ b/Gemfile.rails70.lock.partial @@ -144,9 +144,10 @@ PATH remote: gems/rubocop-canvas specs: rubocop-canvas (1.0.0) - activesupport (>= 6.0) + activesupport (~> 7.0.4) jira_ref_parser (= 1.0.1) - outrigger (~> 3.0) + outrigger (~> 3.0, >= 3.0.1) + railties (~> 7.0.4) rubocop (~> 1.19) rubocop-rails (~> 2.19) diff --git a/gems/activesupport-suspend_callbacks/Gemfile b/gems/activesupport-suspend_callbacks/Gemfile index 867ed22f63c..be173b205f7 100644 --- a/gems/activesupport-suspend_callbacks/Gemfile +++ b/gems/activesupport-suspend_callbacks/Gemfile @@ -1,6 +1,5 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false -# Specify your gem's dependencies in activesupport-suspend_callbacks.gemspec + gemspec diff --git a/gems/activesupport-suspend_callbacks/Gemfile.lock b/gems/activesupport-suspend_callbacks/Gemfile.lock index 315aa6e529b..d68e971c5d7 100644 --- a/gems/activesupport-suspend_callbacks/Gemfile.lock +++ b/gems/activesupport-suspend_callbacks/Gemfile.lock @@ -18,40 +18,43 @@ GEM docile (1.4.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) minitest (5.18.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) tzinfo (2.0.4) concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES activesupport-suspend_callbacks! bundler (~> 2.2) byebug rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/activesupport-suspend_callbacks/activesupport-suspend_callbacks.gemspec b/gems/activesupport-suspend_callbacks/activesupport-suspend_callbacks.gemspec index 6ebbb56da56..3d5d7879c17 100644 --- a/gems/activesupport-suspend_callbacks/activesupport-suspend_callbacks.gemspec +++ b/gems/activesupport-suspend_callbacks/activesupport-suspend_callbacks.gemspec @@ -16,5 +16,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/acts_as_list/Gemfile.lock b/gems/acts_as_list/Gemfile.lock index 49a5064086f..69ba2d0985e 100644 --- a/gems/acts_as_list/Gemfile.lock +++ b/gems/acts_as_list/Gemfile.lock @@ -75,8 +75,8 @@ GEM builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) erubi (1.12.0) globalid (1.1.0) activesupport (>= 5.0) @@ -87,29 +87,37 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -138,19 +146,23 @@ GEM zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) + sqlite3 (1.6.2-aarch64-linux) sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) + strscan (3.0.6) thor (1.2.1) timeout (0.3.2) tzinfo (2.0.4) @@ -161,13 +173,16 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES acts_as_list! bundler (>= 1.5, < 3.0) - rspec (~> 3.5.0) + rspec (~> 3.12) sqlite3 BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/acts_as_list/acts_as_list.gemspec b/gems/acts_as_list/acts_as_list.gemspec index 5eeaaf44cee..4cd4a32f9a0 100644 --- a/gems/acts_as_list/acts_as_list.gemspec +++ b/gems/acts_as_list/acts_as_list.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |spec| spec.add_dependency "rails", ">= 3.2" spec.add_development_dependency "bundler", ">= 1.5", "< 3.0" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "sqlite3" end diff --git a/gems/adheres_to_policy/Gemfile b/gems/adheres_to_policy/Gemfile index ac399bd0aea..be173b205f7 100644 --- a/gems/adheres_to_policy/Gemfile +++ b/gems/adheres_to_policy/Gemfile @@ -2,6 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in adheres_to_policy.gemspec gemspec -gem "simplecov", "0.14.1", require: false diff --git a/gems/adheres_to_policy/Gemfile.lock b/gems/adheres_to_policy/Gemfile.lock index abcf03d2dbb..cab7f447a85 100644 --- a/gems/adheres_to_policy/Gemfile.lock +++ b/gems/adheres_to_policy/Gemfile.lock @@ -75,43 +75,50 @@ GEM builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) docile (1.4.0) erubi (1.12.0) globalid (1.1.0) activesupport (>= 5.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -140,23 +147,25 @@ GEM zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + strscan (3.0.6) thor (1.2.1) timeout (0.3.2) tzinfo (2.0.4) @@ -167,14 +176,17 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES adheres_to_policy! bundler (~> 2.2) rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/adheres_to_policy/adheres_to_policy.gemspec b/gems/adheres_to_policy/adheres_to_policy.gemspec index cb519624e1a..cf77ce22779 100644 --- a/gems/adheres_to_policy/adheres_to_policy.gemspec +++ b/gems/adheres_to_policy/adheres_to_policy.gemspec @@ -15,5 +15,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/autoextend/Gemfile.lock b/gems/autoextend/Gemfile.lock index 12ff450c9e7..fc0a4f69bda 100644 --- a/gems/autoextend/Gemfile.lock +++ b/gems/autoextend/Gemfile.lock @@ -37,12 +37,18 @@ GEM nokogiri (>= 1.5.9) method_source (1.0.0) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -57,17 +63,17 @@ GEM zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) thor (1.2.1) tzinfo (2.0.4) @@ -75,14 +81,17 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES activesupport (~> 7.0) autoextend! byebug railties (~> 7.0) - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/autoextend/autoextend.gemspec b/gems/autoextend/autoextend.gemspec index 113652b677f..7d30580c72b 100644 --- a/gems/autoextend/autoextend.gemspec +++ b/gems/autoextend/autoextend.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "activesupport", "~> 7.0" spec.add_development_dependency "byebug" spec.add_development_dependency "railties", "~> 7.0" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/bookmarked_collection/Gemfile.lock b/gems/bookmarked_collection/Gemfile.lock index 1855117256e..139247dac13 100644 --- a/gems/bookmarked_collection/Gemfile.lock +++ b/gems/bookmarked_collection/Gemfile.lock @@ -93,8 +93,8 @@ GEM byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) erubi (1.12.0) folio-pagination (0.0.12) globalid (1.1.0) @@ -107,29 +107,37 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -158,19 +166,23 @@ GEM zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) + sqlite3 (1.6.2-aarch64-linux) sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) + strscan (3.0.6) thor (1.2.1) timeout (0.3.2) tzinfo (2.0.4) @@ -182,7 +194,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bookmarked_collection! @@ -191,8 +206,8 @@ DEPENDENCIES json_token! paginated_collection! rake - rspec (~> 3.5.0) + rspec (~> 3.12) sqlite3 BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/bookmarked_collection/bookmarked_collection.gemspec b/gems/bookmarked_collection/bookmarked_collection.gemspec index 9b882c11506..024c1877ed9 100644 --- a/gems/bookmarked_collection/bookmarked_collection.gemspec +++ b/gems/bookmarked_collection/bookmarked_collection.gemspec @@ -21,6 +21,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "sqlite3" end diff --git a/gems/broadcast_policy/Gemfile.lock b/gems/broadcast_policy/Gemfile.lock index 3385da97cee..faf30a32d57 100644 --- a/gems/broadcast_policy/Gemfile.lock +++ b/gems/broadcast_policy/Gemfile.lock @@ -32,29 +32,32 @@ GEM coderay (~> 1.1) method_source (~> 1.0) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES broadcast_policy! byebug pry - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/broadcast_policy/broadcast_policy.gemspec b/gems/broadcast_policy/broadcast_policy.gemspec index 5333625bd57..8641101fac9 100644 --- a/gems/broadcast_policy/broadcast_policy.gemspec +++ b/gems/broadcast_policy/broadcast_policy.gemspec @@ -17,5 +17,5 @@ Gem::Specification.new do |s| s.add_dependency "after_transaction_commit" s.add_development_dependency "byebug" s.add_development_dependency "pry" - s.add_development_dependency "rspec", "~> 3.5.0" + s.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/bundler_lockfile_extensions/Gemfile.lock b/gems/bundler_lockfile_extensions/Gemfile.lock index 4fc8b4083e7..f9fcd1ea7f3 100644 --- a/gems/bundler_lockfile_extensions/Gemfile.lock +++ b/gems/bundler_lockfile_extensions/Gemfile.lock @@ -8,25 +8,28 @@ GEM specs: diff-lcs (1.5.0) rspec (3.12.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.9.3) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler_lockfile_extensions! - rspec (~> 3.9.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/bundler_lockfile_extensions/bundler_lockfile_extensions.gemspec b/gems/bundler_lockfile_extensions/bundler_lockfile_extensions.gemspec index 2b0c9e5069d..1f51c593889 100644 --- a/gems/bundler_lockfile_extensions/bundler_lockfile_extensions.gemspec +++ b/gems/bundler_lockfile_extensions/bundler_lockfile_extensions.gemspec @@ -9,5 +9,5 @@ Gem::Specification.new do |spec| spec.files = Dir.glob("{lib,spec}/**/*") + %w[plugins.rb] spec.require_paths = ["lib"] - spec.add_development_dependency "rspec", "~> 3.9.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/canvas_breach_mitigation/Gemfile b/gems/canvas_breach_mitigation/Gemfile index 58ebe1d4411..bb94df82938 100644 --- a/gems/canvas_breach_mitigation/Gemfile +++ b/gems/canvas_breach_mitigation/Gemfile @@ -1,5 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false gemspec diff --git a/gems/canvas_breach_mitigation/Gemfile.lock b/gems/canvas_breach_mitigation/Gemfile.lock index bf7bfe99167..728a957665a 100644 --- a/gems/canvas_breach_mitigation/Gemfile.lock +++ b/gems/canvas_breach_mitigation/Gemfile.lock @@ -17,37 +17,40 @@ GEM docile (1.4.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) minitest (5.18.0) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) tzinfo (2.0.4) concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_breach_mitigation! - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_breach_mitigation/canvas_breach_mitigation.gemspec b/gems/canvas_breach_mitigation/canvas_breach_mitigation.gemspec index 2ad01e3c6d1..9cf5508bed1 100644 --- a/gems/canvas_breach_mitigation/canvas_breach_mitigation.gemspec +++ b/gems/canvas_breach_mitigation/canvas_breach_mitigation.gemspec @@ -14,5 +14,6 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_cache/Gemfile.lock b/gems/canvas_cache/Gemfile.lock index 2b20994df28..f56b46c3e4e 100644 --- a/gems/canvas_cache/Gemfile.lock +++ b/gems/canvas_cache/Gemfile.lock @@ -86,14 +86,13 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) aroi (0.0.7) - activerecord (>= 5.2) - activesupport (>= 5.2) + rails (>= 3.2) builder (3.2.4) byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) digest-murmurhash (1.1.1) dogstatsd-ruby (4.8.2) erubi (1.12.0) @@ -113,29 +112,37 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -185,6 +192,7 @@ GEM sentry-ruby-core (5.1.0) concurrent-ruby statsd-ruby (1.4.0) + strscan (3.0.6) thor (1.2.1) timecop (0.9.6) timeout (0.3.2) @@ -196,7 +204,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler @@ -207,4 +218,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_cassandra/Gemfile b/gems/canvas_cassandra/Gemfile index e1285fd104f..0c66ed953df 100644 --- a/gems/canvas_cassandra/Gemfile +++ b/gems/canvas_cassandra/Gemfile @@ -1,9 +1,8 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false -# Specify your gem's dependencies in canvas_cassandra.gemspec + gemspec -gem "cassandra-cql", "1.2.2", github: "kreynolds/cassandra-cql", ref: "beed72e249d02cebc850a4b92b468c8b64b12257" +gem "cassandra-cql", "1.2.3", github: "kreynolds/cassandra-cql", ref: "02b5abbe441a345c051a180327932566fd66bb36" gem "config_file", path: "../config_file" diff --git a/gems/canvas_cassandra/Gemfile.lock b/gems/canvas_cassandra/Gemfile.lock new file mode 100644 index 00000000000..81af0814ad4 --- /dev/null +++ b/gems/canvas_cassandra/Gemfile.lock @@ -0,0 +1,217 @@ +GIT + remote: https://github.com/kreynolds/cassandra-cql.git + revision: 02b5abbe441a345c051a180327932566fd66bb36 + ref: 02b5abbe441a345c051a180327932566fd66bb36 + specs: + cassandra-cql (1.2.3) + simple_uuid (>= 0.2.0) + thrift_client (>= 0.7.1, < 0.10) + +PATH + remote: ../config_file + specs: + config_file (0.1.0) + rails (>= 5.0) + +PATH + remote: . + specs: + canvas_cassandra (0.1.0) + cassandra-cql (~> 1.2.2) + config_file + rails (>= 5.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.3.6) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + builder (3.2.4) + byebug (11.1.3) + concurrent-ruby (1.2.2) + crass (1.0.6) + diff-lcs (1.5.0) + digest (3.1.1) + docile (1.4.0) + erubi (1.12.0) + globalid (1.1.0) + activesupport (>= 5.0) + i18n (1.13.0) + concurrent-ruby (~> 1.0) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) + minitest (5.18.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.2.1) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) + nokogiri (1.13.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) + racc (1.6.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + bundler (>= 1.15.0) + railties (= 7.0.4.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rake (13.0.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + simple_uuid (0.4.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + strscan (3.0.6) + thor (1.2.1) + thrift (0.9.3.0) + thrift_client (0.9.3) + thrift (~> 0.9.0) + timeout (0.3.2) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.8) + +PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bundler (~> 2.2) + byebug + canvas_cassandra! + cassandra-cql (= 1.2.3)! + config_file! + rake + rspec (~> 3.12) + simplecov (~> 0.22) + +BUNDLED WITH + 2.3.26 diff --git a/gems/canvas_cassandra/canvas_cassandra.gemspec b/gems/canvas_cassandra/canvas_cassandra.gemspec index 4937080f895..a1a2c8257b2 100644 --- a/gems/canvas_cassandra/canvas_cassandra.gemspec +++ b/gems/canvas_cassandra/canvas_cassandra.gemspec @@ -20,5 +20,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_color/Gemfile b/gems/canvas_color/Gemfile index 69f68a2f88f..be173b205f7 100644 --- a/gems/canvas_color/Gemfile +++ b/gems/canvas_color/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in canvas_color.gemspec gemspec diff --git a/gems/canvas_color/Gemfile.lock b/gems/canvas_color/Gemfile.lock new file mode 100644 index 00000000000..e57e551bbd2 --- /dev/null +++ b/gems/canvas_color/Gemfile.lock @@ -0,0 +1,23 @@ +PATH + remote: . + specs: + canvas_color (0.0.1) + +GEM + remote: https://rubygems.org/ + specs: + rake (13.0.6) + +PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bundler (~> 2.2) + canvas_color! + rake + +BUNDLED WITH + 2.4.10 diff --git a/gems/canvas_crummy/Gemfile b/gems/canvas_crummy/Gemfile index b15a4d86e5d..5d6e1236816 100644 --- a/gems/canvas_crummy/Gemfile +++ b/gems/canvas_crummy/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false + # Specify your gem's dependencies in canvas_crummy.gemspec gemspec diff --git a/gems/canvas_crummy/Gemfile.lock b/gems/canvas_crummy/Gemfile.lock new file mode 100644 index 00000000000..96af2592141 --- /dev/null +++ b/gems/canvas_crummy/Gemfile.lock @@ -0,0 +1,31 @@ +PATH + remote: . + specs: + canvas_crummy (0.0.1) + +GEM + remote: https://rubygems.org/ + specs: + docile (1.4.0) + rake (13.0.6) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + +PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bundler (~> 2.2) + canvas_crummy! + rake + simplecov (~> 0.22) + +BUNDLED WITH + 2.3.26 diff --git a/gems/canvas_crummy/canvas_crummy.gemspec b/gems/canvas_crummy/canvas_crummy.gemspec index 7cdc3410056..4b11e642882 100644 --- a/gems/canvas_crummy/canvas_crummy.gemspec +++ b/gems/canvas_crummy/canvas_crummy.gemspec @@ -13,4 +13,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_dynamodb/Gemfile b/gems/canvas_dynamodb/Gemfile index bd5be8fe0ed..922a88fcd4a 100644 --- a/gems/canvas_dynamodb/Gemfile +++ b/gems/canvas_dynamodb/Gemfile @@ -1,6 +1,5 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false # Specify your gem's dependencies in canvas_dynamodb.gemspec gemspec diff --git a/gems/canvas_dynamodb/Gemfile.lock b/gems/canvas_dynamodb/Gemfile.lock new file mode 100644 index 00000000000..57e4d988f95 --- /dev/null +++ b/gems/canvas_dynamodb/Gemfile.lock @@ -0,0 +1,64 @@ +PATH + remote: . + specs: + canvas_dynamodb (0.0.1) + aws-sdk-applicationautoscaling (~> 1.26) + aws-sdk-dynamodb (~> 1.32) + +GEM + remote: https://rubygems.org/ + specs: + aws-eventstream (1.2.0) + aws-partitions (1.737.0) + aws-sdk-applicationautoscaling (1.68.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.171.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-dynamodb (1.83.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + diff-lcs (1.5.0) + docile (1.4.0) + jmespath (1.6.2) + rake (13.0.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + +PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bundler (~> 2.2) + canvas_dynamodb! + rake + rspec (~> 3.12) + simplecov (~> 0.22) + +BUNDLED WITH + 2.3.26 diff --git a/gems/canvas_dynamodb/canvas_dynamodb.gemspec b/gems/canvas_dynamodb/canvas_dynamodb.gemspec index 95d356cc5a1..85655ef402d 100644 --- a/gems/canvas_dynamodb/canvas_dynamodb.gemspec +++ b/gems/canvas_dynamodb/canvas_dynamodb.gemspec @@ -18,5 +18,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.7.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_errors/Gemfile.lock b/gems/canvas_errors/Gemfile.lock index 10d07dbb207..b3a07d55109 100644 --- a/gems/canvas_errors/Gemfile.lock +++ b/gems/canvas_errors/Gemfile.lock @@ -63,13 +63,19 @@ GEM nokogiri (>= 1.5.9) method_source (1.0.0) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) raabro (1.4.0) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -102,7 +108,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler @@ -111,4 +120,4 @@ DEPENDENCIES rspec BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_ext/Gemfile.lock b/gems/canvas_ext/Gemfile.lock index f9013f881bf..7feaa585498 100644 --- a/gems/canvas_ext/Gemfile.lock +++ b/gems/canvas_ext/Gemfile.lock @@ -20,29 +20,32 @@ GEM minitest (5.18.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_ext! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_ext/canvas_ext.gemspec b/gems/canvas_ext/canvas_ext.gemspec index 6d3a7f4dc54..bac052b6bf3 100644 --- a/gems/canvas_ext/canvas_ext.gemspec +++ b/gems/canvas_ext/canvas_ext.gemspec @@ -16,5 +16,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/canvas_http/Gemfile b/gems/canvas_http/Gemfile index de034cc0be3..c965b138963 100644 --- a/gems/canvas_http/Gemfile +++ b/gems/canvas_http/Gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" -# Specify your gem's dependencies in canvas_http.gemspec gemspec gem "canvas_slug", path: "../canvas_slug" diff --git a/gems/canvas_http/Gemfile.lock b/gems/canvas_http/Gemfile.lock index 0f68fd5d1de..6de8907bc79 100644 --- a/gems/canvas_http/Gemfile.lock +++ b/gems/canvas_http/Gemfile.lock @@ -33,26 +33,29 @@ GEM rake (13.0.6) rexml (3.2.5) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) swearjar (1.4.0) webmock (3.18.1) - addressable (>= 2.3.6) + addressable (>= 2.8.0) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) @@ -60,8 +63,8 @@ DEPENDENCIES canvas_slug! multipart! rake - rspec (~> 3.5.0) - webmock (= 1.24.6) + rspec (~> 3.12) + webmock (~> 3.18) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_http/canvas_http.gemspec b/gems/canvas_http/canvas_http.gemspec index af95213096b..7645138d013 100644 --- a/gems/canvas_http/canvas_http.gemspec +++ b/gems/canvas_http/canvas_http.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "multipart" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" - spec.add_development_dependency "webmock", "1.24.6" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "webmock", "~> 3.18" end diff --git a/gems/canvas_http/spec/canvas_http_spec.rb b/gems/canvas_http/spec/canvas_http_spec.rb index 8c7d92ceead..69b5c048159 100644 --- a/gems/canvas_http/spec/canvas_http_spec.rb +++ b/gems/canvas_http/spec/canvas_http_spec.rb @@ -23,6 +23,8 @@ require "webmock" require "tempfile" require "multipart" +WebMock.enable! + describe "CanvasHttp" do include WebMock::API diff --git a/gems/canvas_kaltura/Gemfile.lock b/gems/canvas_kaltura/Gemfile.lock index e143e922438..b1f62f1aa8f 100644 --- a/gems/canvas_kaltura/Gemfile.lock +++ b/gems/canvas_kaltura/Gemfile.lock @@ -44,33 +44,42 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) public_suffix (5.0.1) racc (1.6.2) rake (13.0.6) rexml (3.2.5) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) swearjar (1.4.0) webmock (3.18.1) - addressable (>= 2.3.6) + addressable (>= 2.8.0) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) @@ -80,8 +89,8 @@ DEPENDENCIES canvas_sort! multipart! rake - rspec (~> 3.5.0) - webmock (= 2.3.1) + rspec (~> 3.12) + webmock (~> 3.18) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_kaltura/canvas_kaltura.gemspec b/gems/canvas_kaltura/canvas_kaltura.gemspec index 0ae8f326743..3e1c2c70e29 100644 --- a/gems/canvas_kaltura/canvas_kaltura.gemspec +++ b/gems/canvas_kaltura/canvas_kaltura.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" - spec.add_development_dependency "webmock", "2.3.1" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "webmock", "~> 3.18" end diff --git a/gems/canvas_mimetype_fu/Gemfile b/gems/canvas_mimetype_fu/Gemfile index 58ebe1d4411..be173b205f7 100644 --- a/gems/canvas_mimetype_fu/Gemfile +++ b/gems/canvas_mimetype_fu/Gemfile @@ -1,5 +1,5 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false + gemspec diff --git a/gems/canvas_mimetype_fu/Gemfile.lock b/gems/canvas_mimetype_fu/Gemfile.lock index 15261bac8a6..169f65ac633 100644 --- a/gems/canvas_mimetype_fu/Gemfile.lock +++ b/gems/canvas_mimetype_fu/Gemfile.lock @@ -8,36 +8,39 @@ GEM specs: diff-lcs (1.5.0) docile (1.4.0) - json (2.6.3) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_mimetype_fu! rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_mimetype_fu/canvas_mimetype_fu.gemspec b/gems/canvas_mimetype_fu/canvas_mimetype_fu.gemspec index 85791c3e8d7..7ad9a81f00b 100644 --- a/gems/canvas_mimetype_fu/canvas_mimetype_fu.gemspec +++ b/gems/canvas_mimetype_fu/canvas_mimetype_fu.gemspec @@ -13,5 +13,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_panda_pub/Gemfile.lock b/gems/canvas_panda_pub/Gemfile.lock index 3332009b36c..c3ad68effa1 100644 --- a/gems/canvas_panda_pub/Gemfile.lock +++ b/gems/canvas_panda_pub/Gemfile.lock @@ -76,7 +76,10 @@ GEM hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (>= 1.5, < 3) diff --git a/gems/canvas_partman/Gemfile b/gems/canvas_partman/Gemfile index 0f4dc4f75c4..be173b205f7 100644 --- a/gems/canvas_partman/Gemfile +++ b/gems/canvas_partman/Gemfile @@ -2,8 +2,4 @@ source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false - -gem "byebug", require: false - gemspec diff --git a/gems/canvas_partman/Gemfile.lock b/gems/canvas_partman/Gemfile.lock index 8bfd1a941bc..41fa1af1299 100644 --- a/gems/canvas_partman/Gemfile.lock +++ b/gems/canvas_partman/Gemfile.lock @@ -36,7 +36,6 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) builder (3.2.4) - byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) @@ -44,19 +43,24 @@ GEM erubi (1.12.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) method_source (1.0.0) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) pg (1.4.5) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -71,37 +75,40 @@ GEM zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) - byebug canvas_partman! - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_partman/canvas_partman.gemspec b/gems/canvas_partman/canvas_partman.gemspec index 1b611d38268..806d0432262 100644 --- a/gems/canvas_partman/canvas_partman.gemspec +++ b/gems/canvas_partman/canvas_partman.gemspec @@ -17,5 +17,6 @@ Gem::Specification.new do |spec| spec.add_dependency "pg", ">= 0.17", "< 2.0" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_quiz_statistics/Gemfile b/gems/canvas_quiz_statistics/Gemfile index 1423e69ea43..976ad45a795 100644 --- a/gems/canvas_quiz_statistics/Gemfile +++ b/gems/canvas_quiz_statistics/Gemfile @@ -6,8 +6,3 @@ gemspec gem "canvas_text_helper", path: "../canvas_text_helper" gem "html_text_helper", path: "../html_text_helper" -gem "simplecov", "0.14.1", require: false - -platforms :ruby_20, :ruby_21, :ruby_22 do - gem "iconv", "1.0.4" -end diff --git a/gems/canvas_quiz_statistics/Gemfile.lock b/gems/canvas_quiz_statistics/Gemfile.lock index 62aef22fcf3..5e62fd56004 100644 --- a/gems/canvas_quiz_statistics/Gemfile.lock +++ b/gems/canvas_quiz_statistics/Gemfile.lock @@ -30,76 +30,46 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) byebug (11.1.3) - coderay (1.1.3) concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) docile (1.4.0) - ffi (1.14.2) - formatador (1.1.0) - guard (2.18.0) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.13.0) - shellany (~> 0.0) - thor (>= 0.18.1) - guard-compat (1.2.1) - guard-rspec (4.7.3) - guard (~> 2.1) - guard-compat (~> 1.1) - rspec (>= 2.99.0, < 4.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - iconv (1.0.4) idn-ruby (0.1.5) - json (2.6.3) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - lumberjack (1.2.8) - method_source (1.0.0) minitest (5.18.0) - nenv (0.3.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) - notiffany (0.1.3) - nenv (~> 0.1) - shellany (~> 0.0) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rake (13.0.6) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) sanitize (6.0.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - shellany (0.0.1) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - terminal-notifier-guard (1.7.0) - thor (1.2.1) + simplecov_json_formatter (0.1.4) twitter-text (3.1.0) idn-ruby unf (~> 0.1.0) @@ -110,22 +80,19 @@ GEM unf_ext (0.0.8.2) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES - bundler (~> 2.2) byebug canvas_quiz_statistics! canvas_text_helper! - guard - guard-rspec html_text_helper! - iconv (= 1.0.4) - listen (= 3.0.8) rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) - terminal-notifier-guard + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_quiz_statistics/canvas_quiz_statistics.gemspec b/gems/canvas_quiz_statistics/canvas_quiz_statistics.gemspec index a9762145d21..e32c183280b 100644 --- a/gems/canvas_quiz_statistics/canvas_quiz_statistics.gemspec +++ b/gems/canvas_quiz_statistics/canvas_quiz_statistics.gemspec @@ -14,12 +14,8 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport" spec.add_dependency "html_text_helper" - spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" - spec.add_development_dependency "guard" - spec.add_development_dependency "guard-rspec" - spec.add_development_dependency "listen", "3.0.8" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" - spec.add_development_dependency "terminal-notifier-guard" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_sanitize/Gemfile b/gems/canvas_sanitize/Gemfile index b3ff67e521e..be173b205f7 100644 --- a/gems/canvas_sanitize/Gemfile +++ b/gems/canvas_sanitize/Gemfile @@ -1,7 +1,5 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "simplecov", "0.14.1", require: false -# Specify your gem's dependencies in canvas_sanitize.gemspec gemspec diff --git a/gems/canvas_sanitize/Gemfile.lock b/gems/canvas_sanitize/Gemfile.lock index 11c5c1539e9..bd34be0bffd 100644 --- a/gems/canvas_sanitize/Gemfile.lock +++ b/gems/canvas_sanitize/Gemfile.lock @@ -11,43 +11,52 @@ GEM crass (1.0.6) diff-lcs (1.5.0) docile (1.4.0) - json (2.6.3) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) sanitize (6.0.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) byebug canvas_sanitize! rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_sanitize/canvas_sanitize.gemspec b/gems/canvas_sanitize/canvas_sanitize.gemspec index 4923c558464..d26d834c3f7 100644 --- a/gems/canvas_sanitize/canvas_sanitize.gemspec +++ b/gems/canvas_sanitize/canvas_sanitize.gemspec @@ -16,5 +16,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_security/Gemfile.lock b/gems/canvas_security/Gemfile.lock index b8d8c47c270..6942b339942 100644 --- a/gems/canvas_security/Gemfile.lock +++ b/gems/canvas_security/Gemfile.lock @@ -106,17 +106,16 @@ GEM after_transaction_commit (2.2.2) activerecord (>= 5.2) aroi (0.0.7) - activerecord (>= 5.2) - activesupport (>= 5.2) + rails (>= 3.2) bindata (2.4.14) builder (3.2.4) byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) debug_inspector (1.1.0) deep_merge (1.2.2) diff-lcs (1.5.0) + digest (3.1.1) digest-murmurhash (1.1.1) diplomat (2.6.3) deep_merge (~> 1.2) @@ -158,31 +157,39 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) multipart-post (2.1.1) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) raabro (1.4.0) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -232,6 +239,7 @@ GEM sentry-ruby-core (5.1.0) concurrent-ruby statsd-ruby (1.4.0) + strscan (3.0.6) thor (1.2.1) timecop (0.9.6) timeout (0.3.2) @@ -243,7 +251,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler @@ -257,4 +268,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_slug/Gemfile.lock b/gems/canvas_slug/Gemfile.lock index f1933f71812..8c183eec81a 100644 --- a/gems/canvas_slug/Gemfile.lock +++ b/gems/canvas_slug/Gemfile.lock @@ -10,28 +10,31 @@ GEM diff-lcs (1.5.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) swearjar (1.4.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (>= 1.5, < 3) canvas_slug! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_slug/canvas_slug.gemspec b/gems/canvas_slug/canvas_slug.gemspec index 1f2fce75d99..cf7afd61cea 100644 --- a/gems/canvas_slug/canvas_slug.gemspec +++ b/gems/canvas_slug/canvas_slug.gemspec @@ -13,6 +13,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", ">= 1.5", "< 3" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_dependency "swearjar", "~> 1.4" end diff --git a/gems/canvas_sort/Gemfile b/gems/canvas_sort/Gemfile index d4daab32cdb..be173b205f7 100644 --- a/gems/canvas_sort/Gemfile +++ b/gems/canvas_sort/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in canvas_sort.gemspec gemspec diff --git a/gems/canvas_sort/Gemfile.lock b/gems/canvas_sort/Gemfile.lock index ed9053e78bd..f797b74df90 100644 --- a/gems/canvas_sort/Gemfile.lock +++ b/gems/canvas_sort/Gemfile.lock @@ -9,27 +9,30 @@ GEM diff-lcs (1.5.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_sort! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_sort/canvas_sort.gemspec b/gems/canvas_sort/canvas_sort.gemspec index 3e186554ca6..da92f0c2d4e 100644 --- a/gems/canvas_sort/canvas_sort.gemspec +++ b/gems/canvas_sort/canvas_sort.gemspec @@ -13,5 +13,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/canvas_stringex/Gemfile b/gems/canvas_stringex/Gemfile index 3d2e89c1c92..be173b205f7 100644 --- a/gems/canvas_stringex/Gemfile +++ b/gems/canvas_stringex/Gemfile @@ -3,4 +3,3 @@ source "https://rubygems.org" gemspec -gem "simplecov", "0.14.1", require: false diff --git a/gems/canvas_stringex/Gemfile.lock b/gems/canvas_stringex/Gemfile.lock index 8893bc02679..29b40246659 100644 --- a/gems/canvas_stringex/Gemfile.lock +++ b/gems/canvas_stringex/Gemfile.lock @@ -7,7 +7,6 @@ PATH GEM remote: https://rubygems.org/ specs: - RedCloth (4.3.2) actioncable (7.0.4.3) actionpack (= 7.0.4.3) activesupport (= 7.0.4.3) @@ -76,43 +75,50 @@ GEM builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) docile (1.4.0) erubi (1.12.0) globalid (1.1.0) activesupport (>= 5.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -141,24 +147,29 @@ GEM zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + sqlite3 (1.6.2-aarch64-linux) sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) + strscan (3.0.6) thor (1.2.1) timeout (0.3.2) tzinfo (2.0.4) @@ -169,17 +180,19 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES - RedCloth activerecord bundler (>= 1.5, < 3) canvas_stringex! rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) sqlite3 BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_stringex/canvas_stringex.gemspec b/gems/canvas_stringex/canvas_stringex.gemspec index dcbba55358a..4b4e641dd5c 100644 --- a/gems/canvas_stringex/canvas_stringex.gemspec +++ b/gems/canvas_stringex/canvas_stringex.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "activerecord" spec.add_development_dependency "bundler", ">= 1.5", "< 3" spec.add_development_dependency "rake" - spec.add_development_dependency "RedCloth" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" spec.add_development_dependency "sqlite3" end diff --git a/gems/canvas_stringex/lib/lucky_sneaks/string_extensions.rb b/gems/canvas_stringex/lib/lucky_sneaks/string_extensions.rb index e687d8dfc81..3fd3c6de6c1 100644 --- a/gems/canvas_stringex/lib/lucky_sneaks/string_extensions.rb +++ b/gems/canvas_stringex/lib/lucky_sneaks/string_extensions.rb @@ -23,28 +23,6 @@ module LuckySneaks base.extend(ClassMethods) end - # Returns the string converted (via Textile/RedCloth) to HTML format or - # self if Redcloth is not available. - # - # Using :lite argument will cause RedCloth to not wrap the HTML in a container - # P element, which is useful behavior for generating header element text, etc. - # This is roughly equivalent to ActionView's textilize_without_paragraph - # except that it makes RedCloth do all the work instead of just gsubbing the return - # from RedCloth. - def to_html(lite_mode = false) - if defined?(RedCloth) - if lite_mode - RedCloth.new(self, [:lite_mode]).to_html - elsif include?("
")
-          RedCloth.new(self).to_html.tr("\t", "")
-        else
-          RedCloth.new(self).to_html.tr("\t", "").gsub(/\n\n/, "")
-        end
-      else
-        self
-      end
-    end
-
     # Create a URI-friendly representation of the string. This is used internally by
     # acts_as_url[link:classes/LuckySneaks/ActsAsUrl/ClassMethods.html#M000012]
     # but can be called manually in order to generate an URI-friendly version of any string.
diff --git a/gems/canvas_stringex/spec/lucky_sneaks/string_extensions_spec.rb b/gems/canvas_stringex/spec/lucky_sneaks/string_extensions_spec.rb
index d6e50c8d039..50ee667ff4a 100644
--- a/gems/canvas_stringex/spec/lucky_sneaks/string_extensions_spec.rb
+++ b/gems/canvas_stringex/spec/lucky_sneaks/string_extensions_spec.rb
@@ -19,29 +19,6 @@
 require "spec_helper"
 
 describe "StringExtensions" do
-  it "to_html" do
-    require "RedCloth"
-    {
-      "h1. A Solution" => "

A Solution

", - "I hated wrapping textilize around a string.\n\nIt always felt dirty." => - "

I hated wrapping textilize around a string.

\n

It always felt dirty.

", - "I think _this_ is awesome" => "

I think this is awesome

", - "Um... _*really*_, man" => "

Um… really, man

" - }.each do |plain, html| - expect(html).to eq plain.to_html - end - end - - it "to_html_lite" do - require "RedCloth" - { - "I have no pee on me" => "I have no pee on me", - "But I _do_ get Textile!" => "But I do get Textile!" - }.each do |plain, html| - expect(html).to eq plain.to_html(:lite) - end - end - it "to_url" do { "

This has 100% too much formatting

" => diff --git a/gems/canvas_text_helper/Gemfile b/gems/canvas_text_helper/Gemfile index aa9d7acbbee..be173b205f7 100644 --- a/gems/canvas_text_helper/Gemfile +++ b/gems/canvas_text_helper/Gemfile @@ -2,6 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in text_helper.gemspec gemspec -gem "simplecov", "0.14.1", require: false diff --git a/gems/canvas_text_helper/Gemfile.lock b/gems/canvas_text_helper/Gemfile.lock index 2d4a416bb6e..734e178f639 100644 --- a/gems/canvas_text_helper/Gemfile.lock +++ b/gems/canvas_text_helper/Gemfile.lock @@ -12,36 +12,39 @@ GEM docile (1.4.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_text_helper! rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_text_helper/canvas_text_helper.gemspec b/gems/canvas_text_helper/canvas_text_helper.gemspec index 2dc0410e3a2..96b128c0773 100644 --- a/gems/canvas_text_helper/canvas_text_helper.gemspec +++ b/gems/canvas_text_helper/canvas_text_helper.gemspec @@ -14,5 +14,6 @@ Gem::Specification.new do |spec| spec.add_dependency "i18n" spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/canvas_time/Gemfile b/gems/canvas_time/Gemfile index 0eadb0a910c..be173b205f7 100644 --- a/gems/canvas_time/Gemfile +++ b/gems/canvas_time/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in canvas_time.gemspec gemspec diff --git a/gems/canvas_time/Gemfile.lock b/gems/canvas_time/Gemfile.lock index f1f551d6e44..2840fd2b032 100644 --- a/gems/canvas_time/Gemfile.lock +++ b/gems/canvas_time/Gemfile.lock @@ -20,31 +20,34 @@ GEM minitest (5.18.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) timecop (0.9.6) tzinfo (2.0.4) concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_time! rake - rspec (~> 3.5.0) + rspec (~> 3.12) timecop BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_time/canvas_time.gemspec b/gems/canvas_time/canvas_time.gemspec index d6721ad1a68..3d434ff8883 100644 --- a/gems/canvas_time/canvas_time.gemspec +++ b/gems/canvas_time/canvas_time.gemspec @@ -17,6 +17,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "timecop" end diff --git a/gems/canvas_unzip/Gemfile.lock b/gems/canvas_unzip/Gemfile.lock index be5a1e0a6ac..dcc4cd12f5f 100644 --- a/gems/canvas_unzip/Gemfile.lock +++ b/gems/canvas_unzip/Gemfile.lock @@ -26,31 +26,34 @@ GEM minitest (5.18.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) rubyzip (2.3.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler canvas_mimetype_fu! canvas_unzip! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/canvas_unzip/canvas_unzip.gemspec b/gems/canvas_unzip/canvas_unzip.gemspec index 9d6b512705e..d6edb0dc287 100644 --- a/gems/canvas_unzip/canvas_unzip.gemspec +++ b/gems/canvas_unzip/canvas_unzip.gemspec @@ -17,5 +17,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/config_file/Gemfile.lock b/gems/config_file/Gemfile.lock index cdc225843fb..0b02292ac8c 100644 --- a/gems/config_file/Gemfile.lock +++ b/gems/config_file/Gemfile.lock @@ -76,8 +76,8 @@ GEM byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) erubi (1.12.0) globalid (1.1.0) activesupport (>= 5.0) @@ -88,29 +88,37 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -151,6 +159,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) + strscan (3.0.6) thor (1.2.1) timeout (0.3.2) tzinfo (2.0.4) @@ -161,7 +170,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler @@ -170,4 +182,4 @@ DEPENDENCIES rspec BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/csv_diff/Gemfile b/gems/csv_diff/Gemfile index 58667b0ea5f..be173b205f7 100644 --- a/gems/csv_diff/Gemfile +++ b/gems/csv_diff/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in csv_diff.gemspec gemspec diff --git a/gems/csv_diff/Gemfile.lock b/gems/csv_diff/Gemfile.lock index b48e16b2df6..e1d0a3392ac 100644 --- a/gems/csv_diff/Gemfile.lock +++ b/gems/csv_diff/Gemfile.lock @@ -10,28 +10,34 @@ GEM diff-lcs (1.5.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) + sqlite3 (1.6.2-aarch64-linux) sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) csv_diff! - rake (~> 10.0) - rspec (~> 3.5.0) + rake + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/csv_diff/csv_diff.gemspec b/gems/csv_diff/csv_diff.gemspec index 9da6bd6849f..d22dbfacd12 100644 --- a/gems/csv_diff/csv_diff.gemspec +++ b/gems/csv_diff/csv_diff.gemspec @@ -15,6 +15,6 @@ Gem::Specification.new do |spec| spec.add_dependency "sqlite3" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rake", "~> 10.0" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rake" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/diigo/Gemfile b/gems/diigo/Gemfile index d17f03cf53a..be173b205f7 100644 --- a/gems/diigo/Gemfile +++ b/gems/diigo/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in diigo.gemspec gemspec diff --git a/gems/diigo/Gemfile.lock b/gems/diigo/Gemfile.lock index c6b12646924..4275aba20f1 100644 --- a/gems/diigo/Gemfile.lock +++ b/gems/diigo/Gemfile.lock @@ -8,32 +8,41 @@ GEM remote: https://rubygems.org/ specs: diff-lcs (1.5.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) diigo! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/diigo/diigo.gemspec b/gems/diigo/diigo.gemspec index f6b1f61f341..441e515e070 100644 --- a/gems/diigo/diigo.gemspec +++ b/gems/diigo/diigo.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/dr_diff/Gemfile b/gems/dr_diff/Gemfile index 2557a9045dc..be173b205f7 100644 --- a/gems/dr_diff/Gemfile +++ b/gems/dr_diff/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in dr_diff.gemspec gemspec diff --git a/gems/dr_diff/Gemfile.lock b/gems/dr_diff/Gemfile.lock index 51a006f6cfd..3c232e7e4f1 100644 --- a/gems/dr_diff/Gemfile.lock +++ b/gems/dr_diff/Gemfile.lock @@ -8,51 +8,41 @@ GEM remote: https://rubygems.org/ specs: byebug (11.1.3) - coderay (1.1.3) diff-lcs (1.5.0) gergich (2.1.1) httparty (~> 0.17) sqlite3 (~> 1.4) httparty (0.21.0) - mime-types (~> 3.0) + mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - method_source (1.0.0) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) + mini_mime (1.1.2) multi_xml (0.6.0) - pry (0.14.2) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) - slop (3.6.0) sqlite3 (1.6.2-arm64-darwin) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES byebug (~> 11.1) dr_diff! - pry - pry-nav - rspec (~> 3.5.0) + rspec (~> 3.12) rspec-mocks BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/dr_diff/dr_diff.gemspec b/gems/dr_diff/dr_diff.gemspec index b4dd05ff8ec..feab81b982a 100644 --- a/gems/dr_diff/dr_diff.gemspec +++ b/gems/dr_diff/dr_diff.gemspec @@ -13,8 +13,6 @@ Gem::Specification.new do |spec| spec.add_dependency "gergich", "2.1.1" spec.add_development_dependency "byebug", "~> 11.1" - spec.add_development_dependency "pry" - spec.add_development_dependency "pry-nav" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "rspec-mocks" end diff --git a/gems/dynamic_settings/Gemfile.lock b/gems/dynamic_settings/Gemfile.lock index 505894eeb81..3cc90504984 100644 --- a/gems/dynamic_settings/Gemfile.lock +++ b/gems/dynamic_settings/Gemfile.lock @@ -85,9 +85,9 @@ GEM byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) deep_merge (1.2.2) diff-lcs (1.5.0) + digest (3.1.1) diplomat (2.6.3) deep_merge (~> 1.2) faraday (>= 0.9, < 2.0) @@ -103,30 +103,38 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) multipart-post (2.1.1) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -167,6 +175,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.0) + strscan (3.0.6) thor (1.2.1) timeout (0.3.2) tzinfo (2.0.4) @@ -177,7 +186,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler @@ -187,4 +199,4 @@ DEPENDENCIES rspec BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/event_stream/Gemfile b/gems/event_stream/Gemfile index 8920ac73d44..5c5d950ef91 100644 --- a/gems/event_stream/Gemfile +++ b/gems/event_stream/Gemfile @@ -6,6 +6,7 @@ gemspec gem "bookmarked_collection", path: "../bookmarked_collection" gem "canvas_cassandra", path: "../canvas_cassandra" +gem "cassandra-cql", "1.2.3", github: "kreynolds/cassandra-cql", ref: "02b5abbe441a345c051a180327932566fd66bb36" +gem "config_file", path: "../config_file" gem "json_token", path: "../json_token" gem "paginated_collection", path: "../paginated_collection" -gem "simplecov", "0.14.1", require: false diff --git a/gems/event_stream/Gemfile.lock b/gems/event_stream/Gemfile.lock new file mode 100644 index 00000000000..a8a4a5fb1ae --- /dev/null +++ b/gems/event_stream/Gemfile.lock @@ -0,0 +1,268 @@ +GIT + remote: https://github.com/kreynolds/cassandra-cql.git + revision: 02b5abbe441a345c051a180327932566fd66bb36 + ref: 02b5abbe441a345c051a180327932566fd66bb36 + specs: + cassandra-cql (1.2.3) + simple_uuid (>= 0.2.0) + thrift_client (>= 0.7.1, < 0.10) + +PATH + remote: ../bookmarked_collection + specs: + bookmarked_collection (1.0.0) + folio-pagination (~> 0.0.12) + json_token + paginated_collection + rails (>= 3.2) + will_paginate (~> 3.0) + +PATH + remote: ../canvas_cassandra + specs: + canvas_cassandra (0.1.0) + cassandra-cql (~> 1.2.2) + config_file + rails (>= 5.0) + +PATH + remote: ../config_file + specs: + config_file (0.1.0) + rails (>= 5.0) + +PATH + remote: ../json_token + specs: + json_token (0.0.1) + json + +PATH + remote: ../paginated_collection + specs: + paginated_collection (1.0.0) + folio-pagination (~> 0.0.12) + will_paginate (~> 3.0) + +PATH + remote: . + specs: + event_stream (0.1.0) + bookmarked_collection + canvas_cassandra + inst_statsd + json_token + paginated_collection + rails (>= 4.2) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.3.6) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + aroi (0.0.7) + rails (>= 3.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + diff-lcs (1.5.0) + digest (3.1.1) + docile (1.4.0) + dogstatsd-ruby (4.8.2) + erubi (1.12.0) + folio-pagination (0.0.12) + globalid (1.1.0) + activesupport (>= 5.0) + i18n (1.13.0) + concurrent-ruby (~> 1.0) + inst_statsd (2.2.0) + aroi (>= 0.0.7) + dogstatsd-ruby (~> 4.2) + statsd-ruby (~> 1.0) + json (2.6.3) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) + minitest (5.18.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.2.1) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) + nokogiri (1.13.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) + racc (1.6.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + bundler (>= 1.15.0) + railties (= 7.0.4.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rake (13.0.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + simple_uuid (0.4.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + sqlite3 (1.6.2-aarch64-linux) + sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) + statsd-ruby (1.4.0) + strscan (3.0.6) + thor (1.2.1) + thrift (0.9.3.0) + thrift_client (0.9.3) + thrift (~> 0.9.0) + timeout (0.3.2) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + will_paginate (3.3.0) + zeitwerk (2.6.8) + +PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bookmarked_collection! + bundler (~> 2.2) + canvas_cassandra! + cassandra-cql (= 1.2.3)! + config_file! + event_stream! + json_token! + paginated_collection! + rspec (~> 3.12) + simplecov (~> 0.22) + sqlite3 + +BUNDLED WITH + 2.3.26 diff --git a/gems/event_stream/event_stream.gemspec b/gems/event_stream/event_stream.gemspec index 53b790e9344..6fd35e09eb2 100644 --- a/gems/event_stream/event_stream.gemspec +++ b/gems/event_stream/event_stream.gemspec @@ -20,6 +20,7 @@ Gem::Specification.new do |spec| spec.add_dependency "rails", ">= 4.2" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" spec.add_development_dependency "sqlite3" end diff --git a/gems/google_drive/Gemfile b/gems/google_drive/Gemfile index 25f7bf648b4..be173b205f7 100644 --- a/gems/google_drive/Gemfile +++ b/gems/google_drive/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in google_docs.gemspec gemspec diff --git a/gems/google_drive/Gemfile.lock b/gems/google_drive/Gemfile.lock index 10c9cef5ec4..452c6807e47 100644 --- a/gems/google_drive/Gemfile.lock +++ b/gems/google_drive/Gemfile.lock @@ -86,8 +86,8 @@ GEM crack (0.4.5) rexml crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) erubi (1.12.0) extlib (0.9.16) faraday (0.17.4) @@ -115,9 +115,6 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) @@ -125,22 +122,33 @@ GEM multi_json (1.15.0) multipart-post (2.1.1) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) public_suffix (5.0.1) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -171,23 +179,24 @@ GEM retriable (1.4.1) rexml (3.2.5) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) signet (0.15.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) + strscan (3.0.6) thor (1.2.1) timecop (0.9.6) timeout (0.3.2) @@ -203,16 +212,19 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler byebug google_drive! rake - rspec (~> 3.5.0) + rspec (~> 3.12) timecop webmock BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/google_drive/google_drive.gemspec b/gems/google_drive/google_drive.gemspec index 39d642255fb..28d1bb29e3a 100644 --- a/gems/google_drive/google_drive.gemspec +++ b/gems/google_drive/google_drive.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler" spec.add_development_dependency "byebug" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "timecop" spec.add_development_dependency "webmock" spec.add_dependency "faraday", "~> 0.17.3" diff --git a/gems/html_text_helper/Gemfile b/gems/html_text_helper/Gemfile index f747a440712..4c3ae2cf1ce 100644 --- a/gems/html_text_helper/Gemfile +++ b/gems/html_text_helper/Gemfile @@ -5,10 +5,4 @@ source "https://rubygems.org" # Specify your gem's dependencies in html_text_helper.gemspec gemspec -gem "simplecov", "0.14.1", require: false - gem "canvas_text_helper", path: "../canvas_text_helper" - -platforms :ruby_20, :ruby_21, :ruby_22 do - gem "iconv", "1.0.4" -end diff --git a/gems/html_text_helper/Gemfile.lock b/gems/html_text_helper/Gemfile.lock index 0bc0dbdadee..5387987d92c 100644 --- a/gems/html_text_helper/Gemfile.lock +++ b/gems/html_text_helper/Gemfile.lock @@ -29,32 +29,38 @@ GEM i18n (1.13.0) concurrent-ruby (~> 1.0) idn-ruby (0.1.5) - json (2.6.3) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) sanitize (6.0.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) twitter-text (3.1.0) idn-ruby unf (~> 0.1.0) @@ -65,15 +71,17 @@ GEM unf_ext (0.0.8.2) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_text_helper! html_text_helper! - iconv (= 1.0.4) - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/html_text_helper/html_text_helper.gemspec b/gems/html_text_helper/html_text_helper.gemspec index 3ae5dec9a8e..b7f1e548fba 100644 --- a/gems/html_text_helper/html_text_helper.gemspec +++ b/gems/html_text_helper/html_text_helper.gemspec @@ -20,5 +20,6 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport", ">= 3.2" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/i18n_extraction/Gemfile.lock b/gems/i18n_extraction/Gemfile.lock index 4ec7a54b5fb..3a8b3e5630a 100644 --- a/gems/i18n_extraction/Gemfile.lock +++ b/gems/i18n_extraction/Gemfile.lock @@ -25,29 +25,34 @@ GEM activesupport (>= 6.0) erubi (~> 1.7) globby (>= 0.1.1) - i18n (>= 1.8.6) nokogiri (>= 1.5.0) ruby2ruby (~> 2.4) ruby_parser (~> 3.10) sexp_processor (~> 4.10) ya2yaml (= 0.31) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) ruby2ruby (2.4.4) ruby_parser (~> 3.1) @@ -60,13 +65,16 @@ GEM ya2yaml (0.31) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) i18n_extraction! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/i18n_extraction/i18n_extraction.gemspec b/gems/i18n_extraction/i18n_extraction.gemspec index 46d1a7bf54c..7a6c9c138ae 100644 --- a/gems/i18n_extraction/i18n_extraction.gemspec +++ b/gems/i18n_extraction/i18n_extraction.gemspec @@ -18,5 +18,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/i18n_tasks/Gemfile b/gems/i18n_tasks/Gemfile index 31f34439be4..c36d8a1d51b 100644 --- a/gems/i18n_tasks/Gemfile +++ b/gems/i18n_tasks/Gemfile @@ -3,11 +3,6 @@ source "https://rubygems.org" gemspec -gem "simplecov", "0.14.1", require: false gem "i18n_extraction", path: "../i18n_extraction" gem "utf8_cleaner", path: "../utf8_cleaner" - -platforms :ruby_20, :ruby_21, :ruby_22 do - gem "iconv", "1.0.4" -end diff --git a/gems/i18n_tasks/Gemfile.lock b/gems/i18n_tasks/Gemfile.lock index c854f87e705..4e462d0bcdf 100644 --- a/gems/i18n_tasks/Gemfile.lock +++ b/gems/i18n_tasks/Gemfile.lock @@ -41,30 +41,34 @@ GEM activesupport (>= 6.0) erubi (~> 1.7) globby (>= 0.1.1) - i18n (>= 1.8.6) nokogiri (>= 1.5.0) ruby2ruby (~> 2.4) ruby_parser (~> 3.10) sexp_processor (~> 4.10) ya2yaml (= 0.31) - json (2.6.3) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) ruby2ruby (2.4.4) ruby_parser (~> 3.1) @@ -73,26 +77,29 @@ GEM sexp_processor (~> 4.16) sexp_processor (4.16.1) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) tzinfo (2.0.4) concurrent-ruby (~> 1.0) ya2yaml (0.31) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) i18n_extraction! i18n_tasks! - iconv (= 1.0.4) rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) utf8_cleaner! BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/i18n_tasks/i18n_tasks.gemspec b/gems/i18n_tasks/i18n_tasks.gemspec index 14aa79dd152..3a6a8797cce 100644 --- a/gems/i18n_tasks/i18n_tasks.gemspec +++ b/gems/i18n_tasks/i18n_tasks.gemspec @@ -20,5 +20,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/incoming_mail_processor/Gemfile b/gems/incoming_mail_processor/Gemfile index 8fdfb190803..4da195f8456 100644 --- a/gems/incoming_mail_processor/Gemfile +++ b/gems/incoming_mail_processor/Gemfile @@ -11,7 +11,3 @@ gem "utf8_cleaner", path: "../utf8_cleaner" # a dependency of html_text_helper that bundler doesn't know how to resolve # here. I've reached out to the bundler team, but no word yet gem "canvas_text_helper", path: "../canvas_text_helper" - -platforms :ruby_20, :ruby_21, :ruby_22 do - gem "iconv", "1.0.4" -end diff --git a/gems/incoming_mail_processor/Gemfile.lock b/gems/incoming_mail_processor/Gemfile.lock index c2cfc1d48ef..4f48c0f15e1 100644 --- a/gems/incoming_mail_processor/Gemfile.lock +++ b/gems/incoming_mail_processor/Gemfile.lock @@ -37,19 +37,73 @@ PATH GEM remote: https://rubygems.org/ specs: + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.3.6) activemodel (7.0.4.3) activesupport (= 7.0.4.3) activerecord (7.0.4.3) activemodel (= 7.0.4.3) activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) aroi (0.0.7) - activerecord (>= 5.2) - activesupport (>= 5.2) + rails (>= 3.2) aws-eventstream (1.2.0) aws-partitions (1.737.0) aws-sdk-core (3.171.0) @@ -69,12 +123,16 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) + builder (3.2.4) byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) + digest (3.1.1) dogstatsd-ruby (4.8.2) + erubi (1.12.0) + globalid (1.1.0) + activesupport (>= 5.0) i18n (1.13.0) concurrent-ruby (~> 1.0) idn-ruby (0.1.5) @@ -83,39 +141,88 @@ GEM dogstatsd-ruby (~> 4.2) statsd-ruby (~> 1.0) jmespath (1.6.2) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) mini_mime (1.1.2) minitest (5.18.0) net-imap (0.2.3) - date + digest net-protocol + strscan net-pop (0.1.1) + digest net-protocol + timeout net-protocol (0.2.1) timeout net-smtp (0.3.1) + digest net-protocol + timeout + nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + bundler (>= 1.15.0) + railties (= 7.0.4.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) sanitize (6.0.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) statsd-ruby (1.4.0) + strscan (3.0.6) + thor (1.2.1) timecop (0.9.6) timeout (0.3.2) twitter-text (3.1.0) @@ -127,21 +234,27 @@ GEM unf_ext unf_ext (0.0.8.2) webrick (1.8.1) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) byebug canvas_text_helper! html_text_helper! - iconv (= 1.0.4) incoming_mail_processor! - rspec (~> 3.5.0) + rspec (~> 3.12) timecop (~> 0.9.5) utf8_cleaner! webrick BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/incoming_mail_processor/incoming_mail_processor.gemspec b/gems/incoming_mail_processor/incoming_mail_processor.gemspec index 0bc10627243..bd65274aeb7 100644 --- a/gems/incoming_mail_processor/incoming_mail_processor.gemspec +++ b/gems/incoming_mail_processor/incoming_mail_processor.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "timecop", "~> 0.9.5" spec.add_development_dependency "webrick" end diff --git a/gems/json_token/Gemfile.lock b/gems/json_token/Gemfile.lock index 723ac19fb16..c9436475227 100644 --- a/gems/json_token/Gemfile.lock +++ b/gems/json_token/Gemfile.lock @@ -11,27 +11,30 @@ GEM json (2.6.3) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) json_token! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/json_token/json_token.gemspec b/gems/json_token/json_token.gemspec index 6dfa70e695c..e5e8b4ae993 100644 --- a/gems/json_token/json_token.gemspec +++ b/gems/json_token/json_token.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/linked_in/Gemfile b/gems/linked_in/Gemfile index b8864b41633..be173b205f7 100644 --- a/gems/linked_in/Gemfile +++ b/gems/linked_in/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in linked_in.gemspec gemspec diff --git a/gems/linked_in/Gemfile.lock b/gems/linked_in/Gemfile.lock index 9e5e46afd00..700e13db134 100644 --- a/gems/linked_in/Gemfile.lock +++ b/gems/linked_in/Gemfile.lock @@ -9,43 +9,42 @@ GEM remote: https://rubygems.org/ specs: diff-lcs (1.5.0) - hashie (4.1.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) oauth (0.5.4) - oauth-tty (~> 1.0, >= 1.0.1) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - oauth-tty (1.0.5) - version_gem (~> 1.1, >= 1.1.1) racc (1.6.2) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) - version_gem (1.1.2) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) linked_in! rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/linked_in/linked_in.gemspec b/gems/linked_in/linked_in.gemspec index 1bd43c23132..b27270ba741 100644 --- a/gems/linked_in/linked_in.gemspec +++ b/gems/linked_in/linked_in.gemspec @@ -16,5 +16,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/live_events/Gemfile.lock b/gems/live_events/Gemfile.lock index 32398ee4f9e..2ac77277af0 100644 --- a/gems/live_events/Gemfile.lock +++ b/gems/live_events/Gemfile.lock @@ -9,19 +9,73 @@ PATH GEM remote: https://rubygems.org/ specs: + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.3.6) activemodel (7.0.4.3) activesupport (= 7.0.4.3) activerecord (7.0.4.3) activemodel (= 7.0.4.3) activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) aroi (0.0.7) - activerecord (>= 5.2) - activesupport (>= 5.2) + rails (>= 3.2) aws-eventstream (1.2.0) aws-partitions (1.737.0) aws-sdk-core (3.171.0) @@ -34,10 +88,16 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) + builder (3.2.4) byebug (11.1.3) concurrent-ruby (1.2.2) + crass (1.0.6) diff-lcs (1.5.0) + digest (3.1.1) dogstatsd-ruby (4.8.2) + erubi (1.12.0) + globalid (1.1.0) + activesupport (>= 5.0) i18n (1.13.0) concurrent-ruby (~> 1.0) inst_statsd (2.2.0) @@ -45,30 +105,98 @@ GEM dogstatsd-ruby (~> 4.2) statsd-ruby (~> 1.0) jmespath (1.6.2) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) minitest (5.18.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.2.1) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) racc (1.6.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + bundler (>= 1.15.0) + railties (= 7.0.4.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) statsd-ruby (1.4.0) + strscan (3.0.6) + thor (1.2.1) + timeout (0.3.2) tzinfo (2.0.4) concurrent-ruby (~> 1.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) @@ -76,7 +204,7 @@ DEPENDENCIES live_events! nokogiri rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/live_events/live_events.gemspec b/gems/live_events/live_events.gemspec index 03abda648f4..4d617602f78 100644 --- a/gems/live_events/live_events.gemspec +++ b/gems/live_events/live_events.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "byebug" spec.add_development_dependency "nokogiri" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/lti-advantage/Gemfile b/gems/lti-advantage/Gemfile index 471f09ec939..5b7ecd62343 100644 --- a/gems/lti-advantage/Gemfile +++ b/gems/lti-advantage/Gemfile @@ -4,5 +4,4 @@ source "https://rubygems.org" git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } -# Specify your gem's dependencies in ims-lti.gemspec gemspec diff --git a/gems/lti-advantage/Gemfile.lock b/gems/lti-advantage/Gemfile.lock index ba0e81b8cc9..47b4a74f7d8 100644 --- a/gems/lti-advantage/Gemfile.lock +++ b/gems/lti-advantage/Gemfile.lock @@ -45,14 +45,17 @@ GEM concurrent-ruby (~> 1.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) lti-advantage! - rake (~> 10.0) + rake redcarpet rspec (~> 3.0) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/lti-advantage/lti-advantage.gemspec b/gems/lti-advantage/lti-advantage.gemspec index d078964b667..fe8973348d9 100644 --- a/gems/lti-advantage/lti-advantage.gemspec +++ b/gems/lti-advantage/lti-advantage.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "json-jwt", "~> 1.5" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "rake" spec.add_development_dependency "redcarpet" spec.add_development_dependency "rspec", "~> 3.0" end diff --git a/gems/lti_outbound/Gemfile b/gems/lti_outbound/Gemfile index f9f446b17bc..be173b205f7 100644 --- a/gems/lti_outbound/Gemfile +++ b/gems/lti_outbound/Gemfile @@ -1,6 +1,5 @@ # frozen_string_literal: true source "https://rubygems.org" -# Specify your gem's dependencies in lti_outbound.gemspec -gem "simplecov", "0.14.1", require: false + gemspec diff --git a/gems/lti_outbound/Gemfile.lock b/gems/lti_outbound/Gemfile.lock index f100a56b2cf..a9dfbaf752f 100644 --- a/gems/lti_outbound/Gemfile.lock +++ b/gems/lti_outbound/Gemfile.lock @@ -17,52 +17,45 @@ GEM concurrent-ruby (1.2.2) diff-lcs (1.5.0) docile (1.4.0) - hashie (4.1.0) i18n (1.13.0) concurrent-ruby (~> 1.0) - json (2.6.3) minitest (5.18.0) oauth (0.5.4) - oauth-tty (~> 1.0, >= 1.0.1) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - oauth-tty (1.0.5) - version_gem (~> 1.1, >= 1.1.1) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simplecov (0.22.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) + simplecov_json_formatter (0.1.4) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - version_gem (1.1.2) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) lti_outbound! rake - rspec (~> 3.5.0) - simplecov (= 0.14.1) + rspec (~> 3.12) + simplecov (~> 0.22) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/lti_outbound/lti_outbound.gemspec b/gems/lti_outbound/lti_outbound.gemspec index 434fd225968..cbe5db2b3ab 100644 --- a/gems/lti_outbound/lti_outbound.gemspec +++ b/gems/lti_outbound/lti_outbound.gemspec @@ -19,5 +19,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "simplecov", "~> 0.22" end diff --git a/gems/multipart/Gemfile.lock b/gems/multipart/Gemfile.lock index ee564c59478..8354472ea54 100644 --- a/gems/multipart/Gemfile.lock +++ b/gems/multipart/Gemfile.lock @@ -20,34 +20,37 @@ GEM mime-types-data (3.2023.0218.1) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.0) + rack (>= 1.0, < 3) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) swearjar (1.4.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) canvas_slug! multipart! - rack (~> 1.6) - rack-test (= 0.6.2) + rack (~> 2.2) + rack-test (~> 1.1) rake - rspec (~> 3.5.0) + rspec (~> 3.12) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/multipart/multipart.gemspec b/gems/multipart/multipart.gemspec index 538113c313e..e3b837e91c2 100644 --- a/gems/multipart/multipart.gemspec +++ b/gems/multipart/multipart.gemspec @@ -15,8 +15,8 @@ Gem::Specification.new do |spec| spec.add_dependency "mime-types", "~> 3.2" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rack", "~> 1.6" - spec.add_development_dependency "rack-test", "0.6.2" + spec.add_development_dependency "rack", "~> 2.2" + spec.add_development_dependency "rack-test", "~> 1.1" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/multipart/spec/multipart/post_spec.rb b/gems/multipart/spec/multipart/post_spec.rb index 035feec4e6d..a46cbd533b6 100644 --- a/gems/multipart/spec/multipart/post_spec.rb +++ b/gems/multipart/spec/multipart/post_spec.rb @@ -22,7 +22,7 @@ require "spec_helper" describe Multipart::Post do def parse_params(query, header) - Rack::Utils::Multipart.parse_multipart({ "CONTENT_TYPE" => header["Content-type"], "CONTENT_LENGTH" => query.size, "rack.input" => StringIO.new(query) }) + Rack::Multipart.parse_multipart({ "CONTENT_TYPE" => header["Content-type"], "CONTENT_LENGTH" => query.size, "rack.input" => StringIO.new(query) }) end it "prepare_queries with a File" do diff --git a/gems/paginated_collection/Gemfile.lock b/gems/paginated_collection/Gemfile.lock index ac1500132a4..281caece9fd 100644 --- a/gems/paginated_collection/Gemfile.lock +++ b/gems/paginated_collection/Gemfile.lock @@ -12,30 +12,36 @@ GEM folio-pagination (0.0.12) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) + sqlite3 (1.6.2-aarch64-linux) sqlite3 (1.6.2-arm64-darwin) + sqlite3 (1.6.2-x86_64-darwin) + sqlite3 (1.6.2-x86_64-linux) will_paginate (3.3.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) paginated_collection! rake - rspec (~> 3.5.0) + rspec (~> 3.12) sqlite3 BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/paginated_collection/paginated_collection.gemspec b/gems/paginated_collection/paginated_collection.gemspec index fe7b63950f2..9aad2229a45 100644 --- a/gems/paginated_collection/paginated_collection.gemspec +++ b/gems/paginated_collection/paginated_collection.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "sqlite3" end diff --git a/gems/plugins/academic_benchmark/Gemfile b/gems/plugins/academic_benchmark/Gemfile index 5458ae42acb..be173b205f7 100644 --- a/gems/plugins/academic_benchmark/Gemfile +++ b/gems/plugins/academic_benchmark/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in academic_benchmark.gemspec gemspec diff --git a/gems/plugins/account_reports/Gemfile b/gems/plugins/account_reports/Gemfile index fd5087319ca..be173b205f7 100644 --- a/gems/plugins/account_reports/Gemfile +++ b/gems/plugins/account_reports/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in account_reports.gemspec gemspec diff --git a/gems/plugins/qti_exporter/Gemfile b/gems/plugins/qti_exporter/Gemfile index 79b605efd4b..be173b205f7 100644 --- a/gems/plugins/qti_exporter/Gemfile +++ b/gems/plugins/qti_exporter/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in qti_exporter.gemspec gemspec diff --git a/gems/request_context/Gemfile.lock b/gems/request_context/Gemfile.lock index d5e3051790d..d2aa7120703 100644 --- a/gems/request_context/Gemfile.lock +++ b/gems/request_context/Gemfile.lock @@ -110,8 +110,7 @@ GEM after_transaction_commit (2.2.2) activerecord (>= 5.2) aroi (0.0.7) - activerecord (>= 5.2) - activesupport (>= 5.2) + rails (>= 3.2) bindata (2.4.14) builder (3.2.4) byebug (11.1.3) @@ -182,13 +181,19 @@ GEM net-protocol timeout nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) raabro (1.4.0) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -250,7 +255,10 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler @@ -264,4 +272,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/rubocop-canvas/Gemfile b/gems/rubocop-canvas/Gemfile index fbc1b280fb4..be173b205f7 100644 --- a/gems/rubocop-canvas/Gemfile +++ b/gems/rubocop-canvas/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in rubocop-canvas.gemspec gemspec diff --git a/gems/rubocop-canvas/Gemfile.lock b/gems/rubocop-canvas/Gemfile.lock index dd311c75d89..388f01e210e 100644 --- a/gems/rubocop-canvas/Gemfile.lock +++ b/gems/rubocop-canvas/Gemfile.lock @@ -2,38 +2,39 @@ PATH remote: . specs: rubocop-canvas (1.0.0) - activesupport (>= 6.0) + activesupport (~> 7.0.4) jira_ref_parser (= 1.0.1) - outrigger (~> 3.0) + outrigger (~> 3.0, >= 3.0.1) + railties (~> 7.0.4) rubocop (~> 1.19) + rubocop-rails (~> 2.19) GEM remote: https://rubygems.org/ specs: actionpack (7.0.4.3) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) - rack (~> 2.0, >= 2.0.9) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionview (7.0.4.3) - activesupport (= 6.1.4.7) + activesupport (= 7.0.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) activemodel (7.0.4.3) - activesupport (= 6.1.4.7) + activesupport (= 7.0.4.3) activerecord (7.0.4.3) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) ast (2.4.2) builder (3.2.4) byebug (11.1.3) @@ -51,8 +52,14 @@ GEM nokogiri (>= 1.5.9) method_source (1.0.0) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) outrigger (3.0.1) activerecord (>= 6.0, < 7.1) railties (>= 6.0, < 7.1) @@ -60,42 +67,40 @@ GEM parser (3.2.2.0) ast (~> 2.4.1) pry (0.14.2) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) + coderay (~> 1.1) + method_source (~> 1.0) racc (1.6.2) rack (2.2.3) rack-test (1.1.0) - rack (>= 1.3) + rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) railties (7.0.4.3) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) regexp_parser (2.7.0) rexml (3.2.5) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) rubocop (1.50.2) json (~> 2.3) @@ -109,8 +114,11 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.28.0) parser (>= 3.2.1.0) + rubocop-rails (2.19.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) ruby-progressbar (1.11.0) - slop (3.6.0) thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -118,16 +126,18 @@ GEM zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) byebug - pry (~> 0.10.1) - pry-nav (~> 0.2.4) - rake (~> 10.0) - rspec (~> 3.5.0) + pry (~> 0.10) + rake + rspec (~> 3.12) rubocop-canvas! BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/rubocop-canvas/rubocop-canvas.gemspec b/gems/rubocop-canvas/rubocop-canvas.gemspec index 51963ce451c..65a46617cb0 100644 --- a/gems/rubocop-canvas/rubocop-canvas.gemspec +++ b/gems/rubocop-canvas/rubocop-canvas.gemspec @@ -12,16 +12,16 @@ Gem::Specification.new do |spec| spec.files = Dir.glob("{lib,spec}/**/*") + %w[test.sh] spec.require_paths = ["lib"] - spec.add_dependency "activesupport", ">= 6.0" + spec.add_dependency "activesupport", "~> 7.0.4" spec.add_dependency "jira_ref_parser", "1.0.1" - spec.add_dependency "outrigger", "~> 3.0" + spec.add_dependency "outrigger", "~> 3.0", ">= 3.0.1" + spec.add_dependency "railties", "~> 7.0.4" spec.add_dependency "rubocop", "~> 1.19" spec.add_dependency "rubocop-rails", "~> 2.19" spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" - spec.add_development_dependency "pry", "~> 0.10.1" - spec.add_development_dependency "pry-nav", "~> 0.2.4" - spec.add_development_dependency "rake", "~> 10.0" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "pry", "~> 0.10" + spec.add_development_dependency "rake" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/stringify_ids/Gemfile.lock b/gems/stringify_ids/Gemfile.lock index 408685f7950..af123b8c890 100644 --- a/gems/stringify_ids/Gemfile.lock +++ b/gems/stringify_ids/Gemfile.lock @@ -8,26 +8,29 @@ GEM specs: diff-lcs (1.5.0) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) - rspec (~> 3.5.0) + rspec (~> 3.12) stringify_ids! BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/stringify_ids/stringify_ids.gemspec b/gems/stringify_ids/stringify_ids.gemspec index 04e2e3263a7..e5ea0d5df4c 100644 --- a/gems/stringify_ids/stringify_ids.gemspec +++ b/gems/stringify_ids/stringify_ids.gemspec @@ -12,5 +12,5 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/tatl_tael/Gemfile b/gems/tatl_tael/Gemfile index bb3a3cab63b..be173b205f7 100644 --- a/gems/tatl_tael/Gemfile +++ b/gems/tatl_tael/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in tatl_tael.gemspec gemspec diff --git a/gems/tatl_tael/Gemfile.lock b/gems/tatl_tael/Gemfile.lock index 4257bd6397e..db06613f5bd 100644 --- a/gems/tatl_tael/Gemfile.lock +++ b/gems/tatl_tael/Gemfile.lock @@ -9,28 +9,31 @@ GEM diff-lcs (1.5.0) fakefs (1.9.0) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) timecop (0.9.6) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES fakefs (~> 1.2) - rspec (~> 3.5.0) + rspec (~> 3.12) tatl_tael! - timecop (= 0.9.5) + timecop (~> 0.9) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/tatl_tael/tatl_tael.gemspec b/gems/tatl_tael/tatl_tael.gemspec index 57b4253ea94..ef83f1ad26b 100644 --- a/gems/tatl_tael/tatl_tael.gemspec +++ b/gems/tatl_tael/tatl_tael.gemspec @@ -11,6 +11,6 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_development_dependency "fakefs", "~> 1.2" - spec.add_development_dependency "rspec", "~> 3.5.0" - spec.add_development_dependency "timecop", "0.9.5" + spec.add_development_dependency "rspec", "~> 3.12" + spec.add_development_dependency "timecop", "~> 0.9" end diff --git a/gems/turnitin_api/Gemfile b/gems/turnitin_api/Gemfile index 8080bcc9645..be173b205f7 100644 --- a/gems/turnitin_api/Gemfile +++ b/gems/turnitin_api/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in turnitin_api.gemspec gemspec diff --git a/gems/turnitin_api/Gemfile.lock b/gems/turnitin_api/Gemfile.lock index fed6dc6a941..be211fe3853 100644 --- a/gems/turnitin_api/Gemfile.lock +++ b/gems/turnitin_api/Gemfile.lock @@ -11,11 +11,66 @@ PATH GEM remote: https://rubygems.org/ specs: + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.3.6) activemodel (7.0.4.3) activesupport (= 7.0.4.3) activerecord (7.0.4.3) activemodel (= 7.0.4.3) activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) @@ -24,17 +79,22 @@ GEM addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) aroi (0.0.7) - activerecord (>= 5.2) - activesupport (>= 5.2) + rails (>= 3.2) + builder (3.2.4) concurrent-ruby (1.2.2) crack (0.4.5) rexml + crass (1.0.6) diff-lcs (1.5.0) + digest (3.1.1) dogstatsd-ruby (4.8.2) + erubi (1.12.0) faraday (0.17.4) multipart-post (>= 1.2, < 3) faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) + globalid (1.1.0) + activesupport (>= 5.0) hashdiff (1.0.1) i18n (1.13.0) concurrent-ruby (~> 1.0) @@ -42,42 +102,113 @@ GEM aroi (>= 0.0.7) dogstatsd-ruby (~> 4.2) statsd-ruby (~> 1.0) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) minitest (5.18.0) multipart-post (2.1.1) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.2.1) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) + nokogiri (1.13.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + bundler (>= 1.15.0) + railties (= 7.0.4.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) rake (13.0.6) rexml (3.2.5) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) simple_oauth (0.3.1) statsd-ruby (1.4.0) + strscan (3.0.6) + thor (1.2.1) + timeout (0.3.2) tzinfo (2.0.4) concurrent-ruby (~> 1.0) webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.8) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) - rake (~> 10.0) - rspec (~> 3.5.0) + rake + rspec (~> 3.12) turnitin_api! webmock (~> 3.0) BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/turnitin_api/turnitin_api.gemspec b/gems/turnitin_api/turnitin_api.gemspec index 3b7636ed3c8..9a85c1b7e66 100644 --- a/gems/turnitin_api/turnitin_api.gemspec +++ b/gems/turnitin_api/turnitin_api.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |spec| spec.add_dependency "simple_oauth", "~> 0.3" spec.add_development_dependency "bundler", "~> 2.2" - spec.add_development_dependency "rake", "~> 10.0" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rake" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "webmock", "~> 3.0" end diff --git a/gems/twitter/Gemfile b/gems/twitter/Gemfile index 23260b1d6d6..e3177257c78 100644 --- a/gems/twitter/Gemfile +++ b/gems/twitter/Gemfile @@ -7,7 +7,3 @@ gemspec gem "canvas_text_helper", path: "../canvas_text_helper" gem "html_text_helper", path: "../html_text_helper" - -platforms :ruby_20, :ruby_21, :ruby_22 do - gem "iconv", "1.0.4" -end diff --git a/gems/twitter/Gemfile.lock b/gems/twitter/Gemfile.lock index 1770f6c1844..2b9ff4d3008 100644 --- a/gems/twitter/Gemfile.lock +++ b/gems/twitter/Gemfile.lock @@ -33,40 +33,37 @@ GEM concurrent-ruby (1.2.2) crass (1.0.6) diff-lcs (1.5.0) - hashie (4.1.0) i18n (1.13.0) concurrent-ruby (~> 1.0) idn-ruby (0.1.5) minitest (5.18.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) oauth (0.5.4) - oauth-tty (~> 1.0, >= 1.0.1) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - oauth-tty (1.0.5) - version_gem (~> 1.1, >= 1.1.1) racc (1.6.2) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) sanitize (6.0.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) twitter-text (3.1.0) idn-ruby unf (~> 0.1.0) @@ -75,20 +72,21 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - version_gem (1.1.2) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) byebug canvas_text_helper! html_text_helper! - iconv (= 1.0.4) rake - rspec (~> 3.5.0) + rspec (~> 3.12) twitter! BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/twitter/twitter.gemspec b/gems/twitter/twitter.gemspec index bb75e3ae188..a4b38b1f994 100644 --- a/gems/twitter/twitter.gemspec +++ b/gems/twitter/twitter.gemspec @@ -17,5 +17,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "byebug" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/utf8_cleaner/Gemfile b/gems/utf8_cleaner/Gemfile index 08fccf09623..be173b205f7 100644 --- a/gems/utf8_cleaner/Gemfile +++ b/gems/utf8_cleaner/Gemfile @@ -3,10 +3,3 @@ source "https://rubygems.org" gemspec - -group :test do - platforms :ruby_20, :ruby_21, :ruby_22 do - gem "iconv", "1.0.4" - gem "syck", "1.0.4" - end -end diff --git a/gems/utf8_cleaner/Gemfile.lock b/gems/utf8_cleaner/Gemfile.lock index 378bc6f56b4..9b9a46b0ff1 100644 --- a/gems/utf8_cleaner/Gemfile.lock +++ b/gems/utf8_cleaner/Gemfile.lock @@ -9,29 +9,30 @@ GEM diff-lcs (1.5.0) rake (13.0.6) rspec (3.12.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) rspec-core (3.12.1) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) + rspec-support (~> 3.12.0) rspec-support (3.12.0) PLATFORMS - arm64-darwin-21 + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux DEPENDENCIES bundler (~> 2.2) - iconv (= 1.0.4) rake - rspec (~> 3.5.0) - syck (= 1.0.4) + rspec (~> 3.12) utf8_cleaner! BUNDLED WITH - 2.4.10 + 2.3.26 diff --git a/gems/utf8_cleaner/utf8_cleaner.gemspec b/gems/utf8_cleaner/utf8_cleaner.gemspec index 876bc2b8e76..c7cb75df0b6 100644 --- a/gems/utf8_cleaner/utf8_cleaner.gemspec +++ b/gems/utf8_cleaner/utf8_cleaner.gemspec @@ -13,5 +13,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/gems/workflow/Gemfile b/gems/workflow/Gemfile index 96506796cf0..be173b205f7 100644 --- a/gems/workflow/Gemfile +++ b/gems/workflow/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" -# Specify your gem's dependencies in canvas_workflow.gemspec gemspec diff --git a/gems/workflow/Gemfile.lock b/gems/workflow/Gemfile.lock new file mode 100644 index 00000000000..cfda596643e --- /dev/null +++ b/gems/workflow/Gemfile.lock @@ -0,0 +1,184 @@ +PATH + remote: . + specs: + workflow (0.0.1) + rails (>= 3.2) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.4.3) + actionpack (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) + globalid (>= 0.3.6) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activestorage (7.0.4.3) + actionpack (= 7.0.4.3) + activejob (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + diff-lcs (1.5.0) + digest (3.1.1) + erubi (1.12.0) + globalid (1.1.0) + activesupport (>= 5.0) + i18n (1.13.0) + concurrent-ruby (~> 1.0) + loofah (2.20.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.2) + minitest (5.18.0) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.2.1) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nio4r (2.5.9) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) + nokogiri (1.13.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) + racc (1.6.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (7.0.4.3) + actioncable (= 7.0.4.3) + actionmailbox (= 7.0.4.3) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actiontext (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activestorage (= 7.0.4.3) + activesupport (= 7.0.4.3) + bundler (>= 1.15.0) + railties (= 7.0.4.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rake (13.0.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + strscan (3.0.6) + thor (1.2.1) + timeout (0.3.2) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.8) + +PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + bundler (~> 2.2) + rake + rspec (~> 3.12) + workflow! + +BUNDLED WITH + 2.3.26 diff --git a/gems/workflow/workflow.gemspec b/gems/workflow/workflow.gemspec index a3a7a4f0232..cf98613be4f 100644 --- a/gems/workflow/workflow.gemspec +++ b/gems/workflow/workflow.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.2" spec.add_development_dependency "rake" - spec.add_development_dependency "rspec", "~> 3.5.0" + spec.add_development_dependency "rspec", "~> 3.12" end diff --git a/hooks/pre-commit b/hooks/pre-commit index a56d4301caa..6e540fe6c66 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -25,7 +25,7 @@ if [ $(pwd -P) = $CANVAS ]; then echo "You should run yarn locally or check to make sure docker is running." fi - if git diff --cached --name-only | grep -q Gemfile.lock; then + if git diff --cached --name-only | grep -q 'Gemfile\S*.lock'; then echo "Checking lockfiles..." script/sync_lockfiles.rb fi diff --git a/script/sync_lockfiles.rb b/script/sync_lockfiles.rb index f2f4e9de360..dd82bb4aad1 100755 --- a/script/sync_lockfiles.rb +++ b/script/sync_lockfiles.rb @@ -18,62 +18,86 @@ # with this program. If not, see . require "bundler" +require "tempfile" -sync = ARGV.include?("--sync") +do_sync = ARGV.include?("--sync") ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) -lockfile_name = Dir.glob(Bundler.default_lockfile.dirname + "Gemfile.rails*.lock*").first +canvas_lockfile_name = Dir.glob(Bundler.default_lockfile.dirname + "Gemfile.rails*.lock*").first -default_specs = Bundler::LockfileParser.new(File.read(lockfile_name)).specs.to_h do |spec| # rubocop:disable Rails/IndexBy +canvas_lockfile_contents = File.read(canvas_lockfile_name) +canvas_specs = Bundler::LockfileParser.new(canvas_lockfile_contents).specs.to_h do |spec| # rubocop:disable Rails/IndexBy [[spec.name, spec.platform], spec] end +canvas_root = File.dirname(canvas_lockfile_name) success = true -Dir["Gemfile.d/*.lock", "gems/*/Gemfile.lock"].each do |lockfile| - lockfile_contents = File.read(lockfile) - new_lockfile = lockfile_contents.dup - updates = [] - Bundler::LockfileParser.new(lockfile_contents).specs.each do |spec| - next unless (default_spec = default_specs[[spec.name, spec.platform]]) +Bundler.settings.temporary(cache_all_platforms: true) do + previous_ui_level = Bundler.ui.level + Bundler.ui.level = "silent" - platform = (spec.platform == "ruby") ? "" : "-#{spec.platform}" + Dir["Gemfile.d/*.lock", "gems/*/Gemfile.lock"].each do |gem_lockfile_name| + if do_sync + gem_gemfile_name = gem_lockfile_name.sub(/\.lock$/, "") + # root needs to be set so that paths are output relative to the correct root in the lockfile + Bundler.instance_variable_set(:@root, Pathname.new(gem_lockfile_name).dirname.expand_path) - next if default_spec.version == spec.version + # adjust locked paths from the Canvas lockfile to be relative to _this_ gemfile + new_contents = canvas_lockfile_contents.gsub(/PATH\n remote: ([^\n]+)\n/) do |remote| + remote_path = Pathname.new($1) + next remote if remote_path.absolute? - if sync - updates << [spec, platform, default_spec.version] - new_lockfile.gsub!("#{spec.name} (#{spec.version}#{platform})", "#{spec.name} (#{default_spec.version}#{platform})") - else - warn "#{spec.name}#{platform}@#{spec.version} in #{lockfile} does not match Canvas #{default_spec.version}" + relative_remote_path = remote_path.expand_path(canvas_root).relative_path_from(Bundler.root).to_s + remote.sub($1, relative_remote_path) + end + + # add a source for the current gem + gem_spec = canvas_specs[[File.basename(Bundler.root), "ruby"]] + + if gem_spec + new_contents += <<~TEXT + PATH + remote: . + specs: + #{gem_spec.to_lock} + TEXT + end + + definition = nil + + puts "Syncing #{gem_gemfile_name}..." + # Now build a definition based on the gem's Gemfile, but *Canvas* (tweaked) lockfile + Tempfile.create do |temp_lockfile| + temp_lockfile.write(new_contents) + + definition = Bundler::Definition.build(gem_gemfile_name, temp_lockfile.path, false) + end + + changed = !definition.send(:lockfiles_equal?, File.read(gem_lockfile_name), definition.to_lock, true) + success = false if changed + + if changed + definition.lock(gem_lockfile_name, true) + end + end + + # now do a double check for conflicting requirements + Bundler::LockfileParser.new(File.read(gem_lockfile_name)).specs.each do |spec| + next unless (canvas_spec = canvas_specs[[spec.name, spec.platform]]) + + platform = (spec.platform == "ruby") ? "" : "-#{spec.platform}" + + next if canvas_spec.version == spec.version + + warn "#{spec.name}#{platform}@#{spec.version} in #{gem_lockfile_name} does not match Canvas (@#{canvas_spec.version}); this is may be due to a conflicting requirement, which would require manual resolution." success = false end end - - next if !sync || lockfile_contents == new_lockfile - - Bundler.with_unbundled_env do - ENV["BUNDLE_GEMFILE"] = lockfile.sub(/\.lock$/, "") - updates = updates.map { |spec, platform, new_version| " #{spec.name}#{platform} from #{spec.version} to #{new_version}" } - puts "Updating #{lockfile}:\n#{updates.join("\n")}" - - # first make sure all referenced gems are installed - `bundle check 2> /dev/null || bundle install 2> /dev/null` - - File.write(lockfile, new_lockfile) - - # now see if we screwed it up - result = `bundle check` - unless $?.success? - warn result - success = false - - # revert to its original state - File.write(lockfile, new_lockfile) - end - end +ensure + Bundler.ui.level = previous_ui_level end -if !success && !sync +if !success && !do_sync warn "\nYou can attempt to fix by running script/sync_lockfiles.rb --sync" end