cookbook-release 1.1.4 → 1.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTI3MDYzODBjYjM4MzY0YWZkODczMmI5OTEyZDZjMTRkYTgyYjZhYw==
+    NTI4MmYxOTQ2MTZkMTBjYzZkMDlhMGNiNzk2NGFlZmU4Y2NmMWY2NQ==
   data.tar.gz: !binary |-
-    ODZkZjMzMzE5MzM0ZTliYzAyODM4YjUyNDlkZTUzMGMxM2Y2MWY0ZA==
+    MTRkNTc4MmIyMWRjN2VmM2U2M2I3ZGJlNWVhZGI0MWYwNjZjYjhmMw==
 SHA512:
   metadata.gz: !binary |-
-    MTE4YTk0YTY0MjQ3M2IwNTU5NzkxYjM3NGZmZjBjMjg5NmU1ZTgyNGNiYjA3
-    YzIyYzZjNWU0NjAzOWYzZGIwYjBmNTNhMDg0ZjY0MGQyODhlNGI5M2E2NjE4
-    MmU3MGRiNjNlYmVmYzJkMGQ2NzA1NTAxMzI5Yzk2NjVjNTc5OTY=
+    YzVkNzZmZjNmYjdjNDg2Y2M1ZjFmNDU4ODJlMTliM2ZkOGE4MTIxMTM1NzNm
+    MGJmZTU4NmFiMTRiNWJjNjhkOWFjNTI0MDFjMmMyZGNmM2VlNjU0MTFlMDg0
+    ZDEyNDBhY2JkMmIyNGRkZDU4Yjk2NzJmMjZhMjhmMzQxOTRkMDI=
   data.tar.gz: !binary |-
-    Mjk4YzFiNzI5ZjkwYmNiNDJhY2ZhZWU2Y2FkNGRhOWViOGNhYmMwMjk2NzA1
-    ZDcxNWU3ZjYzZTY1NDZiYzhjYWEwYjczNzQ2YjZiYTI1ZWQwZDRmYjcxY2Yw
-    NjhkZGQ2NzZmYzU0MzlhZDMxYzE2NGY3ZDJhNmRlNjhhNjVhZTQ=
+    YzhiODZlYzc4OTllZmNhYzk3NTAyYWZkMzg3YzJiYzlkNWRjMjk2ZTExMzk5
+    YWUxMDA3OTJmZmZmMzAyNjhmMzE5MzUzNjI4OWM5NmI2MTFiMGRiNDYwNDk3
+    NGFkMDRhNWZkODUxMzY2Y2Q2OWFjNzY4MmY5ZDIxNGE4ZThlMzg=

data/cookbook-release.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cookbook-release'
-  spec.version       = '1.1.4'
+  spec.version       = '1.1.5'
   spec.authors       = ['Grégoire Seux']
   spec.email         = 'g.seux@criteo.com'
   spec.summary       = 'Provide primitives (and rake tasks) to release a cookbook'
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline'
   spec.add_dependency 'mixlib-shellout'
   spec.add_dependency 'chef'
+  spec.add_dependency 'git'
 
 
   spec.add_development_dependency 'rspec'

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

@@ -2,6 +2,7 @@ require 'semantic'
 require 'semantic/core_ext'
 require 'mixlib/shellout'
 require 'highline/import'
+require 'git'
 
 module CookbookRelease
   class GitUtilities
@@ -10,13 +11,15 @@ module CookbookRelease
 
     def initialize(options={})
       @tag_prefix = options[:tag_prefix] || ''
+      cwd = options[:cwd] || Dir.pwd
       @shellout_opts = {
-        cwd: options[:cwd]
+        cwd: cwd
       }
+      @g = Git.open(cwd)
     end
 
     def self.git?(dir)
-      File.directory?(::File.join(dir, '.git'))
+      @g.index.readable?
     end
 
     def reset_command(new_version)
@@ -59,32 +62,20 @@ module CookbookRelease
       last.to_version
     end
 
-    # These string are used to split git commit summary
-    # it just needs to be unlikely in a commit message
-    MAGIC_SEP        = '@+-+@+-+@+-+@'
-    MAGIC_COMMIT_SEP = '@===@===@===@'
-
     def compute_changelog(since)
-      log_cmd = Mixlib::ShellOut.new("git log --pretty=\"tformat:%an <%ae>#{MAGIC_SEP}%s#{MAGIC_SEP}%h#{MAGIC_SEP}%b#{MAGIC_COMMIT_SEP}\" #{since}..HEAD", @shellout_opts)
-      log_cmd.run_command
-      log_cmd.error!
-      log = log_cmd.stdout
-      log.split(MAGIC_COMMIT_SEP).map do |entry|
-        next if entry.chomp == ''
-        author, subject, hash, body = entry.chomp.split(MAGIC_SEP).map(&:chomp)
-        Commit.new({
-          author: author,
-          subject: subject,
-          hash: hash,
-          body: body
-        })
-      end.compact.reject { |commit| commit[:subject] =~ /^Merge branch (.*) into/i }
+      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,
+          body: message.empty? ? nil : message.join('\n')
+        )
+      end.reject { |commit| commit[:subject] =~ /^Merge branch (.*) into/i }
     end
 
     def tag(version)
-      cmd = Mixlib::ShellOut.new("git tag #{@tag_prefix}#{version}", @shellout_opts)
-      cmd.run_command
-      cmd.error!
+      @g.add_tag("#{@tag_prefix}#{version}")
     end
 
     def choose_remote

data/spec/git_spec.rb

@@ -106,5 +106,27 @@ describe CookbookRelease::GitUtilities do
       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
+      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
+      cmds.split("\n").each do |cmd|
+        cmd = Mixlib::ShellOut.new(cmd)
+        cmd.run_command
+        cmd.error!
+      end
+
+      changelog = git.compute_changelog('1.0.0')
+      expect(changelog.size).to eq(2)
+      expect(changelog[1][:subject]).to eq('subject')
+      expect(changelog[1][:body]).to eq('body')
+      expect(changelog[0][:body]).to be_nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement