From 607d247c9a4bcef57a905e82454d5cd10bea5e7e Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith84@gmail.com>
Date: Tue, 8 Sep 2020 23:35:38 -0700
Subject: Replace __FILE__ with __dir__ and use safe operators

A few new chefstyle rules to improve readability here.

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 Gemfile                                                        | 8 ++++----
 lib/mixlib/authentication/signedheaderauth.rb                  | 4 ++--
 mixlib-authentication.gemspec                                  | 2 +-
 spec/mixlib/authentication/http_authentication_request_spec.rb | 2 +-
 spec/mixlib/authentication/mixlib_authentication_spec.rb       | 4 ++--
 spec/spec_helper.rb                                            | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8786b84..50aa5eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,12 +10,12 @@ end
 
 group :test do
   gem "chefstyle"
-  gem "rspec-core", "~> 3.2"
-  gem "rspec-mocks", "~> 3.2"
-  gem "rspec-expectations", "~> 3.2"
-  gem "rake"
   gem "mixlib-log", "~> 3"
   gem "net-ssh"
+  gem "rake"
+  gem "rspec-core", "~> 3.2"
+  gem "rspec-expectations", "~> 3.2"
+  gem "rspec-mocks", "~> 3.2"
 end
 
 group :debug do
diff --git a/lib/mixlib/authentication/signedheaderauth.rb b/lib/mixlib/authentication/signedheaderauth.rb
index c86c295..0e0d865 100644
--- a/lib/mixlib/authentication/signedheaderauth.rb
+++ b/lib/mixlib/authentication/signedheaderauth.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "time" unless defined?(Time)
+require "time" unless defined?(Time.zone_offset)
 require "base64" unless defined?(Base64)
 require "openssl/digest"
 require_relative "../authentication"
@@ -196,7 +196,7 @@ module Mixlib
         # TODO: tim 2009-12-28: It'd be nice to just remove this special case,
         # always sign the entire request body, using the expanded multipart
         # body in the case of a file being include.
-        @hashed_body ||= if file && file.respond_to?(:read)
+        @hashed_body ||= if file&.respond_to?(:read)
                            digester.hash_file(file, digest)
                          else
                            digester.hash_string(body, digest)
diff --git a/mixlib-authentication.gemspec b/mixlib-authentication.gemspec
index 38a30a4..2bcf30e 100644
--- a/mixlib-authentication.gemspec
+++ b/mixlib-authentication.gemspec
@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/lib")
+$:.unshift(__dir__ + "/lib")
 require "mixlib/authentication/version"
 
 Gem::Specification.new do |s|
diff --git a/spec/mixlib/authentication/http_authentication_request_spec.rb b/spec/mixlib/authentication/http_authentication_request_spec.rb
index 29a134a..b74968b 100644
--- a/spec/mixlib/authentication/http_authentication_request_spec.rb
+++ b/spec/mixlib/authentication/http_authentication_request_spec.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require File.expand_path(File.join(__dir__, "..", "..", "spec_helper"))
 
 require "mixlib/authentication"
 require "mixlib/authentication/http_authentication_request"
diff --git a/spec/mixlib/authentication/mixlib_authentication_spec.rb b/spec/mixlib/authentication/mixlib_authentication_spec.rb
index b679208..3a6e0eb 100644
--- a/spec/mixlib/authentication/mixlib_authentication_spec.rb
+++ b/spec/mixlib/authentication/mixlib_authentication_spec.rb
@@ -19,13 +19,13 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require File.expand_path(File.join(__dir__, "..", "..", "spec_helper"))
 require "rubygems" unless defined?(Gem)
 
 require "ostruct" unless defined?(OpenStruct)
 require "openssl" unless defined?(OpenSSL)
 require "mixlib/authentication/signatureverification"
-require "time" unless defined?(Time)
+require "time" unless defined?(Time.zone_offset)
 require "net/ssh" unless defined?(Net::SSH)
 
 # TODO: should make these regular spec-based mock objects.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f10ee93..015c298 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,6 +17,6 @@
 # limitations under the License.
 #
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")) # lib in mixlib-authentication
+$:.unshift File.expand_path(File.join(__dir__, "..", "lib")) # lib in mixlib-authentication
 
 require "rubygems" unless defined?(Gem)
-- 
cgit v1.2.1