git-commit-notifier 0.9.2 → 0.10.0

data/lib/git_commit_notifier/emailer.rb

@@ -52,6 +52,12 @@ class GitCommitNotifier::Emailer
     IO.read(stylesheet)
   end
 
+  def perform_delivery_debug(content)
+    content.each do |line|
+      puts line
+    end
+  end
+
   def perform_delivery_smtp(content, smtp_settings)
     settings = { }
     %w(address port domain user_name password authentication enable_tls).each do |key|
@@ -128,6 +134,7 @@ class GitCommitNotifier::Emailer
     case config['delivery_method'].to_sym
     when :smtp then perform_delivery_smtp(content, config['smtp_server'])
     when :nntp then perform_delivery_nntp(content, config['nntp_settings'])
+    when :debug then perform_delivery_debug(content)
     else # sendmail
       perform_delivery_sendmail(content, @config['sendmail_options'])
     end

data/lib/git_commit_notifier/executor.rb

@@ -7,17 +7,17 @@ module GitCommitNotifier
     def self.run!(args)
       case args.length
       when 0
-        CommitHook.show_error("You have to add a path to the config file for git-commit-notifier")
+        GitCommitNotifier::CommitHook.show_error("You have to add a path to the config file for git-commit-notifier")
         puts "Usage:  git-commit-notifier config-script [oldrev newrev [ref]]"
       when 1
         oldrev, newrev, ref = $stdin.gets.strip.split
-        CommitHook.run args.first, oldrev, newrev, ref
+        GitCommitNotifier::CommitHook.run args.first, oldrev, newrev, ref
       when 2
-        CommitHook.run args.first, args.last, args.last, ""
+        GitCommitNotifier::CommitHook.run args.first, args.last, args.last, ""
       when 3
-        CommitHook.run args.first, args[1], args.last, ""
+        GitCommitNotifier::CommitHook.run args.first, args[1], args.last, ""
       else
-        CommitHook.run args.first, args[1], args[2], args[3]
+        GitCommitNotifier::CommitHook.run args.first, args[1], args[2], args[3]
       end
     end
   end

data/lib/git_commit_notifier/git.rb

@@ -1,17 +1,29 @@
 class GitCommitNotifier::Git
   class << self
     def from_shell(cmd)
-      `#{cmd}`
+      r = `#{cmd}`
+      raise ArgumentError.new("#{cmd} failed") unless $?.exitstatus.zero?
+      r
     end
 
-    def show(rev)
-      from_shell("git show #{rev.strip} -w")
+    def show(rev, ignore_whitespace)
+      gitopt = ""
+      gitopt += " -w" if ignore_whitespace
+      from_shell("git show #{rev.strip}#{gitopt}")
     end
 
     def log(rev1, rev2)
       from_shell("git log #{rev1}..#{rev2}").strip
     end
 
+    def changed_files(rev1, rev2)
+      output = ""
+      lines = from_shell("git log #{rev1}..#{rev2} --name-status --oneline")
+      lines = lines.lines if lines.respond_to?(:lines)
+      lines = lines.select {|line| line =~ /^\w{1}\s+\w+/} # grep out only filenames
+      lines.uniq
+    end
+
     def branch_commits(treeish)
       args = branch_heads - [ branch_head(treeish) ]
       args.map! { |tree| "^#{tree}" }

data/spec/fixtures/git_log_name_status

@@ -0,0 +1,4 @@
+e5be953 add install script
+M       README.rdoc
+D       git_commit_notifier/Rakefile
+M       post-receive

data/spec/lib/git_commit_notifier/commit_hook_spec.rb

@@ -49,6 +49,7 @@ describe GitCommitNotifier::CommitHook do
 
   def run_and_reject(config,times,branch)
     mock(GitCommitNotifier::Git).mailing_list_address { 'recipient@test.com' }
+    mock(GitCommitNotifier::Git).repo_name { 'testproject' }
 
     emailer = mock!.send.times(times).subject
     mock(GitCommitNotifier::Emailer).new(anything, anything).times(times)
@@ -71,8 +72,10 @@ describe GitCommitNotifier::CommitHook do
   def expect_repository_access
     mock(GitCommitNotifier::Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
     mock(GitCommitNotifier::Git).mailing_list_address { 'recipient@test.com' }
+    mock(GitCommitNotifier::Git).repo_name { 'testproject' }
+    mock(GitCommitNotifier::Git).changed_files('7e4f6b4', '4f13525') { [] }
     REVISIONS.each do |rev|
-      mock(GitCommitNotifier::Git).show(rev) { IO.read(FIXTURES_PATH + "git_show_#{rev}") }
+      mock(GitCommitNotifier::Git).show(rev, true) { IO.read(FIXTURES_PATH + "git_show_#{rev}") }
     end
   end
 

data/spec/lib/git_commit_notifier/diff_to_html_spec.rb

@@ -1,72 +1,100 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require 'tempfile'
 require 'nokogiri'
 require 'git_commit_notifier'
 
 describe GitCommitNotifier::DiffToHtml do
 
+  describe :new_file_rights do
+    before(:all) do
+      @diff_to_html = GitCommitNotifier::DiffToHtml.new
+    end
+
+    it "should be DEFAULT_NEW_FILE_RIGHTS unless get stats of git config file" do
+      mock(File).stat(File.expand_path(GitCommitNotifier::DiffToHtml::GIT_CONFIG_FILE, '.')) { raise Errno::ENOENT.new('') }
+      @diff_to_html.new_file_rights.should == GitCommitNotifier::DiffToHtml::DEFAULT_NEW_FILE_RIGHTS
+    end
+
+    it "should be rights of git config file if exists" do
+      stats = mock!.mode { 0444 }.subject
+      mock(File).stat(File.expand_path(GitCommitNotifier::DiffToHtml::GIT_CONFIG_FILE, '.')) { stats }
+      @diff_to_html.new_file_rights.should == 0444
+    end
+  end
+
+  describe :chmod do
+    it "should not raise anything and set mode from stats mode" do
+      file = Tempfile.new('stattest')
+      file.close
+      lambda do
+        File.chmod(File.stat(file.path).mode, file.path)
+      end.should_not raise_error
+    end
+  end
+
   describe :lines_are_sequential? do
     before(:all) do
       @diff_to_html = GitCommitNotifier::DiffToHtml.new
     end
 
     it "should be true if left line numbers are sequential" do
-      @diff_to_html.lines_are_sequential?({
+      @diff_to_html.should be_lines_are_sequential({
         :added => 2,
         :removed => 2
       }, {
         :added => 3,
         :removed => 6
-      }).should be_true
+      })
     end
 
     it "should be true if right line numbers are sequential" do
-      @diff_to_html.lines_are_sequential?({
+      @diff_to_html.should be_lines_are_sequential({
         :added => 2,
         :removed => 2
       }, {
         :added => 7,
         :removed => 3
-      }).should be_true
+      })
     end
 
     it "should be false unless line numbers are sequential" do
-      @diff_to_html.lines_are_sequential?({
+      @diff_to_html.should_not be_lines_are_sequential({
         :added => 2,
         :removed => 2
       }, {
         :added => 4,
         :removed => 6
-      }).should be_false
+      })
     end
 
     it "should be true if left line numbers are sequential (right are nil)" do
-      @diff_to_html.lines_are_sequential?({
+      @diff_to_html.should be_lines_are_sequential({
         :added => 2,
         :removed => 2
       }, {
         :added => 3,
         :removed => nil
-      }).should be_true
+      })
     end
 
     it "should be true if right line numbers are sequential (left are nil)" do
-      @diff_to_html.lines_are_sequential?({
+      @diff_to_html.should be_lines_are_sequential({
         :added => nil,
         :removed => 2
       }, {
         :added => 7,
         :removed => 3
-      }).should be_true
+      })
     end
 
     it "should be false unless line numbers are sequential (nils)" do
-      @diff_to_html.lines_are_sequential?({
+      @diff_to_html.should_not be_lines_are_sequential({
         :added => nil,
         :removed => nil
       }, {
         :added => 4,
         :removed => 6
-      }).should be_false
+      })
     end
   end
 
@@ -98,9 +126,10 @@ describe GitCommitNotifier::DiffToHtml do
   end
 
   it "multiple commits" do
+    mock(GitCommitNotifier::Git).changed_files('7e4f6b4', '4f13525') { [] }
     mock(GitCommitNotifier::Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
     REVISIONS.each do |rev|
-      mock(GitCommitNotifier::Git).show(rev) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
+      mock(GitCommitNotifier::Git).show(rev, true) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
     end
 
     diff = GitCommitNotifier::DiffToHtml.new
@@ -131,7 +160,8 @@ describe GitCommitNotifier::DiffToHtml do
 
     # third commit - dce6ade4cdc2833b53bd600ef10f9bce83c7102d
     hp = Nokogiri::HTML diff.result[2][:html_content]
-    (hp/"table").should have(6).tables # 6 files updated
+    (hp/"h2").should have(6).headers # 6 files in commit
+    (hp/"table").should have(4).tables # 4 files updated
     (hp/"h2")[1].inner_text.should == 'Added binary file railties/doc/guides/source/images/icons/callouts/11.png'
     (hp/"h2")[2].inner_text.should == 'Deleted binary file railties/doc/guides/source/icons/up.png'
     (hp/"h2")[3].inner_text.should == 'Deleted file railties/doc/guides/source/icons/README'
@@ -152,7 +182,7 @@ describe GitCommitNotifier::DiffToHtml do
     first_rev, last_rev = %w[ 0000000000000000000000000000000000000000 9b15cebcc5434e27c00a4a2acea43509f9faea21 ]
     mock(GitCommitNotifier::Git).branch_commits('rvm') { %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ] }
     %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ].each do |rev|
