puppet-blacksmith 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f73159d1aa2ce5dd6ed011b22958cad22de4d331b45a29118d27b0aea808d78
-  data.tar.gz: 88d6257604d035980fdd7c5de4d3da30e427bf8f604046155608ac851c4cb377
+  metadata.gz: f006f3c1be57de47df962b7a653f07c87eb61db0713ff114c47ebe8e6a669f4d
+  data.tar.gz: 69225ae6f22e58d4f11f75f6f37922b5377df32a5b1c9231f89cd22e887d2351
 SHA512:
-  metadata.gz: 9fe046de41ad6b684cc97ba550593c4ea8f6686b6fbecc4fc07584c0b7de69addd2858417813e8ae40580ae619ec858a43e103f47bd62a0b3e79924451202054
-  data.tar.gz: 80c4ff078f2da7b86f0c1d187e0d28591d35edfb66d9c1e09663591dbf7f09516282e5540290971f085b218e0c6fd7af3f2d23448289791255766e4fb2909f91
+  metadata.gz: 386ad8efbc13c3f4c6c18e2a4abec43ad1d74f07e5100137f410c176d474ef37eb947323471eaac5c6d3b5ffd08023c948a3fccbe0daaa04160516f98e2c94a3
+  data.tar.gz: 171770abef7ac2afb77957f9e82572f496149a31cf47ffdd9f411ef3721beea83dc419a564a3a1989a3c92cc7dac754095f1f092c9fb23034c59bdaa02a19356

data/lib/puppet_blacksmith/git.rb

@@ -3,8 +3,8 @@ require 'open3'
 module Blacksmith
   class Git
 
-    attr_accessor :path, :tag_pattern, :tag_message_pattern, :commit_message_pattern
-    attr_writer :tag_pattern, :tag_message_pattern, :commit_message_pattern
+    attr_accessor :path, :tag_pattern, :tag_message_pattern, :tag_sign, :commit_message_pattern
+    attr_writer :tag_pattern, :tag_message_pattern, :tag_sign, :commit_message_pattern
 
     # Pattern to use for tags, %s is replaced with the actual version
     def commit_message_pattern
@@ -19,6 +19,10 @@ module Blacksmith
       @tag_message_pattern
     end
 
+    def tag_sign
+      @tag_sign
+    end
+
     def initialize(path = ".")
       @path = File.expand_path(path)
     end
@@ -39,6 +43,10 @@ module Blacksmith
         tag_message = tag_message_pattern % version
         command += ["-m", tag_message]
       end
+      if tag_sign
+        raise Blacksmith::Error, 'Signed tags require messages - set tag_message_pattern' unless tag_message_pattern
+        command += ["-s"]
+      end
       exec_git command
     end
 

data/lib/puppet_blacksmith/modulefile.rb

@@ -28,14 +28,18 @@ module Blacksmith
       metadata['version']
     end
 
-    def bump!(level = :patch)
-      new_version = increase_version(version, level)
+    def bump_to_version!(new_version)
       text = File.read(path)
       text = replace_version(text, new_version)
-      File.open(path, "w") {|file| file.puts text}
+      File.open(path,"w") { |file| file.puts text }
       new_version
     end
 
+    def bump!(level = :patch)
+      new_version = increase_version(version, level)
+      bump_to_version!(new_version)
+    end
+
     [:major, :minor, :patch, :full].each do |level|
       define_method("bump_#{level}!") { bump!(level) }
     end

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -57,6 +57,13 @@ module Blacksmith
           end
         end
 
+        desc "Bump module to specific version number"
+        task :bump_to_version, [:new_version] do |t, args|
+          m = Blacksmith::Modulefile.new
+          v = m.bump_to_version!(args[:new_version])
+          puts "Bumping version to #{args[:new_version]}"
+        end
+
         desc "Bump module version to the next patch"
         task :bump do
           m = Blacksmith::Modulefile.new

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '4.0.1'
+  VERSION = '4.1.0'
 end

data/spec/puppet_blacksmith/git_spec.rb

@@ -44,10 +44,31 @@ describe 'Blacksmith::Git' do
     end
 
     describe 'tag!' do
-      before { subject.tag!(version) }
-      it "should have the tag" do
-        out = `cd #{path} && git tag`
-        expect(out.chomp).to match(/^v1.0.0$/)
+      context 'basic tag' do
+        before { subject.tag!(version) }
+        it "should have the tag" do
+          out = `cd #{path} && git tag`
+          expect(out.chomp).to match(/^v1.0.0$/)
+        end
+      end
+
+      context 'signed tag without pattern' do
+        before do
+          subject.tag_message_pattern = nil
+          subject.tag_sign = true
+        end
+
+        it { expect { subject.tag!(version) }.to raise_error(Blacksmith::Error, /Signed tags require messages/)}
+      end
+
+      context 'signed tag with pattern' do
+        before do
+          subject.tag_message_pattern = 'Version %s'
+          subject.tag_sign = true
+          allow(subject).to receive(:exec_git).with(['tag', 'v1.0.0', '-m', 'Version 1.0.0', '-s']).and_return(true)
+        end
+
+        it { expect(subject.tag!(version)).to be true }
       end
     end
 

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -109,6 +109,10 @@ describe 'Blacksmith::Modulefile' do
 
   end
 
+  describe 'bump_to_version' do
+    it { expect(subject.bump_to_version!("1.0.0")).to eql("1.0.0") }
+  end
+
   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") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -168,15 +168,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.3
 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/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