puppet-blacksmith 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a927a889bdf0cfbd7d704e233b43a6eab265a1388c7374c5d2190807cad807b8
-  data.tar.gz: 58c976364590d195ef251220e90801560b57433cbf7a65274ad2dbd8b4d30908
+  metadata.gz: 305f0506d63f4917fafb2bc2c7a136901dcb00afad6344fb8237c8f9fd49243e
+  data.tar.gz: b6a858b2f0a624f0b0f263ffa7dd9040c4c979366a79430addb7d21f5f037f7f
 SHA512:
-  metadata.gz: d0f90cd167ebd0d01d1f266795d8602548b0869654a48a98c58fc8c3652c125b9cde78e6041754fb4d3ab58ded58d277f059af8a7cb2f9955ccf2d14ffa2f2c7
-  data.tar.gz: 39df9eb53e3616be2f47ba972206c09d43928c7bbefb550b6cf167c2332c0a8764405f482bba59b99ee560a063b7ac3a8db295213460e4279d8363566e9541ad
+  metadata.gz: 9bfbb91e54799c358123411a37e9aefea96036ea71f4da8c452eaea90f938c5473c0315287c94c3f07e735e4a29452c56a718f7472f6e35b835e39ce3d6a5b0d
+  data.tar.gz: bd96a1ce3caabc6841b2e9d57ddff9d642bd418895fa099c147832cf947334c0b6bf4769e128f62619f9d8d13dd0f1542e15f424e690e0aa5fd3b9ae11b34420

data/lib/puppet_blacksmith/forge.rb

@@ -15,12 +15,13 @@ module Blacksmith
     DEFAULT_CREDENTIALS = { 'url' => PUPPETLABS_FORGE, 'forge_type' => FORGE_TYPE_PUPPET }
     HEADERS = { 'User-Agent' => "Blacksmith/#{Blacksmith::VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE}; #{RUBY_PLATFORM})" }
 
-    attr_accessor :username, :password, :url, :client_id, :client_secret, :forge_type, :token
+    attr_accessor :username, :password, :url, :client_id, :client_secret, :forge_type, :token, :api_key
 
-    def initialize(username = nil, password = nil, url = nil, forge_type = nil, token = nil)
+    def initialize(username = nil, password = nil, url = nil, forge_type = nil, token = nil, api_key = nil)
       self.username = username
       self.password = password
       self.token = token
+      self.api_key = api_key
       RestClient.proxy = ENV['http_proxy']
       load_credentials
       load_client_credentials_from_file
@@ -51,14 +52,15 @@ 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 => http_url(author, name, file), :payload => File.new(file, 'rb'), :headers => http_headers)
+        RestClient::Request.execute(:method => :put, :url => url, :payload => File.new(file, 'rb'), :headers => http_headers)
       else
-        RestClient::Request.execute(:method => :post, :url => http_url(author, name, file), :payload => {:file => File.new(file, 'rb')}, :headers => http_headers)
+        RestClient::Request.execute(:method => :post, :url => url, :payload => {:file => File.new(file, 'rb')}, :headers => http_headers)
       end
     rescue RestClient::Exception => e
-      raise Blacksmith::Error, "Error uploading #{package} to the forge #{url} [#{e.message}]: #{e.response}"
+      raise Blacksmith::Error, "Error uploading #{name} to the forge #{url} [#{e.message}]: #{e.response}"
     end
 
     def http_url(author, name, file)
@@ -73,7 +75,9 @@ module Blacksmith
     def http_headers
       case forge_type
       when FORGE_TYPE_ARTIFACTORY
-        if token
+        if api_key
+          HEADERS.merge({'X-JFrog-Art-Api' => api_key})
+        elsif token
           HEADERS.merge({'Authorization' => "Bearer #{token}"})
         else
           HEADERS.merge({'Authorization' => "Basic " + Base64.strict_encode64("#{username}:#{password}")})
@@ -109,6 +113,7 @@ module Blacksmith
       self.username = credentials['username'] if credentials['username']
       self.password = credentials['password'] if credentials['password']
       self.token = credentials['token'] if credentials['token']
