cookbook-release 1.1.7 → 1.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWRhYzA1YzNlZTFkOTUyNWI1NGMwNGZmZTYzMjQzNzFkYTRkMTc0ZQ==
+    ZTI0NWQ2NzMwMDU5NDAyNDlhZDNhMzRkMzJlMmJhZjliMzU1NjM5NQ==
   data.tar.gz: !binary |-
-    NTM1OTE5YmU1MGU3YzYyNWM1NzUzYzJlNmZkYjI3ZTIzODYyMWU4Mg==
+    MTQ0NzhhOTBmZjczNmMxZGE0MWU0MmE0OGM3MGFmYjU4ZjJkZDM3NA==
 SHA512:
   metadata.gz: !binary |-
-    MWM3NmRlOGEyNTEwMGY2MDM1ZWJjM2RlNWRmMjcyODliYjQ1YjkyMDE5MTk1
-    MGIyODRiMmNhMzY0ZjAxZTkzYWZlZGUxNDNiM2I4MDhhYzg1ODY5N2U2MjJl
-    MGY5Y2M3MjllZDMxMzg5OTljNTQyNGY0NWRmOGFmNzFkZGRiZmQ=
+    NjhiZmI5YzM2ODFjOTAwMjZiYzhlMWM5OTI1ZWZjN2ZkYmU4YzYyZWZlMzAy
+    MDk3YTMwZTlmYjZhZDczZmQ5ZDQwNDI5NTIwNjNlZGY1NDI5NzdhMzAwMWQ4
+    MDMxYjlmYmEyZmIxNGViMGVhZDg4OWQ3MDY3ZWYyODkzMjYzNjU=
   data.tar.gz: !binary |-
-    ODk3MjZmZjcwNmU1YWZkMDI2YTY3ODQzNTVkNmNhMjc0YTVhNjhmOWM2MzY1
-    NDNjMTI1NjRiNDkzOWY0ODM2NjZhMjk3MWQ3OWExOGJkZmZmNjA0ZTYwMTdj
-    NjViYTU1MzM3YTJjMTY1OTMyMjJhZjI1MTgwZWE1Y2FjMmZlNTg=
+    ZjgwZjJkZjM0OWQ4Mzk5MWIxY2MyMDBjYzIzMzI5OGRkYzYzZDRiMjlmYjYw
+    OTMxY2JmZTRjMDYyZmMyOWNjODY2NmI1MzAyZDYyOWZkZTQxYjM3MDkxY2U2
+    NzJiOTBlMzNkNGI3MjBmYzVhMmFiYjY3YjNhODI1YzU4Y2NiOWM=

data/cookbook-release.gemspec

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

@@ -6,7 +6,10 @@ module CookbookRelease
       dir = File.dirname(file)
       version_file = File.join(dir, '.cookbook_version')
 
-      return File.read(version_file) if !GitUtilities.git?(dir) && File.exist?(version_file)
+      if !GitUtilities.git?(dir)
+        return File.read(version_file) if File.exist?(version_file)
+        raise "Can't determine version in a non-git environment without #{version_file}"
+      end
 
       r = Release.new(GitUtilities.new(cwd: dir))
       begin

data/spec/git_spec.rb

@@ -29,6 +29,23 @@ describe CookbookRelease::GitUtilities do
 
   let(:git) { CookbookRelease::GitUtilities.new }
 
+  describe 'git directory' do
+    it 'detects non-git' do
+      tmp = Dir.mktmpdir('cookbook-release')
+      expect(CookbookRelease::GitUtilities.git?(tmp)).to be(false)
+      FileUtils.rm_rf(tmp)
+    end
+
+    it 'detects git' do
+      tmp = Dir.mktmpdir('cookbook-release')
+      cmd = Mixlib::ShellOut.new("git init #{tmp}")
+      cmd.run_command
+      cmd.error!
+      expect(CookbookRelease::GitUtilities.git?(tmp)).to be(true)
+      FileUtils.rm_rf(tmp)
+    end
+  end
+
   describe '.clean_index(?|!)' do
     it 'detects clean index' do
       expect(git.clean_index?).to be(true)

metadata

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