signet 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee45b6d3e6075bfd1d1e5b2fae2830e0f981b2e70e7bb075422e51e20b12f4e8
-  data.tar.gz: 3f019f83eda28d4e0a2b80da812c181f605eae19ecc5b138f9ceee2cfd686fbc
+  metadata.gz: c80485d96774a5d31447471f38ed3f976ed3cbc751f26d9758798adee4e3fced
+  data.tar.gz: 70a563487e412a15c01799c09ec1fed027152e024053272c15858743cf4a58ca
 SHA512:
-  metadata.gz: 4e9f7704e31e89ecb6b8b24c6f09d1d13615cdfc7ba2d165384ab854be0f33c175bc38db7fd138070fdafff73d33676b96d8e1403b10128e811c25311cd15bf8
-  data.tar.gz: 399c408f37ef1cd30d0e0d31dab9d80ebed8a917e659d252905f4d162511edf2f88d72e27cf8b0792794245ce8e06ae769c473aa94f4c559dcea9e222e221785
+  metadata.gz: e004219f1e71c272772bb4892574d8bcc2725fc8f3fb0b474612839661f0a272400ffff50149499b27f91d6287aaeb41fe1065d7bd2652a0f58cdd9f2f12e1da
+  data.tar.gz: 046c9e719091f1f8d17fc324762558b2e6cb00d9b74c0ad66ec4da5bda5d8ba2a2ba6f2e070baacd6af2853d2ca30c1ea198c8ec59bb6fcdf9f63ac11929df9c

data/CHANGELOG.md

@@ -1,27 +1,38 @@
-## 0.11.0 (2018-10-08)
+### 0.12.0 / 2019-10-08
+
+* This version now requires Ruby 2.4.
+* Support array values of the "aud" field.
+* Normalize the version constant to match related gems.
+
+### 0.11.0 / 2018-10-08
+
 * Add constant time comparison for oauth signatures.
 
-## 0.10.0 (2018-09-21)
+### 0.10.0 / 2018-09-21
+
 * Add UnexpectedStatusError class for http status errors that are not handled.
 
-## 0.9.2 (2018-09-12)
+### 0.9.2 / 2018-09-12
+
 * Update issued_at correctly when it is set simultaneously with expires_in.
 
-## 0.9.1 (2018-08-29)
+### 0.9.1 / 2018-08-29
+
 * Warn on EOL ruby versions.
 * Fix DateTime normalization.
 
-## 0.9.0 (2018-08-20)
+### 0.9.0 / 2018-08-20
+
 * Add RemoteServerError class for 5xx level errors.
 * Allow to_json to be called with arguments
 * Expires_in now sets and reflects current expires_at value
 * Expires_within(0) now returns false when expires_at is nil.
 
-## 0.8.1 (2017-10-13)
+### 0.8.1 / 2017-10-13
 
 * Restore support for Ruby 1.9.3
 
-## 0.8.0 (2017-10-12)
+### 0.8.0 / 2017-10-12
 
 * Ensure the "expires_at" attribute is recalculated on refresh (chutzimir)
 * Fix warnings on Ruby 2.4 (koic)
@@ -29,20 +40,20 @@
 * Provide signature verification algorithm for compatibility with ruby-jwt 2.0 (jurriaan)
 * Signet::OAuth2::Client#decoded_id_token can take a keyfinder block (mvastola)
 
-## 0.7.3 (2016-06-20)
+### 0.7.3 / 2016-06-20
 
 * Fix timestamp parsing on 32-bit systems
 * Fix expiration check when issue/expiry times are nil
 
-## 0.7.2 (2015-12-21)
+### 0.7.2 / 2015-12-21
 
 * Don't assume Faraday form encoding middleware is present
 
-## 0.7.1 (2015-12-17)
+### 0.7.1 / 2015-12-17
 
 * Fix an issue with date parsing
 
-## 0.7 (2015-12-06)
+### 0.7 / 2015-12-06
 
 * No longer overwrite SSL environment variables.
 * Tighten up date & URL (de)serialization for OAuth2 client
@@ -51,7 +62,7 @@
 * Add expires_within(sec) method to oauth2 client to facilitate proactive
   refreshes
 
