git-commit-notifier 0.12.1 → 0.12.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/.yardopts CHANGED
@@ -2,6 +2,7 @@
2
2
  --markup-provider redcarpet
3
3
  --charset utf-8
4
4
  --readme README.md
5
+ --plugin redcarpet-ext
5
6
  -
6
7
  README.md
7
8
  LICENSE
data/CHANGES.md CHANGED
@@ -2,6 +2,15 @@
2
2
 
3
3
  ## Not yet released
4
4
 
5
+ ## Version 0.12.2
6
+
7
+ * Restrict `nokogiri` gem version to be lower than 1.6.0 to allow Ruby 1.8.7 installations.
8
+ * Introduce a new option: `reply_to_mailinglist`. This option is mutually
9
+ exclusive to `reply_to_author`. It gives us the ability to set the
10
+ `Reply-To` adddress to the either the recipient/mailinglist.
11
+ * More opaque diffs.
12
+ * Minor updates.
13
+
5
14
  ## Version 0.12.1
6
15
 
7
16
  * The regular expression adjusted to include the underscore in repo name.
data/Gemfile CHANGED
@@ -7,6 +7,3 @@ gem "erubis", "~> 2.7"
7
7
  gem "ripper", :group => :development, :platforms => :mri_18
8
8
 
9
9
  gem "coveralls", :require => false, :platforms => [:mri_19, :mri_20], :group => :development
10
-
11
- gem "nokogiri", "~> 1.5.0", :platforms => :mri_18
12
-
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.12.1
1
+ 0.12.2
@@ -76,9 +76,16 @@ prefer_git_config_mailinglist: false
76
76
 
77
77
  # If reply_to_author is set to true, the Reply-To address is same as the author's
78
78
  # email address, if not it will be same as the from address.
79
+ # Note that you cannot set both, this and reply_to_mailinglist true!
79
80
  # Defaults to false
80
81
  # reply_to_author: false
81
82
 
83
+ # If reply_to_mailinglist is set to true, the Reply-To address is same as the recipient
84
+ # email address, or if that is missing, the same as hooks.mailinglist. If not it will be
85
+ # same as the from address. Note that you cannot set both, this and reply_to_author true!
86
+ # Defaults to false
87
+ # reply_to_mailinglist: false
88
+
82
89
  # stylesheet file (embedded template/styles.css by default)
83
90
  # stylesheet: /absolute/path/to/readable/stylesheet.css
84
91
 
@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
11
11
  s.email = %q{bodo@bitboxer.de}
12
12
  s.extra_rdoc_files = [
13
13
  "LICENSE",
14
- "README.md"
14
+ "README.md",
15
+ "CHANGES.md"
15
16
  ]
16
17
 
17
18
  s.files = `git ls-files`.split("\n")
@@ -28,15 +29,16 @@ Gem::Specification.new do |s|
28
29
  s.add_runtime_dependency(%q<diff-lcs>, ["~> 1.1.2"])
29
30
  s.add_runtime_dependency(%q<nntp>, ["~> 1.0"])
30
31
  s.add_runtime_dependency(%q<premailer>, ["~> 1.7", ">= 1.7.1", "!= 1.7.2"])
31
- s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4"])
32
+ s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4", "< 1.6.0"])
32
33
  s.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.0"])
33
34
  s.add_development_dependency(%q<rake>, ["~> 0.8", "!= 0.9.0"])
34
- s.add_development_dependency(%q<bundler>, ["~> 1.0", ">=1.0.10"])
35
+ s.add_development_dependency(%q<bundler>, ["~> 1.3"])
35
36
  s.add_development_dependency(%q<code-cleaner>, [">= 0"])
36
37
  s.add_development_dependency(%q<rspec-core>, [">= 0"])
37
38
  s.add_development_dependency(%q<rspec-expectations>, [">= 0"])
38
39
  s.add_development_dependency(%q<rr>, ["~> 1.0"])
39
40
  s.add_development_dependency(%q<faker>, ["~> 1.1.2"])
40
41
  s.add_development_dependency(%q<yard>, ["~> 0.8.1"])
