cookbook-release 1.3.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef411df78e2425fbcb6f48fab32e57bcbebacabc
-  data.tar.gz: 91665c7ad89ba2fa63a8f586298214edbe8efc91
+SHA256:
+  metadata.gz: 1d320d81b00bbc0568db5a101bf05cb341ffc23aed196a0d82a08a37c2921ccd
+  data.tar.gz: a66c146cce4f56369b30329f810d0de829abe85fcfe79f9760d0f445547d3a65
 SHA512:
-  metadata.gz: 4fa616dc27a0e09e72c1ce1a4c85dc9462ccfedaa771e36267ef3013434da2b8b347ecce296af6c6d340e7ff5eefcb46da9f5e784ec9c469b57ea85aeb825b80
-  data.tar.gz: 95fdeae091d01fb3db067cf525cc7beb3cc1c55c2cf0517b360b2e719549dd0be950f703ba063f550e911db795693129ed4ac8f263cff0c8df0e228533a30dd7
+  metadata.gz: a8d578db88940e2a0552cd74a203e104693ec1377b97db12fbf29ea15aed8e58e1fb1e967bc3226a8fb45a5689c24ab69d7826fd96a6935fdfc9d908b38f540d
+  data.tar.gz: febc04990a5974dd9305874332443155069f3f044d562fb5297b805345554b2ba62bac2b2e389bbde73bf396b1ef49b2caceddde7ec21b3501d4202d11aed7c7

data/.travis.yml

@@ -4,8 +4,9 @@ rvm:
 deploy:
   provider: rubygems
   api_key:
-    secure: nrEzm2dqWjyaa5ewApSonF+2D+y3PYwt9xaQC04d1NtbhQYyzX6wti3oatpMJI2gkcuuLjKrNHH/aLbKOGv7+Jj5BUJGOLixxhRdJyLWde/6cKCYVgIYPxeUtSJrRgyHAS2o8TDPjhWCT5oRwSkmhd+5D2JKjVqAycetbIzKWWvqScO09z0bF66bbKSfO1s44JwKjnUUW7W9tzrPvMPouBBoFtQ+dQVgxYLajgmjprVvIwzlHxgq/zP8YwL8i7vyRJFiQXyveSxZfBagN2qrUM72HWBPLLW4AeAdLDHYWon88GDU0p+cy2mVeSe67fBPVDopAEGij7MNJCBWV1/SRRKQcEb2U823+1GSB13OvaOGTn9rYsJP5zLKu77ATbHPi22nMfWOAzdEJJ+uFu9XW4nwUO/j79zPC1mEsRZDJlDrmTc4XZQJRKkCUjSl/J53vbdy4JQfos8B2V15tzx1baswQVPZuNiwuP4dOupI34FohJSVXQrsOoWVWVEX5Tfod6s3kpivW6lzwM68I2qXFa/4H8RPU2m0eVpfQslOO8TaGnbodudbQ1LSi/d5W6XWrMVqWGH910JG3jlJgHn5J7yQlI4VqnOpCjGsx/5xincuJZ7hBhcu5q5zcAGem7TrYSNkrx6neBYKmpZBHOWalIGw8wI9uViEsGQ6fayFee8=
+    secure: ylfB0GIaZxPfZ6/dSJIPujfSt3vxqVFg16lqTBq/2AAZ0qwKTZi9qeM/QZDLMX28vCXmTsYxHGepmyvv0PvJaKvy7E6YBzIKz1Y1vsEZFeAFrgIQq9cDvc4wIX2eFjI7N1ChyaRgi+YYK4BSVfKjYqGBfXk5Wyh7uqNEuWE7FzABV+RxXoHcNi+AhYkCX3NF80qNukXRtiB7XTQj6CP4Wd+Dm25iOUwx8/zNMce8Z8V3j2ysvR4Vtm/soDsr/+Z+27wIdP0VqwElV1FxtR9km8MIJhmzSsnzcvgqJpRmMvO6HLZFzwqnLBzCoPYJqm3K+uQSSfll5LbaNtixlBzIusgtGgm1UjQy1YDGkPexJd5K5CuC/LW78Y7Zrl3CeT34RDlICoztEjhJxFry3EvFxPT03lVQx5z5Fc55/u0hy3mBCiHbxHxAPJLMOtehfv35bzOS7Jv3+otBm/8jn9dXO2pJJdwxL9W2wrzljWkly4yemwceMvtMYf+xnf1zdTnMYoqkYGGl0KutbFL69w78w7BwTFQIhcJOO+g27C6V8vHtqU0U5JOgE/QNg3yWhzhQjgCpzQhmuO+Bcs3Jq2T/OcqTfwM6gufNe+Gq2TdEfeH5Y0WcRtTKJBVVQ4XWFtgONE1C1hNBFLyh7GNZDQQVYBT3c/MXeV5Q++rVJYOdSrw=
   gem: cookbook-release
   on:
     tags: true
     repo: criteo/cookbook-release