-## 0.6.1 (2015-06-08)
+### 0.6.1 / 2015-06-08
 
 * Fix language warnings for unused & shadowed variables ((@blowmage)[])
 * Update SSL cert path for OSX ((@gambaroff)[])
@@ -59,14 +70,14 @@
 * Fix incorrect parameter name in OAuth2 client docs ((@samuelreh)[])
 * Fix symbolization of URL parameter keys ((@swifthand)[])
 
-## 0.6.0 (2014-12-05)
+### 0.6.0 / 2014-12-05
 
 * Drop support for ruby versions < 1.9.3
 * Update gem dependencies and lock down versions tighter
 * Allow form encoded responses when exchanging OAuth 2 authorization codes
 * Normalize options keys for indifferent access
 
-## 0.5.1 (2014-06-08)
+### 0.5.1 / 2014-06-08
 
 * Allow Hash objects to be used to initialize authorization URI
 * Added PLAINTEXT and RSA-SHA1 signature methods to OAuth 1 support
@@ -74,53 +85,53 @@
 * The `approval_prompt` option no longer defaults to `:force`
 * The `approval_prompt` and `prompt` are now mutually exclusive.
 
-## 0.5.0 (2013-05-31)
+### 0.5.0 / 2013-05-31
 
 * Switched to faraday 0.9.0
 * Added `expires_at` option
 
-## 0.4.5
+### 0.4.5
 
 * Minor documentation fixes
 * Allow postmessage as a valid redirect_uri in OAuth 2
 
-## 0.4.4
+### 0.4.4
 
 * Add support for assertion profile
 
-## 0.4.3
+### 0.4.3
 
 * Added method to clear credentials
 
-## 0.4.2
+### 0.4.2
 
 * Backwards compatibility for MultiJson
 
-## 0.4.1
+### 0.4.1
 
 * Updated Launchy dependency
 
-## 0.4.0
+### 0.4.0
 
 * Added OAuth 1 server implementation
 * Updated Faraday dependency
 
-## 0.3.4
+### 0.3.4
 
 * Attempts to auto-detect CA cert location
 
-## 0.3.3
+### 0.3.3
 
 * Request objects no longer recreated during processing
 * Faraday middleware now supported
 * Streamed requests now supported
 * Fixed assertion profiles; client ID/secret omission no longer an error
 
-## 0.3.2
+### 0.3.2
 
 * Added audience security check for ID tokens
 
-## 0.3.1
+### 0.3.1
 
 * Fixed a warning while determining grant type
 * Removed requirement that a connection be supplied when authorizing requests
@@ -128,52 +139,52 @@
 * Fixed some documentation stuff around markdown formatting
 * Added support for Google Code wiki format output when generating docs
 
-## 0.3.0
+### 0.3.0
 
 * Replaced httpadapter gem dependency with faraday
 * Replaced json gem dependency with multi_json
 * Updated to OAuth 2.0 draft 22
 * Complete test coverage
 
-## 0.2.4
+### 0.2.4
 
 * Updated to incorporate changes to the Google OAuth endpoints
 
-## 0.2.3
+### 0.2.3
 
 * Added support for JWT-formatted ID tokens.
 * Added :issued_at option to #update_token! method.
 
-## 0.2.2
+### 0.2.2
 
 * Lowered requirements for json gem
 
-## 0.2.1
+### 0.2.1
 
 * Updated to keep in sync with the new httpadapter changes
 
-## 0.2.0
+### 0.2.0
 
 * Added support for OAuth 2.0 draft 10
 
-## 0.1.4
+### 0.1.4
 
 * Added support for a two-legged authorization flow
 
-## 0.1.3
+### 0.1.3
 
 * Fixed issue with headers passed in as a Hash
 * Fixed incompatibilities with Ruby 1.8.6
 
-## 0.1.2
+### 0.1.2
 
 * Fixed bug with overzealous normalization
 
-## 0.1.1
+### 0.1.1
 
 * Fixed bug with missing StringIO require
 * Fixed issue with dependency on unreleased features of addressable
 
-## 0.1.0
+### 0.1.0
 
 * Initial release

data/Gemfile

@@ -1,7 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'jruby-openssl', :platforms => :jruby
-gem 'hurley'
-gem 'bundler', '~> 1.15'
+gem "bundler", ">= 1.15"
+gem "gems", "~> 1.2"
+gem "hurley"
+gem "jruby-openssl", platforms: :jruby

