git-commit-notifier 0.8.0 → 0.8.1

data/spec/lib/git_spec.rb

@@ -0,0 +1,93 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require 'git'
+
+describe 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`
+    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
+    end
+
+    it "should strip given revision" do
+      mock(Git).from_shell("git show #{SAMPLE_REV} -w")
+      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" }
+    end
+
+    it "should get branch heads from shell" do
+      lambda { Git.branch_heads }.should_not raise_error
+    end
+
+    it "should return array of lines" do
+      Git.branch_heads.should == %w[ some popular text ]
+    end
+  end
+
+
+  describe :repo_name do
+    # this spec written because I replaced `pwd` with Dir.pwd
+    it "Dir.pwd should be same as `pwd`.chomp" do
+      Dir.pwd.should == `pwd`.chomp
+    end
+
+    it "should return hooks.emailprefix if it's not empty" do
+      expected = "name of repo"
+      mock(Git).from_shell("git config hooks.emailprefix") { expected }
+      dont_allow(Dir).pwd
+      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(Dir).pwd { "/home/someuser/repositories/myrepo" }
+      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(Dir).pwd { "/home/someuser/repositories/myrepo.git" }
+      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"
+    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"
+    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"
+    end
+  end
+
+end
+
+__END__
+
+ vim: tabstop=2 expandtab shiftwidth=2

data/spec/lib/logger_spec.rb

@@ -0,0 +1,63 @@
+require File.expand_path('../../spec_helper', __FILE__)
+require 'logger'
+
+describe Logger do
+
+  describe :debug? do
+    it "should be false unless debug section exists" do
+      logger = Logger.new({})
+      logger.should_not be_debug
+    end
+
+    it "should be false unless debug/enabled" do
+      logger = 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.should be_debug
+    end
+  end
+
+  describe :log_directory do
+    it "should be nil unless debug?" do
+      logger = 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.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
+    end
+  end
+
+  describe :log_path do
+    it "should be nil unless debug?" do
+      logger = 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 })
+      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
+    end
+  end
+end
+
+__END__
+
+ vim: tabstop=2 expandtab shiftwidth=2

data/spec/lib/result_processor_spec.rb

@@ -0,0 +1,102 @@
+# encoding: utf-8
+
+require File.expand_path('../../spec_helper', __FILE__)
+require 'diff_to_html'
+
+describe ResultProcessor do
+  before(:all) do
+    create_test_input
+  end
+
+  it :processor do
+    processor = ResultProcessor.new(@diff)
+    removal, addition = processor.results
+    removal.should have(1).line
+
+    removal.first.should be_include('&nbsp;&nbsp;<span class="rr">b</span>')
+    removal.first.should be_include('<span class="rr">ton</span>')
+    removal.first.split('<span>').should have(1).span # one occurrence (beginning of string)
+
+    addition.should have(1).line
+    addition.first.should be_include('&nbsp;&nbsp;<span class="aa">s</span>')
+    addition.first.should be_include('<span class="aa">bmi</span>')
+    addition.first.split('<span>').should have(1).span # one occurrence (beginning of string)
+  end
+
+  it "processor with almost no common part" do
+    @diff = [
+      { :action => :match, :token => ' ' },
+      { :action => :match, :token => ' ' },
+      { :action => :discard_a, :token => 'button' },
+      { :action => :discard_b, :token => 'submit' },
+      { :action => :match, :token => 'x' }
+    ]
+
+    processor = ResultProcessor.new(@diff)
+    removal, addition = processor.results
+
+    removal.should have(1).line
+    removal.first.should == '&nbsp;&nbsp;buttonx' # no highlight
+
+    addition.should have(1).line
+    addition.first.should == '&nbsp;&nbsp;submitx' # no highlight
+  end
+
+  it "close span tag when having difference at the end" do
+    diff = []
+    s1 = "  submit_to_remote 'create_btn', 'Create', :url => { :action => 'cre"
+    s2 = "  submit_to_remote 'create_btn', 'Create', :url => { :action => 'sub"
+
+    s1[0..s1.size-6].each_char do |c|
+      diff << { :action => :match, :token => c}
+    end
+    diff << { :action => :discard_a, :token => 'c' }
+    diff << { :action => :discard_a, :token => 'r' }
+    diff << { :action => :discard_a, :token => 'e' }
+    diff << { :action => :discard_b, :token => 's' }
+    diff << { :action => :discard_b, :token => 'u' }
+    diff << { :action => :discard_b, :token => 'b' }
+
+    processor = ResultProcessor.new(diff)
+    removal, addition = processor.results
+
+    removal.should have(1).line
+    removal.first.should be_include('action&nbsp;=&gt;<span class="rr">cre</span>')
+
+    addition.should have(1).line
+    addition.first.should be_include('action&nbsp;=&gt;<span class="aa">sub</span>')
+  end
+
+  def create_test_input
+    s1 = "  button_to_remote 'create_btn', 'Create', :url => { :action => 'create' }"
+    s2 = "  submit_to_remote 'create_btn', 'Create', :url => { :action => 'create' }"
+
+    @diff = [
+      [ :match,     ' ' ],
+      [ :match,     ' ' ],
+      [ :discard_a, 'b' ],
+      [ :discard_b, 's' ],
+      [ :match,     'u' ],
+      [ :discard_b, 'b' ],
+      [ :discard_b, 'm' ],
+      [ :discard_b, 'i' ],
+      [ :match,     't' ],
+      [ :discard_a, 't' ],
+      [ :discard_a, 'o' ],
+      [ :discard_a, 'n' ]
+    ]
+    @diff = @diff.collect { |d| { :action => d.first, :token => d.last}}
+
+    s1[@diff.size..-1].each_char do |c|
+      @diff << { :action => :match, :token => c }
+    end
+  end
+
+  describe :length_in_chars do
+    it "should be unicode friendly" do
+      processor = ResultProcessor.new(@diff)
+      processor.length_in_chars([{ :token => 'японская мама' }]).should == 13
+    end
+  end
+end
+

data/{test/test_helper.rb → spec/spec_helper.rb}

@@ -1,4 +1,16 @@
-require 'test/unit'
+if RUBY_VERSION < '1.9'
+  # This is for Unicode support in Ruby 1.8
+  $KCODE = 'u';
+  require 'jcode'
+end
+
+require 'rubygems'
+require 'faker'
+require 'rspec/core'
+
+RSpec.configure do |conf|
+  conf.mock_with :rr
+end
 
 unless defined? REVISIONS
   REVISIONS = ['e28ad77bba0574241e6eb64dfd0c1291b221effe', # 2 files updated
@@ -7,16 +19,6 @@ unless defined? REVISIONS
              '51b986619d88f7ba98be7d271188785cbbb541a0', # 3 files updated
              '055850e7d925110322b8db4e17c3b840d76e144c'] # Empty merge message
 
+  FIXTURES_PATH = (File.dirname(__FILE__) + '/fixtures/').freeze
 end
 
-class Test::Unit::TestCase
-
-  def read_file(name)
-    out = ''
-    File.open(name).each { |line|
-      out += line
-    }
-    out
-  end
-
-end

data/template/email.html.erb

@@ -1,9 +1,9 @@
 <html><head>
-<style>
+<style type="text/css">
   <%= stylesheet_string %>
 </style>
 </head>
 <body>
-  <%= html_diff %>
+  <%= @html_message %>
 </body>
 </html>

data/template/styles.css

@@ -6,5 +6,6 @@ table {width:100%;border-collapse:collapse}
 .a {background-color: #dfd;}
 .aa {background-color: #afa;}
 .title {background-color: #ddd; padding: 10px;font-family:Verdana;font-size:12px;}
-tr {color:#000;font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace}
+td {color:#000;font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace}
 .ln {background-color: #ccc; width:23px; text-align:right}
+td.sep {text-align:center;border-top:1px solid DimGray;border-bottom:1px solid DimGray;}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-commit-notifier
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Bodo Tasche
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +02:00
+date: 2010-11-03 00:00:00 +01:00
 default_executable: git-commit-notifier
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,14 +64,91 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-core
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec-expectations
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: faker
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: metric_fu
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: This git commit notifier sends html mails with nice diffs for every changed file.
-email: bodo@wannawork.de
+email: bodo@bitboxer.de
 executables: 
 - git-commit-notifier
 extensions: []
@@ -97,26 +170,31 @@ files:
 - lib/diff_to_html.rb
 - lib/emailer.rb
 - lib/git.rb
+- lib/logger.rb
 - lib/result_processor.rb
+- 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-merge.yml
+- spec/fixtures/git_log
+- spec/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
+- spec/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0
+- spec/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9
+- spec/fixtures/git_show_dce6ade4cdc2833b53bd600ef10f9bce83c7102d
+- spec/fixtures/git_show_e28ad77bba0574241e6eb64dfd0c1291b221effe
+- spec/fixtures/git_show_ff037a73fc1094455e7bbf506171a3f3cf873ae6
+- spec/fixtures/new_file_one_line.txt
+- spec/lib/commit_hook_spec.rb
+- spec/lib/diff_to_html_spec.rb
+- spec/lib/emailer_spec.rb
+- spec/lib/git_spec.rb
+- spec/lib/logger_spec.rb
+- spec/lib/result_processor_spec.rb
+- spec/spec_helper.rb
 - template/email.html.erb
 - template/styles.css
-- test/fixtures/existing_file_one_line.txt
-- test/fixtures/git-notifier-group-email-by-push.yml
-- test/fixtures/git-notifier-ignore-merge.yml
-- test/fixtures/git-notifier-with-merge.yml
-- test/fixtures/git_log
-- test/fixtures/git_show_055850e7d925110322b8db4e17c3b840d76e144c
-- test/fixtures/git_show_51b986619d88f7ba98be7d271188785cbbb541a0
-- test/fixtures/git_show_a4629e707d80a5769f7a71ca6ed9471015e14dc9
-- test/fixtures/git_show_dce6ade4cdc2833b53bd600ef10f9bce83c7102d
-- test/fixtures/git_show_e28ad77bba0574241e6eb64dfd0c1291b221effe
-- test/fixtures/new_file_one_line.txt
-- test/test_helper.rb
-- test/unit/test_commit_hook.rb
-- test/unit/test_diff_to_html.rb
-- test/unit/test_result_processor.rb
 has_rdoc: true
-homepage: http://github.com/bodo/git-commit-notifier
+homepage: http://github.com/bitboxer/git-commit-notifier
 licenses: []
 
 post_install_message: 
@@ -129,7 +207,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -138,7 +215,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -150,7 +226,10 @@ signing_key:
 specification_version: 3
 summary: Sends git commit messages with diffs
 test_files: 
-- test/test_helper.rb
-- test/unit/test_commit_hook.rb
-- test/unit/test_diff_to_html.rb
-- test/unit/test_result_processor.rb
+- spec/lib/commit_hook_spec.rb
+- spec/lib/diff_to_html_spec.rb
+- spec/lib/emailer_spec.rb
+- spec/lib/git_spec.rb
+- spec/lib/logger_spec.rb
+- spec/lib/result_processor_spec.rb
+- spec/spec_helper.rb