puppet-blacksmith 3.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 067263620b3ecaa64fcd67b770345766d46f2728
-  data.tar.gz: 87c4bc41babc57dd308dca7307af27ce25e994dd
+SHA256:
+  metadata.gz: 4234c7e6eeb4943c9c3bcd8c4917ae65f9b21e1c4fa5a288064a8d12f8c2323e
+  data.tar.gz: 1d079e264eed5b52b55fd8a1805ee4032d50d5837abd0597555c151ba0b3c3df
 SHA512:
-  metadata.gz: d7a3db4d6999ab0ea7ee416b9fbc8b6f93c40e95bb8bf904fa91766b7a45f8abf87a1a2f7aba226a5710705c50026ef8181330a31f6113e95ba440dcc352d137
-  data.tar.gz: f3514d2f03b03b182aaa6c826e5e01ab5b525456761d13d2fb08f97608bda1754b1f74af99917dc9a4b77615aaf18df88e6a0145342cd9400d9257257df1bfd1
+  metadata.gz: 8398190c749747ed961359f93b8c59409d0bfdf21d3f1a061b76c9c636962ba1e0c10ba2f5c8cd475bae2a50307c259f2f70e7e718b0dd87e5d858e91eecf544
+  data.tar.gz: 98ec860d42286e2e574d0ba1d0fdeee503f63e6cc354c8a0a3f857c487d8e2adda2b23d991d679249781dbcd90aa00f390a4c16e740c799df08f297378a60a86

data/lib/puppet_blacksmith/git.rb

@@ -3,47 +3,68 @@ require 'open3'
 module Blacksmith
   class Git
 
-    attr_accessor :path, :tag_pattern
-    attr_writer :tag_pattern
+    attr_accessor :path, :tag_pattern, :tag_message_pattern, :commit_message_pattern
+    attr_writer :tag_pattern, :tag_message_pattern, :commit_message_pattern
 
     # Pattern to use for tags, %s is replaced with the actual version
+    def commit_message_pattern
+      @commit_message_pattern || "[blacksmith] Bump version to %s"
+    end
+
     def tag_pattern
       @tag_pattern || 'v%s'
     end
 
+    def tag_message_pattern
+      @tag_message_pattern
+    end
+
     def initialize(path = ".")
       @path = File.expand_path(path)
     end
 
+    def has_tag?(tag)
+      exec_git(['tag', '--list', tag]).strip == tag
+    end
+
+    def has_version_tag?(version)
+      tag = tag_pattern % version
+      has_tag? tag
+    end
+
     def tag!(version)
       tag = tag_pattern % version
-      exec_git "tag #{tag}"
+      command = ["tag", tag]
+      if tag_message_pattern
+        tag_message = tag_message_pattern % version
+        command += ["-m", tag_message]
+      end
+      exec_git command
     end
 
     def commit_modulefile!(version)
       files = Blacksmith::Modulefile::FILES.select {|f| File.exists?(File.join(@path,f))}
-      s = exec_git "add #{files.join(" ")}"
-      s += exec_git "commit -m '[blacksmith] Bump version to #{version}'"
+      message = commit_message_pattern % version
+      s = exec_git ["add"] + files
+      s += exec_git ["commit", "-m", message]
       s
     end
 
     def push!
-      s = exec_git "push"
-      s += exec_git "push --tags"
+      s = exec_git ["push"]
+      s += exec_git ["push", "--tags"]
       s
     end
 
-    def git_cmd_with_path(cmd)
-      "git --git-dir=#{File.join(path, '.git')} --work-tree=#{path} #{cmd}"
-    end
+    private
 
     def exec_git(cmd)
       out = ""
       err = ""
       exit_status = nil
-      new_cmd = git_cmd_with_path(cmd)
+      new_cmd = ["git", "--git-dir", File.join(@path, '.git'), "--work-tree", @path] + cmd
       # wait_thr is nil in JRuby < 1.7.5 see http://jira.codehaus.org/browse/JRUBY-6409
