puppet-blacksmith 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9f91ff54da5b285ec0b3a80e6dd5af0106a303b01bdd0d49d25f5c8ab3b7e1
-  data.tar.gz: 78cbb66ab52acef8ce535bb8dfe62c39207772d600cf8ad65108a8a9fb846cf7
+  metadata.gz: 2cb0f832fbc4cb63388a53a880ece21d137ab49718cd968193d390169ddd704a
+  data.tar.gz: '039a6298f6138fa3ca876525e14c9a1ab660433677950d48702842bf8f8a3118'
 SHA512:
-  metadata.gz: 1930c90d9db66bb94c9da46b1b516d5ab8bfa78b04c51ee7e814c4fe52cb9b9ad9fe6c2a34f7b3c57db92013e44e57f86006c60b3897d48fd0f4cd060cd88a06
-  data.tar.gz: 2e621a1f6a129493554eeec16dee86015e4cd8f14d53d7cf0e3cd81f51f7a06ac263a2f26caa8bc767f0e8ab7e8318f9a80c2c82730869a8daa3d1435efac0da
+  metadata.gz: 99c63a7ef2616f6821afda84e1eb3d9f607d7b7f0846c6331ebafc7e0911a221dbcbac64fd636a7a24bb0ebafe052c539b7b96a76f9cbf98b62d5f3a2997a6a4
+  data.tar.gz: 280f703023efd74391501d19c74d1c1e965957f12aca516d52fa589b8e014f1bca00b297399d0b7033bfa69d524fba42383528351332555d64cee2529c62c538

data/lib/puppet_blacksmith/forge.rb

@@ -1,7 +1,8 @@
-require 'rest-client'
+require 'net/http'
 require 'json'
 require 'yaml'
 require 'base64'
+require 'uri'
 
 module Blacksmith
   class Forge
@@ -21,7 +22,6 @@ module Blacksmith
       self.password = password
       self.token = token
       self.api_key = api_key
-      RestClient.proxy = ENV.fetch('http_proxy', nil)
       load_credentials
       self.url = url unless url.nil?
       if %r{http(s)?://forge.puppetlabs.com}.match?(self.url)
@@ -51,15 +51,32 @@ module Blacksmith
     private
 
     def upload(author, name, file)
-      url = http_url(author, name, file)
-      case forge_type
-      when FORGE_TYPE_ARTIFACTORY
-        RestClient::Request.execute(method: :put, url: url, payload: File.new(file, 'rb'), headers: http_headers)
-      else
-        RestClient::Request.execute(method: :post, url: url, payload: { file: File.new(file, 'rb') }, headers: http_headers)
+      target_url = http_url(author, name, file)
+      uri = URI(target_url)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == 'https')
+
+      response = File.open(file, 'rb') do |f|
+        if forge_type == FORGE_TYPE_ARTIFACTORY
+          request = Net::HTTP::Put.new(uri.request_uri, http_headers)
+          request.body_stream = f
+        else
+          request = Net::HTTP::Post.new(uri.request_uri, http_headers)
+          request.set_form([
+                             ['file', f, { filename: File.basename(file) }],
+                           ], 'multipart/form-data')
+        end
+        http.request(request)
       end
-    rescue RestClient::Exception => e
-      raise Blacksmith::Error, "Error uploading #{name} to the forge #{url} [#{e.message}]: #{e.response}"
+
+      raise Blacksmith::Error, "Error uploading #{name} to the forge #{target_url} [#{response.code} #{response.message}]: #{response.body}" unless response.is_a?(Net::HTTPSuccess)
+    rescue Net::HTTPClientException => e
+      raise Blacksmith::Error, "Error uploading #{name} to the forge #{target_url} [#{e.response.code} #{e.response.message}]: #{e.response.body}"
+    rescue Net::HTTPFatalError => e
+      raise Blacksmith::Error, "HTTP error during upload: #{e.message}"
+    rescue StandardError => e
+      raise Blacksmith::Error, "Error uploading #{name} to the forge #{target_url} [#{e.class} #{e.message}]"
     end
 
     def http_url(author, name, file)

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '9.0.0'
+  VERSION = '9.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - MaestroDev
@@ -50,20 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -138,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -196,14 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '4'
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Tasks to manage Puppet module builds
 test_files: []