From 592248e4a7a7bb5935fd342320d03a2b65e93e89 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 20 Sep 2016 01:09:05 +0200 Subject: [PATCH] Add timeouts to requests, update dependencies, bump to 1.0.3 --- .gitignore | 11 ++++++++ .rspec | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 55 ++++++++++++++++++++++----------------- goldfinger.gemspec | 2 +- lib/goldfinger/request.rb | 2 +- 7 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c3456c7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +/.bundle/ +/.yardoc +/Gemfile.lock +/_yardoc/ +/coverage/ +/doc/ +/pkg/ +/spec/reports/ +/tmp/ +*.gem + diff --git a/.rspec b/.rspec index 954c6fb..9a8e706 100644 --- a/.rspec +++ b/.rspec @@ -1,3 +1,3 @@ --color --require spec_helper ---format NyanCatFormatter +--format Fuubar diff --git a/.ruby-version b/.ruby-version index edbec98..42ad437 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1,2 +1,2 @@ -2.2.0 +2.2.4 diff --git a/Gemfile b/Gemfile index 87798e7..377e70d 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ end group :test do gem 'rspec', '>= 3.0' - gem 'nyan-cat-formatter' + gem 'fuubar' gem 'webmock' gem 'rake' end diff --git a/Gemfile.lock b/Gemfile.lock index 67f1c9e..be70ee1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - goldfinger (1.0.2) + goldfinger (1.0.3) addressable (~> 2.4) http (~> 1.0) nokogiri (~> 1.6) @@ -10,14 +10,17 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - coderay (1.1.0) + coderay (1.1.1) crack (0.4.3) safe_yaml (~> 1.0.0) diff-lcs (1.2.5) - domain_name (0.5.20160128) + domain_name (0.5.20160826) unf (>= 0.0.5, < 1.0.0) + fuubar (2.2.0) + rspec-core (~> 3.0) + ruby-progressbar (~> 1.4) hashdiff (0.3.0) - http (1.0.2) + http (1.0.4) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) @@ -27,35 +30,36 @@ GEM http-form_data (1.0.1) http_parser.rb (0.6.0) method_source (0.8.2) - mini_portile2 (2.0.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - nyan-cat-formatter (0.11) - rspec (>= 2.99, >= 2.14.2, < 4) - pry (0.10.3) + mini_portile2 (2.1.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rake (10.5.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.2) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rake (11.2.2) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.3) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + ruby-progressbar (1.8.1) safe_yaml (1.0.4) slop (3.6.0) unf (0.1.4) unf_ext unf_ext (0.0.7.2) - webmock (1.22.6) + webmock (2.1.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -65,9 +69,12 @@ PLATFORMS DEPENDENCIES bundler (~> 1.3) + fuubar goldfinger! - nyan-cat-formatter pry (>= 0.10.3) rake rspec (>= 3.0) webmock + +BUNDLED WITH + 1.13.0 diff --git a/goldfinger.gemspec b/goldfinger.gemspec index 2c71062..fcd9791 100644 --- a/goldfinger.gemspec +++ b/goldfinger.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'goldfinger' - s.version = '1.0.2' + s.version = '1.0.3' s.platform = Gem::Platform::RUBY s.required_ruby_version = '>= 2.0.0' s.date = '2016-02-17' diff --git a/lib/goldfinger/request.rb b/lib/goldfinger/request.rb index bc06052..59c866b 100644 --- a/lib/goldfinger/request.rb +++ b/lib/goldfinger/request.rb @@ -17,7 +17,7 @@ module Goldfinger private def http_client - HTTP + HTTP.timeout(:per_operation, write: 60, connect: 20, read: 60) end end end