mauth-client 6.2.1 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1871065424b09a341be04ecae785be82574cef1fafacb689d2ea538e8d25d03e
-  data.tar.gz: 6ff7c37a989fcdd8ec8e4d46d9ce4e0ab61cd16a7fcd1784f1d85f24e67a2ad1
+  metadata.gz: b9219adefc5bedb36c4994be6309d39c8cb2b2e67a91d8a12f2119caf288df26
+  data.tar.gz: aff48af8ae57b3a4cd12f094abe3ac5c002379177465f1870e739e180e4f37cc
 SHA512:
-  metadata.gz: a71f408dd52e310d544f65d0b0ea03df7a671db23bfc11a39a38795bd23f3f0ff78472982e4176461fd55ea98d3ed5de9a8d9ec9cfea19ffd334d167d9ba1836
-  data.tar.gz: 8334a7c74a7829b52fae5bde7ac783e425c86285d6d17db8f79088ff3998736786813cc5a56de2ffe12fe594db32606e76d9831befb59e3ee507683e4bbd6c76
+  metadata.gz: 5c2dac6db5f67e885d634c428b0dbe0eaeee6a3a74a5dffa64f267e8dd7f3666e7d129ac4dda66fc02d41503c5245cdd546e17d6bd88d217a80ecacbfcae11c3
+  data.tar.gz: 1fdbb74b94544f25b3827638f0ffb853beb19e6e40bcbb1b4b31b547934c9266903fb9e7386e54a251dee2fecc629fb0c6b16cfcb1cdf44a678369ed67b0f32d

data/.rubocop.yml

@@ -0,0 +1,53 @@
+inherit_gem:
+  rubocop-mdsol: rubocop.yml
+
+require:
+  - rubocop-performance
+
+AllCops:
+  Exclude:
+    - gemfiles/**/*
+
+Gemspec/RequireMFA:
+  Enabled: false
+
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/LineLength:
+  Exclude:
+    - spec/client/local_authenticator_spec.rb
+
+Lint/MissingSuper:
+  Exclude:
+    - exe/mauth-client
+    - lib/mauth/faraday.rb
+    - lib/mauth/rack.rb
+
+Metrics/AbcSize:
+  Exclude:
+    - lib/mauth/client.rb
+    - lib/mauth/client/local_authenticator.rb
+    - lib/mauth/proxy.rb
+
+Metrics/MethodLength:
+  Exclude:
+    - lib/mauth/client.rb
+
+Naming/FileName:
+  Exclude:
+    - lib/mauth-client.rb
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/GlobalVars:
+  Exclude:
+    - exe/mauth-client
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes

data/.ruby-version

@@ -0,0 +1 @@
+2.6.9

data/.travis.yml

@@ -1,33 +1,46 @@
+dist: focal
 language: ruby
 cache: bundler
 
 rvm:
-  - 2.3
-  - 2.4
-  - 2.5
   - 2.6
   - 2.7
+  - 3.0
+  - 3.1
+
+env:
+  global:
+    - BUNDLE_JOBS=4
+
+jobs:
+  exclude:
+    - rvm: 3.0
+      gemfile: gemfiles/faraday_0.x.gemfile # Faraday v0.x does not officially support Ruby 3.0 (see: https://github.com/lostisland/faraday/releases/tag/v1.3.0)
+    - rvm: 3.1
+      gemfile: gemfiles/faraday_0.x.gemfile # Faraday v0.x does not officially support Ruby 3.0 (see: https://github.com/lostisland/faraday/releases/tag/v1.3.0)
 
 gemfile:
   - gemfiles/faraday_0.x.gemfile
   - gemfiles/faraday_1.x.gemfile
+  - gemfiles/faraday_2.x.gemfile
 
 before_install:
-  - gem update --system --force -N > /dev/null && echo "Rubygems version $(gem --version)"
-  - gem install bundler --force -N -v=2.1.4 && bundle --version
+  - gem update --system --force -N > /dev/null && echo "Rubygems version $(gem --version)" && bundle --version
 
 install:
-  - bundle install --jobs=3 --retry=3
+  - bundle install
   - >-
     curl -H 'Cache-Control: no-cache'
-    https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/master/travis_ci/fossa_install.sh |
+    https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/main/travis_ci/fossa_install.sh |
     bash -s -- -b $TRAVIS_BUILD_DIR
 
 script:
   - bundle exec rspec
+  - bundle exec rubocop
+  - bundle exec rake benchmark
   - >-
     curl -H 'Cache-Control: no-cache'
-    https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/master/travis_ci/fossa_run.sh |
+    https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/main/travis_ci/fossa_run.sh |
     bash -s -- -b $TRAVIS_BUILD_DIR
 
 deploy:
@@ -38,4 +51,4 @@ deploy:
   on:
     tags: true
     repo: mdsol/mauth-client-ruby
-    condition: $TRAVIS_RUBY_VERSION == 2.7 && $BUNDLE_GEMFILE == $TRAVIS_BUILD_DIR/gemfiles/faraday_1.x.gemfile
+    condition: $TRAVIS_RUBY_VERSION == 3.1 && $BUNDLE_GEMFILE == $TRAVIS_BUILD_DIR/gemfiles/faraday_1.x.gemfile

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'faraday_0.x' do
   gem 'faraday', '0.9.0'
 end
@@ -5,3 +7,7 @@ end
 appraise 'faraday_1.x' do
   gem 'faraday', '~> 1.0'
 end
+
+appraise 'faraday_2.x' do
+  gem 'faraday', '~> 2.0'
+end

data/CHANGELOG.md

@@ -1,14 +1,26 @@
+## v6.4.1
+- Fix MAuth::Rack::Response to not raise FrozenError.
+
+## v6.4.0
+- Support Ruby 3.1.
+- Drop support for Ruby < 2.6.0.
+- Allow Faraday 2.x.
+
+## v6.3.0
+- Support Ruby 3.0.
+- Drop support for Ruby < 2.5.0.
+
 ## v6.2.1
-* Fix SecurityTokenCacher to not cache tokens forever.
+- Fix SecurityTokenCacher to not cache tokens forever.
 
 ## v6.2.0
-* Drop legacy security token expiry in favor of honoring server cache headers via Faraday HTTP Cache Middleware.
+- Drop legacy security token expiry in favor of honoring server cache headers via Faraday HTTP Cache Middleware.
 
 ## v6.1.1
-* Replace `URI.escape` with `CGI.escape` in SecurityTokenCacher to suppress "URI.escape is obsolete" warning.
+- Replace `URI.escape` with `CGI.escape` in SecurityTokenCacher to suppress "URI.escape is obsolete" warning.
 
 ## v6.1.0
-* Allow Faraday 1.x.
+- Allow Faraday 1.x.
 
 ## v6.0.0
 - Added parsing code to test with mauth-protocol-test-suite.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mauth-client.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'mauth/request_and_response'
@@ -16,7 +18,7 @@ class TestSignableRequest < MAuth::Request
   attr_accessor :headers
 
   def merge_headers(headers)
-    self.class.new(@attributes_for_signing).tap{|r| r.headers = (@headers || {}).merge(headers) }
+    self.class.new(@attributes_for_signing).tap { |r| r.headers = (@headers || {}).merge(headers) }
   end
 
   def x_mws_time
@@ -37,7 +39,7 @@ class TestSignableRequest < MAuth::Request
 end
 
 desc 'Runs benchmarks for the library.'