41
- s.add_development_dependency(%q<redcarpet>, ["~> 2.1"])
42
+ s.add_development_dependency(%q<redcarpet>, ["~> 3.0"])
43
+ s.add_development_dependency(%q<yard-redcarpet-ext>, ["~> 0.0.3"])
42
44
  end
@@ -137,6 +137,15 @@ module GitCommitNotifier
137
137
  return
138
138
  end
139
139
 
140
+ reply_to_address = nil
141
+ if config["reply_to_author"]
142
+ reply_to_address ||= result[:commit_info][:email]
143
+ elsif config["reply_to_mailinglist"]
144
+ reply_to_address ||= recipient
145
+ else
146
+ reply_to_address ||= config["from"]
147
+ end
148
+
140
149
  # Debug information
141
150
  logger.debug('----')
142
151
  logger.debug("cwd: #{Dir.pwd}")
@@ -217,7 +226,7 @@ module GitCommitNotifier
217
226
  :recipient => config["send_mail_to_committer"] ? add_committer_to_recipient(recipient, result[:commit_info][:email]) : recipient,
218
227
  :from_address => config["from"] || result[:commit_info][:email],
219
228
  :from_alias => result[:commit_info][:author],
220
- :reply_to_address => config["reply_to_author"] ? result[:commit_info][:email] : config["from"] || result[:commit_info][:email],
229
+ :reply_to_address => reply_to_address,
221
230
  :subject => subject,
222
231
  :commit_date => result[:commit_info][:date],
223
232
  :current_date => Time.new.rfc2822,
@@ -268,7 +277,7 @@ module GitCommitNotifier
268
277
  :recipient => config["send_mail_to_committer"] ? add_committer_to_recipient(recipient, result[:commit_info][:email]) : recipient,
269
278
  :from_address => config["from"] || result[:commit_info][:email],
270
279
  :from_alias => result[:commit_info][:author],
271
- :reply_to_address => config["reply_to_author"] ? result[:commit_info][:email] : config["from"] || result[:commit_info][:email],
280
+ :reply_to_address => reply_to_address,
272
281
  :subject => subject,
273
282
  :commit_date => result[:commit_info][:date],
274
283
  :current_date => Time.new.rfc2822,
@@ -535,7 +535,13 @@ module GitCommitNotifier
535
535
  :gitorious => lambda { |config, commit| "<a href='#{config['gitorious']['path']}/#{config['gitorious']['project']}/#{config['gitorious']['repository']}/commit/#{commit}'>#{commit}</a>" },
536
536
  :trac => lambda { |config, commit| "<a href='#{config['trac']['path']}/#{commit}'>#{commit}</a>" },
