cookbook-release 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8074e7cbc294a8226c5ea6edcaf5392681f9bb57
-  data.tar.gz: 877d487b0100d932eefbdfd15961061720fe7362
+  metadata.gz: d6f3d183b120b444f513d76af4570f6a36e0d0c3
+  data.tar.gz: edd20286cfa46e7b1ed2b66f44b93efaf990008b
 SHA512:
-  metadata.gz: d57da52f9d03f85d6948b460fa9ba858591bce6049e891e486b71d987b9c3338d5d084a1ad16306cfd78f16a0c143928d0fb0f223660b89117cf4d0e504ad4fa
-  data.tar.gz: ad05f19cff16844a4030ecdbaebbbfc9fcb947d911e79eacf516c579687ddf8b8713d4bf583135fab9b2884a62a57af1629eddb8bb36adc0db8fe0888000a6db
+  metadata.gz: 53ec75720a2382d16f865e7dd4f7fa28a815de6626d412e0f42487301067ded8822f8c63a379fc3af59fe0340ac8e5b055e4fdb59b71551619e3652142becfa2
+  data.tar.gz: a588a4e3c9686989f96a336a81b69379537cccb253b81e1ce0b79ab663b99d3f9dba8cd213204d83f24c63d1c07f9f649a597cd3c29cbfdd4edfb36db2f107e8

data/cookbook-release.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cookbook-release'
-  spec.version       = '1.3.0'
+  spec.version       = '1.3.1'
   spec.authors       = ['Grégoire Seux']
   spec.email         = 'g.seux@criteo.com'
   spec.summary       = 'Provide primitives (and rake tasks) to release a cookbook'

data/lib/cookbook-release/commit.rb

@@ -46,14 +46,14 @@ module CookbookRelease
     end
 
     def to_s_oneline
-      "#{self[:hash]} #{self[:author]} #{self[:subject]}"
+      "#{self[:hash]} #{self[:author]} <#{self[:email]}> #{self[:subject]}"
     end
 
     def to_s_html(full)
       result = []
       result << <<-EOH
 <font color=#{color.to_s}>
-  #{self[:hash]} #{self[:author]} #{self[:subject]}
+  #{self[:hash]} #{self[:author]} <#{self[:email]}> #{self[:subject]}
 </font>
       EOH
       if full && self[:body]
@@ -68,7 +68,7 @@ module CookbookRelease
     end
 
     def to_s_markdown(full)
-      result = "*#{self[:hash]}* _#{self[:author]}_ `#{self[:subject]}`"
+      result = "*#{self[:hash]}* _#{self[:author]} <#{self[:email]}>_ `#{self[:subject]}`"
       result << "\n```\n#{self[:body]}\n```" if full && self[:body]
       result
     end

data/lib/cookbook-release/git-utilities.rb

@@ -67,6 +67,7 @@ module CookbookRelease
         message = commit.message.lines.map(&:chomp).compact.delete_if(&:empty?)
         Commit.new(
           author: commit.author.name,
+          email: commit.author.email,
           subject: message.delete_at(0),
           hash: short_sha ? commit.sha[0,7] : commit.sha,
           body: message.empty? ? nil : message.join("\n"),

data/lib/cookbook-release/release.rb

@@ -59,14 +59,14 @@ module CookbookRelease
       puts "Suggested version: " + new_version.to_s
       puts "Commits that suggest this change:"
       reasons.each do |commit|
-        puts "* #{commit[:hash]} #{commit[:subject]} (#{commit[:author]})"
+        puts "* #{commit[:hash]} #{commit[:subject]} (#{commit[:author]} <#{commit[:email]}>)"
       end
     end
 
     def display_changelog(new_version)
       puts "Changelog for #{new_version}:"
       git_changelog.each do |commit|
-        puts "* #{commit[:hash]} #{HighLine.color(commit[:subject], commit.color)} (#{commit[:author]})"
+        puts "* #{commit[:hash]} #{HighLine.color(commit[:subject], commit.color)} (#{commit[:author]} <#{commit[:email]}>)"
       end
     end
 

data/spec/changelog_spec.rb

@@ -9,8 +9,8 @@ describe CookbookRelease::Changelog do
 
     it 'colorize Risky commits in red' do
       expect(git).to receive(:compute_changelog).and_return([
-        CookbookRelease::Commit.new(hash: '654321', subject: '[Risky] hello', author: 'John Doe'),
-        CookbookRelease::Commit.new(hash: '123456', subject: 'hello', author: 'John Doe'),
+        CookbookRelease::Commit.new(hash: '654321', subject: '[Risky] hello', author: 'John Doe', email: 'j.doe@nobody.com'),
+        CookbookRelease::Commit.new(hash: '123456', subject: 'hello', author: 'John Doe', email: 'j.doe@nobody.com'),
       ])
       changelog = CookbookRelease::Changelog.new(git)
       expect(changelog.html).to match(/color=red((?!color=grey).)*Risky/m)
@@ -24,11 +24,12 @@ describe CookbookRelease::Changelog do
           CookbookRelease::Commit.new(
             hash: '123456',
             subject: 'hello',
-            author: 'John Doe')
+            author: 'John Doe',
+            email: 'j.doe@nobody.com')
         ]
       )
       changelog = CookbookRelease::Changelog.new(git)
-      expect(changelog.markdown).to eq('*123456* _John Doe_ `hello`')
+      expect(changelog.markdown).to eq('*123456* _John Doe <j.doe@nobody.com>_ `hello`')
     end
     it 'expand body' do
       expect(git).to receive(:compute_changelog).and_return(
@@ -37,6 +38,7 @@ describe CookbookRelease::Changelog do
             hash: '654321',
             subject: '[Risky] hello',
             author: 'John Doe',
+            email: 'j.doe@nobody.com',
             body: 'Some Men Just Want to Watch the World Burn')
         ]
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Grégoire Seux