+  skip_cleanup: 'true'

data/README.md

@@ -77,4 +77,4 @@ require 'cookbook-release'
 CookbookRelease::Rake::RepoTask.new
 ```
 
-will allow to create tasks to generate html changelog between HEAD and master branch. It aims to make some changes more visible such as [Risky] tag (or any tag used for major changes).
+will allow to create tasks to generate html changelog between HEAD and master branch. It aims to make some changes more visible such as [Risky] tag (or any tag used for major changes). You may add a `sub_dir` parameter to restrict the scope of the changes to a sub-directory of the git root.

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.5'
   spec.authors       = ['Grégoire Seux']
   spec.email         = 'g.seux@criteo.com'
   spec.summary       = 'Provide primitives (and rake tasks) to release a cookbook'
@@ -22,8 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'semantic'
   spec.add_dependency 'highline'
   spec.add_dependency 'mixlib-shellout'
-  spec.add_dependency 'chef'
+  spec.add_dependency 'chef', '>= 12.18.31'
   spec.add_dependency 'git-ng' # see https://github.com/schacon/ruby-git/issues/307
+  spec.add_dependency 'unicode-emoji'
 
 
   spec.add_development_dependency 'rspec'

data/lib/cookbook-release.rb

@@ -12,15 +12,22 @@ module CookbookRelease
 
     class RepoTask < ::Rake::TaskLib
       def initialize(opts = {}, &html_block)
-        desc "Display raw changelog between branches"
-        task "changelog:raw" do
-          git = GitUtilities.new
+        desc 'Display raw changelog between branches'
+        task 'changelog:raw', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
           puts Changelog.new(git, opts).raw
         end
 
-        desc "Display html changelog between branches"
-        task "changelog:html" do
-          git = GitUtilities.new
+        desc 'Display raw changelog between branches with risky commits on top'
+        task 'changelog:raw_priority', [:sub_dir] do |_, args|
+          git = GitUtilities.new(args)
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
+          puts Changelog.new(git, opts).raw_priority
+        end
+
+        desc 'Display html changelog between branches'
+        task 'changelog:html', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
           html = Changelog.new(git, opts).html
           if block_given?
             html = html_block.call(html)
@@ -28,11 +35,33 @@ module CookbookRelease
           puts html
         end
 
+        desc 'Display html changelog between branches with risky commits on top'
+        task 'changelog:html_priority', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
+          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
+        task 'changelog:markdown', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
           puts Changelog.new(git, opts).markdown
         end
+
+        desc 'Display markdown changelog between branches with risky commits on top'
+        task 'changelog:markdown_priority', [:sub_dir] do |_, args|
+          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
 
@@ -44,8 +73,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 +83,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

@@ -4,9 +4,16 @@ 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:'
+
     def initialize(git, opts = {})
       @git = git
       @opts = DEFAULT_OPTS.merge(opts)
@@ -16,6 +23,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
@@ -25,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>" }
@@ -35,15 +55,81 @@ 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?
         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")
     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
+
+    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

@@ -1,3 +1,6 @@
+require 'forwardable'
+require 'unicode/emoji'
+
 module CookbookRelease
   class Commit
     extend Forwardable
@@ -34,6 +37,10 @@ module CookbookRelease
       !!(self[:subject] =~ /\[risky\]/i)
     end
 
+    def nodes_only?
+      self[:nodes_only]
+    end
+
     def color
       case true
       when major?
@@ -59,7 +66,7 @@ module CookbookRelease
       if full && self[:body]
         result << <<-EOH
 <pre>
-#{self[:body]}
+#{strip_change_id(self[:body])}
 </pre>
         EOH
       end
@@ -75,9 +82,24 @@ module CookbookRelease
       else
         result << "_#{self[:author]} <#{self[:email]}>_"
       end
-      result << " `#{self[:subject]}`"
-      result << "\n```\n#{self[:body]}\n```" if full && self[:body]
+      result << ' '
+      result << backtick_string(self[:subject])
+      result << "\n```\n#{strip_change_id(self[:body])}```" if full && self[:body]
       result
     end
