puppet-blacksmith 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 305f0506d63f4917fafb2bc2c7a136901dcb00afad6344fb8237c8f9fd49243e
-  data.tar.gz: b6a858b2f0a624f0b0f263ffa7dd9040c4c979366a79430addb7d21f5f037f7f
+  metadata.gz: c9a6f0b030d273a95e8e0c4c9aa6a2064627e81a8de340568374ababcd78b725
+  data.tar.gz: 65aa44875428323c3863e2fa144eb8bc568018659880494446da84c486062de2
 SHA512:
-  metadata.gz: 9bfbb91e54799c358123411a37e9aefea96036ea71f4da8c452eaea90f938c5473c0315287c94c3f07e735e4a29452c56a718f7472f6e35b835e39ce3d6a5b0d
-  data.tar.gz: bd96a1ce3caabc6841b2e9d57ddff9d642bd418895fa099c147832cf947334c0b6bf4769e128f62619f9d8d13dd0f1542e15f424e690e0aa5fd3b9ae11b34420
+  metadata.gz: 78d1b672f742c6ea6512c80f48fea18565fdce5cb261faa5290544327ef5edea57b24072ac845203f21096fa1fb8ed04f2579a0f5c3775083a47f7a611d83517
+  data.tar.gz: 210e663c53a3bded6079c4056b17c9ce470284444b0ef22ae1e0912ae40bbfdd70a7455a5fb6d9f7d7fdcc22a08e04d52dc00d047cab292448934513edd4d878

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,6 +57,14 @@ 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, nil, nil)
+          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"
@@ -126,7 +135,7 @@ 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 #{m.author}/#{m.name}"
@@ -140,7 +149,7 @@ module Blacksmith
         end
 
         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]
+        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 = '5.1.0'
+  VERSION = '6.0.0'
 end

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/.* \(.*\)$} } }

data/spec/puppet_blacksmith/git_spec.rb

@@ -3,7 +3,7 @@ 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" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - MaestroDev
@@ -9,38 +9,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pdk
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.16
-- !ruby/object:Gem::Dependency
-  name: puppetlabs_spec_helper
-  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: cucumber
   requirement: !ruby/object:Gem::Requirement