Merge pull request #145 from chef/jgarud/fix-verify-pipeline

Fix verify pipeline
chef · Oct 7, 2021 · b85b28d · b85b28d
2 parents ec9e095 + d883f7b
commit b85b28d
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 22 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,10 @@ group :test do
   gem "rspec",   "~> 3.0"
   gem "webmock", "~> 3.7"
   gem "rspec-mocks", "3.9.0"
-  gem "simplecov"
+  gem "simplecov", "~> 0.18.5" # Pin until we drop ruby support 2.4
   gem "simplecov-console"
   gem "rake"
+  gem "parallel", "~> 1.20.1"  # Pin until we drop ruby support 2.4
+  gem "rubocop-ast", "= 1.4.1" # Pin until we drop ruby support 2.4
+  gem "docile", "= 1.3.5"  # Pin until we drop ruby support 2.4
 end
diff --git a/artifactory.gemspec b/artifactory.gemspec
@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "artifactory/version"
 

diff --git a/lib/artifactory.rb b/lib/artifactory.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require_relative "artifactory/version"
 
 module Artifactory
@@ -59,7 +59,7 @@ class << self
     # @return [Pathname]
     #
     def root
-      @root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @root ||= Pathname.new(File.expand_path("..", __dir__))
     end
 
     #

diff --git a/lib/artifactory/client.rb b/lib/artifactory/client.rb
@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-require "cgi"
-require "json"
-require "net/http"
-require "uri"
+require "cgi" unless defined?(CGI)
+require "json" unless defined?(JSON)
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
 
 module Artifactory
   #
@@ -232,7 +232,8 @@ def request(verb, path, data = {}, headers = {}, &block)
 
       # Apply SSL, if applicable
       if uri.scheme == "https"
-        require "net/https" unless defined?(Net::HTTPS)
+        require "net/http" unless defined?(Net::HTTP)
+        require "openssl" unless defined?(Net::HTTPS)
 
         # Turn on SSL
         connection.use_ssl = true

diff --git a/lib/artifactory/resources/artifact.rb b/lib/artifactory/resources/artifact.rb
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "tempfile"
-require "time"
+require "tempfile" unless defined?(Tempfile)
+require "time" unless defined?(Time.zone_offset)
 
 module Artifactory
   class Resource::Artifact < Resource::Base

diff --git a/lib/artifactory/resources/backup.rb b/lib/artifactory/resources/backup.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "rexml/document"
+require "rexml/document" unless defined?(REXML::Document)
 
 module Artifactory
   class Resource::Backup < Resource::Base

diff --git a/lib/artifactory/resources/base.rb b/lib/artifactory/resources/base.rb
@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-require "cgi"
-require "json"
-require "uri"
+require "cgi" unless defined?(CGI)
+require "json" unless defined?(JSON)
+require "uri" unless defined?(URI)
 
 module Artifactory
   class Resource::Base

diff --git a/lib/artifactory/resources/build.rb b/lib/artifactory/resources/build.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "time"
+require "time" unless defined?(Time.zone_offset)
 
 module Artifactory
   class Resource::Build < Resource::Base

diff --git a/lib/artifactory/resources/build_component.rb b/lib/artifactory/resources/build_component.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "time"
+require "time" unless defined?(Time.zone_offset)
 
 module Artifactory
   class Resource::BuildComponent < Resource::Base

diff --git a/lib/artifactory/resources/layout.rb b/lib/artifactory/resources/layout.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "rexml/document"
+require "rexml/document" unless defined?(REXML::Document)
 
 module Artifactory
   class Resource::Layout < Resource::Base

diff --git a/lib/artifactory/resources/ldap_setting.rb b/lib/artifactory/resources/ldap_setting.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "rexml/document"
+require "rexml/document" unless defined?(REXML::Document)
 
 module Artifactory
   class Resource::LDAPSetting < Resource::Base

diff --git a/lib/artifactory/resources/mail_server.rb b/lib/artifactory/resources/mail_server.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "rexml/document"
+require "rexml/document" unless defined?(REXML::Document)
 
 module Artifactory
   class Resource::MailServer < Resource::Base

diff --git a/lib/artifactory/resources/url_base.rb b/lib/artifactory/resources/url_base.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "rexml/document"
+require "rexml/document" unless defined?(REXML::Document)
 
 module Artifactory
   class Resource::URLBase < Resource::Base