git-commit-notifier 0.9.0 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/bin/git-commit-notifier

@@ -6,24 +6,11 @@ if RUBY_VERSION < '1.9'
   require 'jcode'
 end
 
+require 'rubygems'
+
 # parameters: revision1, revision 2, branch
-THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-$:.unshift File.join(File.dirname(THIS_FILE), "../lib")
 
-require 'git_commit_notifier'
-include GitCommitNotifier
+require 'git_commit_notifier/executor'
+
+GitCommitNotifier::Executor.run!(ARGV)
 
-case ARGV.length
-when 0
-  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 ARGV[0], oldrev, newrev, ref
-when 2
-  CommitHook.run ARGV[0], ARGV[1], ARGV[1], ""
-when 3
-  CommitHook.run ARGV[0], ARGV[1], ARGV[2], ""
-else
-  CommitHook.run ARGV[0], ARGV[1], ARGV[2], ARGV[3]
-end

data/git-commit-notifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-commit-notifier}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-05}
   s.default_executable = %q{git-commit-notifier}
   s.description = %q{This git commit notifier sends html mails with nice diffs for every changed file.}
   s.email = %q{bodo@bitboxer.de}
@@ -35,9 +35,11 @@ Gem::Specification.new do |s|
     "lib/git_commit_notifier/diff_to_html.rb",
     "lib/git_commit_notifier/emailer.rb",
     "lib/git_commit_notifier/escape_helper.rb",
+    "lib/git_commit_notifier/executor.rb",
     "lib/git_commit_notifier/git.rb",
     "lib/git_commit_notifier/logger.rb",
     "lib/git_commit_notifier/result_processor.rb",
+    "local-run.rb",
     "spec/fixtures/existing_file_one_line.txt",
     "spec/fixtures/git-notifier-group-email-by-push.yml",
     "spec/fixtures/git-notifier-ignore-merge.yml",

data/lib/git_commit_notifier/commit_hook.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'yaml'
 require 'cgi'
 require 'net/smtp'
@@ -34,7 +33,7 @@ module GitCommitNotifier
         recipient = config["mailinglist"] || Git.mailing_list_address
 
         if recipient.nil? || recipient.length == 0
-          GitCommitNotifier::CommitHook.show_error(
+          CommitHook.show_error(
             "Please add a recipient for the emails. Eg : \n" +
             "      git config hooks.mailinglist  developer@example.com"
           )
@@ -65,7 +64,7 @@ module GitCommitNotifier
         
         info("Sending mail...")
 
-        diff2html = GitCommitNotifier::DiffToHtml.new(Dir.pwd, config)
+        diff2html = DiffToHtml.new(Dir.pwd, config)
         diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name)
 
         diffresult = diff2html.result
@@ -85,7 +84,7 @@ module GitCommitNotifier
           result = diffresult.first
           return if result.nil? || !result[:commit_info]
 
