git-commit-notifier 0.8.1 → 0.9.0

data/Gemfile

@@ -0,0 +1,21 @@
+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
+

data/Gemfile.lock

@@ -0,0 +1,105 @@
+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

data/README.textile

@@ -5,7 +5,9 @@ __by Bodo Tasche (bodo 'at' wannawork 'dot' de), Akzhan Abdulin (akzhan 'dot' ab
 Sends email commit messages splitting commits that were pushed in one step. 
 Email is delivered as text or HTML with changes refined per word. Emails 
 have a scanable subject containing the first sentence of the commit as well 
-as the author, project and branch name.
+as the author, project and branch name. 
+
+It's also possible to send a mail to a newsgroup using NNTP.
 
 For example:
 
@@ -85,6 +87,9 @@ You should not receive messages about commits those already posted in other bran
 This behaviour can be changed using unique_commits_per_branch option. When it's true,
 you should receive new message about commit when it's merged in other branch.
 
+Yet another option, skip_commits_older_than (in days), should be used to not inform about
+old commits in processes of forking, branching etc.
+
 h2. Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -13,9 +13,9 @@ begin
     gem.homepage = "http://github.com/bitboxer/git-commit-notifier"
     gem.authors = ["Bodo Tasche"]
     gem.add_dependency('diff-lcs')
-    gem.add_dependency('mocha')
-    gem.add_dependency('hpricot')
-    gem.add_dependency('tamtam')
+    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')

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/bin/git-commit-notifier

@@ -9,7 +9,9 @@ end
 # parameters: revision1, revision 2, branch
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift File.join(File.dirname(THIS_FILE), "../lib")
-require "commit_hook"
+
+require 'git_commit_notifier'
+include GitCommitNotifier
 
 case ARGV.length
 when 0

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

@@ -7,8 +7,13 @@ ignore_merge: false
 # Limit lines per diff
 # lines_per_diff: 300
 
-# The recipient for the commit:
-mailinglist: developers@example.com 
+# defines what branches to email for (defaults to all)
+# include_branches: master
+# 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 "," :
+mailinglist: developers@example.com,dev2@example.com,dev3@example.com,cto@example.com
 
 # The from addres. If not defined it will use 
 # the address that is configured in git
@@ -17,7 +22,7 @@ mailinglist: developers@example.com
 # stylesheet file (embedded template/styles.css by default)
 # stylesheet: /absolute/path/to/readable/stylesheet.css
 
-# select the delivery method: smtp or sendmail 
+# select the delivery method: smtp, nntp, or sendmail 
 delivery_method: sendmail 
 
 # Optionally group email by push: don't send an email for each commit when true.
@@ -33,11 +38,27 @@ smtp_server:
   authentication: plain
   enable_tls: false
 
+# settings for the tls smtp server (gmail,etc)
+# If you use gmail, just uncomment follow section and configure password
+#smtp_server:
+#  address: smtp.gmail.com
+#  port: 587
+#  domain: smtp.gmail.com
+#  user_name: username@gmail.com
+#  password: password
+#  authentication: plain
+#  enable_tls: true
+
 # settings for sendmail
 sendmail_options:
   location: /usr/sbin/sendmail
   arguments: -i -t
 
+# settings for nntp/newsgroup
+nntp_settings:
+  address: your.nntp.host.here
+  port: 119
+
 # Decorate files and commit ids with link to a webview. Possible values: none, gitweb, gitorious, cgit or trac
 link_files: none 
 
@@ -78,8 +99,11 @@ message_integration:
 # Track unique commits per branch?
 unique_commits_per_branch: false
 
+# Skip commits older than N days
+skip_commits_older_than: 7
+
 # This is developer debugging options. Do not uncomment it if You aren't Jedi
 # debug:
-#   enable: true
+#   enabled: true
 #   log_directory: /path/to/log/directory
 

data/git-commit-notifier.gemspec

@@ -1,74 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2011-04-04}
   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}
   s.executables = ["git-commit-notifier"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "bin/git-commit-notifier",
-     "config/git-notifier-config.yml.sample",
-     "git-commit-notifier.gemspec",
-     "lib/commit_hook.rb",
-     "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"
+    "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/git.rb",
+    "lib/git_commit_notifier/logger.rb",
+    "lib/git_commit_notifier/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-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.homepage = %q{http://github.com/bitboxer/git-commit-notifier}
-  s.rdoc_options = ["--charset=UTF-8"]
   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/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"
+    "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
@@ -77,9 +81,16 @@ Gem::Specification.new do |s|
 
     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<mocha>, [">= 0"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<tamtam>, [">= 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"])
@@ -88,9 +99,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<metric_fu>, [">= 0"])
     else
       s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<tamtam>, [">= 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"])