-      Open3.popen3(new_cmd) do |stdin, stdout, stderr, wait_thr|
+      Open3.popen3(*new_cmd) do |stdin, stdout, stderr, wait_thr|
         out = stdout.read
         err = stderr.read
         exit_status = wait_thr.nil? ? nil : wait_thr.value

data/lib/puppet_blacksmith/modulefile.rb

@@ -1,49 +1,25 @@
-# Avoid loading everything Puppet when we only need the module tool
-# It causes trouble running it from jruby warbled jars
-# module Puppet
-#   def self.settings
-#     {}
-#   end
-#   def self.[](param)
-#   end
-# end
-# require 'puppet/error'
-# require 'puppet/module_tool'
-require 'puppet'
-require 'puppet/module_tool'
 require 'puppet_blacksmith/version_helper'
 
-Puppet[:confdir] = "."
-
 module Blacksmith
   class Modulefile
 
-    FILES = ["metadata.json", "Modulefile"]
+    FILES = ["metadata.json"]
 
     attr_reader :path
 
     def initialize(path = nil)
       @path = path.nil? ? FILES.find {|f| File.exists? f} : path
       raise Blacksmith::Error, "Unable to find any of #{FILES}" unless @path
-      @modulefile = @path =~ /Modulefile$/
     end
 
     def metadata
-      unless @metadata
-        if @modulefile
-          metadata = Puppet::ModuleTool::Metadata.new
-          Puppet::ModuleTool::ModulefileReader.evaluate(metadata, path)
-          @metadata = { 'name' => metadata.name, 'version' => metadata.version, 'author' => metadata.author }
-        else
-          @metadata = JSON.parse(File.read(path))
-        end
-      end
+      @metadata = JSON.parse(File.read(path)) unless @metadata
       @metadata
     end
 
     # name in metadata.json is author-modulename
     def name
-      @modulefile ? metadata['name'] : metadata['name'].split('-',2)[1]
+      metadata['name'].split('-',2)[1]
     end
     def author
       metadata['author'] || metadata['name'].split('-',2)[0]
@@ -71,13 +47,9 @@ module Blacksmith
     end
 
     def replace_version(text, version)
