Merge pull request #140 from oauth-xx/upgrade_code_climate

ch1ago · web-flow · commit e07786a58c6d · 2017-03-20T14:30:27.000-03:00
Upgrade Code Climate and fixing tests
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,16 @@
-addons:
-  apt:
-    packages:
-    - libcurl-dev
-
 language: ruby
 
-before_install: rvm rubygems master --force
-install: gem install --file
-script: "RUBYGEMS_GEMDEPS=- rake test"
-
 rvm:
-- "2.3.0"
+- "ruby-head"
+- "2.4.0"
+- "2.3"
 - "2.2"
 - "2.1"
 - "2.0"
 
 addons:
   code_climate:
     repo_token: 8f697ca756250f0c2c54170ae27e8a9c459d18a0236903b11291c88291b3aac9
+
+after_success:
+  - bundle exec codeclimate-test-reporter
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :test do
-  gem "codeclimate-test-reporter", require: nil
-end
diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,9 @@
+=== CURRENT
+
+* Adding support to Ruby 2.4 and head (James Pinto)
+* Upgrading to CodeClimate 1.0 (James Pinto)
+* Nokogiri 1.7 does not accept Ruby 2.0 (James Pinto)
+
 === 0.5.1 2016-02-29
 
 * Proper handling for empty query string in RequestToken#build_authorize_url (midchildan,
diff --git a/oauth.gemspec b/oauth.gemspec
@@ -19,6 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files  = Dir.glob("test/**/*.rb")
   spec.extra_rdoc_files = [ "LICENSE", "README.rdoc", "TODO" ]
 
+  # This gem will work with 2.0 or greater...
+  spec.required_ruby_version = '>= 2.0'
+
+  # Nokogiri 1.7 does not accept Ruby 2.0
+  spec.add_development_dependency("nokogiri", "~> 1.6.8") if RUBY_VERSION < "2.1"
+
   spec.add_development_dependency("rake")
   spec.add_development_dependency("minitest")
   spec.add_development_dependency("byebug")
@@ -31,4 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("em-http-request", "0.2.11")
   spec.add_development_dependency("curb")
   spec.add_development_dependency("webmock", "< 2.0")
+  spec.add_development_dependency("codeclimate-test-reporter")
+  spec.add_development_dependency("simplecov")
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,19 +1,26 @@
+# ensure test env
+
 ENV['RACK_ENV'] = 'test'
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+# simplecov, Travis will call codeclimate
+
+require 'simplecov'
+SimpleCov.start
+
+# require third-party code
 
-require 'rubygems'
+require 'byebug'
+require 'stringio'
 require 'minitest/autorun'
 require 'mocha/mini_test'
 require 'rack/test'
+require 'webmock/minitest'
 
-require 'byebug'
+# require our lib
 
 $LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
 require 'oauth'
-require 'stringio'
-require 'webmock/minitest'
-WebMock.disable_net_connect!(allow: "codeclimate.com")
+
+# require our support code
 
 require 'support/minitest_helpers'
diff --git a/test/test_helper_units.rb b/test/test_helper_units.rb
diff --git a/test/units/test_access_token.rb b/test/units/test_access_token.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class TestAccessToken < Minitest::Test
   def setup
diff --git a/test/units/test_action_controller_request_proxy.rb b/test/units/test_action_controller_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 require 'oauth/request_proxy/action_controller_request'
 
diff --git a/test/units/test_cli.rb b/test/units/test_cli.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 require 'oauth/cli'
 
diff --git a/test/units/test_consumer.rb b/test/units/test_consumer.rb
@@ -1,6 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
-
-require 'stringio'
+require File.expand_path('../../test_helper', __FILE__)
 
 # This performs testing against Andy Smith's test server http://term.ie/oauth/example/
 # Thanks Andy.
diff --git a/test/units/test_curb_request_proxy.rb b/test/units/test_curb_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 begin
 
diff --git a/test/units/test_em_http_client.rb b/test/units/test_em_http_client.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 begin
 
 require 'oauth/client/em_http'
diff --git a/test/units/test_em_http_request_proxy.rb b/test/units/test_em_http_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 begin
 
diff --git a/test/units/test_hmac_sha1.rb b/test/units/test_hmac_sha1.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class TestSignatureHmacSha1 < Minitest::Test
   def test_that_hmac_sha1_implements_hmac_sha1
diff --git a/test/units/test_net_http_client.rb b/test/units/test_net_http_client.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class NetHTTPClientTest < Minitest::Test
 
diff --git a/test/units/test_net_http_request_proxy.rb b/test/units/test_net_http_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class NetHTTPRequestProxyTest < Minitest::Test
 
diff --git a/test/units/test_oauth_helper.rb b/test/units/test_oauth_helper.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class TestOAuthHelper < Minitest::Test
 
diff --git a/test/units/test_rack_request_proxy.rb b/test/units/test_rack_request_proxy.rb
@@ -1,7 +1,6 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/request_proxy/rack_request'
-require 'rack/request'
-require 'rack/mock'
 
 class RackRequestProxyTest < Minitest::Test
 
diff --git a/test/units/test_request_token.rb b/test/units/test_request_token.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class StubbedToken < OAuth::RequestToken
   define_method :build_authorize_url_promoted do |root_domain, params|
diff --git a/test/units/test_rest_client_request_proxy.rb b/test/units/test_rest_client_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 begin
   require 'oauth/request_proxy/rest_client_request'
diff --git a/test/units/test_rsa_sha1.rb b/test/units/test_rsa_sha1.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/consumer'
 require 'oauth/signature/rsa/sha1'
 
diff --git a/test/units/test_server.rb b/test/units/test_server.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/server'
 
 class ServerTest < Minitest::Test
diff --git a/test/units/test_signature.rb b/test/units/test_signature.rb
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 class TestOauth < Minitest::Test
 
diff --git a/test/units/test_signature_base.rb b/test/units/test_signature_base.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/signature/base'
 require 'net/http'
 
diff --git a/test/units/test_signature_hmac_sha1.rb b/test/units/test_signature_hmac_sha1.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/signature/hmac/sha1'
 
 class SignatureHMACSHA1Test < Minitest::Test
diff --git a/test/units/test_signature_plain_text.rb b/test/units/test_signature_plain_text.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/signature/plaintext'
 
 class TestSignaturePlaintext < Minitest::Test
diff --git a/test/units/test_token.rb b/test/units/test_token.rb
@@ -1,4 +1,5 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
+
 require 'oauth/token'
 
 class TestToken < Minitest::Test
diff --git a/test/units/test_typhoeus_request_proxy.rb b/test/units/test_typhoeus_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper_units', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 begin
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require File.expand_path('../../test_helper_units', __FILE__)`
	`1`	`+require File.expand_path('../../test_helper', __FILE__)`
`2`	`2`
`3`	`3`	`class TestAccessToken < Minitest::Test`
`4`	`4`	`def setup`