puppet-blacksmith 4.1.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5fe0a0ea848cc10d19a20511cee762cb0b6441d99f08f637ba9c81a7fa4b8a
-  data.tar.gz: a5a715ea02d0a7b4878679ec0a7d9c1350e361eac887c3127bafa2a444604093
+  metadata.gz: a927a889bdf0cfbd7d704e233b43a6eab265a1388c7374c5d2190807cad807b8
+  data.tar.gz: 58c976364590d195ef251220e90801560b57433cbf7a65274ad2dbd8b4d30908
 SHA512:
-  metadata.gz: b1b32ddcc1022b19845e1bfcbafcb7aebb17d6096bfd17a332dbd84aa3aa0a877c1f447e5eb15bad0232a957d727873272b5a38049efe2f5ecd20e19235a139b
-  data.tar.gz: 0f3757316471f2d9709f5b6d96dc63e0f6496b4a88ecb55bab0c9f6e908d548159f0ab201032fbf4297efe794f7a96fe147d504f5b41d1ea8c8092a029d38d82
+  metadata.gz: d0f90cd167ebd0d01d1f266795d8602548b0869654a48a98c58fc8c3652c125b9cde78e6041754fb4d3ab58ded58d277f059af8a7cb2f9955ccf2d14ffa2f2c7
+  data.tar.gz: 39df9eb53e3616be2f47ba972206c09d43928c7bbefb550b6cf167c2332c0a8764405f482bba59b99ee560a063b7ac3a8db295213460e4279d8363566e9541ad

data/lib/puppet_blacksmith/forge.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'json'
 require 'yaml'
+require 'base64'
 
 module Blacksmith
   class Forge
@@ -8,14 +9,18 @@ module Blacksmith
     PUPPETLABS_FORGE = "https://forgeapi.puppetlabs.com"
     CREDENTIALS_FILE_HOME = "~/.puppetforge.yml"
     CREDENTIALS_FILE_PROJECT = '.puppetforge.yml'
-    DEFAULT_CREDENTIALS = { 'url' => PUPPETLABS_FORGE }
+    FORGE_TYPE_PUPPET = 'puppet'
+    FORGE_TYPE_ARTIFACTORY = 'artifactory'
+    SUPPORTED_FORGE_TYPES = [FORGE_TYPE_PUPPET, FORGE_TYPE_ARTIFACTORY]
+    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
+    attr_accessor :username, :password, :url, :client_id, :client_secret, :forge_type, :token
 
-    def initialize(username = nil, password = nil, url = nil)
+    def initialize(username = nil, password = nil, url = nil, forge_type = nil, token = nil)
       self.username = username
       self.password = password
+      self.token = token
       RestClient.proxy = ENV['http_proxy']
       load_credentials
       load_client_credentials_from_file
@@ -24,19 +29,61 @@ module Blacksmith
         puts "Ignoring url entry in .puppetforge.yml: must point to the api server at #{PUPPETLABS_FORGE}, not the Forge webpage"
         self.url = PUPPETLABS_FORGE
       end
+      self.forge_type = forge_type unless forge_type.nil?
+      raise Blacksmith::Error, "Unsupported forge type: #{self.forge_type}" unless SUPPORTED_FORGE_TYPES.include?(self.forge_type)
     end
 
-    def push!(name, package = nil)
+    def push!(name, package = nil, author = nil, version = nil)
+      user = author || username
       unless package
-        regex = /^#{username}-#{name}-.*\.tar\.gz$/
+        v = version ? Regexp.escape(version) : '.*'
+        regex = /^#{user}-#{name}-#{v}\.tar\.gz$/
         pkg = File.expand_path("pkg")
-        f = Dir.new(pkg).select{|f| f.match(regex)}.last
+        f = Dir.new(pkg).select{|fn| fn.match(regex)}.last
         raise Errno::ENOENT, "File not found in #{pkg} with regex #{regex}" if f.nil?
         package = File.join(pkg, f)
       end
       raise Errno::ENOENT, "File does not exist: #{package}" unless File.exists?(package)
 
-      # login to the puppet forge
+      upload(user, name, package)
+    end
+
+    private
+
+    def upload(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)
+      else
+        RestClient::Request.execute(:method => :post, :url => http_url(author, name, file), :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}"
+    end
+
+    def http_url(author, name, file)
+      case forge_type
+      when FORGE_TYPE_ARTIFACTORY
+        "#{url}/#{author}/#{name}/#{File.basename(file)}"
+      else
+        "#{url}/v2/releases"
+      end
+    end
+
+    def http_headers
+      case forge_type
+      when FORGE_TYPE_ARTIFACTORY
+        if token
+          HEADERS.merge({'Authorization' => "Bearer #{token}"})
+        else
+          HEADERS.merge({'Authorization' => "Basic " + Base64.strict_encode64("#{username}:#{password}")})
+        end
+      else
+        HEADERS.merge({'Authorization' => "Bearer #{token || oauth_access_token}"})
+      end
+    end
+
+    def oauth_access_token
       begin
         response = RestClient.post("#{url}/oauth/token", {
           'client_id' => client_id,
@@ -49,20 +96,9 @@ module Blacksmith
         raise Blacksmith::Error, "Error login to the forge #{url} as #{username} [#{e.message}]: #{e.response}"
       end
       login_data = JSON.parse(response)
-      access_token = login_data['access_token']
-
-      # upload the file
-      begin
-        response = RestClient.post("#{url}/v2/releases",
-          {:file => File.new(package, 'rb')},
-          HEADERS.merge({'Authorization' => "Bearer #{access_token}"}))
-      rescue RestClient::Exception => e
-        raise Blacksmith::Error, "Error uploading #{package} to the forge #{url} [#{e.message}]: #{e.response}"
-      end
+      login_data['access_token']
     end
 
-    private
-
     def load_credentials
       file_credentials = load_credentials_from_file
       env_credentials = load_credentials_from_env
@@ -72,21 +108,25 @@ module Blacksmith
 
       self.username = credentials['username'] if credentials['username']
       self.password = credentials['password'] if credentials['password']
+      self.token = credentials['token'] if credentials['token']
       if credentials['forge']
         # deprecated
         puts "'forge' entry is deprecated in .puppetforge.yml, use 'url'"
         self.url = credentials['forge']
       end
       self.url = credentials['url'] if credentials['url']
+      self.forge_type = credentials['forge_type'] if credentials['forge_type']
 
-      unless self.username && self.password
+      unless (self.username && self.password) || self.token
         raise Blacksmith::Error, <<-eos
 Could not find Puppet Forge credentials!
 
 Please set the environment variables
 BLACKSMITH_FORGE_URL
+BLACKSMITH_FORGE_TYPE
 BLACKSMITH_FORGE_USERNAME
 BLACKSMITH_FORGE_PASSWORD
+BLACKSMITH_FORGE_TOKEN
 
 or create the file '#{CREDENTIALS_FILE_PROJECT}' or '#{CREDENTIALS_FILE_HOME}'
 with content similiar to:
@@ -132,6 +172,14 @@ password: mypassword
         credentials['url'] = ENV['BLACKSMITH_FORGE_URL']
       end
 
+      if ENV['BLACKSMITH_FORGE_TYPE']
+        credentials['forge_type'] = ENV['BLACKSMITH_FORGE_TYPE']
+      end
+
+      if ENV['BLACKSMITH_FORGE_TOKEN']
+        credentials['token'] = ENV['BLACKSMITH_FORGE_TOKEN']
+      end
+
       return credentials
     end
 

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -61,7 +61,7 @@ module Blacksmith
             desc "Bump module version to the next #{level.upcase} version"
             task level do
               m = Blacksmith::Modulefile.new
-              v = m.send("bump_#{level}!")
+              v = m.bump!(level)
               puts "Bumping version from #{m.version} to #{v}"
             end
           end
@@ -129,8 +129,8 @@ module Blacksmith
         task :push => :build do
           m = Blacksmith::Modulefile.new
           forge = Blacksmith::Forge.new
-          puts "Uploading to Puppet Forge #{forge.username}/#{m.name}"
-          forge.push!(m.name)
+          puts "Uploading to Puppet Forge #{m.author}/#{m.name}"
+          forge.push!(m.name, nil, m.author, m.version)
         end
 
         desc "Runs clean again"
@@ -139,7 +139,7 @@ module Blacksmith
           Rake::Task["clean"].execute
         end
 
-        desc "Release the Puppet module, doing a clean, build, tag, push, bump_commit and git push."
+        desc "Release the Puppet module, doing a clean, build, bump_commit, tag, push and git push."
         release_dependencies = @build ? [:clean, :build, :bump_commit, :tag, :push] : [:clean, :bump_commit, :tag]
         task :release => release_dependencies do
           puts "Pushing to remote git repo"

data/lib/puppet_blacksmith/version.rb

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

data/lib/puppet_blacksmith/version_helper.rb

@@ -115,9 +115,11 @@ module Blacksmith
 
       def increment!(term)
         new_version = clone
-        new_value = send(term) + 1
 
-        new_version.send("#{term}=", new_value)
+        if term != :patch || @pre.nil?
+          new_version.send("#{term}=", send(term) + 1)
+        end
+
         new_version.minor = 0 if term == :major
         new_version.patch = 0 if term == :major || term == :minor
         new_version.build = new_version.pre = nil

data/spec/data/metadata.json

@@ -16,7 +16,7 @@
     },
     {
       "name": "puppet",
-      "version_requirement": ">=2.7.20 <4.0.0"
+      "version_requirement": ">=2.7.20 <7.0.0"
     }
   ],
   "name": "maestrodev-test",