@@ -100,9 +118,16 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<tamtam>, [">= 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"])

data/lib/git_commit_notifier.rb

@@ -0,0 +1,8 @@
+require 'git_commit_notifier/commit_hook'
+require 'git_commit_notifier/diff_to_html'
+require 'git_commit_notifier/diff_callback'
+require 'git_commit_notifier/emailer'
+require 'git_commit_notifier/escape_helper'
+require 'git_commit_notifier/git'
+require 'git_commit_notifier/logger'
+require 'git_commit_notifier/result_processor'

data/lib/git_commit_notifier/commit_hook.rb

@@ -0,0 +1,130 @@
+require 'rubygems'
+require 'yaml'
+require 'cgi'
+require 'net/smtp'
+require 'digest/sha1'
+
+module GitCommitNotifier
+  class CommitHook
+
+    class << self
+      attr_reader :config
+
+      def show_error(message)
+        $stderr.puts "************** GIT NOTIFIER PROBLEM *******************"
+        $stderr.puts "\n"
+        $stderr.puts message
+        $stderr.puts "\n"
+        $stderr.puts "************** GIT NOTIFIER PROBLEM *******************"
+      end
+
+      def info(message)
+        $stdout.puts message
+        $stdout.flush
+      end
+
+      def logger
+        @logger ||= Logger.new(config)
+      end
+
+      def run(config_name, rev1, rev2, ref_name)
+        @config = File.exists?(config_name) ? YAML::load_file(config_name) : {}
+
+        project_path = Dir.getwd
+        recipient = config["mailinglist"] || Git.mailing_list_address
+
+        if recipient.nil? || recipient.length == 0
+          GitCommitNotifier::CommitHook.show_error(
+            "Please add a recipient for the emails. Eg : \n" +
+            "      git config hooks.mailinglist  developer@example.com"
+          )
+          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?
+
+        prefix = @config["emailprefix"] || Git.repo_name
+        branch_name = ref_name.split("/").last
+
+        logger.debug("prefix: #{prefix}")
+        logger.debug("branch: #{branch_name}")
+
+        unless include_branches.nil? || include_branches.include?(branch_name)
+          info("Supressing mail for branch #{branch_name}...")
+          return
+        end
+
+        branch_name = branch_name.eql?('master') ? "" : "/#{branch_name}"
+        
+        info("Sending mail...")
+
+        diff2html = GitCommitNotifier::DiffToHtml.new(Dir.pwd, config)
+        diff2html.diff_between_revisions(rev1, rev2, prefix, ref_name)
+
+        diffresult = diff2html.result
+
+        if config["ignore_merge"]
+          diffresult = diffresult.reject do |result|
+            !result[:commit_info][:merge].nil?
+          end
+        end
+
+        if config["group_email_by_push"]
+          text, html = [], []
+          diffresult.each_with_index do |result, i|
+            text << result[:text_content]
+            html << result[:html_content]
+          end
+          result = diffresult.first
+          return if result.nil? || !result[:commit_info]
+
+          emailer = GitCommitNotifier::Emailer.new(config,
+            :project_path => project_path,
+            :recipient => recipient,
+            :from_address => config["from"] || result[:commit_info][:email],
+            :from_alias => result[:commit_info][:author],
+            :subject => "[#{prefix}#{branch_name}] #{diffresult.size > 1 ? "#{diffresult.size} commits: " : ''}#{result[:commit_info][:message]}",
+            :text_message => text.join("------------------------------------------\n\n"),
+            :html_message => html.join("<hr /><br />"),
+            :old_rev => rev1,
+            :new_rev => rev2,
+            :ref_name => ref_name
+          )
+          emailer.send
+        else
+          diffresult.reverse.each_with_index do |result, i|
+            next unless result[:commit_info]
+            nr = number(diffresult.size, i)
+
+            emailer = GitCommitNotifier::Emailer.new(config,
+              :project_path => project_path,
+              :recipient => recipient,
+              :from_address => config["from"] || result[:commit_info][:email],
+              :from_alias => result[:commit_info][:author],
+              :subject => "[#{prefix}#{branch_name}]#{nr} #{result[:commit_info][:message]}",
+              :text_message => result[:text_content],
+              :html_message => result[:html_content],
+              :old_rev => rev1,
+              :new_rev => rev2,
+              :ref_name => ref_name
+            )
+            emailer.send
+          end
+        end
+      end
+
+      def number(total_entries, i)
+        return '' if total_entries <= 1
+        digits = total_entries < 10 ? 1 : 3
+        '[' + sprintf("%0#{digits}d", i + 1) + ']'
+      end
+    end
+  end
+end