Merge pull request #1321 from alexjfisher/dirty_debug

Fix dirty working tree debug logging

Author: jonathannewman

CHANGELOG.mkd

@@ -4,6 +4,8 @@ CHANGELOG
 Unreleased
 ----------
 
+- Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
+
 3.15.2
 ------
 - Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)

lib/r10k/git/shellgit/working_repository.rb

@@ -94,7 +94,7 @@ def dirty?(exclude_spec=false)
     result = git(['diff-index', '--exit-code', '--name-only', 'HEAD'], :path => @path.to_s, :raise_on_fail => false)
 
     if result.exit_code != 0
-      dirty_files = result.stdout.split('\n')
+      dirty_files = result.stdout.split("\n")
       dirty_files.delete_if { |f| f.start_with?('spec/') } if exclude_spec
 
       dirty_files.each do |file|

spec/shared-examples/git/working_repository.rb

@@ -194,11 +194,13 @@
     context "with local changes" do
       before(:each) do
         File.open(File.join(subject.path, 'README.markdown'), 'a') { |f| f.write('local modifications!') }
+        File.open(File.join(subject.path, 'CHANGELOG'), 'a') { |f| f.write('local modifications to the changelog too') }
       end
 
       it "logs and reports worktree as dirty" do
         expect(subject.logger).to receive(:debug).with(/found local modifications in.*README\.markdown/i)
-        expect(subject.logger).to receive(:debug1)
+        expect(subject.logger).to receive(:debug).with(/found local modifications in.*CHANGELOG/i)
+        expect(subject.logger).to receive(:debug1).twice
 
         expect(subject.dirty?).to be true
       end