cookbook-release 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTI4ODkyNzExM2I1YWMyZGJiYjliMWY0YTMwYmRlMWIzNDMyMTRjZA==
+    YTQzZWMzNGFjMmFiOWViYzY3NjBmNDFkNDNlMmNmODNmNGExOGI2NQ==
   data.tar.gz: !binary |-
-    NjQyZmEzMDQxNWNmYzc3NmNhODQyODk0N2ZiNjFlZDljMTQ4YmZmYQ==
+    MTI4ZjA0M2Y1Yzc1YjgwZjJlN2VmMWEyNmRjMDNmZTViMDQxOTUzNA==
 SHA512:
   metadata.gz: !binary |-
-    NDNiYTdjNzBlNTllZTliYzAxNDViZDc2Y2Q0NTMxYWMxMDQzMWE1OWE2NDgz
-    YWI5ZjUxNTc0ZGQ0MTJlY2FkZjk2OWE1MGM2NzA1OTBjMWMxZjMwMTI4MWEx
-    NDdlZjg2OGUzZDEyMGUzNTA5NDZiMmUxZWFkYWJkNDE4YWEwNjg=
+    OTMwOGEyYzZmYjczYjkwODhkODdlYTI5OWVjOGZkZTRlMDMzZDc4M2UwNTQw
+    NGNhOGQwYTQwZjAyMjMwYjM0YWVkMmE4NmJiMTJkMjM1YjA0OGY3YTAyMzc4
+    YmQ0ODBmY2E0NjY3YzVjM2UyYzJlMTMwMDhjN2MzZDQ3ZmY2YzI=
   data.tar.gz: !binary |-
-    NTM4MzgzMDdiMTA5OWMzMzNjZDViN2RiNmNkNzUyYzI1MGVmY2EzYjk1MTlj
-    OWZmNzlhOGRlMTZmNzU0MWFmM2ExOWE0YmRkYmVlZWE4MDljODEyNGUwNTk4
-    Zjk5NTQyYWE0MjU4OTA2MTliOTIxMTFmYzZlODY2YWZhNzQyNWY=
+    MzgzMGZmNDdlN2U0ZmQ4ZjA5MTQ5OGNiM2EzZDM1NTFlMjliNjUxMzZiNDll
+    YWI0NGRkOTg4MzJlYTdiYmRhOWRkNDFiYTBhM2Q4M2EwYTVjYTRmMTJjNWNl
+    NjAxYjkxZDI0YTE4OWU5NGIxYTY2NDA3NmUzZTMyMDI4NGJiNGQ=

data/README.md

@@ -16,7 +16,8 @@ Include cookbook-release into your `Gemfile`.
 Require cookbook-release into the `metadata.rb` file and replace the version by the helper:
 
 ```
-version          Release.current_version
+require 'cookbook-release'
+version          Release.current_version(__FILE__)
 ```
 
 Include the rake tasks in your Rakefile:
@@ -33,6 +34,7 @@ export SUPERMARKET_CLIENTKEYFILE=/tmp/my_key.pem
 export SUPERMARKET_USERID=my_username
 export SUPERMARKET_URL="http://supermarket.chef.io/api/v1/cookbooks"
 export NO_PROMPT=""
+export SUPERMARKET_NO_SSL_VERIFY=1
 rake release!
 ```
 

data/cookbook-release.gemspec

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

@@ -14,6 +14,10 @@ class GitUtilities
     }
   end
 
+  def self.git?(dir)
+    !Mixlib::ShellOut.new('git status', cwd: dir).run_command.error?
+  end
+
   def reset_command(new_version)
     "git reset --hard HEAD^ && git tag -d #{new_version}"
   end

data/lib/cookbook-release/release.rb

@@ -2,12 +2,17 @@ class Release
 
   # file will be used to determine the git directory
   def self.current_version(file)
-    r = Release.new(GitUtilities.new(cwd: File.dirname(file)))
+    dir = File.dirname(file)
+    version_file = File.join(dir, '.cookbook_version')
+
+    return File.read(version_file) if !GitUtilities.git?(dir) && File.exist?(version_file)
+
+    r = Release.new(GitUtilities.new(cwd: dir))
     begin
       r.new_version.first
     rescue ExistingRelease
       r.last_release
-    end
+    end.tap { |v| File.write(version_file, v) }
   end
 
   class ExistingRelease < StandardError

data/lib/cookbook-release/supermarket.rb

@@ -14,6 +14,7 @@ class Supermarket
     @url        = opts[:url] || ENV['SUPERMARKET_URL'] || (raise "Require a supermarket url")
     @user_id    = opts[:user_id] || ENV['SUPERMARKET_USERID'] || (raise "Require a user id")
     @client_key = opts[:client_key_file] || ENV['SUPERMARKET_CLIENTKEYFILE'] || (raise "Require a client key file")
+    Chef::Config[:ssl_verify_mode] = :verify_none if ENV['SUPERMARKET_NO_SSL_VERIFY']
   end
 
   include ::Chef::Mixin::ShellOut

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic