oauth2 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91742d7784cd1d8b7e085cefa2ad5e0f5931112741ca2e6fd50a925d404854e
-  data.tar.gz: befcd535b9af7309adf7f320b29280ee020b9d66517cd08824b143b9b41dbd79
+  metadata.gz: 6de8ef7ab0a480b7a6ce04291414f466818e21f3ca59927cec920f5587ad99a8
+  data.tar.gz: 7d92dd6b75f2ce746dc73c406045e564ee0aa5aa6af6da7fd86e880b08a8fb2a
 SHA512:
-  metadata.gz: 8175756609903d2bd60b635301c6f3a67fe55a3c8ebb6bda5e1e6f8c66cc0d861685f4ed78882ec2602ba6e8ce113b50e3aa94cb4f907515ada5fe93e4bcb579
-  data.tar.gz: 711dbe14418c8599fe5ae05cffa4dd60d0a0891a1438999ef00bcea495f87ecf0a6c1d928795f61e06396a11983b9670d4a933b5db93f10b4eb350406ea348e0
+  metadata.gz: b456941102259c8318c986dd2715c52ecd49aa9413e7dee3c73c4580b2129b3302ed94741f1caf6707d54626702d4adbe033f952be16d2501cc2e9e2e57726a2
+  data.tar.gz: f5a9b3c8802389bf18eb04ffeb368edd2a70ee11d2615d187296a99ed14ae1cf36bd88cc2f5bdd0512a0133a5ae174f29820492d678222eb6be71cc464bb501d

data/.gitignore

@@ -9,4 +9,11 @@ measurement/*
 pkg/*
 rdoc/*
 
+# rspec failure tracking
 .rspec_status
+
+# gemfiles for CI
+/gemfiles/*.gemfile.lock
+
+# CI bundle
+/gemfiles/vendor/

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/.travis.yml

@@ -1,6 +1,23 @@
 before_install:
-  - gem update --system
-  - gem install bundler
+  # rubygems 2.7.8 and greater include bundler
+  # - Ruby 2.2, and under, get RubyGems ~> 2.7.10, (includes bundler 1.17.3)
+  # - Anything else, including Ruby 2.3, and above, gets RubyGems ~> 3, and update bundler to latest
+  # - NOTE ON JRUBY: identifies as RUBY_VERSION ~> 1.9, 2.0, 2.3, or 2.5.
+  # - NOTE ON TRUFFLERUBY: identifies as RUBY_VERSION ~> 2.6
+  - |
+    rv="$(ruby -e 'STDOUT.write RUBY_VERSION')"
+    echo "Discovered Ruby Version of =====> $rv"
+    if   [ "$rv" \< "2.3" ]; then
+      gem update --system 2.7.10
+    elif   [ "$rv" \< "2.4" ]; then
+      gem update --system 2.7.10 --no-document
+    elif [ "$rv" = "2.5.3" ]; then
+      # JRUBY 9.2 Identifies as 2.5.3, and it fails to update rubygems
+      gem install --no-document bundler "bundler:>=2.0"
+    else
+      gem update --system --no-document --conservative
+      gem install --no-document bundler "bundler:>=2.0"
+    fi
 
 bundler_args: --no-deployment --jobs 3 --retry 3
 
@@ -12,38 +29,42 @@ matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
-    - rvm: rbx-3
+    - rvm: truffleruby
+    - rvm: jruby-9.0
   fast_finish: true
   include:
-    - rvm: jruby-1.7.27 # targets MRI v1.9
-      gemfile: gemfiles/jruby_1.7.gemfile
-    - rvm: 1.9.3-p551
+#    - rvm: jruby-1.7 # targets MRI v1.9
+#      gemfile: gemfiles/jruby_1.7.gemfile
+    - rvm: 1.9
       gemfile: gemfiles/ruby_1.9.gemfile
-    - rvm: 2.0.0-p648
+    - rvm: 2.0
       gemfile: gemfiles/ruby_2.0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/ruby_2.1.gemfile
-    - rvm: jruby-9.0.5.0 # targets MRI v2.0
+    - rvm: jruby-9.0 # targets MRI v2.0
       gemfile: gemfiles/jruby_9.0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/ruby_2.1.gemfile
     # DEPRECATION WARNING
     # oauth2 1.x series releases are the last to support Ruby versions above
     # oauth2 2.x series releases will support Ruby versions below, and not above
-    - rvm: jruby-9.1.9.0 # targets MRI v2.3
+    - rvm: jruby-9.1 # targets MRI v2.3
       gemfile: gemfiles/jruby_9.1.gemfile
-    - rvm: 2.2.10
+    - rvm: 2.2
       gemfile: gemfiles/ruby_2.2.gemfile
-    - rvm: 2.3.7
+    - rvm: 2.3
       gemfile: gemfiles/ruby_2.3.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.4
       gemfile: gemfiles/ruby_2.4.gemfile
-    - rvm: jruby-9.2.0.0 # targets MRI v2.5
+    - rvm: jruby-9.2 # targets MRI v2.5
       gemfile: gemfiles/jruby_9.2.gemfile
-    - rvm: 2.5.1
+    - rvm: 2.5
       gemfile: gemfiles/ruby_2.5.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/ruby_2.6.gemfile
     - rvm: jruby-head
       gemfile: gemfiles/jruby_head.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/ruby_head.gemfile
-    - rvm: rbx-3
+    - rvm: truffleruby
+      gemfile: gemfiles/truffleruby.gemfile
 
 sudo: false

data/CHANGELOG.md

@@ -5,15 +5,20 @@ All notable changes to this project will be documented in this file.
 
 - no changes yet
 
+## [1.4.2] - 2019-10-01
+
+- [#478](https://github.com/oauth-xx/oauth2/pull/478) - support latest version of faraday & fix build (@pboling)
+  - officially support Ruby 2.6 and truffleruby
+
 ## [1.4.1] - 2018-10-13
 
-- [#417](oauth-xx/oauth2#417) - update jwt dependency (@thewoolleyman)
-- [#418](oauth-xx/oauth2#418) - remove rubocop dependency (temporary, added back in [#423](oauth-xx/oauth2#423)) (@pboling)
-- [#419](oauth-xx/oauth2#419) - update faraday dependency (@pboling)
-- [#420](oauth-xx/oauth2#420) - update [oauth2.gemspec](oauth2.gemspec) (@pboling)
-- [#421](oauth-xx/oauth2#421) - fix [CHANGELOG.md](CHANGELOG.md) for previous releases (@pboling)
-- [#422](oauth-xx/oauth2#422) - update [LICENSE](LICENSE) and [README.md](README.md) (@pboling)
-- [#423](oauth-xx/oauth2#423) - update [builds](https://travis-ci.org/oauth-xx/oauth2/builds), [Rakefile](Rakefile) (@pboling)
+- [#417](https://github.com/oauth-xx/oauth2/pull/417) - update jwt dependency (@thewoolleyman)
+- [#419](https://github.com/oauth-xx/oauth2/pull/419) - remove rubocop dependency (temporary, added back in [#423](https://github.com/oauth-xx/oauth2/pull/423)) (@pboling)
+- [#418](https://github.com/oauth-xx/oauth2/pull/418) - update faraday dependency (@pboling)
+- [#420](https://github.com/oauth-xx/oauth2/pull/420) - update [oauth2.gemspec](https://github.com/oauth-xx/oauth2/blob/1-4-stable/oauth2.gemspec) (@pboling)
+- [#421](https://github.com/oauth-xx/oauth2/pull/421) - fix [CHANGELOG.md](https://github.com/oauth-xx/oauth2/blob/1-4-stable/CHANGELOG.md) for previous releases (@pboling)
+- [#422](https://github.com/oauth-xx/oauth2/pull/422) - update [LICENSE](https://github.com/oauth-xx/oauth2/blob/1-4-stable/LICENSE) and [README.md](https://github.com/oauth-xx/oauth2/blob/1-4-stable/README.md) (@pboling)
+- [#423](https://github.com/oauth-xx/oauth2/pull/423) - update [builds](https://travis-ci.org/oauth-xx/oauth2/builds), [Rakefile](https://github.com/oauth-xx/oauth2/blob/1-4-stable/Rakefile) (@pboling)
   - officially document supported Rubies
     * Ruby 1.9.3
     * Ruby 2.0.0
@@ -136,4 +141,4 @@ All notable changes to this project will be documented in this file.
 [1.3.1]: https://github.com/oauth-xx/oauth2/compare/v1.3.0...v1.3.1
 [1.4.0]: https://github.com/oauth-xx/oauth2/compare/v1.3.1...v1.4.0
 [1.4.1]: https://github.com/oauth-xx/oauth2/compare/v1.4.0...v1.4.1
-[unreleased]: https://github.com/oauth-xx/oauth2/compare/v1.4.0...1-4-stable
+[unreleased]: https://github.com/oauth-xx/oauth2/compare/v1.4.1...HEAD

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'faraday', '~> 0.9.2', :platforms => [:jruby_18, :ruby_18]
+gem 'faraday', ['>= 0.8', '< 2.0'], :platforms => [:jruby_18, :ruby_18]
 gem 'jwt', '< 1.5.2', :platforms => [:jruby_18, :ruby_18]
 gem 'rake', '< 11.0'
 gem 'rdoc', '~> 4.2.2'
@@ -17,7 +17,6 @@ group :test do
     gem 'rubocop-rspec', '~> 1.27.0' # last version that can use rubocop < 0.58
   end
   gem 'pry', '~> 0.11' if ruby_version >= Gem::Version.new('2.0')
-  gem 'rspec-pending_for'
 
   gem 'addressable', '~> 2.3.8'
   gem 'backports'

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](http://img.shields.io/gem/v/oauth2.svg)][gem]
 [![Total Downloads](https://img.shields.io/gem/dt/oauth2.svg)][gem]
 [![Downloads Today](https://img.shields.io/gem/rt/oauth2.svg)][gem]
-[![Build Status](http://img.shields.io/travis/oauth-xx/oauth2.svg)][travis]
+[![Build Status](https://travis-ci.org/oauth-xx/oauth2.svg?branch=1-4-stable)][travis]
 [![Coverage Status](http://img.shields.io/coveralls/intridea/oauth2.svg)][coveralls]
 [![Maintainability](https://api.codeclimate.com/v1/badges/688c612528ff90a46955/maintainability)][codeclimate-maintainability]
 [![Depfu](https://badges.depfu.com/badges/6d34dc1ba682bbdf9ae2a97848241743/count.svg)][depfu]
@@ -129,29 +129,33 @@ requests for tokens for any Authentication grant type.
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-### Rubies with support ending at Oauth2 2.x
+### Rubies with support ending at Oauth2 1.x
 
 * Ruby 1.9.3
+  - [JRuby 1.7][jruby-1.7] (targets MRI v1.9)
+
 * Ruby 2.0.0
+  - [JRuby 9.0][jruby-9.0] (targets MRI v2.0)
 * Ruby 2.1
-* Ruby 2.2
-* [JRuby 1.7][jruby-1.7] (targets MRI v1.9)
-* [JRuby 9.0][jruby-9.0] (targets MRI v2.0)
 
 ---
 
 ### Rubies with continued support past Oauth2 2.x
 
-* Ruby 2.3 - Support through version 3.x series
-* Ruby 2.4
-* Ruby 2.5
-* [JRuby 9.1][jruby-9.1] (targets MRI v2.3) 
-* [JRuby 9.2][jruby-9.2] (targets MRI v2.5)
+* Ruby 2.2 - Support ends with version 2.x series
+* Ruby 2.3 - Support ends with version 3.x series
+  - [JRuby 9.1][jruby-9.1] (targets MRI v2.3) 
+* Ruby 2.4 - Support ends with version 4.x series
+* Ruby 2.5 - Support ends with version 5.x series
+  - [JRuby 9.2][jruby-9.2] (targets MRI v2.5)
+  - [truffleruby][truffleruby] (targets MRI 2.5)
+* Ruby 2.6 - Support ends with version 6.x series
 
 [jruby-1.7]: https://www.jruby.org/2017/05/11/jruby-1-7-27.html
 [jruby-9.0]: https://www.jruby.org/2016/01/26/jruby-9-0-5-0.html
 [jruby-9.1]: https://www.jruby.org/2017/05/16/jruby-9-1-9-0.html
 [jruby-9.2]: https://www.jruby.org/2018/05/24/jruby-9-2-0-0.html
+[truffleruby]: https://github.com/oracle/truffleruby
 
 If something doesn't work on one of these interpreters, it's a bug.
 

data/gemfiles/jruby_1.7.gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
+gem 'faraday', '~> 0.15.4'
 
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-end
+gem 'json', '< 2.0'
+gem 'rack', '~> 1.2'
+gem 'rake', [">= 10.0", "< 12"]
+gem 'term-ansicolor', '< 1.4.0'
+gem 'tins', '< 1.7'
 
 gemspec :path => '../'

data/gemfiles/jruby_9.0.gemfile

@@ -1,13 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
+gem 'faraday', '~> 0.15.4'
 
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
+gem 'rake', [">= 10.0", "< 12"]
 
 gemspec :path => '../'

data/gemfiles/jruby_9.1.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/jruby_9.2.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/jruby_head.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_1.9.gemfile

@@ -1,16 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
+gem 'faraday', '~> 0.15.4'
 
 gem 'json', '< 2.0'
 gem 'rack', '~> 1.2'
+gem 'rake', [">= 10.0", "< 12"]
 gem 'term-ansicolor', '< 1.4.0'
 gem 'tins', '< 1.7'
 
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.0.gemfile

@@ -1,17 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
+gem 'faraday', '~> 0.15.4'
 gem 'rack', '~> 1.2'
 
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.1.gemfile

@@ -1,19 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
+gem 'faraday', '~> 0.15.4'
 gem 'rack', '~> 1.2'
 
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.2.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.3.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.4.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.5.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.6.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'pry'
+  gem 'byebug'
+  gem 'pry-byebug'
+end
+
+gemspec :path => '../'