Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop Typhoeus requirement #756

Merged
merged 2 commits into from
Sep 21, 2020
Merged

Drop Typhoeus requirement #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaa20e7
Drop Typhoeus requirement
BanzaiMan Jun 10, 2020
295dd54
Wrap `rescue` in `begin; end` block
BanzaiMan Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/travis/cli/api_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,17 @@ class ApiCommand < Command
c.enterprise_name = name || 'default'
end

on('--adapter ADAPTER', 'Faraday adapter to use for HTTP requests') do |c, adapter|
adapter.gsub! '-', '_'
require "faraday/adapter/#{adapter}"
require 'typhoeus/adapters/faraday' if adapter == 'typhoeus'
c.session.faraday_adapter = adapter.to_sym
on('--adapter ADAPTER', 'Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, ' \
'and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info') do |c, adapter|
begin
adapter.gsub! '-', '_'
require "faraday/adapter/#{adapter}"
require 'typhoeus/adapters/faraday' if adapter == 'typhoeus'
c.session.faraday_adapter = adapter.to_sym
rescue LoadError => e
warn "\`--adapter #{adapter}\` is given, but it is not installed. Run \`gem install #{adapter}\` and try again"
exit 1
end
end

def initialize(*)
Expand Down
1 change: 0 additions & 1 deletion travis.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ Gem::Specification.new do |s|
s.add_dependency "highline", "~> 2.0"
s.add_dependency "gh", "~> 0.13"
s.add_dependency "launchy", "~> 2.1", "< 2.5.0"
s.add_dependency "typhoeus", "~> 0.6", ">= 0.6.8"
s.add_dependency "json", "~> 2.3"
s.add_dependency "pusher-client", "~> 0.4"
s.add_development_dependency "rspec", "~> 2.12"
Expand Down