puppet-blacksmith 8.3.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2eedc76c05832e4a0212823b2be4b5c66854a8519f4429627b9910e0ddb0872
-  data.tar.gz: 3490c7e3c75ae40b18f9f8d0f18fcd457016e7a592a001939621ceba01e4a7fe
+  metadata.gz: 2cb0f832fbc4cb63388a53a880ece21d137ab49718cd968193d390169ddd704a
+  data.tar.gz: '039a6298f6138fa3ca876525e14c9a1ab660433677950d48702842bf8f8a3118'
 SHA512:
-  metadata.gz: 2c4f176fbd9b52b966904b716b8b41015e179fa4719b89524d53fe4ac78132cfd064c4729dd49c8f1ff8b938c281ee6abfbad7808f29757d62396693e6fe7637
-  data.tar.gz: 0ab56a93a4b54353d886b54fe896e17912d4ed81160d46d35d294dcdd63ef0414eeef75165375e720ac0326522d471124b82263c02ff42f73627c240e98a336e
+  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/rake_tasks.rb

@@ -6,11 +6,11 @@ module Blacksmith
   class RakeTask < ::Rake::TaskLib
     attr_accessor :tag_pattern, :tag_message_pattern, :tag_sign, :commit_message_pattern, :build
 
-    def initialize(*args, &task_block)
+    def initialize(*args, &)
       @build = true
       @task_name = args.shift || 'blacksmith'
       @desc = args.shift || 'Puppet Forge utilities'
-      define(args, &task_block)
+      define(args, &)
     end
 
     def git
@@ -102,7 +102,7 @@ module Blacksmith
 
           %i[major minor patch].each do |level|
             desc "Get the next #{level.upcase} version"
-            task "next:#{level}".to_sym do
+            task :"next:#{level}" do
               m = Blacksmith::Modulefile.new
               puts m.increase_version(m.version, level)
             end
@@ -118,7 +118,7 @@ module Blacksmith
         namespace :bump_commit do
           %i[major minor patch full].each do |level|
             desc "Bump module version to the next #{level.upcase} version and git commit"
-            task level => "bump:#{level}".to_sym do
+            task level => :"bump:#{level}" do
               m = Blacksmith::Modulefile.new
               git.commit_modulefile!(m.version)
             end

data/lib/puppet_blacksmith/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 8.3.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: 3.1.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -193,14 +179,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      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: []