👷 More GitLab CI updates

Author: pboling

.envrc

@@ -19,7 +19,7 @@ export K_SOUP_COV_DO=true # Means you want code coverage
 # Available formats are html, xml, rcov, lcov, json, tty
 export K_SOUP_COV_COMMAND_NAME="RSpec Coverage"
 export K_SOUP_COV_FORMATTERS="html,tty"
-export K_SOUP_COV_MIN_BRANCH=100 # Means you want to enforce X% branch coverage
+export K_SOUP_COV_MIN_BRANCH=99 # Means you want to enforce X% branch coverage
 export K_SOUP_COV_MIN_LINE=100 # Means you want to enforce X% line coverage
 export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
 export K_SOUP_COV_MULTI_FORMATTERS=true

.rubocop.yml

@@ -1,9 +1,9 @@
-inherit_from:
-  - .rubocop_rspec.yml
-
 inherit_gem:
   rubocop-lts: rubocop-lts.yml
 
+inherit_from:
+  - .rubocop_rspec.yml
+
 AllCops:
   DisplayCopNames: true # Display the name of the failing cops
   Exclude:
@@ -12,15 +12,7 @@ AllCops:
     - '**/.irbrc'
 
 Metrics/BlockLength:
-  ExcludedMethods:
-    - context
-    - describe
-    - it
-    - shared_context
-    - shared_examples
-    - shared_examples_for
-    - namespace
-    - draw
+  Enabled: false
 
 Gemspec/RequiredRubyVersion:
   Enabled: false

.rubocop_gradual.lock

@@ -81,7 +81,6 @@ GEM
     gem_bench (2.0.5)
       bundler (>= 1.14)
       version_gem (~> 1.1, >= 1.1.4)
-    github-markup (5.0.1)
     hashie (5.0.0)
     io-console (0.8.0)
     irb (1.15.2)
@@ -127,7 +126,6 @@ GEM
     rake (13.2.1)
     rdoc (6.13.1)
       psych (>= 4.0.0)
-    redcarpet (3.6.1)
     reek (6.5.0)
       dry-schema (~> 1.13)
       logger (~> 1.6)
@@ -276,13 +274,11 @@ DEPENDENCIES
   bundler-audit (~> 0.9.2)
   debug (>= 1.0.0)
   gem_bench (~> 2.0, >= 2.0.5)
-  github-markup (~> 5.0, >= 5.0.1)
   kettle-soup-cover (~> 1.0, >= 1.0.6)
   nkf (~> 0.2)
   oauth2!
   rake (>= 12)
   rdoc (~> 6.11)
-  redcarpet (~> 3.6)
   reek (~> 6.4)
   rexml (>= 3)
   rspec (>= 3)

Gemfile.lock

