git-commit-notifier 0.9.1 → 0.9.2

data/.gitignore

@@ -0,0 +1,23 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+.bundle
+Gemfile.lock
+
+## PROJECT::SPECIFIC

data/.rspec

@@ -0,0 +1 @@
+-c -f progress

data/Gemfile

@@ -1,21 +1,4 @@
 source :rubygems
 
-gem 'diff-lcs'
-gem 'nntp'
-gem 'premailer', '~>1.7.1'
-gem 'nokogiri'
-
-group :development do
-  gem 'jeweler'
-  gem 'code-cleaner'
-  gem 'metric_fu'
-end
-
-group :test do
-  gem 'rspec-core'
-  gem 'rspec-expectations'
-  gem 'rr'
-  gem 'faker'
-  gem 'rcov'
-end
+gemspec
 

data/Rakefile

@@ -4,41 +4,20 @@ require 'rake'
 APP_ROOT = File.dirname(__FILE__).freeze
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "git-commit-notifier"
-    gem.summary = %Q{Sends git commit messages with diffs}
-    gem.description = %Q{This git commit notifier sends html mails with nice diffs for every changed file.}
-    gem.email = "bodo@bitboxer.de"
-    gem.homepage = "http://github.com/bitboxer/git-commit-notifier"
-    gem.authors = ["Bodo Tasche"]
-    gem.add_dependency('diff-lcs')
-    gem.add_dependency('nntp')
-    gem.add_dependency('premailer', '~>1.7.1')
-    gem.add_dependency('nokogiri')
-    gem.add_development_dependency('rspec-core')
-    gem.add_development_dependency('rspec-expectations')
-    gem.add_development_dependency('rr')
-    gem.add_development_dependency('faker')
-    gem.add_development_dependency('rcov')
-    gem.add_development_dependency('metric_fu')
-  end
-  Jeweler::GemcutterTasks.new
+  require 'bundler'
+  Bundler::GemHelper.install_tasks
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts "Bundler not available. Install it with: gem install bundler"
 end
 
 begin
   require 'rspec/core/rake_task'
 
-  RSpec::Core::RakeTask.new do |t|
-    t.rspec_opts = ["-c", "-f progress"]
-  end
+  RSpec::Core::RakeTask.new
 
   RSpec::Core::RakeTask.new(:rcov) do |t|
     t.rcov = true
     t.ruby_opts = '-w'
-    t.rspec_opts = ["-c", "-f progress"]
     t.rcov_opts = %q[-Ilib --exclude "spec/*,gems/*"]
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/config/git-notifier-config.yml.sample

@@ -8,11 +8,14 @@ ignore_merge: false
 # lines_per_diff: 300
 
 # defines what branches to email for (defaults to all)
-# include_branches: master
-# include_branches: [master,some_other_branch]
+# include_branches: ['master', 'some_other_branch']
+# include_branches: 'master, some_other_branch'
+# include_branches:
+#   - master
+#   - some_other_branch
 
 # The recipient (or newsgroup for nntp) for the commit
-# It can send to multiple destination, just seperate email address by "," :
+# It can send to multiple destinations, just separate email addresses by ",".
 mailinglist: developers@example.com,dev2@example.com,dev3@example.com,cto@example.com
 
 # The from addres. If not defined it will use 
@@ -100,7 +103,9 @@ message_integration:
 unique_commits_per_branch: false
 
 # Skip commits older than N days
-skip_commits_older_than: 7
+#skip_commits_older_than: 7
+
+show_master_branch_name: false
 
 # This is developer debugging options. Do not uncomment it if You aren't Jedi
 # debug:

data/git-commit-notifier.gemspec

@@ -1,15 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{git-commit-notifier}
-  s.version = "0.9.1"
+  s.version = IO.read('VERSION').chomp
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2011-04-05}
+  s.date = Time.now.strftime('%Y-%m-%d')
   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}
