cookbook-release 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0438ab5b35c35ac88fbc7f99b58e43882fe7fc2cb2d4299ed1d609cd0b702d4d'
-  data.tar.gz: 7390fd2694a610a5ac4fe0b81f4fdc6e7cbee9e4381d96f7b0ff9573f7c70cd0
+  metadata.gz: e4b745baf2a010f96d7bd64dea31e9275f5d070cf871d738f0f1e9a6271a7554
+  data.tar.gz: 84360fb9192231adc36ef0e1031b7a4ca2cac799848a08efb6c270b7daa7943a
 SHA512:
-  metadata.gz: 27ff8bf88d9e8453cfa5a46b45dd74e59ac5a8ba5e18b4b988b4acdf2a6b7d7b4e29c057ad73e402fcec7065b1662d5b8003496e100ce8592787da8441ab2a5f
-  data.tar.gz: 6e44f603a8aa0801968d3eea30574ef3b0c8751cb98c80b2d9f57f2511e80414d0f1cf978b4688105a58140c3e8123eb1437eeed355bb2507f85b5b53c181e23
+  metadata.gz: 9278ffaf0ed6073d59b733e1c79c39a80b199874ba3f94318801805ba1f70508b019ae359926272183f862e0702c4d8596f98a095f10624592c0c2eb28ffd972
+  data.tar.gz: d08177747f17e1fb1c5a9527bd75b55be0bf9f9446e9e18529bf3d2121ed77427dbedd22d49d0b074f8d0e2d56a12dbff8d365ffcda4c5dbea7109fb43eab9ff

data/cookbook-release.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cookbook-release'
-  spec.version       = '1.5.1'
+  spec.version       = '1.6.0'
   spec.authors       = ['Grégoire Seux']
   spec.email         = 'g.seux@criteo.com'
   spec.summary       = 'Provide primitives (and rake tasks) to release a cookbook'
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'semantic'
   spec.add_dependency 'highline'
   spec.add_dependency 'mixlib-shellout'
-  spec.add_dependency 'chef', '>= 12.18.31'
+  # TODO: support Chef 17 and leverage knife gem at some point
+  spec.add_dependency 'chef', '>= 12.18.31', '< 17.0' # knife code has been moved to dedicated gem starting with Chef 17
   spec.add_dependency 'git-ng' # see https://github.com/schacon/ruby-git/issues/307
   spec.add_dependency 'unicode-emoji'
 

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

@@ -24,6 +24,9 @@ module CookbookRelease
     end
 
     def self.find_root(dir = Dir.pwd)
+      # Do not consider given dir as part of the git repo if not in git hierarchy or dir is not tracked
+      return if ::Mixlib::ShellOut.new('git ls-files --error-unmatch .', cwd: dir).run_command.error?
+
       cmd = Mixlib::ShellOut.new("git rev-parse --show-toplevel", cwd: dir)
       cmd.run_command
       cmd.error? ? nil : cmd.stdout.chomp

data/spec/git_spec.rb

@@ -45,9 +45,18 @@ describe CookbookRelease::GitUtilities do
       FileUtils.rm_rf(tmp)
     end
 
-    it 'finds repo\'s root from subdir' do
+    it 'do not finds repo\'s root from untracked subdir' do
       subdir = 'cookbooks/mycookbook'
       FileUtils.mkdir_p(subdir)
+      expect(CookbookRelease::GitUtilities.find_root(subdir)).to be nil
+    end
+
+    it 'finds repo\'s root from tracked subdir' do
+      subdir = 'cookbooks/mycookbook'
+      tracked_file = ::File.join(subdir, 'tracked_file')
+      FileUtils.mkdir_p(subdir)
+      FileUtils.touch(tracked_file)
+      ::Mixlib::ShellOut.new("git add '#{tracked_file}'").run_command
       expect(CookbookRelease::GitUtilities.find_root(subdir)).to eq(Dir.pwd)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -59,6 +59,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.18.31
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.18.31
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17.0'
 - !ruby/object:Gem::Dependency
   name: git-ng
   requirement: !ruby/object:Gem::Requirement