puppet-blacksmith 4.1.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5fe0a0ea848cc10d19a20511cee762cb0b6441d99f08f637ba9c81a7fa4b8a
-  data.tar.gz: a5a715ea02d0a7b4878679ec0a7d9c1350e361eac887c3127bafa2a444604093
+  metadata.gz: 831c83df3a3914c5302c2a6c5b9edc3109e0cdc346818b0f49794159f5ee0961
+  data.tar.gz: 5b8d9388f85252d81e841f3cb0a02e8f8f6f4315556c124fbe6918e760233fce
 SHA512:
-  metadata.gz: b1b32ddcc1022b19845e1bfcbafcb7aebb17d6096bfd17a332dbd84aa3aa0a877c1f447e5eb15bad0232a957d727873272b5a38049efe2f5ecd20e19235a139b
-  data.tar.gz: 0f3757316471f2d9709f5b6d96dc63e0f6496b4a88ecb55bab0c9f6e908d548159f0ab201032fbf4297efe794f7a96fe147d504f5b41d1ea8c8092a029d38d82
+  metadata.gz: 78e89d0d7e97dd8b82f3e4288933971ba021506aebf7ba1ebdba6df066872f7988598ff861298ec461337361eacf449fb9e90be4ddab1bd4c1f4d9a1e63e8d3c
+  data.tar.gz: ecf85ece2841aee1371683d6f6b74a111e548729b4a593576299e91505b090230a20dfa801a5b5304c03e64b51261a644f3e716bae58904c59b231c53f7fcb9e

data/LICENSE

@@ -1,13 +1,203 @@
 Copyright (c) 2013 MaestroDev
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-   http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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,19 @@ 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, :api_key
 
-    def initialize(username = nil, password = nil, url = 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
@@ -24,19 +30,64 @@ 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)
+      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)
+      end
+    rescue RestClient::Exception => e
+      raise Blacksmith::Error, "Error uploading #{name} 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 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}")})
+        end
+      else
+        HEADERS.merge({'Authorization' => "Bearer #{api_key || token || oauth_access_token}"})
+      end
+    end
+
+    def oauth_access_token
       begin
         response = RestClient.post("#{url}/oauth/token", {
           'client_id' => client_id,
@@ -49,20 +100,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 +112,27 @@ 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'"
         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 || self.api_key
         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
+BLACKSMITH_FORGE_API_KEY
 
 or create the file '#{CREDENTIALS_FILE_PROJECT}' or '#{CREDENTIALS_FILE_HOME}'
 with content similiar to:
@@ -132,6 +178,18 @@ 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
+
+      if ENV['BLACKSMITH_FORGE_API_KEY']
+        credentials['api_key'] = ENV['BLACKSMITH_FORGE_API_KEY']
+      end
+
       return credentials
     end
 

data/lib/puppet_blacksmith/modulefile.rb

@@ -21,8 +21,11 @@ module Blacksmith
     def name
       metadata['name'].split('-',2)[1]
     end
+    def namespace
+      metadata['name'].split('-',2)[0]
+    end
     def author
-      metadata['author'] || metadata['name'].split('-',2)[0]
+      metadata['author'] || namespace
     end
     def version
       metadata['version']

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -30,6 +30,7 @@ module Blacksmith
 
       # clear any (auto-)pre-existing task
       [
+        :build,
         :bump,
         'bump:major',
         'bump:minor',
@@ -56,12 +57,20 @@ module Blacksmith
 
       namespace :module do
 
+        desc 'Build the module using puppet-modulebuilder'
+        task :build do
+          require 'puppet/modulebuilder'
+          builder = Puppet::Modulebuilder::Builder.new(Dir.pwd)
+          package_file = builder.build
+          puts "Built #{package_file}"
+        end
+
         namespace :bump do
           [:major, :minor, :patch, :full].each do |level|
             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
@@ -126,11 +135,11 @@ module Blacksmith
         end
 
         desc "Push module to the Puppet Forge"
-        task :push => :build do
+        task :push => :'module: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.namespace}/#{m.name}"
+          forge.push!(m.name, nil, m.namespace, m.version)
         end
 
         desc "Runs clean again"
@@ -139,8 +148,8 @@ module Blacksmith
           Rake::Task["clean"].execute
         end
 
-        desc "Release the Puppet module, doing a clean, build, tag, push, bump_commit and git push."
-        release_dependencies = @build ? [:clean, :build, :bump_commit, :tag, :push] : [:clean, :bump_commit, :tag]
+        desc "Release the Puppet module, doing a clean, build, bump_commit, tag, push and git push."
+        release_dependencies = @build ? [:clean, :'module:build', :bump_commit, :tag, :push] : [:clean, :bump_commit, :tag]
         task :release => release_dependencies do
           puts "Pushing to remote git repo"
           git.push!

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '4.1.2'
+  VERSION = '6.1.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-different-author.json

@@ -0,0 +1,36 @@
+{
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "4",
+        "5",
+        "6"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": "3.2.x"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=2.7.20 <7.0.0"
+    }
+  ],
+  "name": "maestrodev-test",
+  "version": "1.0.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
+  "author": "MaestroDev",
+  "license": "Apache 2.0",
+  "summary": "Puppet Module Standard Library",
+  "description": "Standard Library for Puppet Modules",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+  "dependencies": [
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": ">= 3.0.0"
+    }
+  ]
+}

data/spec/data/metadata-no-author.json

@@ -0,0 +1,35 @@
+{
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "4",
+        "5",
+        "6"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": "3.2.x"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": ">=2.7.20 <7.0.0"
+    }
+  ],
+  "name": "maestrodev-test",
+  "version": "1.0.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
+  "license": "Apache 2.0",
+  "summary": "Puppet Module Standard Library",
+  "description": "Standard Library for Puppet Modules",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+  "dependencies": [
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": ">= 3.0.0"
+    }
+  ]
+}

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_shared.rb

@@ -15,9 +15,9 @@ RSpec.shared_context "forge" do
   let(:module_name) { "test" }
   let(:version) { "1.0.0" }
   let(:module_name) { "maestrodev-test" }
-  let(:spec_data) { File.join(File.dirname(__FILE__), '/../data') }
+  let(:spec_data) { File.join(__dir__, '..', 'data') }
   let(:spec_module) { File.join(spec_data, module_name) }
-  let(:target) { File.expand_path(File.join(__FILE__, "../../..", "pkg", module_name)) }
+  let(:target) { File.expand_path(File.join(__dir__, "..", "..", "pkg", module_name)) }
   let(:package) { "#{target}.tar.gz" }
 
   let(:headers) { { 'User-Agent' => %r{^Blacksmith/#{Blacksmith::VERSION} Ruby/.* \(.*\)$} } }
@@ -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/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/git_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 describe 'Blacksmith::Git' do
 
   subject { Blacksmith::Git.new(path) }
-  let(:path) { File.expand_path(File.join(File.dirname(__FILE__), '../../tmp/git_test')) }
+  let(:path) { File.expand_path(File.join(__dir__, '../../tmp/git_test')) }
   let(:version) { '1.0.0' }
   let(:metadata_file) { "metadata.json" }
 
   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

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -11,6 +11,32 @@ describe 'Blacksmith::Modulefile' do
     it { expect(subject.name).to eql("test") }
   end
 
+  context "using different author" do
+    let(:path) { "spec/data/metadata-different-author.json" }
+
+    subject { Blacksmith::Modulefile.new(path) }
+
+    it_behaves_like :metadata
+
+    describe "author and namespace" do
+      it { expect(subject.author).to eql("MaestroDev") }
+      it { expect(subject.namespace).to eql("maestrodev") }
+    end
+  end
+
+  context "using no author" do
+    let(:path) { "spec/data/metadata-no-author.json" }
+
+    subject { Blacksmith::Modulefile.new(path) }
+
+    it_behaves_like :metadata
+
+    describe "author and namespace" do
+      it { expect(subject.author).to eql("maestrodev") }
+      it { expect(subject.namespace).to eql("maestrodev") }
+    end
+  end
+
   context "using metadata.json" do
 
     it_behaves_like :metadata
@@ -37,7 +63,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 +109,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 +142,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,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 6.1.0
 platform: ruby
 authors:
 - MaestroDev
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: puppet-modulebuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,33 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.16
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.16
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppetlabs_spec_helper
+  name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.16
 - !ruby/object:Gem::Dependency
   name: cucumber
   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: []
@@ -139,8 +154,9 @@ 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-different-author.json
+- spec/data/metadata-no-author.json
 - spec/data/metadata.json
 - spec/data/response.json
 - spec/puppet_blacksmith/forge_live_spec.rb
@@ -150,7 +166,8 @@ files:
 - spec/puppet_blacksmith/modulefile_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/voxpupuli/puppet-blacksmith
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -160,26 +177,26 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.8
 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/metadata-different-author.json
+- spec/data/metadata-no-author.json
+- spec/data/maestrodev-test/metadata.json
+- 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'