cookbook-release 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 57e2bcc2990d45377c96a8b34b77103cff548f5ca7eaed951e946f0d9303cfa3
-  data.tar.gz: 89ddf7b79d5999cfd47d2ad6350d80801e3b6de8b2d048a8ee78516c8945585b
+SHA1:
+  metadata.gz: ef4f876c9097c92b3f1531e562f575d0f607fec7
+  data.tar.gz: 80314fba7113d9b8134aeb467c0973ad3cf3734f
 SHA512:
-  metadata.gz: 059852351bb66fd6369180260c30e59764252cd78847c40190eaca36e97375dea5fbb97e332a7518f8d57c24e7d31f41ec410a7a6d7b79ee01741dc0080f9cf2
-  data.tar.gz: c9060e027e88bce6a27fdf280fb3684360e64e94ddd4d6b7292f5e2b3e34cc40b1952242944f5d069db9493cb1888d5343bd8520d91208069db5935451cd341e
+  metadata.gz: f0e4ec14d3d2759e8cd7f357d06a0e5ecdd30d6b90c8b16afdf486bb60dca6586f0de89b6dd69e66085a71f52eee9a75d57ba35d57df67f36b9d654c8102689d
+  data.tar.gz: be592e21c15ec5022533001a738157d2afc91857238f3b9a3ee2b5c414c4a544c1ebae3bed21c197e6ca9c53b0b71bc381ef8a4dbe2ddcf9f80275e6817c5f2e

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 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

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.4.0'
+  spec.version       = '1.4.1'
   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

@@ -13,20 +13,21 @@ module CookbookRelease
     class RepoTask < ::Rake::TaskLib
       def initialize(opts = {}, &html_block)
         desc 'Display raw changelog between branches'
-        task 'changelog:raw' do
-          git = GitUtilities.new
+        task 'changelog:raw', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
           puts Changelog.new(git, opts).raw
         end
 
         desc 'Display raw changelog between branches with risky commits on top'
-        task 'changelog:raw_priority' do
-          git = GitUtilities.new
+        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' do
-          git = GitUtilities.new
+        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)
@@ -35,8 +36,8 @@ module CookbookRelease
         end
 
         desc 'Display html changelog between branches with risky commits on top'
-        task 'changelog:html_priority' do
-          git = GitUtilities.new
+        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)
@@ -45,14 +46,14 @@ module CookbookRelease
         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' do
-          git = GitUtilities.new
+        task 'changelog:markdown_priority', [:sub_dir] do |_, args|
+          git = GitUtilities.new('sub_dir': args['sub_dir'])
           puts Changelog.new(git, opts).markdown_priority
         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,

data/spec/git_spec.rb

@@ -123,12 +123,31 @@ 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 '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 -m "subject" -m "body" -m "line2"

metadata

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