@@ -297,11 +297,12 @@ You can specify custom URLs for authorization and access token, and when using a
 
 ```ruby
 client = OAuth2::Client.new(
-"client_id",
-"client_secret",
+  "client_id",
+  "client_secret",
   site: "https://example.org/nested/directory/on/your/server",
   authorize_url: "/jaunty/authorize/",
-  token_url: "/stirrups/access_token")
+  token_url: "/stirrups/access_token",
+  )
 # => #<OAuth2::Client:0x00000001204c8288 @id="client_id", @secret="client_sec...
 client.auth_code.authorize_url(redirect_uri: "http://localhost:8080/oauth2/callback")
 # => "https://example.org/jaunty/authorize/?client_id=client_id&redirect_uri=http%3A%2F%2Flocalhost%3A8080%2Foauth2%2Fcallback&response_type=code"

README.md

@@ -13,7 +13,6 @@ gem_version =
     OAuth2::Version::VERSION
   end
 
-
 Gem::Specification.new do |spec|
   # Linux distros may package ruby gems differently,
   #   and securely certify them independently via alternate package management systems.
@@ -31,14 +30,14 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.authors = ['Peter Boling', 'Erik Michaels-Ober', 'Michael Bleigh']
-  spec.summary = 'OAuth 2.0 Core Ruby implementation'
-  spec.description = 'A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth spec.'
-  spec.email = ['[email protected]', '[email protected]']
-  spec.homepage = 'https://gitlab.com/oauth-xx/oauth2'
-  spec.licenses = 'MIT'
-  spec.name = 'oauth2'
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.authors = ["Peter Boling", "Erik Michaels-Ober", "Michael Bleigh"]
+  spec.summary = "OAuth 2.0 Core Ruby implementation"
+  spec.description = "A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth spec."
+  spec.email = ["[email protected]", "[email protected]"]
+  spec.homepage = "https://gitlab.com/oauth-xx/oauth2"
+  spec.licenses = "MIT"
+  spec.name = "oauth2"
+  spec.required_ruby_version = ">= 2.2.0"
   spec.version = gem_version
   spec.post_install_message = %{
 You have installed oauth2 version #{gem_version}, congratulations!
@@ -76,16 +75,16 @@ Please report issues, and star the project!
 Thanks, |7eter l-|. l3oling
 }
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = "#{spec.homepage}/-/tree/v#{spec.version}"
-  spec.metadata['changelog_uri'] = "#{spec.homepage}/-/blob/v#{spec.version}/CHANGELOG.md"
-  spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/-/issues"
-  spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}"
-  spec.metadata['wiki_uri'] = "#{spec.homepage}/-/wiki"
-  spec.metadata['mailing_list_uri'] = 'https://groups.google.com/g/oauth-ruby'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "#{spec.homepage}/-/tree/v#{spec.version}"
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/-/blob/v#{spec.version}/CHANGELOG.md"
+  spec.metadata["bug_tracker_uri"] = "#{spec.homepage}/-/issues"
+  spec.metadata["documentation_uri"] = "https://www.rubydoc.info/gems/#{spec.name}/#{spec.version}"
+  spec.metadata["wiki_uri"] = "#{spec.homepage}/-/wiki"
+  spec.metadata["mailing_list_uri"] = "https://groups.google.com/g/oauth-ruby"
   spec.metadata["news_uri"] = "https://www.railsbling.com/tags/#{spec.name}"
-  spec.metadata['funding_uri'] = 'https://liberapay.com/pboling'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata["funding_uri"] = "https://liberapay.com/pboling"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir[
@@ -115,22 +114,22 @@ Thanks, |7eter l-|. l3oling
   spec.bindir = "exe"
   spec.executables = []
 
-  spec.add_dependency 'faraday', ['>= 0.17.3', '< 3.0']
-  spec.add_dependency 'jwt', ['>= 1.0', '< 3.0']
-  spec.add_dependency 'multi_xml', '~> 0.5'
-  spec.add_dependency 'rack', ['>= 1.2', '< 4']
-  spec.add_dependency 'snaky_hash', '~> 2.0'
+  spec.add_dependency("faraday", [">= 0.17.3", "< 3.0"])
+  spec.add_dependency("jwt", [">= 1.0", "< 3.0"])
+  spec.add_dependency("multi_xml", "~> 0.5")
+  spec.add_dependency("rack", [">= 1.2", "< 4"])
+  spec.add_dependency("snaky_hash", "~> 2.0")
   spec.add_dependency("version_gem", ">= 1.1.8", "< 3") # Ruby >= 2.2.0
 
-  spec.add_development_dependency 'addressable', '>= 2'
-  spec.add_development_dependency 'backports', '>= 3'
-  spec.add_development_dependency 'nkf', '~> 0.2'
-  spec.add_development_dependency 'rake', '>= 12'
-  spec.add_development_dependency 'rexml', '>= 3'
-  spec.add_development_dependency 'rspec', '>= 3'
-  spec.add_development_dependency 'rspec-block_is_expected'
-  spec.add_development_dependency 'rspec-pending_for'
-  spec.add_development_dependency 'rspec-stubbed_env'
-  spec.add_development_dependency 'rubocop-lts', '~> 8.0'
-  spec.add_development_dependency 'silent_stream'
+  spec.add_development_dependency("addressable", ">= 2")
+  spec.add_development_dependency("backports", ">= 3")
+  spec.add_development_dependency("nkf", "~> 0.2")
+  spec.add_development_dependency("rake", ">= 12")
+  spec.add_development_dependency("rexml", ">= 3")
+  spec.add_development_dependency("rspec", ">= 3")
+  spec.add_development_dependency("rspec-block_is_expected")
+  spec.add_development_dependency("rspec-pending_for")
+  spec.add_development_dependency("rspec-stubbed_env")
+  spec.add_development_dependency("rubocop-lts", "~> 8.0")
+  spec.add_development_dependency("silent_stream")
 end

oauth2.gemspec

@@ -2,4 +2,4 @@
 
 puts "LOADING DEBUGGER: #{load_debugger}" if load_debugger
 
-require "debug" if load_debugger
+require "debug" if load_debugger

spec/config/debug.rb

@@ -216,15 +216,15 @@ def assert_initialized_token(target)
             let(:token) { "" }
 
             it "raises on initialize" do
-              block_is_expected.to raise_error(OAuth2::Error, {:mode=>:this_is_bad, :raise_errors=>true}.to_s)
+              block_is_expected.to raise_error(OAuth2::Error, {mode: :this_is_bad, raise_errors: true}.to_s)
             end
           end
 
           context "when there is nil token" do
             let(:token) { nil }
 
             it "raises on initialize" do
-              block_is_expected.to raise_error(OAuth2::Error, {:mode=>:this_is_bad, :raise_errors=>true}.to_s)
+              block_is_expected.to raise_error(OAuth2::Error, {mode: :this_is_bad, raise_errors: true}.to_s)
             end
           end
         end
@@ -412,7 +412,7 @@ def assert_initialized_token(target)
 
           context "when there is no refresh_token" do
             it "raises on initialize" do
-              block_is_expected.to raise_error(OAuth2::Error, {:raise_errors=>true}.to_s)
+              block_is_expected.to raise_error(OAuth2::Error, {raise_errors: true}.to_s)
             end
           end
 
@@ -438,7 +438,7 @@ def assert_initialized_token(target)
 
           context "when there is no refresh_token" do
             it "raises on initialize" do
-              block_is_expected.to raise_error(OAuth2::Error, {:raise_errors=>true}.to_s)
+              block_is_expected.to raise_error(OAuth2::Error, {raise_errors: true}.to_s)
             end
           end
 

spec/oauth2/access_token_spec.rb

@@ -128,6 +128,7 @@
     it "filters secret by default" do
       expect(described_class.filtered_attribute_names).to include(:secret)
     end
+
     it "filters out the @secret value" do
       expect(subject.inspect).to include("@secret=[FILTERED]")
     end
@@ -137,31 +138,37 @@
         @original_filter = described_class.filtered_attribute_names
         described_class.filtered_attributes :vanilla
       end
+
+      after do
+        described_class.filtered_attributes(*@original_filter)
+      end
+
       it "changes the filter" do
         expect(described_class.filtered_attribute_names).to eq([:vanilla])
       end
+
       it "does not filter out the @secret value" do
         expect(subject.inspect).to include("@secret=\"bar\"")
       end
-      after do
-        described_class.filtered_attributes(*@original_filter)
-      end
     end
 
     context "when filter is empty" do
       before do
         @original_filter = described_class.filtered_attribute_names
         described_class.filtered_attributes
       end
+
+      after do
+        described_class.filtered_attributes(*@original_filter)
+      end
+
       it "changes the filter" do
         expect(described_class.filtered_attribute_names).to eq([])
       end
+
       it "does not filter out the @secret value" do
         expect(subject.inspect).to include("@secret=\"bar\"")
       end
-      after do
-        described_class.filtered_attributes(*@original_filter)
-      end
     end
   end
 end

spec/oauth2/authenticator_spec.rb

@@ -176,7 +176,7 @@ def to_str
         end
 
         it "just returns the thing if it can" do
-          expect(subject.message).to eq({:hello=>:world}.to_s)
+          expect(subject.message).to eq({hello: :world}.to_s)
         end
       end
     end
@@ -451,7 +451,7 @@ def to_str
         expect(subject.message.each_line.to_a).to eq(
           [
             "i_am_a_teapot: Short and stout\n",
-            {:text=>"Coffee brewing failed", "error_description"=>"Short and stout", "error"=>"i_am_a_teapot"}.to_s,
+            {:text => "Coffee brewing failed", "error_description" => "Short and stout", "error" => "i_am_a_teapot"}.to_s,
           ],
         )
       end
@@ -466,11 +466,11 @@ def to_str
 
         it "just returns whatever it can" do
           expect(subject.message.each_line.to_a).to eq(
-                                                      [
-                                                        "i_am_a_teapot: Short and stout\n",
-                                                        {:hello=>:world, "error_description"=>"Short and stout", "error"=>"i_am_a_teapot"}.to_s
-                                                      ]
-                                                    )
+            [
+              "i_am_a_teapot: Short and stout\n",
+              {:hello => :world, "error_description" => "Short and stout", "error" => "i_am_a_teapot"}.to_s,
+            ],
+          )
         end
       end
     end
@@ -484,7 +484,7 @@ def to_str
       end
 
       it "just returns the thing if it can" do
-        expect(subject.message).to eq({:hello=>:world}.to_s)
+        expect(subject.message).to eq({hello: :world}.to_s)
       end
     end
 
@@ -496,7 +496,7 @@ def to_str
 
       it "does not prepend anything to the message" do
         expect(subject.message.lines.count).to eq(1)
-        expect(subject.message).to eq({:text=>"Coffee brewing failed"}.to_s)
+        expect(subject.message).to eq({text: "Coffee brewing failed"}.to_s)
       end
 
       it "does not set code" do
@@ -519,7 +519,7 @@ def to_str
         expect(subject.message.each_line.to_a).to eq(
           [
             "i_am_a_teapot: Short and stout\n",
-            {:text=>"Coffee brewing failed", "error_description"=>"Short and stout", "error"=>"i_am_a_teapot", "status"=>"418"}.to_s,
+            {:text => "Coffee brewing failed", "error_description" => "Short and stout", "error" => "i_am_a_teapot", "status" => "418"}.to_s,
           ],
         )
       end
@@ -552,7 +552,7 @@ def to_str
         expect(subject.message.each_line.to_a).to eq(
           [
             "i_am_a_teapot: \n",
-            {:text=>"Coffee brewing failed", "error"=>"i_am_a_teapot", "status"=>"418"}.to_s,
+            {:text => "Coffee brewing failed", "error" => "i_am_a_teapot", "status" => "418"}.to_s,
           ],
         )
       end
@@ -568,7 +568,7 @@ def to_str
         expect(subject.message.each_line.to_a).to eq(
           [
             "Short and stout\n",
-            {:text=>"Coffee brewing failed", "error_description"=>"Short and stout"}.to_s,
+            {:text => "Coffee brewing failed", "error_description" => "Short and stout"}.to_s,
           ],
         )
       end
@@ -584,11 +584,11 @@ def to_str
 
         it "does not try to encode the message string" do
           expect(subject.message.each_line.to_a).to eq(
-                                                      [
-                                                         "Short and stout\n",
-                                                         {:text=>"Coffee brewing failed", "error_description"=>"Short and stout"}.to_s
-                                                       ]
-                                                    )
+            [
+              "Short and stout\n",
+              {:text => "Coffee brewing failed", "error_description" => "Short and stout"}.to_s,
+            ],
+          )
         end
       end