From b57a8e8717a2a56e3ea4480c0511b1252cf345dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 15 Sep 2023 20:00:59 +0200 Subject: [PATCH 1/3] Update dependencies --- Gemfile.lock | 119 ++++++++++++++---------------------- lib/manifique/web_client.rb | 8 +-- manifique.gemspec | 14 ++--- 3 files changed, 56 insertions(+), 85 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7ecc364..da447a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,79 +2,54 @@ PATH remote: . specs: manifique (0.1.0) - faraday (~> 0.9.2, < 0.10.0) - faraday_middleware (~> 0.12.2) - nokogiri (~> 1.10.4) + faraday (~> 2.7.11) + faraday-follow_redirects (= 0.3.0) + nokogiri (~> 1.15.4) GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - coderay (1.1.2) - crack (0.4.3) - safe_yaml (~> 1.0.0) - diff-lcs (1.3) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - ffi (1.9.25) - formatador (0.2.5) - guard (2.14.2) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.9.12) - 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) - hashdiff (0.3.7) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - lumberjack (1.0.13) - method_source (0.9.0) - mini_portile2 (2.4.0) - multipart-post (2.1.1) - nenv (0.3.0) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) - notiffany (0.1.1) - nenv (~> 0.1) - shellany (~> 0.0) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (3.0.2) - rake (13.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + base64 (0.1.1) + coderay (1.1.3) + crack (0.4.5) + rexml + diff-lcs (1.5.0) + faraday (2.7.11) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.0.2) + hashdiff (1.0.1) + method_source (1.0.0) + mini_portile2 (2.8.4) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (5.0.3) + racc (1.7.1) + rake (13.0.6) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - ruby_dep (1.5.0) - safe_yaml (1.0.4) - shellany (0.0.1) - thor (0.20.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + ruby2_keywords (0.0.5) webmock (3.4.2) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -84,14 +59,12 @@ PLATFORMS ruby DEPENDENCIES - bundler (~> 1.16) - guard (~> 2.14.2) - guard-rspec (~> 4.7.3) + bundler (~> 2.3.7) manifique! - pry (~> 0.11.3) + pry (~> 0.14.2) rake (~> 13.0) - rspec (~> 3.0) + rspec (~> 3.12) webmock (~> 3.4.2) BUNDLED WITH - 1.17.2 + 2.3.7 diff --git a/lib/manifique/web_client.rb b/lib/manifique/web_client.rb index c81e993..34d3ad1 100644 --- a/lib/manifique/web_client.rb +++ b/lib/manifique/web_client.rb @@ -1,6 +1,6 @@ require 'json' require 'faraday' -require 'faraday_middleware' +require 'faraday/follow_redirects' require 'nokogiri' require 'manifique/metadata' require 'manifique/errors' @@ -153,9 +153,9 @@ module Manifique end def do_get_request(url) - conn = Faraday.new do |b| - b.use FaradayMiddleware::FollowRedirects - b.adapter :net_http + conn = Faraday.new do |faraday| + faraday.response :follow_redirects + faraday.adapter Faraday.default_adapter end res = conn.get url if res.status < 400 diff --git a/manifique.gemspec b/manifique.gemspec index 6a086da..4d1ecba 100644 --- a/manifique.gemspec +++ b/manifique.gemspec @@ -22,15 +22,13 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_development_dependency "bundler", "~> 1.16" + spec.add_development_dependency "bundler", "~> 2.3.7" spec.add_development_dependency "rake", "~> 13.0" - spec.add_development_dependency "rspec", "~> 3.0" + spec.add_development_dependency "rspec", "~> 3.12" spec.add_development_dependency "webmock", "~> 3.4.2" - spec.add_development_dependency "pry", "~> 0.11.3" - spec.add_development_dependency "guard", "~> 2.14.2" - spec.add_development_dependency "guard-rspec", "~> 4.7.3" + spec.add_development_dependency "pry", "~> 0.14.2" - spec.add_runtime_dependency "faraday", "~> 0.9.2", "< 0.10.0" - spec.add_runtime_dependency "faraday_middleware", "~> 0.12.2" - spec.add_runtime_dependency "nokogiri", "~> 1.10.4" + spec.add_runtime_dependency "faraday", "~> 2.7.11" + spec.add_runtime_dependency "faraday-follow_redirects", "0.3.0" + spec.add_runtime_dependency "nokogiri", "~> 1.15.4" end From e89b8485563afcb201d15ac49fb8af8c2e53dd10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 15 Sep 2023 20:03:47 +0200 Subject: [PATCH 2/3] Remove Travis CI config --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5711919..0000000 --- a/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -sudo: false -language: ruby -rvm: - - 2.6.6 -cache: bundler -before_install: gem install bundler From 60d463c0bb0b74eb9637439dd0e1c5ef66fa63cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 15 Sep 2023 20:11:26 +0200 Subject: [PATCH 3/3] Add Drone CI config --- .drone.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..261e837 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,9 @@ +kind: pipeline +name: default + +steps: +- name: specs + image: ruby + commands: + - bundle install --jobs=3 --retry=3 + - rake spec