537
537
  :cgit => lambda { |config, commit| "<a href='#{config['cgit']['path']}/#{config['cgit']['project'] || "#{Git.repo_name_real}"}/commit/?id=#{commit}'>#{commit}</a>" },
538
- :gitlabhq => lambda { |config, commit| "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>" },
538
+ :gitlabhq => lambda { |config, commit|
539
+ if config['gitlabhq']['version'] >= 4.0
540
+ "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name_with_parent.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"
541
+ else
542
+ "<a href='#{config['gitlabhq']['path']}/#{Git.repo_name.gsub(".", "_")}/commits/#{commit}'>#{commit}</a>"
543
+ end
544
+ },
539
545
  :gitalist => lambda { |config, commit| "<a href='#{config['gitalist']['path']}/projects/#{config['gitalist']['project'] || Git.repo_name}/#{commit}/log'>#{commit}</a>" },
540
546
  :redmine => lambda { |config, commit| "<a href='#{config['redmine']['path']}/projects/#{config['redmine']['project'] || Git.repo_name}/repository/revisions/#{commit}'>#{commit}</a>" },
541
547
  :github => lambda { |config, commit| "<a href='#{config['github']['path']}/#{config['github']['project']}/#{Git.repo_name}/commit/#{commit}'>#{commit}</a>" },
data/template/styles.css CHANGED
@@ -22,6 +22,6 @@ td.sep {text-align:center; border-top:1px solid DimGray; border-bottom:1px solid
22
22
  .ln {background-color: white; width: 35px; padding-right: 5px; text-align:right; color: #666; border-right: 1px solid #ccc; }
23
23
 
24
24
  .r {background-color: #fdd;}
25
- .rr {background-color: #faa;}
25
+ .rr {background-color: #faa; font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace;}
26
26
  .a {background-color: #dfd;}
27
- .aa {background-color: #afa;}
27
+ .aa {background-color: #afa; font-family: "Bitstream Vera Sans Mono","Monaco","Courier",monospace;}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-commit-notifier
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.1
4
+ version: 0.12.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-08-29 00:00:00.000000000 Z
13
+ date: 2013-10-22 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: diff-lcs
@@ -80,6 +80,9 @@ dependencies:
80
80
  - - ~>
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.4'
83
+ - - <
84
+ - !ruby/object:Gem::Version
85
+ version: 1.6.0
83
86
  type: :runtime
84
87
  prerelease: false
85
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -88,6 +91,9 @@ dependencies:
88
91
  - - ~>
89
92
  - !ruby/object:Gem::Version
90
93
  version: '1.4'
94
+ - - <
95
+ - !ruby/object:Gem::Version
96
+ version: 1.6.0
91
97
  - !ruby/object:Gem::Dependency
92
98
  name: yajl-ruby
93
99
  requirement: !ruby/object:Gem::Requirement
@@ -133,10 +139,7 @@ dependencies:
133
139
  requirements:
134
140
  - - ~>
135
141
  - !ruby/object:Gem::Version
136
- version: '1.0'
137
- - - ! '>='
138
- - !ruby/object:Gem::Version
139
- version: 1.0.10
142
+ version: '1.3'
140
143
  type: :development
141
144
  prerelease: false
142
145
  version_requirements: !ruby/object:Gem::Requirement
@@ -144,10 +147,7 @@ dependencies:
144
147
  requirements:
145
148
  - - ~>
146
149
  - !ruby/object:Gem::Version
147
- version: '1.0'
148
- - - ! '>='
149
- - !ruby/object:Gem::Version
150
- version: 1.0.10
150
+ version: '1.3'
151
151
  - !ruby/object:Gem::Dependency
152
152
  name: code-cleaner
153
153
  requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,23 @@ dependencies:
251
251
  requirements:
252
252
  - - ~>
253
253
  - !ruby/object:Gem::Version
254
- version: '2.1'
254
+ version: '3.0'
255
+ type: :development
256
+ prerelease: false
257
+ version_requirements: !ruby/object:Gem::Requirement
258
+ none: false
259
+ requirements:
260
+ - - ~>
261
+ - !ruby/object:Gem::Version
262
+ version: '3.0'
263
+ - !ruby/object:Gem::Dependency
264
+ name: yard-redcarpet-ext
265
+ requirement: !ruby/object:Gem::Requirement
266
+ none: false
267
+ requirements:
268
+ - - ~>
269
+ - !ruby/object:Gem::Version
270
+ version: 0.0.3
255
271
  type: :development
256
272
  prerelease: false
257
273
  version_requirements: !ruby/object:Gem::Requirement
@@ -259,7 +275,7 @@ dependencies:
259
275
  requirements:
260
276
  - - ~>
261
277
  - !ruby/object:Gem::Version
262
- version: '2.1'
278
+ version: 0.0.3
263
279
  description: This git commit notifier sends html mails with nice diffs for every changed
264
280
  file.
265
281
  email: bodo@bitboxer.de
@@ -269,6 +285,7 @@ extensions: []
269
285
  extra_rdoc_files:
270
286
  - LICENSE
271
287
  - README.md
288
+ - CHANGES.md
272
289
  files:
273
290
  - .gitignore
274
291
  - .rspec
@@ -339,7 +356,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
339
356
  version: '0'
340
357
  segments:
341
358
  - 0
342
- hash: -137437954914361840
359
+ hash: -144969551668064151
343
360
  required_rubygems_version: !ruby/object:Gem::Requirement
344
361
  none: false
345
362
  requirements: