cookbook-release 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef411df78e2425fbcb6f48fab32e57bcbebacabc
-  data.tar.gz: 91665c7ad89ba2fa63a8f586298214edbe8efc91
+SHA256:
+  metadata.gz: 57e2bcc2990d45377c96a8b34b77103cff548f5ca7eaed951e946f0d9303cfa3
+  data.tar.gz: 89ddf7b79d5999cfd47d2ad6350d80801e3b6de8b2d048a8ee78516c8945585b
 SHA512:
-  metadata.gz: 4fa616dc27a0e09e72c1ce1a4c85dc9462ccfedaa771e36267ef3013434da2b8b347ecce296af6c6d340e7ff5eefcb46da9f5e784ec9c469b57ea85aeb825b80
-  data.tar.gz: 95fdeae091d01fb3db067cf525cc7beb3cc1c55c2cf0517b360b2e719549dd0be950f703ba063f550e911db795693129ed4ac8f263cff0c8df0e228533a30dd7
+  metadata.gz: 059852351bb66fd6369180260c30e59764252cd78847c40190eaca36e97375dea5fbb97e332a7518f8d57c24e7d31f41ec410a7a6d7b79ee01741dc0080f9cf2
+  data.tar.gz: c9060e027e88bce6a27fdf280fb3684360e64e94ddd4d6b7292f5e2b3e34cc40b1952242944f5d069db9493cb1888d5343bd8520d91208069db5935451cd341e

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
-- 2.4.0
+  - 2.4.0
+before_install:
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do gem install bundler -v 1.15.4
 deploy:
   provider: rubygems
   api_key:

data/cookbook-release.gemspec

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

@@ -12,14 +12,20 @@ module CookbookRelease
 
     class RepoTask < ::Rake::TaskLib
       def initialize(opts = {}, &html_block)
-        desc "Display raw changelog between branches"
-        task "changelog:raw" do
+        desc 'Display raw changelog between branches'
+        task 'changelog:raw' do
           git = GitUtilities.new
           puts Changelog.new(git, opts).raw
         end
 
-        desc "Display html changelog between branches"
-        task "changelog:html" do
+        desc 'Display raw changelog between branches with risky commits on top'
+        task 'changelog:raw_priority' do
+          git = GitUtilities.new
+          puts Changelog.new(git, opts).raw_priority
+        end
+
+        desc 'Display html changelog between branches'
+        task 'changelog:html' do
           git = GitUtilities.new
           html = Changelog.new(git, opts).html
           if block_given?
@@ -28,11 +34,27 @@ module CookbookRelease
           puts html
         end
 
+        desc 'Display html changelog between branches with risky commits on top'
+        task 'changelog:html_priority' do
+          git = GitUtilities.new
+          html = Changelog.new(git, opts).html_priority
+          if block_given?
+            html = html_block.call(html)
+          end
+          puts html
+        end
+
         desc 'Display markdown changelog between branches'
         task 'changelog:markdown' do
           git = GitUtilities.new
           puts Changelog.new(git, opts).markdown
         end
+
+        desc 'Display markdown changelog between branches with risky commits on top'
+        task 'changelog:markdown_priority' do
+          git = GitUtilities.new
+          puts Changelog.new(git, opts).markdown_priority
+        end
       end
     end
 
@@ -44,8 +66,8 @@ module CookbookRelease
 
       def define_tasks(namespaced)
 
-        desc "Prepare cookbook release and push tag to git"
-        task "release!" do
+        desc 'Prepare cookbook release and push tag to git'
+        task 'release!' do
           opts = {
             no_prompt: ENV['NO_PROMPT'],
             category: ENV['COOKBOOK_CATEGORY'],
@@ -54,22 +76,22 @@ module CookbookRelease
           Release.new(git, opts).release!
         end
 
-        desc "Suggest new release version"
-        task "release:suggest_version" do
+        desc 'Suggest new release version'
+        task 'release:suggest_version' do
           git = GitUtilities.new
           release = Release.new(git)
           release.display_suggested_version(*release.new_version)
         end
 
-        desc "Display last released version"
-        task "release:version" do
+        desc 'Display last released version'
+        task 'release:version' do
           git = GitUtilities.new
           release = Release.new(git)
           puts release.last_release
         end
 
-        desc "Display changelog since last release"
-        task "release:changelog" do
+        desc 'Display changelog since last release'
+        task 'release:changelog' do
           git = GitUtilities.new
           release = Release.new(git)
           release.display_changelog(release.new_version.first)

data/lib/cookbook-release/changelog.rb

@@ -7,6 +7,11 @@ module CookbookRelease
       short_sha: true
     }
 
