From 1f0fabc6b5da1fd86a8cde79b91cb3b5531711cb Mon Sep 17 00:00:00 2001 From: "Daniel (dB.) Doubrovkine" Date: Thu, 9 Mar 2023 19:57:46 -0500 Subject: [PATCH] Update dependencies. --- Gemfile | 6 +- Gemfile.lock | 300 +++++++++--------- .../api/presenters/team_presenter.rb | 2 +- slack-api-explorer/server.rb | 2 +- 4 files changed, 162 insertions(+), 148 deletions(-) diff --git a/Gemfile b/Gemfile index a1fe424..2849847 100644 --- a/Gemfile +++ b/Gemfile @@ -10,10 +10,12 @@ gem 'mongoid' gem 'mongoid-scroll' gem 'newrelic-slack-ruby-bot' gem 'newrelic_rpm' +gem 'rack', '~> 2.2' gem 'rack-robotz' gem 'rack-server-pages' gem 'slack-ruby-bot-server' gem 'slack-ruby-bot-server-mailchimp' +gem 'slack-ruby-bot-server-rtm' gem 'unicorn' group :development, :test do @@ -28,10 +30,10 @@ end group :test do gem 'capybara' - gem 'database_cleaner' + gem 'database_cleaner', '~> 1.8.4' gem 'fabrication' gem 'faker' - gem 'hyperclient' + gem 'hyperclient', '~> 0.9' gem 'rack-test' gem 'rspec' gem 'selenium-webdriver' diff --git a/Gemfile.lock b/Gemfile.lock index a0f6224..15de972 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,139 +1,144 @@ GEM remote: http://rubygems.org/ specs: - activemodel (5.2.3) - activesupport (= 5.2.3) - activesupport (5.2.3) + activemodel (7.0.4.2) + activesupport (= 7.0.4.2) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - async (1.17.1) - console (~> 1.0) + async (1.31.0) + console (~> 1.10) nio4r (~> 2.3) timers (~> 4.1) - async-io (1.20.0) - async (~> 1.14) + async-io (1.34.3) + async async-websocket (0.8.0) async-io websocket-driver (~> 0.7.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - bson (4.4.2) - builder (3.2.3) - capybara (3.16.2) + bson (4.15.0) + builder (3.2.4) + capybara (3.38.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.2) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - concurrent-ruby (1.1.5) - console (1.2.1) - crack (0.4.3) - safe_yaml (~> 1.0.0) - database_cleaner (1.7.0) - declarative (0.0.10) - declarative-option (0.1.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.3) - domain_name (0.5.20180417) + concurrent-ruby (1.2.2) + console (1.16.2) + fiber-local + crack (0.4.5) + rexml + database_cleaner (1.8.5) + declarative (0.0.20) + diff-lcs (1.5.0) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - equalizer (0.0.11) - fabrication (2.20.1) - faker (1.9.3) - i18n (>= 0.7) - faraday (0.15.4) + dry-core (1.0.0) + concurrent-ruby (~> 1.0) + zeitwerk (~> 2.6) + dry-inflector (1.0.0) + dry-logic (1.5.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.1) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + fabrication (2.30.0) + faker (3.1.1) + i18n (>= 1.8.11, < 2) + faraday (0.17.6) multipart-post (>= 1.2, < 3) - faraday-digestauth (0.3.0) - faraday (~> 0.7) + faraday-digestauth (0.4.1) + faraday (>= 0.7) net-http-digest_auth (~> 1.4) - faraday_hal_middleware (0.1.0) - faraday_middleware (~> 0.9) - faraday_middleware (0.13.1) + faraday_hal_middleware (0.1.1) + faraday_middleware (>= 0.9) + faraday_middleware (0.14.0) faraday (>= 0.7.4, < 1.0) faraday_middleware-parse_oj (0.3.2) faraday (~> 0.9) faraday_middleware (>= 0.9.1, < 1.0) oj (>= 2.0, < 4.0) - ffi (1.10.0) - foreman (0.85.0) - thor (~> 0.19.1) + fiber-local (1.0.0) + foreman (0.87.2) giphy (3.0.0) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-parse_oj (~> 0.3) launchy (~> 2.4) - gli (2.18.1) - grape (1.2.3) + gli (2.21.0) + grape (1.7.0) activesupport builder + dry-types (>= 1.1) mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - virtus (>= 1.0.0) grape-roar (0.4.1) grape multi_json roar (~> 1.1.0) - grape-swagger (0.32.1) - grape (>= 0.16.2) - hashdiff (0.3.8) - hashie (3.6.0) - http-cookie (1.0.3) + grape-swagger (1.5.0) + grape (~> 1.3) + hashdiff (1.0.1) + hashie (5.0.0) + http-accept (1.7.0) + http-cookie (1.0.5) domain_name (~> 0.5) - hyperclient (0.9.0) + hyperclient (0.9.3) + addressable faraday (>= 0.9.0) - faraday-digestauth + faraday-digestauth (>= 0.3.0) faraday_hal_middleware faraday_middleware net-http-digest_auth - uri_template - i18n (1.6.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - ice_nine (0.11.2) io-console (0.6.0) - irb (1.6.2) + irb (1.6.3) reline (>= 0.3.0) jaro_winkler (1.5.4) jsonpath (0.9.0) multi_json to_regexp (~> 0.2.1) - kaminari-core (1.1.1) + kaminari-core (1.2.2) kaminari-grape (1.0.1) grape kaminari-core (~> 1.0) - kgio (2.11.2) - launchy (2.4.3) - addressable (~> 2.3) + kgio (2.11.4) + launchy (2.5.2) + addressable (~> 2.8) mailchimp_api_v3 (0.2.18) rest-client (~> 2) + matrix (0.4.2) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_mime (1.0.1) + mime-types-data (3.2023.0218.1) + mini_mime (1.1.2) mini_portile2 (2.8.1) - minitest (5.11.3) - mongo (2.8.0) - bson (>= 4.4.2, < 5.0.0) - mongoid (7.0.2) - activemodel (>= 5.1, < 6.0.0) - mongo (>= 2.5.1, < 3.0.0) - mongoid-compatibility (0.5.1) + minitest (5.18.0) + mongo (2.18.2) + bson (>= 4.14.1, < 5.0.0) + mongoid (8.0.3) + activemodel (>= 5.1, < 7.1, != 7.0.0) + mongo (>= 2.18.0, < 3.0.0) + ruby2_keywords (~> 0.0.5) + mongoid-compatibility (0.6.0) activesupport mongoid (>= 2.0) - mongoid-scroll (0.3.6) + mongoid-scroll (1.0.0) i18n mongoid (>= 3.0) mongoid-compatibility @@ -141,67 +146,71 @@ GEM i18n mongoid (>= 3.0.0) mongoid-compatibility - multi_json (1.13.1) - multipart-post (2.1.1) - mustermann (1.0.3) - mustermann-grape (1.0.0) - mustermann (~> 1.0.0) + multi_json (1.15.0) + multipart-post (2.3.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + mustermann-grape (1.0.2) + mustermann (>= 1.0.0) net-http-digest_auth (1.4.1) netrc (0.11.0) - newrelic-slack-ruby-bot (0.2.1) + newrelic-slack-ruby-bot (0.2.2) newrelic_rpm slack-ruby-bot (>= 0.10.5) - newrelic_rpm (6.2.0.354) - nio4r (2.3.1) - nokogiri (1.14.0) + newrelic_rpm (9.0.0) + nio4r (2.5.8) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oj (3.7.12) + oj (3.14.2) parallel (1.22.1) - parser (3.2.0.0) + parser (3.2.1.1) ast (~> 2.4.1) - public_suffix (3.0.3) + public_suffix (5.0.1) racc (1.6.2) - rack (2.0.7) + rack (2.2.6.3) rack-accept (0.4.5) rack (>= 0.4) - rack-cors (1.0.3) + rack-cors (2.0.0) + rack (>= 2.0.0) rack-rewrite (1.5.1) rack-robotz (0.0.4) rack rack-server-pages (0.1.0) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rainbow (3.1.1) - raindrops (0.19.0) - rake (12.3.2) - regexp_parser (1.4.0) + raindrops (0.20.1) + rake (13.0.6) + regexp_parser (2.7.0) reline (0.3.2) io-console (~> 0.5) - representable (3.0.4) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) - rest-client (2.0.2) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - roar (1.1.0) - representable (~> 3.0.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rexml (3.2.5) + roar (1.1.1) + representable (~> 3.0) + 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.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) rubocop (0.76.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -209,17 +218,19 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.11.0) - rubyzip (1.2.2) - safe_yaml (1.0.5) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) - slack-ruby-bot (0.12.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + selenium-webdriver (4.8.1) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + slack-ruby-bot (0.16.1) + activesupport hashie slack-ruby-client (>= 0.14.0) - slack-ruby-bot-server (0.11.0) - async-websocket + slack-ruby-bot-server (2.1.0) + async foreman grape grape-roar (>= 0.4.0) @@ -228,59 +239,58 @@ GEM rack-cors rack-rewrite rack-server-pages - slack-ruby-bot (>= 0.12.0) + slack-ruby-client slack-ruby-bot-server-mailchimp (0.2.0) mailchimp_api_v3 slack-ruby-bot-server (>= 0.10.0) - slack-ruby-client (0.14.4) + slack-ruby-bot-server-rtm (0.2.0) + async-websocket (~> 0.8.0) + slack-ruby-bot (>= 0.12.0) + slack-ruby-bot-server (>= 1.0.0) + slack-ruby-client (0.14.6) activesupport faraday (>= 0.9) faraday_middleware gli hashie websocket-driver - thor (0.19.4) - thread_safe (0.3.6) - timers (4.3.0) + timers (4.3.5) to_regexp (0.2.1) - tzinfo (1.2.10) - thread_safe (~> 0.1) + trailblazer-option (0.1.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) + unf_ext (0.0.8.2) unicode-display_width (1.6.1) - unicorn (5.5.0) + unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) - uri_template (0.7.0) - vcr (4.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - webmock (3.5.1) - addressable (>= 2.3.6) + vcr (6.1.0) + webmock (3.18.1) + addressable (>= 2.8.0) crack (>= 0.3.2) - hashdiff - websocket-driver (0.7.1) + hashdiff (>= 0.4.0, < 2.0.0) + websocket (1.2.9) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.6.7) PLATFORMS ruby DEPENDENCIES capybara - database_cleaner + database_cleaner (~> 1.8.4) fabrication faker foreman giphy - hyperclient + hyperclient (~> 0.9) irb jsonpath (= 0.9.0) kaminari-grape @@ -289,6 +299,7 @@ DEPENDENCIES mongoid-shell newrelic-slack-ruby-bot newrelic_rpm + rack (~> 2.2) rack-robotz rack-server-pages rack-test @@ -298,6 +309,7 @@ DEPENDENCIES selenium-webdriver slack-ruby-bot-server slack-ruby-bot-server-mailchimp + slack-ruby-bot-server-rtm unicorn vcr webmock @@ -306,4 +318,4 @@ RUBY VERSION ruby 2.7.7p221 BUNDLED WITH - 2.3.26 + 2.4.2 diff --git a/slack-api-explorer/api/presenters/team_presenter.rb b/slack-api-explorer/api/presenters/team_presenter.rb index fc75b54..984d432 100644 --- a/slack-api-explorer/api/presenters/team_presenter.rb +++ b/slack-api-explorer/api/presenters/team_presenter.rb @@ -9,7 +9,7 @@ module TeamPresenter property :team_id, type: String, desc: 'Slack team ID.' property :name, type: String, desc: 'Team name.' property :domain, type: String, desc: 'Team domain.' - property :active, type: Boolean, desc: 'Team is active.' + property :active, type: Grape::API::Boolean, desc: 'Team is active.' property :created_at, type: DateTime, desc: 'Date/time when the team was created.' property :updated_at, type: DateTime, desc: 'Date/time when the team was accepted, declined or canceled.' diff --git a/slack-api-explorer/server.rb b/slack-api-explorer/server.rb index bb01f77..d176e6e 100644 --- a/slack-api-explorer/server.rb +++ b/slack-api-explorer/server.rb @@ -1,4 +1,4 @@ module SlackApiExplorer - class Server < SlackRubyBotServer::Server + class Server < SlackRubyBotServer::RealTime::Server end end