puppet-blacksmith 2.2.0 → 2.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDliNmIwNmE5NWY3NDU3MWE0ZDhiYjQ3MDhjZjBjZWI3ZjVkNWYwOQ==
+    MDg2NDI3YmNhMzc0YjllYWFlOGI3Y2NiZDhiMzNlZTZmMGRhNmVhNQ==
   data.tar.gz: !binary |-
-    YTMzNGMzZjhjYjBlMjAxMjJjNWVmMGJlMGE4ZGMyNDMyZWVlMGM4Nw==
+    NTljZGQ1N2IyZjA4NjI2YTIwODEzMjhjNDA5ZmIwMzRhZjU5NjZmOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDY3OTg3MzMyYjVmNWQyNWUxNjVkZjU0Njc3NzI2OGU3YTQ3ZDA3NjQ2MWIz
-    NDFiOGNhZmI0YTg4MTY4YmMyNGJkYTEyZjc4MjYzM2U5OGZkNjBhYzdlZjE4
-    ZDYyMjFkN2UxODQ3MmY2NTM1MjM0MmE2YWE3MDc2MWIzZWMxMzI=
+    NzAwZDI5Yjg2ODRhMjk0MzJlMDZmNjgzOGQwODk2MTQ2ZTU4N2VlYmZhZjNj
+    NmViMTNmM2ZlZTFjZmMwNmYyNWZkNWM4MDEwYjRhODhhYWMwNTg5ZjE0NzQw
+    YjAzMzk5NjI1NjJhNjFjZTRiOTFjOTk1OGEyYTFkNDMxZTIzMzU=
   data.tar.gz: !binary |-
-    ZWIyYmIzZWVhZTUwY2MxYjcyNTgwZGM2NTVhMWE2YWYzMDgxM2VjYTQ2NzBl
-    ZjcxZjY3NDUxNDdhZWQ1Yjc5M2U4YWNlYmViNTMzYWNiODRhM2EzMjgzYzYx
-    NDIzZWMwMzY3ODQ1NjY2NjEwMDY4YWI5YTUyYTMxYWJhZDExYzg=
+    YTRkYmE0MDQ2ZDRlNmJkYWJiMzg1ZTcyMTBmNDI5MmVmZmFjMWNjMjAxMTRi
+    MGUzN2I5ODRiNGU4OTA2NzAyNTkwN2ZmYTdkYTdhMGNiNTA2ODIwZjg2YzE0
+    ZjhhZjJhMDVjMTU1N2UzNWJhMGM0OTI1MTMxM2ExYzQ2MGEzMTY=

data/lib/puppet_blacksmith/git.rb

@@ -14,7 +14,8 @@ module Blacksmith
     end
 
     def commit_modulefile!
-      s = exec_git "add Modulefile"
+      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'"
       s
     end
@@ -43,7 +44,7 @@ module Blacksmith
       if exit_status.nil?
         raise Blacksmith::Error, err unless err.empty?
       elsif !exit_status.success?
-        raise Blacksmith::Error, err.empty? ? "Command #{new_cmd} failed with exit status #{exit_status}" : err
+        raise Blacksmith::Error, err.empty? ? "Command #{new_cmd} failed with exit status #{exit_status}#{"\n#{out}" unless out.empty?}" : err
       end
       return out
     end

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '2.2.0'
+  VERSION = '2.3.1'
 end

data/spec/puppet_blacksmith/git_spec.rb

@@ -5,11 +5,14 @@ describe 'Blacksmith::Git' do
   subject { Blacksmith::Git.new(path) }
   let(:path) { File.join(File.dirname(__FILE__), '../../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}`
+    FileUtils.touch(File.join(path, metadata_file))
+    `cd #{path} && git add #{metadata_file} && git commit -am "Init"`
   end
 
   shared_examples_for :git do
@@ -21,6 +24,18 @@ describe 'Blacksmith::Git' do
       end
     end
 
+    describe 'commit_modulefile' do
+      before do
+        open(File.join(subject.path, metadata_file), 'a') { |f|
+          f.puts "more text"
+        }
+      end
+
+      it "should commit the metadata file" do
+        expect(subject.commit_modulefile!).to match(/\[blacksmith\] Bump version/)
+      end
+    end
+
     describe 'exec_git' do
       let(:cmd) { 'log' }
       let(:stdin) { nil }
@@ -52,7 +67,7 @@ describe 'Blacksmith::Git' do
         # 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$/) }
+          it { expect { subject.exec_git(cmd) }.to raise_error(Blacksmith::Error, /^Command .* failed with exit status.*1.*$/) }
         end
 
         context 'when stderr is not empty' do
@@ -64,18 +79,11 @@ describe 'Blacksmith::Git' do
   end
 
   context "Using Modulefile" do
-    before do
-      FileUtils.touch(File.join(path, "Modulefile"))
-      `cd #{path} && git add Modulefile && git commit -am "Init"`
-    end
+    let(:metadata_file) { "Modulefile" }
     it_behaves_like :git
   end
 
   context "Using metadata.json" do
-    before do
-      FileUtils.touch(File.join(path, "metadata.json"))
-      `cd #{path} && git add metadata.json && git commit -am "Init"`
-    end
     it_behaves_like :git
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client