+    RISKY = 'RISKY/BREAKING (details below):'
+    NO_RISKY = 'NO RISKY/BREAKING COMMITS. READ FULL CHANGELOG.'
+    FULL = 'Full changelog:'
+    DETAILS = 'Details of risky commits:'
+
     def initialize(git, opts = {})
       @git = git
       @opts = DEFAULT_OPTS.merge(opts)
@@ -16,6 +21,18 @@ module CookbookRelease
       changelog.map(&:to_s_oneline)
     end
 
+    def raw_priority
+      risky_commits = changelog.select { |c| c.risky? || c.major? }
+      result = []
+      if risky_commits.any?
+        result << "#{RISKY}\n" << risky_commits.map(&:to_s_oneline).join("\n") << "\n"
+      else
+        result << "#{NO_RISKY}\n\n"
+      end
+      result << "#{FULL}\n"
+      result << changelog.map(&:to_s_oneline).join("\n")
+    end
+
     def html
       result = []
       result << <<-EOH
@@ -35,6 +52,31 @@ module CookbookRelease
       result.join("\n")
     end
 
+    def html_priority
+      risky_commits = changelog.select { |c| c.risky? || c.major? }
+      result = []
+      result << <<-EOH
+<html>
+  <body>
+      EOH
+      if risky_commits.any?
+        result << "    <p>#{RISKY}</p>\n" << risky_commits.map { |c| c.to_s_html(false) }.map {|c| "    <p>#{c}</p>"}.join("\n")
+      else
+        result << "    <p>#{NO_RISKY}</p>\n\n"
+      end
+      result << "    <p>#{FULL}</p>\n"
+      result << changelog.map { |c| c.to_s_html(false) }.map { |c| "    <p>#{c}</p>" }.join("\n")
+      if risky_commits.any?
+        result << "\n<p>#{DETAILS}</p>\n"
+        result << risky_commits.map { |c| c.to_s_html(true) }.map { |c| "    <p>#{c}</p>" }.join("\n")
+      end
+      result <<  <<-EOH
+  </body>
+</html>
+      EOH
+      result.join("\n")
+    end
+
     def markdown
       changelog.map do |c|
         full_body ||= @opts[:expand_major] && c.major?
@@ -44,6 +86,23 @@ module CookbookRelease
       end.join("\n")
     end
 
+    def markdown_priority
+      risky_commits = changelog.select { |c| c.risky? || c.major? }
+      result = []
+      if risky_commits.any?
+        result << "*#{RISKY}*\n" << risky_commits.map { |c| c.to_s_markdown(false) }.join("\n") << "\n"
+      else
+        result << "*#{NO_RISKY}*\n\n"
+      end
+      result << "*#{FULL}*\n"
+      result << changelog.map { |c| c.to_s_markdown(false) }.join("\n")
+      if risky_commits.any?
+        result << "\n#{DETAILS}\n"
+        result << risky_commits.map { |c| c.to_s_markdown(true) }.join("\n")
+      end
+      result
+    end
+
     private
 
     def changelog

data/lib/cookbook-release/commit.rb

@@ -59,7 +59,7 @@ module CookbookRelease
       if full && self[:body]
         result << <<-EOH
 <pre>
-#{self[:body]}
+#{strip_change_id(self[:body])}
 </pre>
         EOH
       end
@@ -76,8 +76,14 @@ module CookbookRelease
         result << "_#{self[:author]} <#{self[:email]}>_"
       end
       result << " `#{self[:subject]}`"
-      result << "\n```\n#{self[:body]}\n```" if full && self[:body]
+      result << "\n```\n#{strip_change_id(self[:body])}```" if full && self[:body]
       result
     end
+
+    private
+
+    def strip_change_id(body)
+      body.each_line.reject {|l| l.start_with?('Change-Id') }.join
+    end
   end
 end

data/lib/cookbook-release/release.rb

@@ -86,7 +86,13 @@ module CookbookRelease
     end
 
     def release!
-      new_version = prepare_release
+
+      new_version = begin
+                      prepare_release
+                    rescue ExistingRelease
+                      raise unless ENV['COOKBOOK_RELEASE_SILENT_FAIL']
+                      exit 0
+                    end
       begin
         git.tag(new_version)
         display_changelog(new_version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Provide primitives (and rake tasks) to release a cookbook