@@ -28,9 +28,9 @@
   "description": "Standard Library for Puppet Modules",
   "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
   "dependencies": [
-      {
-          "name": "puppetlabs-stdlib",
-          "version_requirement": ">= 3.0.0"
-      }
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": ">= 3.0.0"
+    }
   ]
 }

data/spec/puppet_blacksmith/forge_spec.rb

@@ -91,7 +91,7 @@ describe 'Blacksmith::Forge' do
             :headers => {})
 
         stub_request(:post, "#{forge}/v2/releases").with(
-            :headers => headers.merge({'Accept'=>'*/*', 'Accept-Encoding'=>'gzip, deflate', 'Authorization'=>'Bearer e52f78b62e97cb8d8db6659a73aa522cca0f5c74d4714e0ed0bdd10000000000', 'Content-Type'=>%r{\Amultipart/form-data;}})
+            :headers => headers.merge({'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer e52f78b62e97cb8d8db6659a73aa522cca0f5c74d4714e0ed0bdd10000000000', 'Content-Type'=>%r{\Amultipart/form-data;}})
           ) { |request |
             request.body =~ %r{Content-Disposition: form-data; name=\"file\"; filename=\"maestrodev-test.tar.gz\"\r\nContent-Type: application/gzip}
           }.to_return(:status => 200, :body => File.read(File.join(spec_data, "response.json")), :headers => {})

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -37,7 +37,7 @@ describe 'Blacksmith::Modulefile' do
               },
               {
                 "name": "puppet",
-                "version_requirement": ">=2.7.20 <4.0.0"
+                "version_requirement": ">=2.7.20 <7.0.0"
               }
             ],
             "name": "maestrodev-test",
@@ -83,7 +83,7 @@ describe 'Blacksmith::Modulefile' do
               },
               {
                 "name": "puppet",
-                "version_requirement": ">=2.7.20 <4.0.0"
+                "version_requirement": ">=2.7.20 <7.0.0"
               }
             ],
             "name": "maestrodev-test",
@@ -116,25 +116,28 @@ describe 'Blacksmith::Modulefile' do
   describe 'increase_version' do
     it { expect(subject.increase_version("1.0.0")).to eql("1.0.1") }
     it { expect(subject.increase_version("1.0.1")).to eql("1.0.2") }
-    it { expect { subject.increase_version("1.0") }.to raise_error }
-    it { expect { subject.increase_version("1.0.12qwe") }.to raise_error }
+    it { expect { subject.increase_version("1.0") }.to raise_error(ArgumentError) }
+    it { expect { subject.increase_version("1.0.12qwe") }.to raise_error(ArgumentError) }
   end
 
   describe 'bump patch version' do
     it { expect(subject.increase_version("1.0.0", :patch)).to eql("1.0.1") }
     it { expect(subject.increase_version("1.1.0", :patch)).to eql("1.1.1") }
     it { expect(subject.increase_version("1.1.1", :patch)).to eql("1.1.2") }
+    it { expect(subject.increase_version("1.1.2-rc0", :patch)).to eql("1.1.2") }
   end
 
   describe 'bump minor version' do
     it { expect(subject.increase_version("1.0.0", :minor)).to eql("1.1.0") }
     it { expect(subject.increase_version("1.1.0", :minor)).to eql("1.2.0") }
     it { expect(subject.increase_version("1.1.1", :minor)).to eql("1.2.0") }
+    it { expect(subject.increase_version("1.1.1-rc0", :minor)).to eql("1.2.0") }
   end
 
   describe 'bump major version' do
     it { expect(subject.increase_version("1.0.0", :major)).to eql("2.0.0") }
     it { expect(subject.increase_version("1.1.0", :major)).to eql("2.0.0") }
     it { expect(subject.increase_version("1.1.1", :major)).to eql("2.0.0") }
+    it { expect(subject.increase_version("1.1.1-rc0", :major)).to eql("2.0.0") }
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 5.0.0
 platform: ruby
 authors:
 - MaestroDev
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,6 +39,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: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +139,7 @@ dependencies:
         version: '2.0'
 description: Puppet module tools for development and Puppet Forge management
 email:
-- info@maestrodev.com
+- voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -160,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,18 +183,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tasks to manage Puppet module builds
 test_files:
-- spec/data/Modulefile
-- spec/data/maestrodev-test/metadata.json
-- spec/data/response.json
-- spec/data/metadata.json
-- spec/puppet_blacksmith/forge_live_spec.rb
 - spec/puppet_blacksmith/forge_shared.rb
-- spec/puppet_blacksmith/forge_spec.rb
+- spec/puppet_blacksmith/forge_live_spec.rb
 - spec/puppet_blacksmith/git_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
+- 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