-      mock(GitCommitNotifier::Git).show(rev) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
+      mock(GitCommitNotifier::Git).show(rev, true) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
     end
     diff = GitCommitNotifier::DiffToHtml.new
     mock(diff).check_handled_commits(anything) { |commits| commits }

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -12,15 +12,21 @@ describe GitCommitNotifier::Git do
   end
 
   describe :show do
-    it "should get data from shell: git show" do
+    it "should get data from shell: git show without whitespaces" do
       expected = 'some data from git show'
       mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} -w") { expected }
-      GitCommitNotifier::Git.show(SAMPLE_REV).should == expected
+      GitCommitNotifier::Git.show(SAMPLE_REV, true).should == expected
+    end
+
+    it "should get data from shell: git show with whitespaces" do
+      expected = 'some data from git show'
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV}") { expected }
+      GitCommitNotifier::Git.show(SAMPLE_REV, false).should == expected
     end
 
     it "should strip given revision" do
       mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} -w")
-      GitCommitNotifier::Git.show("#{SAMPLE_REV}\n")
+      GitCommitNotifier::Git.show("#{SAMPLE_REV}\n", true)
     end
   end
 
@@ -86,4 +92,13 @@ describe GitCommitNotifier::Git do
     end
   end
 
+  describe :changed_files do
+    it "should run git log --name-status --oneline with given args and strip out the result" do
+      files = ["M       README.rdoc\n",
+               "D       git_commit_notifier/Rakefile\n",
+               "M       post-receive\n"]
+      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2} --name-status --oneline" ) { IO.read(FIXTURES_PATH + 'git_log_name_status') }
+      GitCommitNotifier::Git.changed_files(SAMPLE_REV, SAMPLE_REV_2).should == files
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,11 @@ if RUBY_VERSION < '1.9'
   require 'jcode'
 end
 
+if RUBY_VERSION >= '1.9'
+  Encoding.default_external = "utf-8"
+  Encoding.default_internal = "utf-8"
+end
+
 require 'rubygems'
 require 'faker'
 require 'rspec/core'

metadata

@@ -1,164 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-commit-notifier
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.10.0
   prerelease: 
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Bodo Tasche
+- Akzhan Abdulin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-03 00:00:00.000000000 +02:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: diff-lcs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70356965199120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nntp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965199120
+- !ruby/object:Gem::Dependency
+  name: nntp
+  requirement: &70356965198640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: premailer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965198640
+- !ruby/object:Gem::Dependency
+  name: premailer
+  requirement: &70356965198160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.7.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965198160
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70356965197680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965197680
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70356965197200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.10
+    requirements:
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: code-cleaner
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965197200
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70356965196720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965196720
+- !ruby/object:Gem::Dependency
+  name: code-cleaner
+  requirement: &70356965196240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965196240
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: &70356965195760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965195760
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &70356965195280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: faker
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70356965195280
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70356969054480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70356969054480
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: &70356969054000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: metric_fu
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70356969054000
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70356969053520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-description: This git commit notifier sends html mails with nice diffs for every changed file.
+  prerelease: false
+  version_requirements: *70356969053520
+description: This git commit notifier sends html mails with nice diffs for every changed
+  file.
 email: bodo@bitboxer.de
-executables: 
+executables:
 - git-commit-notifier
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- README.textile
-files: 
+- README.md
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
-- README.textile
+- README.md
 - Rakefile
 - VERSION
 - bin/git-commit-notifier
@@ -181,6 +183,7 @@ files:
 - spec/fixtures/git-notifier-with-branch-restrictions.yml
 - spec/fixtures/git-notifier-with-merge.yml
 - spec/fixtures/git_log
+- spec/fixtures/git_log_name_status
 - spec/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
 - spec/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0
 - spec/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9
@@ -197,40 +200,42 @@ files:
 - spec/spec_helper.rb
 - template/email.html.erb
 - template/styles.css
+has_rdoc: true
 homepage: http://github.com/bitboxer/git-commit-notifier
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1995003777923227847
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sends git commit messages with diffs
-test_files: 
+test_files:
 - spec/fixtures/existing_file_one_line.txt
 - spec/fixtures/git-notifier-group-email-by-push.yml
 - spec/fixtures/git-notifier-ignore-merge.yml
 - spec/fixtures/git-notifier-with-branch-restrictions.yml
 - spec/fixtures/git-notifier-with-merge.yml
 - spec/fixtures/git_log
+- spec/fixtures/git_log_name_status
 - spec/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
 - spec/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0
 - spec/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9
@@ -245,4 +250,3 @@ test_files:
 - spec/lib/git_commit_notifier/logger_spec.rb
 - spec/lib/git_commit_notifier/result_processor_spec.rb
 - spec/spec_helper.rb
-has_rdoc: