cookbook-release 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b086128b5edf30914681275eaae9561b8f88becde0c7a145504a67d75f3c54
-  data.tar.gz: 3db6bc505828795a5ca7af695fcd121dad92fe2470b3f28c1de96e750d238169
+  metadata.gz: d48e42c04f5d4ac5f465c53eebb18921398ba5212f39cf0fa6207e6377e3b162
+  data.tar.gz: 684da15c491938a19b473ddcd997d428830631c11a0a174b70dcf02bf1dbba9d
 SHA512:
-  metadata.gz: fd9f54971f71eedba8fce9a35f9b142fd83cb73959333614e36075a5b4f2ec51560da11f7eda6edb7769b5044d379afe6ee1bfa0c425cac02b41f7e9a53b0abe
-  data.tar.gz: 5fcfe52e2d656c3b372516b5ff92f7d14ef3679032372c514b29463230e17052caa40787bd22a3e16b974deadf63d02b7d1fd3ea8ee9923e03f9d905a2c3c67c
+  metadata.gz: 2a2455d339262c0e83172ee37af3ff81f224139915022a97dcbbbac2ea8d8b45e754af7dcf7a913c612418d63614848ce7c0fc6d957bddddb77cb01515f66eef
+  data.tar.gz: 4fd577bd939752c1ddf96d003f9c521b2c186b2e3ce9333046cfb1a0d5c2c3c8b0e2415d26aa4183955ed1ab0625559755e1b13cc783099224985cb3b4a2d528

data/cookbook-release.gemspec

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

@@ -56,6 +56,12 @@ module CookbookRelease
           git = GitUtilities.new('sub_dir': args['sub_dir'])
           puts Changelog.new(git, opts).markdown_priority
         end
+
+        desc 'Display markdown changelog between branches with risky commits on top and non-node-only changes separated'
+        task 'changelog:markdown_priority_nodes', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
+          puts Changelog.new(git, opts).markdown_priority_nodes
+        end
       end
     end
 

data/lib/cookbook-release/changelog.rb

@@ -4,11 +4,13 @@ module CookbookRelease
     DEFAULT_OPTS = {
       expand_major: true,
       expand_risky: true,
+      separate_nodes: true,
       short_sha: true
     }
 
     RISKY = 'RISKY/BREAKING (details below):'
     NO_RISKY = 'NO RISKY/BREAKING COMMITS. READ FULL CHANGELOG.'
+    NON_NODES_ONLY = 'Non-risky/major, Non-node-only commits'
     FULL = 'Full changelog:'
     DETAILS = 'Details of risky commits:'
 
@@ -42,6 +44,7 @@ module CookbookRelease
       result << changelog.map do |c|
         full_body ||= @opts[:expand_major] && c.major?
         full_body ||= @opts[:expand_risky] && c.risky?
+        full_body ||= @opts[:separate_nodes] && c.nodes_only?
         full_body ||= @opts[:expand_commit] && (c[:subject] =~ @opts[:expand_commit] || c[:body] =~ @opts[:expand_commit])
         c.to_s_html(full_body)
       end.map { |c| "    <p>#{c}</p>" }
@@ -81,6 +84,8 @@ module CookbookRelease
       changelog.map do |c|
         full_body ||= @opts[:expand_major] && c.major?
         full_body ||= @opts[:expand_risky] && c.risky?
+        full_body ||= @opts[:separate_nodes] && c.nodes_only?
+        full_body ||= @opts[:expand_commit] && (c[:subject] =~ @opts[:expand_commit] || c[:body] =~ @opts[:expand_commit])
         full_body ||= @opts[:expand_commit] && (c[:subject] =~ @opts[:expand_commit] || c[:body] =~ @opts[:expand_commit])
         c.to_s_markdown(full_body)
       end.join("\n")
@@ -103,6 +108,28 @@ module CookbookRelease
       result
     end
 
+    def markdown_priority_nodes
+      cl = changelog
+      risky_commits = cl.select { |c| c.risky? || c.major? }
+      not_nodes_only_commits = cl.reject { |c| c.nodes_only? || 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
+      if not_nodes_only_commits.any?
+        result << "*#{NON_NODES_ONLY}*\n" << not_nodes_only_commits.map { |c| c.to_s_markdown(false) }.join("\n") << "\n"
+      end
+      result << "*#{FULL}*\n"
+      result << cl.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

@@ -34,6 +34,10 @@ module CookbookRelease
       !!(self[:subject] =~ /\[risky\]/i)
     end
 
+    def nodes_only?
+      self[:nodes_only]
+    end
+
     def color
       case true
       when major?

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

@@ -72,7 +72,10 @@ module CookbookRelease
           subject: message.delete_at(0),
           hash: short_sha ? commit.sha[0,7] : commit.sha,
           body: message.empty? ? nil : message.join("\n"),
-          is_merge_commit: commit.parents.length > 1
+          is_merge_commit: commit.parents.length > 1,
+          nodes_only: @g.diff(commit.sha, "#{commit.sha}~1").name_status.reject do |path, change_type|
+            path.include?('nodes/') && ['A', 'D'].include?(change_type) # basic node additions or deletions only
+          end.count.zero?
         )
       end.reject { |commit| commit[:is_merge_commit] }
     end

data/spec/changelog_spec.rb

@@ -55,5 +55,40 @@ describe CookbookRelease::Changelog do
         expect(changelog.markdown).to start_with('*654321* @j.doe `[Risky] hello`')
       end
     end
+    context 'Separates risky and non-risky+non-nodes' do
+      let(:commits) do
+        [
+          CookbookRelease::Commit.new(
+            hash: '654321',
+            subject: 'hello',
+            author: 'John Doe',
+            email: 'j.doe@nobody.com',
+            body: 'New Men Just Want to Watch the World Burn',
+            nodes_only: false),
+          CookbookRelease::Commit.new(
+            hash: '654321',
+            subject: '[Risky] hello',
+            author: 'John Doe',
+            email: 'j.doe@nobody.com',
+            body: 'Some Men Just Want to Watch the World Turn',
+            nodes_only: true),
+          CookbookRelease::Commit.new(
+            hash: '654321',
+            subject: 'hello only nodes',
+            author: 'John Doe',
+            email: 'j.doe@nobody.com',
+            body: 'Old Men Just Want to Watch the World Learn',
+            nodes_only: true)
+        ]
+      end
+
+      it 'expands the body with non-risky+non-nodes' do
+        expect(git).to receive(:compute_changelog).and_return(commits)
+        changelog = CookbookRelease::Changelog.new(git, expand_risky: true, nodes_only: true)
+        expect(changelog.markdown_priority_nodes.join('')).to include(
+          "\n*Non-risky/major, Non-node-only commits*\n*654321* _John Doe <j.doe@nobody.com>_ `hello`\n*Full"
+        )
+      end
+    end
   end
 end

data/spec/git_spec.rb

@@ -183,5 +183,32 @@ git tag 12.34.56
       changelog = git.compute_changelog('HEAD~1', false)
       expect(changelog[0][:hash].size).to eq(40)
     end
+
+    it 'detects node-only commits' do
+      cmds = <<-EOH
+      mkdir -p nodes/preprod
+      echo "hello first" > nodes/preprod/tata.rb
+      git add nodes/preprod/tata.rb
+      git commit -m "hello there"
+      echo "hello second" > nodes/preprod/tata.rb
+      git add nodes/preprod/tata.rb
+      git commit -m "hello there modify"
+      mkdir -p toto
+      echo "hello" > toto/titi.rb
+      git add toto/titi.rb
+      git commit -m "subject" -m "body" -m "line2"
+      EOH
+      cmds.split("\n").each do |cmd|
+        cmd = Mixlib::ShellOut.new(cmd)
+        cmd.run_command
+        cmd.error!
+      end
+
+      git = CookbookRelease::GitUtilities.new
+      changelog = git.compute_changelog('HEAD~3')
+      expect(changelog[0][:nodes_only]).to be false # Add a non-"nodes" file
+      expect(changelog[1][:nodes_only]).to be false # Modify a "nodes" file
+      expect(changelog[2][:nodes_only]).to be true # Add a "nodes" file
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-05-03 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.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provide primitives (and rake tasks) to release a cookbook