+
+    def backtick_string(input)
+      s = input.gsub(/( )?(#{Unicode::Emoji::REGEX})( )?/, '` \2 `')
+               .gsub(/( )?``( )?/, '')
+      s += '`' unless s =~ /`$/
+      s = '`' + s unless s =~ /^`/
+      s
+    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/git-utilities.rb

@@ -12,6 +12,7 @@ module CookbookRelease
     def initialize(options={})
       @tag_prefix = options[:tag_prefix] || ''
       cwd = options[:cwd] || Dir.pwd
+      @sub_dir = options[:sub_dir] # if nil takes the cwd
       @shellout_opts = {
         cwd: cwd
       }
@@ -63,7 +64,7 @@ module CookbookRelease
     end
 
     def compute_changelog(since, short_sha = true)
-      @g.log(500).between(since, 'HEAD').map do |commit|
+      @g.log(500).object(@sub_dir).between(since, 'HEAD').map do |commit|
         message = commit.message.lines.map(&:chomp).compact.delete_if(&:empty?)
         Commit.new(
           author: commit.author.name,
@@ -71,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/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)

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/commit_spec.rb

@@ -23,4 +23,16 @@ describe CookbookRelease::Commit do
       expect(minor_change)   .not_to be_patch
     end
   end
+
+  describe '.to_s_markdown' do
+    it 'surrounds subject with backticks' do
+      commit = CookbookRelease::Commit.new(subject: 'This is a fix', hash: 'abcdef', author: 'Linus', email: 'linus@linux.org')
+      expect(commit.to_s_markdown(false)).to match(/`#{commit[:subject]}`/)
+    end
+
+    it 'properly handle emojis' do
+      commit = CookbookRelease::Commit.new(subject: 'This is a fix 🔧 and I love 🪐🚀', hash: 'abcdef', author: 'Linus', email: 'linus@linux.org')
+      expect(commit.to_s_markdown(false)).to match(/`This is a fix` 🔧 `and I love` 🪐🚀/)
+    end
+  end
 end

data/spec/git_spec.rb

@@ -123,16 +123,35 @@ git tag 12.34.56
         cmd.run_command
         cmd.error!
       end
-
       changelog = git.compute_changelog('1.0.0')
       expect(changelog.size).to eq(3)
       expect(changelog.map {|c| c[:subject]}).to contain_exactly('A commit', 'Another commit', 'A third one')
     end
 
-    it 'parse correctly commits' do
+    it 'shows only sub_dir commits' do
       cmds = <<-EOH
       git commit --allow-empty -m "subject" -m "body" -m "line2"
       git commit --allow-empty -m "without body"
+      mkdir -p subbie
+      echo "hello" > subbie/there
+      git add subbie/there
+      git commit -m "hello there"
+      EOH
+      sub_git = CookbookRelease::GitUtilities.new(sub_dir: 'subbie')
+      cmds.split("\n").each do |cmd|
+        cmd = Mixlib::ShellOut.new(cmd)
+        cmd.run_command
+        cmd.error!
+      end
+
+      changelog = sub_git.compute_changelog('1.0.0')
+      expect(changelog.size).to eq(1)
+    end
+
+    it 'parse correctly commits' do
+      cmds = <<-EOH
+      git commit --allow-empty --no-verify -m "subject" -m "body" -m "line2"
+      git commit --allow-empty --no-verify -m "without body"
       EOH
       cmds.split("\n").each do |cmd|
         cmd = Mixlib::ShellOut.new(cmd)
@@ -164,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.3.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.18.31
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.18.31
+- !ruby/object:Gem::Dependency
+  name: git-ng
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git-ng
+  name: unicode-emoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provide primitives (and rake tasks) to release a cookbook