cookbook-release 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y5ZDZjMzE3MjM4NjY2YTJjZDMyYWQ3NTIxYTUwOGRiYTc5MjY5Yg==
+    YTI3MDYzODBjYjM4MzY0YWZkODczMmI5OTEyZDZjMTRkYTgyYjZhYw==
   data.tar.gz: !binary |-
-    NmM3YWY0YjYxZmY5ZjQwY2UyODc3MGYyYTk4YTBiNGZmZDQ2NWYyNQ==
+    ODZkZjMzMzE5MzM0ZTliYzAyODM4YjUyNDlkZTUzMGMxM2Y2MWY0ZA==
 SHA512:
   metadata.gz: !binary |-
-    ODE2ZjdjYjVlMWU2OTBmOTZjNjdmNmJiOGVkMDdmNmIwYjYwZDgyNDQwMDAz
-    YTMzYmUwMjAxNjkwZDMzN2Q2ODBiNzBlYjg5Y2Y4M2NhNDk1OTllZTQ0MjAy
-    NzUyMjYzZTExNjdkMDgyY2IwNThhYjE1MTQ4MzBmNzY4YzdkOGM=
+    MTE4YTk0YTY0MjQ3M2IwNTU5NzkxYjM3NGZmZjBjMjg5NmU1ZTgyNGNiYjA3
+    YzIyYzZjNWU0NjAzOWYzZGIwYjBmNTNhMDg0ZjY0MGQyODhlNGI5M2E2NjE4
+    MmU3MGRiNjNlYmVmYzJkMGQ2NzA1NTAxMzI5Yzk2NjVjNTc5OTY=
   data.tar.gz: !binary |-
-    ZmI1OTUxNmUxMmIxNWQzZmY2YWNjOWRjNjVhNDJmZjYxOGE5ZDRhYzBiN2Ez
-    ZWVmNTE4ZDI2N2U3ZjdhNDE3MWQ4ZWRhODI1ZDk3OTI4YjljMWRhMDQ1MDlm
-    MWVjMDc1ZWY3YWEwOTQzNTI1MTQ3NTNjYzBkMDA2OWEwZGQ4ZDk=
+    Mjk4YzFiNzI5ZjkwYmNiNDJhY2ZhZWU2Y2FkNGRhOWViOGNhYmMwMjk2NzA1
+    ZDcxNWU3ZjYzZTY1NDZiYzhjYWEwYjczNzQ2YjZiYTI1ZWQwZDRmYjcxY2Yw
+    NjhkZGQ2NzZmYzU0MzlhZDMxYzE2NGY3ZDJhNmRlNjhhNjVhZTQ=

data/cookbook-release.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cookbook-release'
-  spec.version       = '1.1.3'
+  spec.version       = '1.1.4'
   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/changelog.rb

@@ -34,12 +34,20 @@ module CookbookRelease
       result.join("\n")
     end
 
+    def markdown
+      changelog.map do |c|
+        full_body ||= @opts[:expand_major] && c.major?
+        full_body ||= @opts[:expand_risky] && c.risky?
+        full_body ||= @opts[:expand_commit] && (c[:subject] =~ @opts[:expand_commit] || c[:body] =~ @opts[:expand_commit])
+        c.to_s_markdown(full_body)
+      end.join("\n")
+    end
+
     private
 
     def changelog
       ref = ENV['RELEASE_BRANCH'] || 'origin/master'
       @git.compute_changelog(ref)
     end
-
   end
 end

data/lib/cookbook-release/commit.rb

@@ -67,5 +67,10 @@ module CookbookRelease
       result.join("\n")
     end
 
+    def to_s_markdown(full)
+      result = "*#{self[:hash]}* _#{self[:author]}_ `#{self[:subject]}`"
+      result << "\n```\n#{self[:body]}\n```" if full && self[:body]
+      result
+    end
   end
 end

data/lib/cookbook-release.rb

@@ -27,6 +27,12 @@ module CookbookRelease
           end
           puts html
         end
+
+        desc 'Display markdown changelog between branches'
+        task 'changelog:markdown' do
+          git = GitUtilities.new
+          puts Changelog.new(git, opts).markdown
+        end
       end
     end
 

data/spec/changelog_spec.rb

@@ -17,4 +17,31 @@ describe CookbookRelease::Changelog do
     end
   end
 
+  describe '.md' do
+    it 'add formatting' do
+      expect(git).to receive(:compute_changelog).and_return(
+        [
+          CookbookRelease::Commit.new(
+            hash: '123456',
+            subject: 'hello',
+            author: 'John Doe')
+        ]
+      )
+      changelog = CookbookRelease::Changelog.new(git)
+      expect(changelog.markdown).to eq('*123456* _John Doe_ `hello`')
+    end
+    it 'expand body' do
+      expect(git).to receive(:compute_changelog).and_return(
+        [
+          CookbookRelease::Commit.new(
+            hash: '654321',
+            subject: '[Risky] hello',
+            author: 'John Doe',
+            body: 'Some Men Just Want to Watch the World Burn')
+        ]
+      )
+      changelog = CookbookRelease::Changelog.new(git, expand_risky: true)
+      expect(changelog.markdown).to include("\n```\nSome Men Just Want")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic