cookbook-release 1.1.5 → 1.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI4MmYxOTQ2MTZkMTBjYzZkMDlhMGNiNzk2NGFlZmU4Y2NmMWY2NQ==
+    NjE4ODBmMzczNjhkNzcyNGZlZTJlYjZjYTZjYzU5ZDlmNWE0NWYyNw==
   data.tar.gz: !binary |-
-    MTRkNTc4MmIyMWRjN2VmM2U2M2I3ZGJlNWVhZGI0MWYwNjZjYjhmMw==
+    YmZlZmI2ZTUzN2M5ZGI0ZmI5ZTI2NGM4YWQyZTY2ZjczNzEyODQyNg==
 SHA512:
   metadata.gz: !binary |-
-    YzVkNzZmZjNmYjdjNDg2Y2M1ZjFmNDU4ODJlMTliM2ZkOGE4MTIxMTM1NzNm
-    MGJmZTU4NmFiMTRiNWJjNjhkOWFjNTI0MDFjMmMyZGNmM2VlNjU0MTFlMDg0
-    ZDEyNDBhY2JkMmIyNGRkZDU4Yjk2NzJmMjZhMjhmMzQxOTRkMDI=
+    MzY5NWU3ZjhjZDc0MmMyMTM3MGQ0NTMxNDFlMTg3Njk2MjlhYjI1ODJhNDE2
+    YWQyZjRjYmFmYWU3MzIzYTc4OTAzNmU0OGE0NDY3NWIwZmZkNTY2ZTUxNjRm
+    NWJhOGJjOTViYjc0NTY5Nzk3NWFkOTNmMDdhMTc3NjhkOWNlNzQ=
   data.tar.gz: !binary |-
-    YzhiODZlYzc4OTllZmNhYzk3NTAyYWZkMzg3YzJiYzlkNWRjMjk2ZTExMzk5
-    YWUxMDA3OTJmZmZmMzAyNjhmMzE5MzUzNjI4OWM5NmI2MTFiMGRiNDYwNDk3
-    NGFkMDRhNWZkODUxMzY2Y2Q2OWFjNzY4MmY5ZDIxNGE4ZThlMzg=
+    YjZkY2JiMjdhOTExZmFmMGFlMzdjZTQwNDg4YWY1YzYyYzI5ZGU2MDQzMjk0
+    OTBhZTk1MmRmOTQzZmQ2Yjc2ZjgyMTk5MGJmOTViNDBmZTIyZjVkYmFkMmY5
+    MTFhZGVlZGI0MjIyNTI4MmU2NTQzZGNjOWEzZmNkMDE4OTU3YmQ=

data/cookbook-release.gemspec

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

@@ -4,6 +4,7 @@ module CookbookRelease
     DEFAULT_OPTS = {
       expand_major: true,
       expand_risky: true,
+      short_sha: true
     }
 
     def initialize(git, opts = {})
@@ -47,7 +48,7 @@ module CookbookRelease
 
     def changelog
       ref = ENV['RELEASE_BRANCH'] || 'origin/master'
-      @git.compute_changelog(ref)
+      @git.compute_changelog(ref, @opts[:short_sha])
     end
   end
 end

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

@@ -19,7 +19,7 @@ module CookbookRelease
     end
 
     def self.git?(dir)
-      @g.index.readable?
+      !@g.nil?
     end
 
     def reset_command(new_version)
@@ -62,13 +62,13 @@ module CookbookRelease
       last.to_version
     end
 
-    def compute_changelog(since)
+    def compute_changelog(since, short_sha = true)
       commits = @g.log.between(since, 'HEAD').map do |commit|
         message = commit.message.lines.map(&:chomp).compact.delete_if(&:empty?)
         Commit.new(
           author: commit.author.name,
           subject: message.delete_at(0),
-          hash: commit.sha,
+          hash: short_sha ? commit.sha[0,7] : commit.sha,
           body: message.empty? ? nil : message.join('\n')
         )
       end.reject { |commit| commit[:subject] =~ /^Merge branch (.*) into/i }

data/spec/git_spec.rb

@@ -12,6 +12,8 @@ describe CookbookRelease::GitUtilities do
     git init .
     git config user.email "you@example.com"
     git config user.name Hello
+    git commit --allow-empty -m 'none'
+    git tag 1.0.0
     EOH
     cmds.split("\n").each do |cmd|
       cmd = Mixlib::ShellOut.new(cmd)
@@ -65,10 +67,6 @@ describe CookbookRelease::GitUtilities do
   describe '.compute_last_release' do
     it 'finds the last release' do
       cmds = <<-EOH
-      touch toto
-      git add toto
-      git commit -m'none'
-      git tag 1.0.0
       git commit --allow-empty -m 'none'
       git tag 1.2.43
       git commit --allow-empty -m 'none'
@@ -88,10 +86,6 @@ describe CookbookRelease::GitUtilities do
   describe '.compute_changelog' do
     it 'find the proper changelog' do
       cmds = <<-EOH
-      touch toto
-      git add toto
-      git commit -m'none'
-      git tag 1.0.0
       git commit --allow-empty -m 'A commit'
       git commit --allow-empty -m 'Another commit'
       git commit --allow-empty -m 'A third one'
@@ -109,10 +103,6 @@ describe CookbookRelease::GitUtilities do
 
     it 'parse correctly commits' do
       cmds = <<-EOH
-      touch toto
-      git add toto
-      git commit -m'none'
-      git tag 1.0.0
       git commit --allow-empty -m "subject" -m "body"
       git commit --allow-empty -m "without body"
       EOH
@@ -128,5 +118,23 @@ describe CookbookRelease::GitUtilities do
       expect(changelog[1][:body]).to eq('body')
       expect(changelog[0][:body]).to be_nil
     end
+
+    it 'can use short sha' do
+      cmd = Mixlib::ShellOut.new('git commit --allow-empty -m "subject"')
+      cmd.run_command
+      cmd.error!
+
+      changelog = git.compute_changelog('HEAD~1', true)
+      expect(changelog[0][:hash].size).to eq(7)
+    end
+
+    it 'can use long sha' do
+      cmd = Mixlib::ShellOut.new('git commit --allow-empty -m "subject"')
+      cmd.run_command
+      cmd.error!
+
+      changelog = git.compute_changelog('HEAD~1', false)
+      expect(changelog[0][:hash].size).to eq(40)
+    end
   end
 end

metadata

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