git-commit-notifier 0.5.0 → 0.6.1

data/LICENSE

@@ -1,4 +1,4 @@
- Copyright (c) 2008 Csoma Zoltan, Primalgrasp
+ Copyright (c) 2008, 2010 Bodo Tasche, Csoma Zoltan, Primalgrasp
  
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

data/README.textile

@@ -33,12 +33,6 @@ h1. Requirements
 
 h1. Installing and Configuring
 
-Before installing the Git Commit Notification script, make sure the following 
-Git settings are configured correctly.
-
-* git config hooks.mailinglist (email address of the recipient, probably your mailing list address)
-* __Optional:__ git config hooks.emailprefix (application name, used in email subject)
-
 Install the gem:
 
 <pre>sudo gem install git-commit-notifier</pre>

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.1

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

@@ -1,5 +1,12 @@
-delivery_method: sendmail # smtp or sendmail
 ignore_merge: false # set to true if you want to ignore empty merge messages
+mailinglist: developers@example.com # recipient for the commit mail
+
+# Optional parameter for the subject-line of the mail 
+# emailprefix: GIT
+
+link_files: none # Decorates files with link to a webview. Possible values: none or gitweb
+
+delivery_method: sendmail # smtp or sendmail
 
 smtp_server:
   address: localhost
@@ -14,4 +21,6 @@ sendmail_options:
   location: /usr/sbin/sendmail
   arguments:
 
-
+gitweb:
+  path: http://developerserver/path_to_gitweb
+  project: test.git

data/git-commit-notifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-commit-notifier}
-  s.version = "0.5.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-03-29}
   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@wannawork.de}

data/lib/commit_hook.rb

@@ -18,8 +18,11 @@ class CommitHook
   end
 
   def self.run(config, rev1, rev2, ref_name)
+    @config = {}
+    @config = YAML::load_file(config) if File.exist?(config)
+
     project_path = Dir.getwd
-    recipient = Git.mailing_list_address
+    recipient = @config["mailinglist"] || Git.mailing_list_address
     
     if (recipient.nil? || recipient.length == 0)
       CommitHook.show_error(
@@ -31,13 +34,10 @@ class CommitHook
     puts "Sending mail..."
     STDOUT.flush
     
-    prefix = Git.repo_name
+    prefix = @config["emailprefix"] || Git.repo_name
     branch_name = (ref_name =~ /master$/i) ? "" : "/#{ref_name.split("/").last}"
 
-    @config = {}
-    @config = YAML::load_file(config) if File.exist?(config)
-
-    diff2html = DiffToHtml.new(Dir.pwd)
+    diff2html = DiffToHtml.new(Dir.pwd, @config)
     diff2html.diff_between_revisions rev1, rev2, prefix, ref_name
     
     diffresult = diff2html.result

data/lib/diff_to_html.rb

@@ -7,11 +7,12 @@ def escape_content(s)
 end
 
 class DiffToHtml
-  attr_accessor :file_prefix
+  attr_accessor :file_prefix, :current_file_name
   attr_reader :result
 
-  def initialize(config_dir = nil)
-    @previous_dir = config_dir
+  def initialize(previous_dir = nil, config = nil)
+    @previous_dir = previous_dir
+    @config = config || {}
   end
 
   def range_info(range)
@@ -107,7 +108,14 @@ class DiffToHtml
     else
       op = "Changed"
     end
-    header = "#{op} #{binary}file #{@current_file_name}"
+    
+    file_name = @current_file_name
+    
+    if (@config["link_files"] && @config["link_files"] == "gitweb" && @config["gitweb"])
+      file_name = "<a href='#{@config['gitweb']['path']}/gitweb?p=#{@config['gitweb']['project']};f=#{file_name};hb=head'>#{file_name}</a>"
+    end
+    
+    header = "#{op} #{binary}file #{file_name}"
     "<h2>#{header}</h2>\n"
   end
 
@@ -286,7 +294,7 @@ class DiffToHtml
 
       title = "<div class=\"title\">"
       title += "<strong>Message:</strong> #{message_array_as_html commit_info[:message]}<br />\n"
-      title += "<strong>Commit</strong> #{commit_info[:commit]}<br />\n"
+      title += "<strong>Commit:</strong> #{commit_info[:commit]}<br />\n"
       title += "<strong>Branch:</strong> #{branch}\n<br />" unless branch =~ /\/head/
       title += "<strong>Date:</strong> #{CGI.escapeHTML commit_info[:date]}\n<br />"
       title += "<strong>Author:</strong> #{CGI.escapeHTML(commit_info[:author])} &lt;#{commit_info[:email]}&gt;\n</div>"

data/lib/emailer.rb

@@ -5,8 +5,7 @@ require 'tamtam'
 class Emailer
 
   def initialize(config, project_path, recipient, from_address, from_alias, subject, text_message, html_diff, old_rev, new_rev, ref_name)
-    @config = config
-    @config ||= {}
+    @config = config || {}
     @project_path = project_path
     @recipient = recipient
     @from_address = from_address

data/test/unit/test_diff_to_html.rb

@@ -94,4 +94,23 @@ class DiffToHtmlTest < Test::Unit::TestCase
               'key',',',' ','scope'], tokens
   end
 
+  def test_operation_description
+    diff = DiffToHtml.new
+    diff.current_file_name = "file/to/test.yml"
+    assert_equal "<h2>Changed file file/to/test.yml</h2>\n", diff.operation_description
+
+    config = {
+      "link_files" => "gitweb",
+      "gitweb" => {
+        "path" => "http://developerserver/path_to_gitweb", 
+        "project" => "test.git"
+      }
+    }
+
+    diff = DiffToHtml.new(nil, config)
+    diff.current_file_name = "file/to/test.yml"
+    assert_equal "<h2>Changed file <a href='http://developerserver/path_to_gitweb/gitweb?p=test.git;f=file/to/test.yml;hb=head'>file/to/test.yml</a></h2>\n", diff.operation_description
+
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 0
-  version: 0.5.0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Bodo Tasche
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +01:00
+date: 2010-03-29 00:00:00 +02:00
 default_executable: git-commit-notifier
 dependencies: 
 - !ruby/object:Gem::Dependency