data/README.md

@@ -1,7 +1,7 @@
 # Signet
 
 <dl>
-  <dt>Homepage</dt><dd><a href="http://code.google.com/p/oauth-signet/">http://code.google.com/p/oauth-signet/</a></dd>
+  <dt>Homepage</dt><dd><a href="https://github.com/googleapis/signet/">https://github.com/googleapis/signet/</a></dd>
   <dt>Author</dt><dd><a href="mailto:bobaman@google.com">Bob Aman</a></dd>
   <dt>Copyright</dt><dd>Copyright © 2010 Google, Inc.</dd>
   <dt>License</dt><dd>Apache 2.0</dd>
@@ -59,10 +59,9 @@ client.fetch_access_token!
 Be sure `https://rubygems.org` is in your gem sources.
 
 ## Supported Ruby Versions
-This library is currently supported on Ruby 1.9+.  
-However, Ruby 2.4 or later is strongly recommended, as earlier releases have
-reached or are nearing end-of-life. After March 31, 2019, Google will provide
-official support only for Ruby versions that are considered current and
+
+This library requires Ruby 2.4 or later.
+In general, this library supports Ruby versions that are considered current and
 supported by Ruby Core (that is, Ruby versions that are either in normal
 maintenance or in security maintenance).
 See https://www.ruby-lang.org/en/downloads/branches/ for further details.

data/Rakefile

@@ -1,42 +1,91 @@
-lib_dir = File.expand_path(File.join(File.dirname(__FILE__), "lib"))
-$:.unshift(lib_dir)
-$:.uniq!
-
-require 'rubygems'
-require 'rake'
+require "rubygems"
+require "json"
+require "rake"
 require "bundler/gem_tasks"
 
-require File.join(File.dirname(__FILE__), 'lib/signet', 'version')
-
-PKG_DISPLAY_NAME   = 'Signet'
-PKG_NAME           = PKG_DISPLAY_NAME.downcase
-PKG_VERSION        = Signet::VERSION::STRING
-PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
-
-RELEASE_NAME       = "REL #{PKG_VERSION}"
-
-PKG_AUTHOR         = "Bob Aman"
-PKG_AUTHOR_EMAIL   = "bobaman@google.com"
-PKG_HOMEPAGE       = "http://code.google.com/p/oauth-signet/"
-PKG_DESCRIPTION    = <<-TEXT
-Signet is an OAuth 1.0 / OAuth 2.0 implementation.
-TEXT
-PKG_SUMMARY        = PKG_DESCRIPTION
-
-PKG_FILES = FileList[
-    "lib/**/*", "spec/**/*", "vendor/**/*",
-    "tasks/**/*", "website/**/*",
-    "[A-Z]*", "Rakefile"
-].exclude(/database\.yml/).exclude(/[_\.]git$/).exclude(/Gemfile\.lock/)
-
-RCOV_ENABLED = !!(RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/)
-if RCOV_ENABLED
-  task :default => 'spec:rcov'
-else
-  task :default => 'spec:normal'
+task :release_gem, :tag do |_t, args|
+  tag = args[:tag]
+  raise "You must provide a tag to release." if tag.nil?
+
+  # Verify the tag format "vVERSION"
+  m = tag.match(/signet\/v(?<version>\S*)/)
+  raise "Tag #{tag} does not match the expected format." if m.nil?
+
+  version = m[:version]
+  raise "You must provide a version." if version.nil?
+
+  api_token = ENV["RUBYGEMS_API_TOKEN"]
+
+  require "gems"
+  if api_token
+    ::Gems.configure do |config|
+      config.key = api_token
+    end
+  end
+
+  Bundler.with_clean_env do
+    sh "rm -rf pkg"
+    sh "bundle update"
+    sh "bundle exec rake build"
+  end
+
+  path_to_be_pushed = "pkg/signet-#{version}.gem"
+  if File.file? path_to_be_pushed
+    begin
+      ::Gems.push File.new(path_to_be_pushed)
+      puts "Successfully built and pushed signet for version #{version}"
+    rescue StandardError => e
+      puts "Error while releasing signet version #{version}: #{e.message}"
+    end
+  else
+    raise "Cannot build signet for version #{version}"
+  end
 end
 
-WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
-SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
+task :ci do
+  header "Using Ruby - #{RUBY_VERSION}"
+  sh "bundle exec rubocop"
+  sh "bundle exec rspec"
+end
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+namespace :kokoro do
+  task :load_env_vars do
+    service_account = "#{ENV['KOKORO_GFILE_DIR']}/service-account.json"
+    ENV["GOOGLE_APPLICATION_CREDENTIALS"] = service_account
+    filename = "#{ENV['KOKORO_GFILE_DIR']}/env_vars.json"
+    env_vars = JSON.parse File.read(filename)
+    env_vars.each { |k, v| ENV[k] = v }
+  end
+
+  task :presubmit do
+    Rake::Task["ci"].invoke
+  end
+
+  task :continuous do
+    Rake::Task["ci"].invoke
+  end
+
+  task :nightly do
+    Rake::Task["ci"].invoke
+  end
+
+  task :release do
+    version = "0.1.0"
+    Bundler.with_clean_env do
+      version = `bundle exec gem list`
+                .split("\n").select { |line| line.include? "signet" }
+                .first.split("(").last.split(")").first || "0.1.0"
+    end
+    Rake::Task["kokoro:load_env_vars"].invoke
+    Rake::Task["release_gem"].invoke "signet/v#{version}"
+  end
+end
+
+def header str, token = "#"
+  line_length = str.length + 8
+  puts ""
+  puts token * line_length
+  puts "#{token * 3} #{str} #{token * 3}"
+  puts token * line_length
+  puts ""
+end

data/lib/signet.rb

@@ -12,13 +12,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'signet/version'
+require "signet/version"
 
 module Signet #:nodoc:
-  def self.parse_auth_param_list(auth_param_string)
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
+  def self.parse_auth_param_list auth_param_string
     # Production rules from:
     # http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-12
-    token = /[-!#$\%&'*+.^_`|~0-9a-zA-Z]+/
+    token = /[-!#{$OUTPUT_RECORD_SEPARATOR}%&'*+.^_`|~0-9a-zA-Z]+/
     d_qdtext = /[\s\x21\x23-\x5B\x5D-\x7E\x80-\xFF]/n
     d_quoted_pair = /\\[\s\x21-\x7E\x80-\xFF]/n
     d_qs = /"(?:#{d_qdtext}|#{d_quoted_pair})*"/
@@ -36,10 +38,10 @@ module Signet #:nodoc:
     #
     # This would be way easier in Ruby 1.9, but we want backwards
     # compatibility.
-    while (match = remainder.match(auth_param))
+    while (match = remainder.match auth_param)
       if match.pre_match && match.pre_match !~ /^[\s,]*$/
         raise ParseError,
-          "Unexpected auth param format: '#{auth_param_string}'."
+              "Unexpected auth param format: '#{auth_param_string}'."
       end
       auth_param_pairs << match.captures[0] # Appending pair
       remainder = match.post_match
@@ -47,24 +49,25 @@ module Signet #:nodoc:
     end
     if last_match.post_match && last_match.post_match !~ /^[\s,]*$/
       raise ParseError,
-        "Unexpected auth param format: '#{auth_param_string}'."
+            "Unexpected auth param format: '#{auth_param_string}'."
     end
     # Now parse the auth-param pair strings & turn them into key-value pairs.
-    return (auth_param_pairs.inject([]) do |accu, pair|
-      name, value = pair.split('=', 2)
+    (auth_param_pairs.each_with_object [] do |pair, accu|
+      name, value = pair.split "=", 2
       if value =~ /^".*"$/
         value = value.gsub(/^"(.*)"$/, '\1').gsub(/\\(.)/, '\1')
       elsif value =~ /^'.*'$/
         value = value.gsub(/^'(.*)'$/, '\1').gsub(/\\(.)/, '\1')
-      elsif value =~ /[\(\)<>@,;:\\\"\/\[\]?={}]/
+      elsif value =~ %r{[\(\)<>@,;:\\\"/\[\]?={}]}
         # Certain special characters are not allowed
-        raise ParseError, (
-          "Unexpected characters in auth param " +
-          "list: '#{auth_param_string}'."
-        )
+        raise ParseError,
+              "Unexpected characters in auth param " \
+              "list: '#{auth_param_string}'."
+
       end
       accu << [name, value]
-      accu
     end)
   end
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/MethodLength
 end