@@ -18,124 +15,29 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.textile"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "bin/git-commit-notifier",
-    "config/git-notifier-config.yml.sample",
-    "git-commit-notifier.gemspec",
-    "lib/git_commit_notifier.rb",
-    "lib/git_commit_notifier/commit_hook.rb",
-    "lib/git_commit_notifier/diff_callback.rb",
-    "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",
-    "spec/fixtures/git-notifier-with-branch-restrictions.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/git_commit_notifier/commit_hook_spec.rb",
-    "spec/lib/git_commit_notifier/diff_to_html_spec.rb",
-    "spec/lib/git_commit_notifier/emailer_spec.rb",
-    "spec/lib/git_commit_notifier/git_spec.rb",
-    "spec/lib/git_commit_notifier/logger_spec.rb",
-    "spec/lib/git_commit_notifier/result_processor_spec.rb",
-    "spec/spec_helper.rb",
-    "template/email.html.erb",
-    "template/styles.css"
-  ]
+
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+
   s.homepage = %q{http://github.com/bitboxer/git-commit-notifier}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sends git commit messages with diffs}
-  s.test_files = [
-    "spec/lib/git_commit_notifier/commit_hook_spec.rb",
-    "spec/lib/git_commit_notifier/diff_to_html_spec.rb",
-    "spec/lib/git_commit_notifier/emailer_spec.rb",
-    "spec/lib/git_commit_notifier/git_spec.rb",
-    "spec/lib/git_commit_notifier/logger_spec.rb",
-    "spec/lib/git_commit_notifier/result_processor_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_runtime_dependency(%q<nntp>, [">= 0"])
-      s.add_runtime_dependency(%q<premailer>, ["~> 1.7.1"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<code-cleaner>, [">= 0"])
-      s.add_development_dependency(%q<metric_fu>, [">= 0"])
-      s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_runtime_dependency(%q<nntp>, [">= 0"])
-      s.add_runtime_dependency(%q<premailer>, ["~> 1.7.1"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<rspec-core>, [">= 0"])
-      s.add_development_dependency(%q<rspec-expectations>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
-      s.add_development_dependency(%q<faker>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<metric_fu>, [">= 0"])
-    else
-      s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<nntp>, [">= 0"])
-      s.add_dependency(%q<premailer>, ["~> 1.7.1"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<code-cleaner>, [">= 0"])
-      s.add_dependency(%q<metric_fu>, [">= 0"])
-      s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<nntp>, [">= 0"])
-      s.add_dependency(%q<premailer>, ["~> 1.7.1"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rspec-core>, [">= 0"])
-      s.add_dependency(%q<rspec-expectations>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<faker>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<metric_fu>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<nntp>, [">= 0"])
-    s.add_dependency(%q<premailer>, ["~> 1.7.1"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<code-cleaner>, [">= 0"])
-    s.add_dependency(%q<metric_fu>, [">= 0"])
-    s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<nntp>, [">= 0"])
-    s.add_dependency(%q<premailer>, ["~> 1.7.1"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rspec-core>, [">= 0"])
-    s.add_dependency(%q<rspec-expectations>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<faker>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<metric_fu>, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
+  s.add_runtime_dependency(%q<nntp>, [">= 0"])
+  s.add_runtime_dependency(%q<premailer>, [">= 1.7.1"])
+  s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
+  s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
+  s.add_development_dependency(%q<code-cleaner>, [">= 0"])
+  s.add_development_dependency(%q<rspec-core>, [">= 0"])
+  s.add_development_dependency(%q<rspec-expectations>, [">= 0"])
+  s.add_development_dependency(%q<rr>, [">= 0"])
+  s.add_development_dependency(%q<faker>, [">= 0"])
+  s.add_development_dependency(%q<rcov>, [">= 0"])
+  s.add_development_dependency(%q<metric_fu>, [">= 0"])
 end
 

data/lib/git_commit_notifier/commit_hook.rb

@@ -26,6 +26,17 @@ module GitCommitNotifier
         @logger ||= Logger.new(config)
       end
 
+      def include_branches
+        include_branches = config["include_branches"]
+        unless include_branches.nil?
+          if include_branches.kind_of?(String) && include_branches =~ /\,/
+            include_branches = include_branches.split(/\s*\,\s*/)
+          end
+          include_branches = Array(include_branches)
+        end
+        include_branches
+      end
+
       def run(config_name, rev1, rev2, ref_name)
         @config = File.exists?(config_name) ? YAML::load_file(config_name) : {}
 
@@ -40,16 +51,14 @@ module GitCommitNotifier
           return
         end
 
-        include_branches = config["include_branches"]
-
         logger.debug('----')
         logger.debug("pwd: #{Dir.pwd}")
         logger.debug("ref_name: #{ref_name}")
         logger.debug("rev1: #{rev1}")
         logger.debug("rev2: #{rev2}")
-        logger.debug("included branches: #{include_branches.join(',')}") unless include_branches.nil?
+        logger.debug("included branches: #{include_branches.join(', ')}") unless include_branches.nil?
 
-        prefix = @config["emailprefix"] || Git.repo_name
+        prefix = config["emailprefix"] || Git.repo_name
         branch_name = ref_name.split("/").last
 
         logger.debug("prefix: #{prefix}")
@@ -60,8 +69,9 @@ module GitCommitNotifier
           return
         end
 
-        branch_name = branch_name.eql?('master') ? "" : "/#{branch_name}"
-        
+        branch_name = "/#{branch_name}"
+        branch_name = "" if !config["show_master_branch_name"] && branch_name.eql?('/master')
+
         info("Sending mail...")
 
         diff2html = DiffToHtml.new(Dir.pwd, config)

data/lib/git_commit_notifier/git.rb

@@ -13,7 +13,7 @@ class GitCommitNotifier::Git
     end
 
     def branch_commits(treeish)
-      args = Git.branch_heads - [ Git.branch_head(treeish) ]
+      args = branch_heads - [ branch_head(treeish) ]
       args.map! { |tree| "^#{tree}" }
       args << treeish
       lines = from_shell("git rev-list #{args.join(' ')}")

data/spec/lib/git_commit_notifier/commit_hook_spec.rb

@@ -27,14 +27,14 @@ describe GitCommitNotifier::CommitHook do
     # 4 commits, one email for each of them, without merge
     run_with_config('spec/fixtures/git-notifier-with-branch-restrictions.yml',4,'refs/heads/branch2')
   end
-  
+
 
   it "should email for commits to master if master set as include_branch" do
     # 4 commits, one email for each of them, without merge
     run_with_config('spec/fixtures/git-notifier-with-branch-restrictions.yml',4)
   end
-  
-  
+
+
   def run_with_config(config, times, branch = 'refs/heads/master')
     expect_repository_access
 
@@ -45,7 +45,7 @@ describe GitCommitNotifier::CommitHook do
     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(GitCommitNotifier::Git).mailing_list_address { 'recipient@test.com' }
@@ -57,7 +57,7 @@ describe GitCommitNotifier::CommitHook do
 
     GitCommitNotifier::CommitHook.run config, REVISIONS.first, REVISIONS.last, branch
   end
-  
+
 
   def test_commit_from
     # 1 commit with a from: adress
@@ -109,4 +109,24 @@ describe GitCommitNotifier::CommitHook do
     end
   end
 
+  describe :include_branches do
+    it "should be nil if not specified in config" do
+      mock(GitCommitNotifier::CommitHook).config { Hash.new }
+      GitCommitNotifier::CommitHook.include_branches.should be_nil
+    end
+    it "should be single item array if one branch as string specified" do
+      mock(GitCommitNotifier::CommitHook).config { { 'include_branches' => 'staging' } }
+      GitCommitNotifier::CommitHook.include_branches.should == %w( staging )
+    end
+    it "should be array if specified as array" do
+      mock(GitCommitNotifier::CommitHook).config { { 'include_branches' => %w(test staging gotcha)  } }
+      GitCommitNotifier::CommitHook.include_branches.should == %w(test staging gotcha)
+    end
+    it "should be array of items, splitted by comma if specified as comma-separated list string" do
+      mock(GitCommitNotifier::CommitHook).config { { 'include_branches' => 'test, me, yourself'  } }
+      GitCommitNotifier::CommitHook.include_branches.should == %w(test me yourself)
+    end
+
+  end
+
 end

data/spec/lib/git_commit_notifier/diff_to_html_spec.rb

@@ -3,7 +3,7 @@ require 'nokogiri'
 require 'git_commit_notifier'
 
 describe GitCommitNotifier::DiffToHtml do
-  
+
   describe :lines_are_sequential? do
     before(:all) do
       @diff_to_html = GitCommitNotifier::DiffToHtml.new

data/spec/lib/git_commit_notifier/emailer_spec.rb

@@ -82,7 +82,7 @@ describe GitCommitNotifier::Emailer do
       mock(GitCommitNotifier::Emailer).require('erubis') { raise LoadError.new('erubis') }
       mock(GitCommitNotifier::Emailer).require('erb')
       mock.proxy(ERB).new('erb')
-      
+
       GitCommitNotifier::Emailer.template.should be_kind_of(ERB)
     end
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: git-commit-notifier
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
+  prerelease: 
+  version: 0.9.2
 platform: ruby
 authors: 
 - Bodo Tasche
@@ -14,234 +10,140 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
-default_executable: git-commit-notifier
+date: 2011-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nntp
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: premailer
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 1
         version: 1.7.1
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.4.4
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.0.10
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: code-cleaner
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: metric_fu
+  name: rspec-core
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: nntp
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: premailer
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 1
-        version: 1.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rspec-expectations
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id013
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rr
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id014
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: faker
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id015
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id016
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: metric_fu
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id017
+  version_requirements: *id012
 description: This git commit notifier sends html mails with nice diffs for every changed file.
 email: bodo@bitboxer.de
 executables: 
@@ -252,9 +154,9 @@ extra_rdoc_files:
 - LICENSE
 - README.textile
 files: 
-- .document
+- .gitignore
+- .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile
@@ -295,7 +197,6 @@ files:
 - spec/spec_helper.rb
 - template/email.html.erb
 - template/styles.css
-has_rdoc: true
 homepage: http://github.com/bitboxer/git-commit-notifier
 licenses: []
 
@@ -309,25 +210,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Sends git commit messages with diffs
 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_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/git_commit_notifier/commit_hook_spec.rb
 - spec/lib/git_commit_notifier/diff_to_html_spec.rb
 - spec/lib/git_commit_notifier/emailer_spec.rb
@@ -335,3 +245,4 @@ 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: 

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/Gemfile.lock

@@ -1,105 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    Saikuro (1.1.0)
-    abstract (1.0.0)
-    activesupport (3.0.5)
-    arrayfields (4.7.4)
-    chronic (0.3.0)
-    churn (0.0.13)
-      chronic (>= 0.2.3)
-      hirb
-      json_pure
-      main
-      ruby_parser (~> 2.0.4)
-      sexp_processor (~> 3.0.3)
-    code-cleaner (0.8.2)
-    colored (1.2)
-    css_parser (1.1.9)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    faker (0.9.5)
-      i18n (~> 0.4)
-    fattr (2.2.0)
-    flay (1.4.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    flog (2.5.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    git (1.2.5)
-    haml (3.0.25)
-    hirb (0.4.3)
-    htmlentities (4.3.0)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json_pure (1.5.1)
-    main (4.4.0)
-      arrayfields (>= 4.7.4)
-      fattr (>= 2.1.0)
-    metric_fu (2.1.1)
-      Saikuro (>= 1.1.0)
-      activesupport (>= 2.0.0)
-      chronic (~> 0.3.0)
-      churn (>= 0.0.7)
-      flay (>= 1.2.1)
-      flog (>= 2.3.0)
-      rails_best_practices (>= 0.6.4)
-      rcov (>= 0.8.3.3)
-      reek (>= 1.2.6)
-      roodi (>= 2.1.0)
-      syntax
-    nntp (1.0.0)
-    nokogiri (1.4.4)
-    premailer (1.7.1)
-      css_parser (>= 1.1.9)
-      htmlentities (>= 4.0.0)
-    rails_best_practices (0.7.5)
-      activesupport
-      colored (~> 1.2)
-      erubis (~> 2.6.6)
-      haml (~> 3.0.18)
-      i18n
-      ruby-progressbar (~> 0.0.9)
-      ruby_parser (~> 2.0.4)
-    rake (0.8.7)
-    rcov (0.9.9)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    roodi (2.1.0)
-      ruby_parser
-    rr (1.0.2)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    ruby-progressbar (0.0.9)
-    ruby2ruby (1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
-    syntax (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  code-cleaner
-  diff-lcs
-  faker
-  jeweler
-  metric_fu
-  nntp
-  nokogiri
-  premailer (~> 1.7.1)
-  rcov
-  rr
-  rspec-core
-  rspec-expectations