puppet-blacksmith 2.0.2 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTAzNDJmZTgyMGJhYjE3MmY2ZDM1MzM0MjI0ZmYzYTBhNWM5ZjIxOQ==
+  data.tar.gz: !binary |-
+    M2RmMDlkZTljMzcwOWVlY2I5MzQ5MjJlYjEzMWE3YjAyYzAxZDkyMg==
+SHA512:
+  metadata.gz: !binary |-
+    Yjc3MDI2MDNiMWQwY2RiNzcyNjgzYmE1MWExMmM2Nzg3ZDY2MWQ2NWE4MmIz
+    YmU3ZmFiYTEzNzNiMTI5OGRiNzc4MjZjMTk0MzhhZjhiOTBiN2JlOTY0MDMz
+    Mjk3MDdkZTlhZThlMzJiZWFhM2I2NDY1MjMwMTFlMTBhZWFmMjU=
+  data.tar.gz: !binary |-
+    N2JlMTY5Y2I3YjU5Y2M0Yzg4Mzg0Nzc4YmE5Yjc1NDEwYzcxNDIxYzRiNDBk
+    YjBmNmE2Y2Y0MTQ2YWE0ZmQ3Y2ViODZmMmM1M2IwYmQyY2U0OTQ1NmQ4MmYz
+    Yzg5ODEzN2ZmNWE4NDVmM2RmM2EzZTY1YTkzZWIyNGQzNDY0NzE=

data/lib/puppet_blacksmith.rb

@@ -1,4 +1,4 @@
-require_relative 'puppet_blacksmith/error'
-require_relative 'puppet_blacksmith/forge'
-require_relative 'puppet_blacksmith/git'
-require_relative 'puppet_blacksmith/modulefile'
+require 'puppet_blacksmith/error'
+require 'puppet_blacksmith/forge'
+require 'puppet_blacksmith/git'
+require 'puppet_blacksmith/modulefile'

data/lib/puppet_blacksmith/forge.rb

@@ -72,8 +72,8 @@ module Blacksmith
         raise Blacksmith::Error, <<-eos
 Could not find Puppet Forge credentials file '#{credentials_file}'
 Please create it
---- 
-forge: https://forge.puppetlabs.com
+---
+url: https://forge.puppetlabs.com
 username: myuser
 password: mypassword
     eos

data/lib/puppet_blacksmith/git.rb

@@ -25,18 +25,26 @@ module Blacksmith
       s
     end
 
+    def git_cmd_with_path(cmd)
+      "git --git-dir=#{File.join(path, '.git')} --work-tree=#{path} #{cmd}"
+    end
+
     def exec_git(cmd)
       out = ""
       err = ""
+      exit_status = nil
+      new_cmd = git_cmd_with_path(cmd)
       # wait_thr is nil in JRuby < 1.7.5 see http://jira.codehaus.org/browse/JRUBY-6409
-      new_cmd = "git --git-dir=#{File.join(path, '.git')} --work-tree=#{path} #{cmd}"
       Open3.popen3(new_cmd) do |stdin, stdout, stderr, wait_thr|
         out = stdout.read
         err = stderr.read
-        # exit_status = wait_thr.value
+        exit_status = wait_thr.nil? ? nil : wait_thr.value
+      end
+      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
       end
-      exit_status = $?
-      raise Blacksmith::Error, err unless exit_status.success?
       return out
     end
   end

data/lib/puppet_blacksmith/modulefile.rb

@@ -10,6 +10,8 @@
 # require 'puppet/error'
 # require 'puppet/module_tool'
 require 'puppet'
+require 'puppet/module_tool'
+
 Puppet[:confdir] = "."
 
 module Blacksmith

data/lib/puppet_blacksmith/rake_tasks.rb

@@ -1,5 +1,5 @@
 require 'rake'
-require_relative '../puppet_blacksmith'
+require 'puppet_blacksmith'
 
 namespace :module do
   desc "Bump module version to the next minor"

data/lib/puppet_blacksmith/version.rb

@@ -1,3 +1,3 @@
 module Blacksmith
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/spec/data/Modulefile

@@ -1,7 +1,6 @@
 name 'maestrodev-test'
 version '1.0.0'
 
-author 'maestrodev'
 license 'Apache License, Version 2.0'
 project_page 'http://github.com/maestrodev/puppet-blacksmith'
 source 'http://github.com/maestrodev/puppet-blacksmith'

data/spec/puppet_blacksmith/forge_spec.rb

@@ -11,6 +11,23 @@ describe 'Blacksmith::Forge' do
   let(:version) { "1.0.0" }
   let(:package) { File.dirname(__FILE__) + '/../data/maestrodev-ant-1.0.4.tar.gz' }
 
+  describe 'missing credentials file' do
+    before do
+      File.stub(:expand_path => '/home/mr_puppet/.puppetforge.yml')
+    end
+
+    context "when the credentials file is missing" do
+      before do
+
+      end
+
+      it "should raise an error" do
+        expect { foo = Blacksmith::Forge.new(nil, password, forge) }.to raise_error(/Could not find Puppet Forge credentials file '\/home\/mr\_puppet\/.puppetforge.yml'\s*Please create it\s*---\s*url: https:\/\/forge.puppetlabs.com\s*username: myuser\s*password: mypassword/)
+      end
+    end
+
+  end
+
   describe 'push' do
 
     before do
@@ -29,7 +46,7 @@ describe 'Blacksmith::Forge' do
       end
 
       it "should push the module" do
-        
+
       end
     end
 

data/spec/puppet_blacksmith/git_spec.rb

@@ -21,4 +21,45 @@ describe 'Blacksmith::Git' do
       out.chomp.should match(/^v1.0.0$/)
     end
   end
+
+  describe 'exec_git' do
+    let(:cmd) { 'log' }
+    let(:stdin) { nil }
+    let(:stdout) { '' }
+    let(:stderr) { '' }
+    let(:exit_code) { double('exit_code', :success? => true) }
+    let(:wait_thr) { double('wait_thr', :value => exit_code) }
+
+    context 'when git succeeds' do
+      before do
+        Open3.stub(:popen3).and_yield(nil, double(:read => stdout), double(:read => stderr), wait_thr)
+        expect { subject.exec_git(cmd) }.to_not raise_error
+      end
+
+      context 'when stderr is empty' do
+        it {}
+      end
+
+      context 'when stderr is not empty' do
+        let(:stderr) { 'some error' }
+        it {}
+      end
+
+    end
+
+    context 'when git fails' do
+      before { subject.stub(: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$/) }
+      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/) }
+      end
+    end
+  end
 end

data/spec/puppet_blacksmith/modulefile_spec.rb

@@ -7,7 +7,7 @@ describe 'Blacksmith::Modulefile' do
 
   context 'when modulefile is parsed' do
     it { subject.metadata.version.should eql("1.0.0") }
-    it { subject.metadata.username.should eql("maestrodev") }
+    it { subject.metadata.author.should eql("maestrodev") }
     it { subject.metadata.name.should eql("test") }
   end
 

metadata

@@ -1,115 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: puppet-blacksmith
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - MaestroDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &18291200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18291200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &18289080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.16
   type: :runtime
   prerelease: false
-  version_requirements: *18289080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.16
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18288080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18288080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18377600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18377600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
-  requirement: &18373140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18373140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &18319260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18319260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &18313840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18313840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18390180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *18390180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &18388580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18388580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Puppet module tools for development and Puppet Forge management
 email:
 - info@maestrodev.com
@@ -117,53 +143,49 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - lib/puppet_blacksmith.rb
+- lib/puppet_blacksmith/error.rb
 - lib/puppet_blacksmith/forge.rb
+- lib/puppet_blacksmith/git.rb
 - lib/puppet_blacksmith/modulefile.rb
 - lib/puppet_blacksmith/rake_tasks.rb
 - lib/puppet_blacksmith/version.rb
-- lib/puppet_blacksmith/error.rb
-- lib/puppet_blacksmith/git.rb
-- LICENSE
-- spec/spec_helper.rb
-- spec/puppet_blacksmith/git_spec.rb
+- spec/data/Modulefile
+- spec/data/forge_error.html
+- spec/data/maestrodev-ant-1.0.4.tar.gz
 - spec/puppet_blacksmith/forge_spec.rb
+- spec/puppet_blacksmith/git_spec.rb
 - spec/puppet_blacksmith/modulefile_spec.rb
-- spec/data/maestrodev-ant-1.0.4.tar.gz
-- spec/data/forge_error.html
-- spec/data/Modulefile
+- spec/spec_helper.rb
 homepage: http://github.com/maestrodev/puppet-blacksmith
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 936353051533112818
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tasks to manage Puppet module builds
 test_files:
 - spec/spec_helper.rb
-- spec/puppet_blacksmith/git_spec.rb
-- spec/puppet_blacksmith/forge_spec.rb
-- spec/puppet_blacksmith/modulefile_spec.rb
 - spec/data/maestrodev-ant-1.0.4.tar.gz
 - spec/data/forge_error.html
 - spec/data/Modulefile
+- spec/puppet_blacksmith/forge_spec.rb
+- spec/puppet_blacksmith/modulefile_spec.rb
+- spec/puppet_blacksmith/git_spec.rb