-task :benchmark do
+task :benchmark do # rubocop:disable Metrics/BlockLength
   mc = MAuth::Client.new(
     private_key: OpenSSL::PKey::RSA.generate(2048),
     app_uuid: SecureRandom.uuid,

data/examples/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'faraday', '~> 1.0'

data/examples/Gemfile.lock

@@ -1,39 +1,61 @@
 PATH
   remote: ..
   specs:
-    mauth-client (6.1.0)
+    mauth-client (6.4.0)
       addressable (~> 2.0)
       coderay (~> 1.0)
       dice_bag (>= 0.9, < 2.0)
-      faraday (>= 0.9, < 2.0)
-      faraday_middleware (>= 0.9, < 2.0)
+      faraday (>= 0.9, < 3.0)
+      faraday-http-cache (>= 2.0, < 3.0)
       rack
       term-ansicolor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     coderay (1.1.3)
-    dice_bag (1.4.1)
+    dice_bag (1.6.1)
       diff-lcs (~> 1.0)
       rake
       thor (< 2.0)
-    diff-lcs (1.4.4)
-    faraday (1.0.1)
+    diff-lcs (1.5.0)
+    faraday (1.9.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     multipart-post (2.1.1)
     public_suffix (4.0.6)
     rack (2.2.3)
-    rake (13.0.1)
+    rake (13.0.6)
+    ruby2_keywords (0.0.5)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.0.1)
-    tins (1.25.0)
+    thor (1.2.1)
+    tins (1.31.0)
       sync
 
 PLATFORMS
@@ -44,4 +66,4 @@ DEPENDENCIES
   mauth-client!
 
 BUNDLED WITH
-   2.1.4
+   2.2.29

data/examples/get_user_info.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 abort "USAGE: ./#{__FILE__} <USER UUID>" unless ARGV.size == 1
 
@@ -6,7 +7,7 @@ require 'bundler/setup'
 Bundler.require(:default)
 
 def config
-  @conf ||= YAML.load(File.open("./config.yml"))
+  @config ||= YAML.safe_load(File.open('./config.yml'))
 end
 
 # get user information
@@ -18,8 +19,8 @@ end
 def get_data_from_imedidata(resource_name)
   puts "fetching #{resource_name}..."
   begin
-    connection = Faraday::Connection.new(url: config["imedidata"]["host"]) do |builder|
-      builder.use MAuth::Faraday::RequestSigner, config["mauth"]
+    connection = Faraday::Connection.new(url: config['imedidata']['host']) do |builder|
+      builder.use MAuth::Faraday::RequestSigner, config['mauth']
       builder.adapter Faraday.default_adapter
     end
 
@@ -44,15 +45,14 @@ end
 
 get_user_info_mauth(ARGV[0])
 
-
 ### OTHER EXAMPLES
 
 #### get study groups for an user
 def get_study_groups_mauth(user_uuid)
- get_data_from_imedidata "users/#{user_uuid}/study_groups.json"
+  get_data_from_imedidata "users/#{user_uuid}/study_groups.json"
 end
 
 #### get roles for a user in an application study
 def get_user_study_roles_mauth(user_uuid, study_uuid)
- get_data_from_imedidata "users/#{user_uuid}/studies/#{study_uuid}/apps/#{config["mauth"]["app_uuid"]}/roles.json"
+  get_data_from_imedidata "users/#{user_uuid}/studies/#{study_uuid}/apps/#{config["mauth"]["app_uuid"]}/roles.json"
 end

data/exe/mauth-client

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
 
-require 'rubygems'
 require 'faraday'
-require 'faraday_middleware'
 require 'logger'
 require 'mauth/client'
 require 'mauth/faraday'
@@ -17,41 +16,42 @@ require 'optparse'
 
 # $options default values
 $options = {
-  :authenticate_response => true,
-  :verbose => true,
-  :color => nil,
-  :no_ssl_verify => false,
+  authenticate_response: true,
+  verbose: true,
+  color: nil,
+  no_ssl_verify: false
 }
 
 additional_headers = []
 opt_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: mauth-client [options] <verb> <url> [body]"
+  opts.banner = 'Usage: mauth-client [options] <verb> <url> [body]'
 
-  opts.on("-v", "--[no-]verbose", "Run verbosely - output is like curl -v (this is the default)") do |v|
+  opts.on('-v', '--[no-]verbose', 'Run verbosely - output is like curl -v (this is the default)') do |v|
     $options[:verbose] = v
   end
-  opts.on("-q", "Run quietly - only outputs the response body (same as --no-verbose)") do |v|
+  opts.on('-q', 'Run quietly - only outputs the response body (same as --no-verbose)') do |v|
     $options[:verbose] = !v
   end
-  opts.on("--[no-]authenticate", "Authenticate the response received") do |v|
+  opts.on('--[no-]authenticate', 'Authenticate the response received') do |v|
     $options[:authenticate_response] = v
   end
-  opts.on("--[no-]color", "Color the output (defaults to color if the output device is a TTY)") do |v|
+  opts.on('--[no-]color', 'Color the output (defaults to color if the output device is a TTY)') do |v|
     $options[:color] = v
   end
-  opts.on("-t", "--content-type CONTENT-TYPE", "Sets the Content-Type header of the request") do |v|
+  opts.on('-t', '--content-type CONTENT-TYPE', 'Sets the Content-Type header of the request') do |v|
     $options[:content_type] = v
   end
-  opts.on("-H", "--header LINE", "accepts a json string of additional headers to included. IE 'cache-expirey: 10, other: value") do |v|
+  opts.on('-H', '--header LINE',
+    "accepts a json string of additional headers to included. IE 'cache-expirey: 10, other: value") do |v|
     additional_headers << v
   end
-  opts.on("--no-ssl-verify", "Disables SSL verification - use cautiously!") do
+  opts.on('--no-ssl-verify', 'Disables SSL verification - use cautiously!') do
     $options[:no_ssl_verify] = true
   end
-  $options[:additional_headers] =additional_headers
+  $options[:additional_headers] = additional_headers
 end
 opt_parser.parse!
-abort(opt_parser.help) unless (2..3).include?(ARGV.size)
+abort(opt_parser.help) unless (2..3).cover?(ARGV.size)
 
 # FIND MAUTH CONFIG
 
@@ -61,32 +61,32 @@ possible_mauth_config_files = [
   ENV['MAUTH_CONFIG_YAML'],
   '~/.mauth_config.yml',
   './config/mauth.yml',
-  './mauth.yml',
+  './mauth.yml'
 ].compact
 
 mauth_config_yml = possible_mauth_config_files.detect do |filename|
-  File.exists?(File.expand_path(filename))
+  File.exist?(File.expand_path(filename))
 end
 unless mauth_config_yml
-  message = "could not find mauth config. giving up. please place a mauth config in one of the standard places, " +
-    "or point the MAUTH_CONFIG_YML environment variable at an existing one. standard places are:" +
-    possible_mauth_config_files.map{|f| "\n\t#{f}" }.join
+  message = 'could not find mauth config. giving up. please place a mauth config in one of the standard places, ' \
+            'or point the MAUTH_CONFIG_YML environment variable at an existing one. standard places are:' +
+            possible_mauth_config_files.map { |f| "\n\t#{f}" }.join
   abort message
 end
 
-mauth_config = MAuth::Client.default_config(:mauth_config_yml => File.expand_path(mauth_config_yml))
+mauth_config = MAuth::Client.default_config(mauth_config_yml: File.expand_path(mauth_config_yml))
 
 # INSTANTIATE MAUTH CLIENT
 
-logger = Logger.new(STDERR)
+logger = Logger.new($stderr)
 mauth_client = MAuth::Client.new(mauth_config.merge('logger' => logger))
 
 # OUTPUTTERS FOR FARADAY THAT SHOULD MOVE TO A LIB SOMEWHERE
 
 # outputs the response body to the given output device (defaulting to STDOUT)
 class FaradayOutputter < Faraday::Middleware
-  def initialize(app, outdev=STDOUT)
-    @app=app
+  def initialize(app, outdev = $stdout)
+    @app = app
     @outdev = outdev
   end
 
@@ -100,7 +100,6 @@ end
 # this is to approximate `curl -v`s output. but it's all faked, whereas curl gives you
 # the real text written and read for request and response. whatever, close enough.
 class FaradayCurlVOutputter < FaradayOutputter
-
   # defines a method with the given name, applying coloring defined by any additional arguments.
   # if $options[:color] is set, respects that; otherwise, applies color if the output device is a tty.
   def self.color(name, *color_args)
@@ -129,10 +128,11 @@ class FaradayCurlVOutputter < FaradayOutputter
   color :response_header
   color :response_blankline, :intense_green, :bold
 
-  def call(request_env)
+  def call(request_env) # rubocop:disable Metrics/AbcSize
     @outdev.puts "#{info('*')} #{info_body("connect to #{request_env[:url].host} on port #{request_env[:url].port}")}"
-    @outdev.puts "#{info('*')} #{info_body("getting our SSL on")}" if request_env[:url].scheme=='https'
-    @outdev.puts "#{request('>')} #{request_verb(request_env[:method].to_s.upcase)} #{request_env[:url].path} #{protocol('HTTP/1.1' || 'or something - TODO')}"
+    @outdev.puts "#{info('*')} #{info_body("getting our SSL on")}" if request_env[:url].scheme == 'https'
+    @outdev.puts "#{request('>')} #{request_verb(request_env[:method].to_s.upcase)} #{request_env[:url].path}" \
+                 "#{protocol('HTTP/1.1' || 'or something - TODO')}"
     request_env[:request_headers].each do |k, v|
       @outdev.puts "#{request('>')} #{request_header(k)}#{request(':')} #{v}"
     end
@@ -142,11 +142,12 @@ class FaradayCurlVOutputter < FaradayOutputter
       @outdev.puts "#{request('>')} #{line}"
     end
     @app.call(request_env).on_complete do |response_env|
-      @outdev.puts "#{response('<')} #{protocol('HTTP/1.1' || 'or something - TODO')} #{response_status(response_env[:status].to_s)}"
+      @outdev.puts "#{response('<')} #{protocol('HTTP/1.1' || 'or something - TODO')} " \
+                   "#{response_status(response_env[:status].to_s)}"
       request_env[:response_headers].each do |k, v|
         @outdev.puts "#{response('<')} #{response_header(k)}#{response(':')} #{v}"
       end
-      @outdev.puts "#{response_blankline  ('<')} "
+      @outdev.puts "#{response_blankline('<')} "
       response_body = color_body_by_content_type(response_env[:body], response_env[:response_headers]['Content-Type'])
       (response_body || '').split("\n", -1).each do |line|
         @outdev.puts "#{response('<')} #{line}"
@@ -161,62 +162,61 @@ class FaradayCurlVOutputter < FaradayOutputter
 
   # a mapping for each registered CodeRay scanner to the Media Types which represent
   # that language. extremely incomplete!
-  CodeRayForMediaTypes = {
-    :c => [],
-    :cpp => [],
-    :clojure => [],
-    :css => ['text/css', 'application/css-stylesheet'],
-    :delphi => [],
-    :diff => [],
-    :erb => [],
-    :groovy => [],
-    :haml => [],
-    :html => ['text/html'],
-    :java => [],
-    :java_script => ['application/javascript', 'text/javascript', 'application/x-javascript'],
-    :json => ['application/json', %r(\Aapplication/.*\+json\z)],
-    :php => [],
-    :python => ['text/x-python'],
-    :ruby => [],
-    :sql => [],
-    :xml => ['text/xml', 'application/xml', %r(\Aapplication/.*\+xml\z)],
-    :yaml => [],
-  }
+  CODE_RAY_FOR_MEDIA_TYPES = {
+    c: [],
+    cpp: [],
+    clojure: [],
+    css: ['text/css', 'application/css-stylesheet'],
+    delphi: [],
+    diff: [],
+    erb: [],
+    groovy: [],
+    haml: [],
+    html: ['text/html'],
+    java: [],
+    java_script: ['application/javascript', 'text/javascript', 'application/x-javascript'],
+    json: ['application/json', %r{\Aapplication/.*\+json\z}],
+    php: [],
+    python: ['text/x-python'],
+    ruby: [],
+    sql: [],
+    xml: ['text/xml', 'application/xml', %r{\Aapplication/.*\+xml\z}],
+    yaml: []
+  }.freeze
 
   # takes a body and a content type; returns the body, with coloring (ansi colors for terminals)
   # possibly added, if it's a recognized content type and #color? is true
   def color_body_by_content_type(body, content_type)
-    if body && color?
-      # kinda hacky way to get the media_type. faraday should supply this ...
-      require 'rack'
-      media_type = ::Rack::Request.new({'CONTENT_TYPE' => content_type}).media_type
-      coderay_scanner = CodeRayForMediaTypes.reject{|k,v| !v.any?{|type| type === media_type} }.keys.first
-      if coderay_scanner
-        require 'coderay'
-        if coderay_scanner == :json
-          body = begin
-            JSON.pretty_generate(JSON.parse(body))
-          rescue JSON::ParserError
-            body
-          end
-        end
-        body = CodeRay.scan(body, coderay_scanner).encode(:terminal)
+    return body unless body && color?
+
+    # kinda hacky way to get the media_type. faraday should supply this ...
+    require 'rack'
+    media_type = ::Rack::Request.new({ 'CONTENT_TYPE' => content_type }).media_type
+    coderay_scanner = CODE_RAY_FOR_MEDIA_TYPES.select { |_k, v| v.any?(media_type) }.keys.first
+    return body unless coderay_scanner
+
+    require 'coderay'
+    if coderay_scanner == :json
+      body = begin
+        JSON.pretty_generate(JSON.parse(body))
+      rescue JSON::ParserError
+        body
       end
     end
-    body
+    CodeRay.scan(body, coderay_scanner).encode(:terminal)
   end
 end
 
 # CONFIGURE THE FARADAY CONNECTION
 faraday_options = {}
 if $options[:no_ssl_verify]
-  faraday_options[:ssl] = {:verify => false}
+  faraday_options[:ssl] = { verify: false }
 end
 connection = Faraday.new(faraday_options) do |builder|
-  builder.use MAuth::Faraday::MAuthClientUserAgent, "MAuth-Client CLI"
-  builder.use MAuth::Faraday::RequestSigner, :mauth_client => mauth_client
+  builder.use MAuth::Faraday::MAuthClientUserAgent, 'MAuth-Client CLI'
+  builder.use MAuth::Faraday::RequestSigner, mauth_client: mauth_client
   if $options[:authenticate_response]
-    builder.use MAuth::Faraday::ResponseAuthenticator, :mauth_client => mauth_client
+    builder.use MAuth::Faraday::ResponseAuthenticator, mauth_client: mauth_client
   end
   builder.use $options[:verbose] ? FaradayCurlVOutputter : FaradayOutputter
   builder.adapter Faraday.default_adapter
@@ -224,41 +224,38 @@ end
 
 httpmethod, url, body = *ARGV
 
-unless Faraday::Connection::METHODS.map{|m| m.to_s.downcase }.include?(httpmethod.downcase)
+unless Faraday::Connection::METHODS.map { |m| m.to_s.downcase }.include?(httpmethod.downcase)
   abort "Unrecognized HTTP method given: #{httpmethod}\n\n" + opt_parser.help
 end
 
 headers = {}
 if $options[:content_type]
   headers['Content-Type'] = $options[:content_type]
-else
-  if body
-    # I'd rather not have a default content-type, but if none is set then the HTTP adapter sets this to
-    # application/x-www-form-urlencoded anyway. application/json is a better default for our purposes.
-    headers['Content-Type'] = 'application/json'
-  end
+elsif body
+  headers['Content-Type'] = 'application/json'
+  # I'd rather not have a default content-type, but if none is set then the HTTP adapter sets this to
+  # application/x-www-form-urlencoded anyway. application/json is a better default for our purposes.
 end
 
-if $options[:additional_headers]
-  $options[:additional_headers].each do |cur|
-    raise "Headers must be in the format of [key]:[value]" unless cur.include?(':')
-    key, throw_away ,value = cur.partition(':')
-    headers[key] = value
-  end
+$options[:additional_headers]&.each do |cur|
+  raise 'Headers must be in the format of [key]:[value]' unless cur.include?(':')
+
+  key, _throw_away, value = cur.partition(':')
+  headers[key] = value
 end
 
 # OH LOOK IT'S FINALLY ACTUALLY CONNECTING TO SOMETHING
 
 begin
-  response = connection.run_request(httpmethod.downcase.to_sym, url, body, headers)
+  connection.run_request(httpmethod.downcase.to_sym, url, body, headers)
 rescue MAuth::InauthenticError, MAuth::UnableToAuthenticateError, MAuth::MAuthNotPresent, MAuth::MissingV2Error => e
-  if $options[:color].nil? ? STDERR.tty? : $options[:color]
+  if $options[:color].nil? ? $stderr.tty? : $options[:color]
     class_color = Term::ANSIColor.method(e.is_a?(MAuth::UnableToAuthenticateError) ? :intense_yellow : :intense_red)
     message_color = Term::ANSIColor.method(e.is_a?(MAuth::UnableToAuthenticateError) ? :yellow : :red)
   else
-    class_color = proc{|s| s }
-    message_color = proc{|s| s }
+    class_color = proc { |s| s }
+    message_color = proc { |s| s }
   end
-  STDERR.puts(class_color.call(e.class.to_s))
-  STDERR.puts(message_color.call(e.message))
+  warn(class_color.call(e.class.to_s))
+  warn(message_color.call(e.message))
 end