+      self.api_key = credentials['api_key'] if credentials['api_key']
       if credentials['forge']
         # deprecated
         puts "'forge' entry is deprecated in .puppetforge.yml, use 'url'"
@@ -117,7 +122,7 @@ module Blacksmith
       self.url = credentials['url'] if credentials['url']
       self.forge_type = credentials['forge_type'] if credentials['forge_type']
 
-      unless (self.username && self.password) || self.token
+      unless (self.username && self.password) || self.token || self.api_key
         raise Blacksmith::Error, <<-eos
 Could not find Puppet Forge credentials!
 
@@ -127,6 +132,7 @@ BLACKSMITH_FORGE_TYPE
 BLACKSMITH_FORGE_USERNAME
 BLACKSMITH_FORGE_PASSWORD
 BLACKSMITH_FORGE_TOKEN
+BLACKSMITH_FORGE_API_KEY
 
 or create the file '#{CREDENTIALS_FILE_PROJECT}' or '#{CREDENTIALS_FILE_HOME}'
 with content similiar to:
@@ -180,6 +186,10 @@ password: mypassword
         credentials['token'] = ENV['BLACKSMITH_FORGE_TOKEN']
       end
 
+      if ENV['BLACKSMITH_FORGE_API_KEY']
+        credentials['api_key'] = ENV['BLACKSMITH_FORGE_API_KEY']
+      end
+
       return credentials
     end
 

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

data/spec/puppet_blacksmith/forge_shared.rb

@@ -32,6 +32,6 @@ RSpec.shared_context "forge" do
     File.open(File.join(target, "metadata.json"),"w") do |file|
       file.write(JSON.pretty_generate(metadata))
     end
-    `cd #{target}/..; tar -czf #{module_name}.tar.gz #{module_name}`
+    `cd '#{target}/..'; tar -czf #{module_name}.tar.gz #{module_name}`
   end
 end

data/spec/puppet_blacksmith/git_spec.rb

@@ -10,9 +10,9 @@ describe 'Blacksmith::Git' do
   before do
     FileUtils.rm_rf path
     FileUtils.mkdir_p(path)
-    `git init #{path}`
+    `git init '#{path}'`
     FileUtils.touch(File.join(path, metadata_file))
-    `cd #{path} && git add #{metadata_file} && git commit -am "Init"`
+    `cd '#{path}' && git add #{metadata_file} && git commit -am "Init"`
   end
 
   shared_examples_for :git do
@@ -47,7 +47,7 @@ describe 'Blacksmith::Git' do
       context 'basic tag' do
         before { subject.tag!(version) }
         it "should have the tag" do
-          out = `cd #{path} && git tag`
+          out = `cd '#{path}' && git tag`
           expect(out.chomp).to match(/^v1.0.0$/)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - MaestroDev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2020-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pdk
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +168,6 @@ files:
 - lib/puppet_blacksmith/rake_tasks.rb
 - lib/puppet_blacksmith/version.rb
 - lib/puppet_blacksmith/version_helper.rb
-- spec/data/Modulefile
 - spec/data/maestrodev-test/metadata.json
 - spec/data/metadata.json
 - spec/data/response.json
@@ -195,6 +208,5 @@ test_files:
 - spec/puppet_blacksmith/forge_spec.rb
 - spec/spec_helper.rb
 - spec/data/maestrodev-test/metadata.json
-- spec/data/Modulefile
 - spec/data/response.json
 - spec/data/metadata.json

data/spec/data/Modulefile

@@ -1,9 +0,0 @@
-name 'maestrodev-test'
-version '1.0.0'
-
-license 'Apache License, Version 2.0'
-project_page 'http://github.com/maestrodev/puppet-blacksmith'
-source 'http://github.com/maestrodev/puppet-blacksmith'
-summary 'Testing Puppet module operations'
-description 'Testing Puppet module operations'
-dependency 'puppetlabs/stdlib', '>= 3.0.0'