-      if @modulefile
-        text.gsub(/\nversion[ ]+['"].*['"]/, "\nversion '#{version}'")
-      else
-        json = JSON.parse(text)
-        json['version'] = version
-        JSON.pretty_generate(json)
-      end
+      json = JSON.parse(text)
+      json['version'] = version
+      JSON.pretty_generate(json)
     end
 
     def increase_version(version, level = :patch)
@@ -86,21 +58,15 @@ module Blacksmith
     end
 
     def replace_dependency_version(text, module_name, version)
-      if @modulefile
-        # example: dependency 'puppetlabs/stdlib', '>= 2.3.0'
-        module_name = module_name.sub(/^([^\/-]+)-/, '\1/')
-        text.gsub(/\ndependency[ ]+['"].*#{module_name}['"],([ ]+['"].*['"]|)/, "\ndependency '#{module_name}', '#{version}'")
-      else
-        module_name = module_name.sub(/\//, '-')
-        json = JSON.parse(text)
-        new_dep_list = []
-        json['dependencies'].each do |dep|
-          dep['version_requirement'] = version if dep['name'] == module_name
-          new_dep_list << dep
-        end
-        json['dependencies'] = new_dep_list
-        JSON.pretty_generate(json)
+      module_name = module_name.sub(/\//, '-')
+      json = JSON.parse(text)
+      new_dep_list = []
+      json['dependencies'].each do |dep|
+        dep['version_requirement'] = version if dep['name'] == module_name
+        new_dep_list << dep
       end
+      json['dependencies'] = new_dep_list
+      JSON.pretty_generate(json)
     end
   end
 end

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -5,7 +5,7 @@ require 'puppet_blacksmith'
 module Blacksmith
   class RakeTask < ::Rake::TaskLib
 
-    attr_accessor :tag_pattern, :build
+    attr_accessor :tag_pattern, :tag_message_pattern, :commit_message_pattern, :build
 
     def initialize(*args, &task_block)
       @build = true
@@ -69,6 +69,8 @@ module Blacksmith
           m = Blacksmith::Modulefile.new
           git = Blacksmith::Git.new
           git.tag_pattern = @tag_pattern
+          git.tag_message_pattern = @tag_message_pattern
+          git.commit_message_pattern = @commit_message_pattern
           git.tag!(m.version)
         end
 
@@ -99,7 +101,11 @@ module Blacksmith
             desc "Bump module version to the next #{level.upcase} version and git commit"
             task level => "bump:#{level}".to_sym do
               m = Blacksmith::Modulefile.new
-              Blacksmith::Git.new.commit_modulefile!(m.version)
+              git = Blacksmith::Git.new
+              git.tag_pattern = @tag_pattern
+              git.tag_message_pattern = @tag_message_pattern
+              git.commit_message_pattern = @commit_message_pattern
+              git.commit_modulefile!(m.version)
             end
           end
         end
@@ -107,7 +113,11 @@ module Blacksmith
         desc "Bump version and git commit"
         task :bump_commit => :bump do
           m = Blacksmith::Modulefile.new
-          Blacksmith::Git.new.commit_modulefile!(m.version)
+          git = Blacksmith::Git.new
+          git.tag_pattern = @tag_pattern
+          git.tag_message_pattern = @tag_message_pattern
+          git.commit_message_pattern = @commit_message_pattern
+          git.commit_modulefile!(m.version)
         end
 
         desc "Push module to the Puppet Forge"
@@ -125,10 +135,14 @@ module Blacksmith
         end
 
         desc "Release the Puppet module, doing a clean, build, tag, push, bump_commit and git push."
-        release_dependencies = @build ? [:clean, :build, :tag, :push, :bump_commit] : [:clean, :tag, :bump_commit]
+        release_dependencies = @build ? [:clean, :build, :bump_commit, :tag, :push] : [:clean, :bump_commit, :tag]
         task :release => release_dependencies do
           puts "Pushing to remote git repo"
-          Blacksmith::Git.new.push!
+          git = Blacksmith::Git.new
+          git.tag_pattern = @tag_pattern
+          git.tag_message_pattern = @tag_message_pattern
+          git.commit_message_pattern = @commit_message_pattern
+          git.push!
         end
 
         desc "Set specific module dependency version"

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '3.4.0'
+  VERSION = '4.0.0'
 end

data/spec/puppet_blacksmith/forge_spec.rb

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

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.join(File.dirname(__FILE__), '../../tmp/git_test') }
+  let(:path) { File.expand_path(File.join(File.dirname(__FILE__), '../../tmp/git_test')) }
   let(:version) { '1.0.0' }
   let(:metadata_file) { "metadata.json" }
 
@@ -16,6 +16,33 @@ describe 'Blacksmith::Git' do
   end
 
   shared_examples_for :git do
+    describe 'has_tag?' do
+      context 'with a tag' do
+        before { subject.tag!(version) }
+        it { expect(subject.has_tag?("v#{version}")).to be true }
+      end
+
+      context 'with a partial match' do
+        before { subject.tag!(version) }
+        it { expect(subject.has_tag?(version)).to be false }
+      end
+
+      context 'without a tag' do
+        it { expect(subject.has_tag?('something')).to be false }
+      end
+    end
+
+    describe 'has_tag?' do
+      context 'with a tag' do
+        before { subject.tag!(version) }
+        it { expect(subject.has_version_tag?(version)).to be true }
+      end
+
+      context 'without a tag' do
+        it { expect(subject.has_version_tag?('something')).to be false }
+      end
+    end
+
     describe 'tag!' do
       before { subject.tag!(version) }
       it "should have the tag" do
@@ -37,7 +64,7 @@ describe 'Blacksmith::Git' do
     end
 
     describe 'exec_git' do
-      let(:cmd) { 'log' }
+      let(:cmd) { ['log'] }
       let(:stdin) { nil }
       let(:stdout) { '' }
       let(:stderr) { '' }
@@ -46,8 +73,10 @@ describe 'Blacksmith::Git' do
 
       context 'when git succeeds' do
         before do
-          allow(Open3).to receive(:popen3).and_yield(nil, double(:read => stdout), double(:read => stderr), wait_thr)
-          expect { subject.exec_git(cmd) }.to_not raise_error
+          allow(Open3).to receive(:popen3). \
+            with('git', '--git-dir', File.join(path, '.git'), '--work-tree', path, *cmd). \
+            and_yield(nil, double(:read => stdout), double(:read => stderr), wait_thr)
+          expect { subject.send(:exec_git, cmd) }.to_not raise_error
         end
 
         context 'when stderr is empty' do
@@ -62,27 +91,20 @@ describe 'Blacksmith::Git' do
       end
 
       context 'when git fails' do
-        before { allow(subject).to receive(:git_cmd_with_path) {cmd} }
-
         # this spec fails on jruby, can't detect exit code of script
         context 'when stderr is empty' do
-          let(:cmd) { "git" } # exits with 1
-          it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /^Command .* failed with exit status.*1.*$/) }
+          let(:cmd) { [] } # exits with 1
+          it { expect { subject.send(:exec_git, cmd) }.to raise_error(Blacksmith::Error, /^Command .* failed with exit status.*1.*$/) }
         end
 
         context 'when stderr is not empty' do
-          let(:cmd) { "git help xxxx" } # exits with 1 and prints to stdout
-          it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /No manual entry for gitxxx/) }
+          let(:cmd) { ["help", "xxxx"] } # exits with 1 and prints to stdout
+          it { expect { subject.send(:exec_git, cmd) }.to raise_error(Blacksmith::Error, /No manual entry for gitxxx/) }
         end
       end
     end
   end
 
-  context "Using Modulefile" do
-    let(:metadata_file) { "Modulefile" }
-    it_behaves_like :git
-  end
-
   context "Using metadata.json" do
     it_behaves_like :git
   end

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -109,49 +109,6 @@ describe 'Blacksmith::Modulefile' do
 
   end
 
-  context "using a Modulefile" do
-
-    let(:path) { "spec/data/Modulefile" }
-
-    it_behaves_like :metadata
-
-    describe 'replace_version' do
-      it "should replace the version in a Modulefile" do
-        expected = <<-eos
-name 'maestrodev-test'
-version '1.0.1'
-
-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'
-eos
-
-        expect(subject.replace_version(File.read(path), "1.0.1")).to eql(expected)
-      end
-    end
-
-    describe 'replace_dependency_version' do
-      it "should replace the dependency version in a Modulefile" do
-        expected = <<-eos
-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', '>= 4.0.0'
-eos
-
-        expect(subject.replace_dependency_version(File.read(path), 'puppetlabs-stdlib', '>= 4.0.0')).to eql(expected)
-      end
-    end
-  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: 3.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.16
-  type: :runtime
+        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: rake
+  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: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '2.0'
 description: Puppet module tools for development and Puppet Forge management
 email:
 - info@maestrodev.com
@@ -149,7 +149,7 @@ files:
 - spec/puppet_blacksmith/git_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/maestrodev/puppet-blacksmith
+homepage: http://github.com/voxpupuli/puppet-blacksmith
 licenses: []
 metadata: {}
 post_install_message: 
@@ -168,14 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.0
 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/Modulefile
 - spec/data/response.json
 - spec/puppet_blacksmith/forge_live_spec.rb
 - spec/puppet_blacksmith/forge_shared.rb