-          emailer = GitCommitNotifier::Emailer.new(config,
+          emailer = Emailer.new(config,
             :project_path => project_path,
             :recipient => recipient,
             :from_address => config["from"] || result[:commit_info][:email],
@@ -103,7 +102,7 @@ module GitCommitNotifier
             next unless result[:commit_info]
             nr = number(diffresult.size, i)
 
-            emailer = GitCommitNotifier::Emailer.new(config,
+            emailer = Emailer.new(config,
               :project_path => project_path,
               :recipient => recipient,
               :from_address => config["from"] || result[:commit_info][:email],

data/lib/git_commit_notifier/diff_to_html.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'diff/lcs'
 require 'digest/sha1'
 require 'time'

data/lib/git_commit_notifier/emailer.rb

@@ -35,7 +35,7 @@ class GitCommitNotifier::Emailer
   end
 
   def mail_html_message
-    html = Emailer.template.result(binding)
+    html = GitCommitNotifier::Emailer.template.result(binding)
     premailer = Premailer.new(html, :with_html_string => true, :adapter => :nokogiri)
     premailer.to_inline_css
   end
@@ -87,7 +87,6 @@ class GitCommitNotifier::Emailer
   end
 
   def perform_delivery_nntp(content, nntp_settings)
-    require 'rubygems'
     require 'nntp'
     Net::NNTP.start(nntp_settings['address'], nntp_settings['port']) do |nntp|
         nntp.post content
@@ -99,40 +98,38 @@ class GitCommitNotifier::Emailer
     quoted_from_alias = quote_if_necessary("#{@from_alias}",'utf-8')
     from = @from_alias.empty? ? @from_address : "#{quoted_from_alias} <#{@from_address}>"
 
-    content = ["From: #{from}\n",
-        "#{to_tag}: #{quote_if_necessary(@recipient, 'utf-8')}\n",
-        "Subject: #{quote_if_necessary(@subject, 'utf-8')}\n",
-        "X-Mailer: git-commit-notifier\n",
-        "X-Git-Refname: #{@ref_name}\n",
-        "X-Git-Oldrev: #{@old_rev}\n",
-        "X-Git-Newrev: #{@new_rev}\n",
-        "Mime-Version: 1.0\n",
+    content = [
+        "From: #{from}",
+        "#{to_tag}: #{quote_if_necessary(@recipient, 'utf-8')}",
+        "Subject: #{quote_if_necessary(@subject, 'utf-8')}",
+        "X-Mailer: git-commit-notifier",
+        "X-Git-Refname: #{@ref_name}",
+        "X-Git-Oldrev: #{@old_rev}",
+        "X-Git-Newrev: #{@new_rev}",
+        "Mime-Version: 1.0",
         "Content-Type: multipart/alternative; boundary=#{boundary}\n\n\n",
-        "--#{boundary}\n",
-        "Content-Type: text/plain; charset=utf-8\n",
-        "Content-Transfer-Encoding: 8bit\n",
+        "--#{boundary}",
+        "Content-Type: text/plain; charset=utf-8",
+        "Content-Transfer-Encoding: 8bit",
         "Content-Disposition: inline\n\n\n",
         @text_message,
-        "\n--#{boundary}\n",
-        "Content-Type: text/html; charset=utf-8\n",
-        "Content-Transfer-Encoding: 8bit\n",
+        "\n--#{boundary}",
+        "Content-Type: text/html; charset=utf-8",
+        "Content-Transfer-Encoding: 8bit",
         "Content-Disposition: inline\n\n\n",
         mail_html_message,
-        "\n--#{boundary}--"]
+        "--#{boundary}--"]
 
     if @recipient.empty?
       puts content.join("\n")
       return
     end
 
-    if config['delivery_method'] == 'smtp'
-      perform_delivery_smtp(content, @config['smtp_server'])
-    else
-      if config['delivery_method'] == 'nntp'
-         perform_delivery_nntp(content, @config['nntp_settings'])
-      else
-          perform_delivery_sendmail(content, @config['sendmail_options'])
-      end
+    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'])
+    else # sendmail
+      perform_delivery_sendmail(content, @config['sendmail_options'])
     end
   end
 

data/lib/git_commit_notifier/executor.rb

@@ -0,0 +1,25 @@
+# parameters: revision1, revision 2, branch
+
+require 'git_commit_notifier'
+
+module GitCommitNotifier
+  class Executor
+    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")
+        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
+      when 2
+        CommitHook.run args.first, args.last, args.last, ""
+      when 3
+        CommitHook.run args.first, args[1], args.last, ""
+      else
+        CommitHook.run args.first, args[1], args[2], args[3]
+      end
+    end
+  end
+end
+

data/lib/git_commit_notifier/result_processor.rb

@@ -1,5 +1,4 @@
 require 'cgi'
-
 require 'git_commit_notifier/escape_helper'
 
 module GitCommitNotifier

data/local-run.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+if RUBY_VERSION < '1.9'
+  # This is for Unicode support in Ruby 1.8
+  $KCODE = 'u';
+  require 'jcode'
+end
+
+require 'rubygems'
+$LOAD_PATH.unshift(File.expand_path('./lib', File.dirname(__FILE__)))
+
+# parameters: revision1, revision 2, branch
+
+require 'git_commit_notifier/executor'
+
+GitCommitNotifier::Executor.run!(ARGV)
+

data/spec/lib/git_commit_notifier/commit_hook_spec.rb

@@ -1,9 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 
-include GitCommitNotifier
-
-describe CommitHook do
+describe GitCommitNotifier::CommitHook do
 
   it "should ignore merge" do
     # 4 commits, one email for each of them, without merge
@@ -41,23 +39,23 @@ describe CommitHook do
     expect_repository_access
 
     emailer = mock!.send.times(times).subject
-    mock(Emailer).new(anything, anything) { emailer }.times(times)
-    mock(CommitHook).info(/Sending mail/)
+    mock(GitCommitNotifier::Emailer).new(anything, anything) { emailer }.times(times)
+    mock(GitCommitNotifier::CommitHook).info(/Sending mail/)
 
-    any_instance_of(DiffToHtml, :check_handled_commits => lambda { |commits| commits })
-    CommitHook.run config, REVISIONS.first, REVISIONS.last, branch
+    any_instance_of(GitCommitNotifier::DiffToHtml, :check_handled_commits => lambda { |commits| commits })
+    GitCommitNotifier::CommitHook.run config, REVISIONS.first, REVISIONS.last, branch
   end
   
 
   def run_and_reject(config,times,branch)
-    mock(Git).mailing_list_address { 'recipient@test.com' }
+    mock(GitCommitNotifier::Git).mailing_list_address { 'recipient@test.com' }
 
     emailer = mock!.send.times(times).subject
-    mock(Emailer).new(anything, anything).times(times)
+    mock(GitCommitNotifier::Emailer).new(anything, anything).times(times)
 
-    mock(CommitHook).info(/Supressing mail for branch/)
+    mock(GitCommitNotifier::CommitHook).info(/Supressing mail for branch/)
 
-    CommitHook.run config, REVISIONS.first, REVISIONS.last, branch
+    GitCommitNotifier::CommitHook.run config, REVISIONS.first, REVISIONS.last, branch
   end
   
 
@@ -65,23 +63,23 @@ describe CommitHook do
     # 1 commit with a from: adress
     expect_repository_access
     emailer = mock!.send.subject
-    mock(Emailer).new(anything, hash_including(:from_address => "max@example.com")) { emailer }
+    mock(GitCommitNotifier::Emailer).new(anything, hash_including(:from_address => "max@example.com")) { emailer }
 
-    CommitHook.run 'spec/fixtures/git-notifier-group-email-by-push.yml', REVISIONS.first, REVISIONS.last, 'refs/heads/master'
+    GitCommitNotifier::CommitHook.run 'spec/fixtures/git-notifier-group-email-by-push.yml', REVISIONS.first, REVISIONS.last, 'refs/heads/master'
    end
 
   def expect_repository_access
-    mock(Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
-    mock(Git).mailing_list_address { 'recipient@test.com' }
+    mock(GitCommitNotifier::Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
+    mock(GitCommitNotifier::Git).mailing_list_address { 'recipient@test.com' }
     REVISIONS.each do |rev|
-      mock(Git).show(rev) { IO.read(FIXTURES_PATH + "git_show_#{rev}") }
+      mock(GitCommitNotifier::Git).show(rev) { IO.read(FIXTURES_PATH + "git_show_#{rev}") }
     end
   end
 
   describe :logger do
-    it "should be nstance of logger" do
-      stub(CommitHook).config { {} }
-      CommitHook.logger.should be_kind_of(Logger)
+    it "should be instance of logger" do
+      stub(GitCommitNotifier::CommitHook).config { {} }
+      GitCommitNotifier::CommitHook.logger.should be_kind_of(GitCommitNotifier::Logger)
     end
   end
 
@@ -90,7 +88,7 @@ describe CommitHook do
       mock($stderr).puts("\n").times(2)
       mock($stderr).puts(/GIT\sNOTIFIER\sPROBLEM/).times(2)
       mock($stderr).puts('yes')
-      CommitHook.show_error('yes')
+      GitCommitNotifier::CommitHook.show_error('yes')
     end
   end
 
@@ -98,16 +96,16 @@ describe CommitHook do
     it "should write to and flush stdout" do
       mock($stdout).puts('msg')
       mock($stdout).flush
-      CommitHook.info('msg')
+      GitCommitNotifier::CommitHook.info('msg')
     end
   end
 
   describe :run do
     it "should report error when no recipients specified" do
       mock(File).exists?(:noconfig) { false }
-      mock(Git).mailing_list_address { nil }
-      mock(CommitHook).show_error(/recipient/)
-      CommitHook.run(:noconfig, :rev1, :rev2, 'master')
+      mock(GitCommitNotifier::Git).mailing_list_address { nil }
+      mock(GitCommitNotifier::CommitHook).show_error(/recipient/)
+      GitCommitNotifier::CommitHook.run(:noconfig, :rev1, :rev2, 'master')
     end
   end
 

data/spec/lib/git_commit_notifier/diff_to_html_spec.rb

@@ -2,13 +2,11 @@ require File.expand_path('../../../spec_helper', __FILE__)
 require 'nokogiri'
 require 'git_commit_notifier'
 
-include GitCommitNotifier
-
-describe DiffToHtml do
+describe GitCommitNotifier::DiffToHtml do
   
   describe :lines_are_sequential? do
     before(:all) do
-      @diff_to_html = DiffToHtml.new
+      @diff_to_html = GitCommitNotifier::DiffToHtml.new
     end
 
     it "should be true if left line numbers are sequential" do
@@ -74,25 +72,25 @@ describe DiffToHtml do
 
   describe :unique_commits_per_branch? do
     it "should be false unless specified in config" do
-      diff = DiffToHtml.new(nil, {})
+      diff = GitCommitNotifier::DiffToHtml.new(nil, {})
       diff.should_not be_unique_commits_per_branch
     end
 
     it "should be false if specified as false in config" do
-      diff = DiffToHtml.new(nil, { 'unique_commits_per_branch' => false })
+      diff = GitCommitNotifier::DiffToHtml.new(nil, { 'unique_commits_per_branch' => false })
       diff.should_not be_unique_commits_per_branch
     end
 
     it "should be true if specified as true in config" do
-      diff = DiffToHtml.new(nil, { 'unique_commits_per_branch' => true })
+      diff = GitCommitNotifier::DiffToHtml.new(nil, { 'unique_commits_per_branch' => true })
       diff.should be_unique_commits_per_branch
     end
   end
 
   describe :get_previous_commits do
     it "should read and parse previous file if it exists" do
-      fn = DiffToHtml::HANDLED_COMMITS_FILE
-      diff = DiffToHtml.new
+      fn = GitCommitNotifier::DiffToHtml::HANDLED_COMMITS_FILE
+      diff = GitCommitNotifier::DiffToHtml.new
       mock(File).exists?(fn) { true }
       mock(IO).read(fn) { "a\nb" }
       diff.get_previous_commits(fn).should == %w[a b]
@@ -100,12 +98,12 @@ describe DiffToHtml do
   end
 
   it "multiple commits" do
-    mock(Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
+    mock(GitCommitNotifier::Git).log(REVISIONS.first, REVISIONS.last) { IO.read(FIXTURES_PATH + 'git_log') }
     REVISIONS.each do |rev|
-      mock(Git).show(rev) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
+      mock(GitCommitNotifier::Git).show(rev) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
     end
 
-    diff = DiffToHtml.new
+    diff = GitCommitNotifier::DiffToHtml.new
     mock(diff).check_handled_commits(anything) { |commits| commits }
     diff.diff_between_revisions REVISIONS.first, REVISIONS.last, 'testproject', 'master'
 
@@ -152,11 +150,11 @@ describe DiffToHtml do
 
   it "should get good diff when new branch created" do
     first_rev, last_rev = %w[ 0000000000000000000000000000000000000000 9b15cebcc5434e27c00a4a2acea43509f9faea21 ]
-    mock(Git).branch_commits('rvm') { %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ] }
+    mock(GitCommitNotifier::Git).branch_commits('rvm') { %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ] }
     %w[ ff037a73fc1094455e7bbf506171a3f3cf873ae6 ].each do |rev|
-      mock(Git).show(rev) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
+      mock(GitCommitNotifier::Git).show(rev) { IO.read(FIXTURES_PATH + 'git_show_' + rev) }
     end
-    diff = DiffToHtml.new
+    diff = GitCommitNotifier::DiffToHtml.new
     mock(diff).check_handled_commits(anything) { |commits| commits }
     diff.diff_between_revisions(first_rev, last_rev, 'tm-admin', 'rvm')
     diff.result.should have(1).commit
@@ -167,7 +165,7 @@ describe DiffToHtml do
 
   describe :message_map do
     before(:each) do
-      @diff = DiffToHtml.new
+      @diff = GitCommitNotifier::DiffToHtml.new
     end
 
     it "should do message mapping" do
@@ -186,18 +184,9 @@ describe DiffToHtml do
   describe :do_message_integration do
     before(:each) do
       @config = Hash.new
-      @diff = DiffToHtml.new(nil, @config)
-    end
-=begin
-    return message unless @config['message_integration'].respond_to?(:each_pair)
-    @config['message_integration'].each_pair do |pm, url|
-      pm_def = DiffToHtml::INTEGRATION_MAP[pm.to_sym] or next
-      replace_with = pm_def[:replace_with]
-      replace_with = replace_with.kind_of?(Proc) ? lambda { |m| pm_def[:replace_with].call(m, url) } : replace_with.gsub('#{url}', url)
-      message_replace!(message, pm_def[:search_for], replace_with)
-    end
-    message
-=end
+      @diff = GitCommitNotifier::DiffToHtml.new(nil, @config)
+    end
+
     it "should do nothing unless message_integration config section exists" do
       mock.proxy(nil).respond_to?(:each_pair)
       dont_allow(@diff).message_replace!
@@ -215,7 +204,7 @@ describe DiffToHtml do
   describe :old_commit? do
     before(:each) do
       @config = Hash.new
-      @diff_to_html = DiffToHtml.new(nil, @config)
+      @diff_to_html = GitCommitNotifier::DiffToHtml.new(nil, @config)
     end
 
     it "should be false unless skip_commits_older_than set" do
@@ -239,8 +228,7 @@ describe DiffToHtml do
 
     it "should be true if commit is older than required by skip_commits_older_than" do
       @config['skip_commits_older_than'] = 1
-      @diff_to_html.old_commit?({:date => (Time.now - 2 * DiffToHtml::SECS_PER_DAY).to_s}).should be_true
+      @diff_to_html.old_commit?({:date => (Time.now - 2 * GitCommitNotifier::DiffToHtml::SECS_PER_DAY).to_s}).should be_true
     end
   end
-
 end

data/spec/lib/git_commit_notifier/emailer_spec.rb

@@ -2,26 +2,24 @@ require File.expand_path('../../../spec_helper', __FILE__)
 
 require 'git_commit_notifier'
 
-include GitCommitNotifier
-
-describe Emailer do
+describe GitCommitNotifier::Emailer do
   describe :new do
     it "should assign config if given" do
-      Emailer.new({:a => :b}).config[:a].should == :b
+      GitCommitNotifier::Emailer.new({:a => :b}).config[:a].should == :b
     end
 
     it "should use empty hash unless config given" do
-      cfg = Emailer.new(false).config
+      cfg = GitCommitNotifier::Emailer.new(false).config
       cfg.should be_kind_of(Hash)
       cfg.should be_empty
     end
 
     it "should assign parameters from options" do
       options = {}
-      Emailer::PARAMETERS.each do |name|
+      GitCommitNotifier::Emailer::PARAMETERS.each do |name|
         options[name.to_sym] = Faker::Lorem.sentence
       end
-      emailer = Emailer.new({}, options)
+      emailer = GitCommitNotifier::Emailer.new({}, options)
       options.each_pair do |key, value|
         emailer.instance_variable_get("@#{key}").should == value
       end
@@ -30,15 +28,15 @@ describe Emailer do
 
   describe :stylesheet_string do
     it "should return default stylesheet if custom is not provided" do
-      emailer = Emailer.new({})
-      mock(IO).read(Emailer::DEFAULT_STYLESHEET_PATH) { 'ok' }
+      emailer = GitCommitNotifier::Emailer.new({})
+      mock(IO).read(GitCommitNotifier::Emailer::DEFAULT_STYLESHEET_PATH) { 'ok' }
       emailer.stylesheet_string.should == 'ok'
     end
 
     it "should return custom stylesheet if custom is provided" do
-      emailer = Emailer.new({'stylesheet' => '/path/to/custom/stylesheet'})
+      emailer = GitCommitNotifier::Emailer.new({'stylesheet' => '/path/to/custom/stylesheet'})
       mock(IO).read('/path/to/custom/stylesheet') { 'ok' }
-      dont_allow(IO).read(Emailer::DEFAULT_STYLESHEET_PATH)
+      dont_allow(IO).read(GitCommitNotifier::Emailer::DEFAULT_STYLESHEET_PATH)
       emailer.stylesheet_string.should == 'ok'
     end
   end
@@ -46,27 +44,27 @@ describe Emailer do
   describe :mail_html_message do
     it "should form inline html" do
       options = {}
-      Emailer::PARAMETERS.each do |name|
+      GitCommitNotifier::Emailer::PARAMETERS.each do |name|
         options[name.to_sym] = Faker::Lorem.sentence
       end
-      emailer = Emailer.new({}, options)
+      emailer = GitCommitNotifier::Emailer.new({}, options)
       emailer.mail_html_message.should match(/html/)
     end
   end
 
   describe :template do
     before(:each) do
-      Emailer.reset_template
-      mock(IO).read(Emailer::TEMPLATE) { 'erb' }
+      GitCommitNotifier::Emailer.reset_template
+      mock(IO).read(GitCommitNotifier::Emailer::TEMPLATE) { 'erb' }
     end
 
     it "should respond to result" do
-      Emailer.template.should respond_to(:result)
+      GitCommitNotifier::Emailer.template.should respond_to(:result)
     end
 
     it "should return Erubis template if Erubis installed" do
-      mock(Emailer).require('erubis')
-      dont_allow(Emailer).require('erb')
+      mock(GitCommitNotifier::Emailer).require('erubis')
+      dont_allow(GitCommitNotifier::Emailer).require('erb')
       unless defined?(Erubis)
         module Erubis
           class Eruby
@@ -76,16 +74,16 @@ describe Emailer do
         end
       end
       mock.proxy(Erubis::Eruby).new('erb')
-      Emailer.template.should be_kind_of(Erubis::Eruby)
+      GitCommitNotifier::Emailer.template.should be_kind_of(Erubis::Eruby)
     end
 
     it "should return ERB template unless Erubis installed" do
       require 'erb'
-      mock(Emailer).require('erubis') { raise LoadError.new('erubis') }
-      mock(Emailer).require('erb')
+      mock(GitCommitNotifier::Emailer).require('erubis') { raise LoadError.new('erubis') }
+      mock(GitCommitNotifier::Emailer).require('erb')
       mock.proxy(ERB).new('erb')
       
-      Emailer.template.should be_kind_of(ERB)
+      GitCommitNotifier::Emailer.template.should be_kind_of(ERB)
     end
   end
 end

data/spec/lib/git_commit_notifier/git_spec.rb

@@ -1,42 +1,40 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 
-include GitCommitNotifier
-
-describe Git do
+describe GitCommitNotifier::Git do
   SAMPLE_REV = '51b986619d88f7ba98be7d271188785cbbb541a0'.freeze
   SAMPLE_REV_2 = '62b986619d88f7ba98be7d271188785cbbb541b1'.freeze
 
   describe :from_shell do
     it "should be backtick" do
-      Git.from_shell('pwd').should == `pwd`
+      GitCommitNotifier::Git.from_shell('pwd').should == `pwd`
     end
   end
 
   describe :show do
     it "should get data from shell: git show" do
       expected = 'some data from git show'
-      mock(Git).from_shell("git show #{SAMPLE_REV} -w") { expected }
-      Git.show(SAMPLE_REV).should == expected
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} -w") { expected }
+      GitCommitNotifier::Git.show(SAMPLE_REV).should == expected
     end
 
     it "should strip given revision" do
-      mock(Git).from_shell("git show #{SAMPLE_REV} -w")
-      Git.show("#{SAMPLE_REV}\n")
+      mock(GitCommitNotifier::Git).from_shell("git show #{SAMPLE_REV} -w")
+      GitCommitNotifier::Git.show("#{SAMPLE_REV}\n")
     end
   end
 
   describe :branch_heads do
     before(:each) do
-      mock(Git).from_shell("git rev-parse --branches") { "some\npopular\ntext\n" }
+      mock(GitCommitNotifier::Git).from_shell("git rev-parse --branches") { "some\npopular\ntext\n" }
     end
 
     it "should get branch heads from shell" do
-      lambda { Git.branch_heads }.should_not raise_error
+      lambda { GitCommitNotifier::Git.branch_heads }.should_not raise_error
     end
 
     it "should return array of lines" do
-      Git.branch_heads.should == %w[ some popular text ]
+      GitCommitNotifier::Git.branch_heads.should == %w[ some popular text ]
     end
   end
 
@@ -49,42 +47,42 @@ describe Git do
 
     it "should return hooks.emailprefix if it's not empty" do
       expected = "name of repo"
-      mock(Git).from_shell("git config hooks.emailprefix") { expected }
+      mock(GitCommitNotifier::Git).from_shell("git config hooks.emailprefix") { expected }
       dont_allow(Dir).pwd
-      Git.repo_name.should == expected
+      GitCommitNotifier::Git.repo_name.should == expected
     end
 
     it "should return folder name if no emailprefix and directory not ended with .git" do
-      mock(Git).from_shell("git config hooks.emailprefix") { " " }
+      mock(GitCommitNotifier::Git).from_shell("git config hooks.emailprefix") { " " }
       mock(Dir).pwd { "/home/someuser/repositories/myrepo" }
-      Git.repo_name.should == "myrepo"
+      GitCommitNotifier::Git.repo_name.should == "myrepo"
     end
 
     it "should return folder name without extension if no emailprefix and directory ended with .git" do
-      mock(Git).from_shell("git config hooks.emailprefix") { " " }
+      mock(GitCommitNotifier::Git).from_shell("git config hooks.emailprefix") { " " }
       mock(Dir).pwd { "/home/someuser/repositories/myrepo.git" }
-      Git.repo_name.should == "myrepo"
+      GitCommitNotifier::Git.repo_name.should == "myrepo"
     end
   end
 
   describe :log do
     it "should run git log with given args" do
-      mock(Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2}") { " ok " }
-      Git.log(SAMPLE_REV, SAMPLE_REV_2).should == "ok"
+      mock(GitCommitNotifier::Git).from_shell("git log #{SAMPLE_REV}..#{SAMPLE_REV_2}") { " ok " }
+      GitCommitNotifier::Git.log(SAMPLE_REV, SAMPLE_REV_2).should == "ok"
     end
   end
 
   describe :branch_head do
     it "should run git rev-parse with given treeish" do
-      mock(Git).from_shell("git rev-parse #{SAMPLE_REV}") { " ok " }
-      Git.branch_head(SAMPLE_REV).should == "ok"
+      mock(GitCommitNotifier::Git).from_shell("git rev-parse #{SAMPLE_REV}") { " ok " }
+      GitCommitNotifier::Git.branch_head(SAMPLE_REV).should == "ok"
     end
   end
 
   describe :mailing_list_address do
     it "should run git config hooks.mailinglist" do
-      mock(Git).from_shell("git config hooks.mailinglist") { " ok " }
-      Git.mailing_list_address.should == "ok"
+      mock(GitCommitNotifier::Git).from_shell("git config hooks.mailinglist") { " ok " }
+      GitCommitNotifier::Git.mailing_list_address.should == "ok"
     end
   end
 

data/spec/lib/git_commit_notifier/logger_spec.rb

@@ -1,60 +1,59 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 
-include GitCommitNotifier
-
-describe Logger do
+describe GitCommitNotifier::Logger do
   describe :debug? do
     it "should be false unless debug section exists" do
-      logger = Logger.new({})
+      logger = GitCommitNotifier::Logger.new({})
       logger.should_not be_debug
     end
 
     it "should be false unless debug/enabled" do
-      logger = Logger.new("debug" => { "enabled" => false })
+      logger = GitCommitNotifier::Logger.new("debug" => { "enabled" => false })
       logger.should_not be_debug
     end
 
     it "should be true if debug/enabled" do
-      logger = Logger.new("debug" => { "enabled" => true })
+      logger = GitCommitNotifier::Logger.new("debug" => { "enabled" => true })
       logger.should be_debug
     end
   end
 
   describe :log_directory do
     it "should be nil unless debug?" do
-      logger = Logger.new({})
+      logger = GitCommitNotifier::Logger.new({})
       logger.should_not be_debug
       logger.log_directory.should be_nil
     end
 
     it "should be custom if debug and custom directory specified" do
       expected = Faker::Lorem.sentence
-      logger = Logger.new("debug" => { "enabled" => true, "log_directory" => expected})
+      logger = GitCommitNotifier::Logger.new("debug" => { "enabled" => true, "log_directory" => expected})
       logger.log_directory.should == expected
     end
 
     it "should be default log directory if debug and custom directory not specified" do
-      logger = Logger.new("debug" => { "enabled" => true })
-      logger.log_directory.should == Logger::DEFAULT_LOG_DIRECTORY
+      logger = GitCommitNotifier::Logger.new("debug" => { "enabled" => true })
+      logger.log_directory.should == GitCommitNotifier::Logger::DEFAULT_LOG_DIRECTORY
     end
   end
 
   describe :log_path do
     it "should be nil unless debug?" do
-      logger = Logger.new({})
+      logger = GitCommitNotifier::Logger.new({})
       mock(logger).debug? { false }
       logger.log_path.should be_nil
     end
 
     it "should be path in log_directory if debug?" do
-      logger = Logger.new("debug" => { "enabled" => true })
+      logger = GitCommitNotifier::Logger.new("debug" => { "enabled" => true })
       File.dirname(logger.log_path).should == logger.log_directory
     end
 
     it "should points to LOG_NAME if debug?" do
-      logger = Logger.new("debug" => { "enabled" => true })
-      File.basename(logger.log_path).should == Logger::LOG_NAME
+      logger = GitCommitNotifier::Logger.new("debug" => { "enabled" => true })
+      File.basename(logger.log_path).should == GitCommitNotifier::Logger::LOG_NAME
     end
   end
 end
+

data/spec/lib/git_commit_notifier/result_processor_spec.rb

@@ -3,15 +3,13 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 require 'git_commit_notifier'
 
-include GitCommitNotifier
-
-describe ResultProcessor do
+describe GitCommitNotifier::ResultProcessor do
   before(:all) do
     create_test_input
   end
 
   it :processor do
-    processor = ResultProcessor.new(@diff)
+    processor = GitCommitNotifier::ResultProcessor.new(@diff)
     removal, addition = processor.results
     removal.should have(1).line
 
@@ -34,7 +32,7 @@ describe ResultProcessor do
       { :action => :match, :token => 'x' }
     ]
 
-    processor = ResultProcessor.new(@diff)
+    processor = GitCommitNotifier::ResultProcessor.new(@diff)
     removal, addition = processor.results
 
     removal.should have(1).line
@@ -59,7 +57,7 @@ describe ResultProcessor do
     diff << { :action => :discard_b, :token => 'u' }
     diff << { :action => :discard_b, :token => 'b' }
 
-    processor = ResultProcessor.new(diff)
+    processor = GitCommitNotifier::ResultProcessor.new(diff)
     removal, addition = processor.results
 
     removal.should have(1).line
@@ -96,7 +94,7 @@ describe ResultProcessor do
 
   describe :length_in_chars do
     it "should be unicode friendly" do
-      processor = ResultProcessor.new(@diff)
+      processor = GitCommitNotifier::ResultProcessor.new(@diff)
       processor.length_in_chars([{ :token => 'японская мама' }]).should == 13
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Bodo Tasche
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +02:00
+date: 2011-04-05 00:00:00 +02:00
 default_executable: git-commit-notifier
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -268,9 +268,11 @@ files:
 - lib/git_commit_notifier/diff_to_html.rb
 - lib/git_commit_notifier/emailer.rb
 - lib/git_commit_notifier/escape_helper.rb
+- lib/git_commit_notifier/executor.rb
 - lib/git_commit_notifier/git.rb
 - lib/git_commit_notifier/logger.rb
 - lib/git_commit_notifier/result_processor.rb
+- local-run.rb
 - spec/fixtures/existing_file_one_line.txt
 - spec/fixtures/git-notifier-group-email-by-push.yml
 - spec/fixtures/git-notifier-ignore-merge.yml