cookbook-release 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4e16de633b17c5ed9330aa52a064e28f1f3137c1
-  data.tar.gz: 0e622fbfd16fdbbc72cb33d4c2d8d49037c27515
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTI4ODkyNzExM2I1YWMyZGJiYjliMWY0YTMwYmRlMWIzNDMyMTRjZA==
+  data.tar.gz: !binary |-
+    NjQyZmEzMDQxNWNmYzc3NmNhODQyODk0N2ZiNjFlZDljMTQ4YmZmYQ==
 SHA512:
-  metadata.gz: 300f1ef19d91db02acafd02474d7f46619205dcb9653b814cbccc2f1d45fd83e1e88c9d4fa4f1662a82d65bf6c904670c0965e7539b2ac64a780494ab5b76890
-  data.tar.gz: 03feb35e48cc03df23754f34ccc0fd0f01a3d7877ab1fc0cc01c88cb22b825a2cc37db80807d6dc6b4943feeda181ca20c3ab635e306390da7604b67a850b1ee
+  metadata.gz: !binary |-
+    NDNiYTdjNzBlNTllZTliYzAxNDViZDc2Y2Q0NTMxYWMxMDQzMWE1OWE2NDgz
+    YWI5ZjUxNTc0ZGQ0MTJlY2FkZjk2OWE1MGM2NzA1OTBjMWMxZjMwMTI4MWEx
+    NDdlZjg2OGUzZDEyMGUzNTA5NDZiMmUxZWFkYWJkNDE4YWEwNjg=
+  data.tar.gz: !binary |-
+    NTM4MzgzMDdiMTA5OWMzMzNjZDViN2RiNmNkNzUyYzI1MGVmY2EzYjk1MTlj
+    OWZmNzlhOGRlMTZmNzU0MWFmM2ExOWE0YmRkYmVlZWE4MDljODEyNGUwNTk4
+    Zjk5NTQyYWE0MjU4OTA2MTliOTIxMTFmYzZlODY2YWZhNzQyNWY=

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-- 2.0.0
+- 2.1.0
 deploy:
   provider: rubygems
   api_key:
-    secure: b2DxgLbIDryhuaaTqnph9b15Yhh4ZNfOsiL6AqO2Cb4rlr+IUnrcR8+aQyhHlk2zKi/1FCIOTDKpp8mZOERkzN6EtGrvCLdDsN4ILdem0weVQCl/1xh/+JI6qWszg5jOdx7AXste6hzKR7Y+liIGaw5GkvuUlLA4oE5Yvb2Fgd9sNtiUjbwn0gVvxcHkfmlsmR2p/mHjKmqYNfx1ycMfdRrzzehhW6p8p5h57uVjI/m+YAM05OUyrJVTPLwdNteE+lbs7gCBDEq1EVBup7e4H0XKaz1+9jCSRCvZLkjNMcpbXImth2N65VFbNLr59tHjj9Y56n9GOTdOH9HQPXoFV9a6eZ9E3oI0ZXvRyjeWJsRRzE6K6zEHGH8lSXSi/Vfa1uiXhFLTggVC2t5jl3SFk+dEh5koKz7DPlqxijinIWjEQGBtTxaRdAuXdbB+LY/mrjEJoPbtMj6ruFqh+fcwTrRfGgyQxYSATC3PizJrTrpZDNeTWET0QukZPjEnkPWB3WWWezwz4OgCT5pGt8aXs2wtvN604vuNJR9XtgPIlm9asf7Jj5V23GA71LU1SnedAxjfqIV16x3dm4O8eNzYRy+pai0BvlWO57UaSRHwqIYcqxM50KPr8rdLEKusPJha5Ysywc06XCsrG10nPyEWnRYhHxscZVXsQyqWHKjF7AU=
+    secure: nrEzm2dqWjyaa5ewApSonF+2D+y3PYwt9xaQC04d1NtbhQYyzX6wti3oatpMJI2gkcuuLjKrNHH/aLbKOGv7+Jj5BUJGOLixxhRdJyLWde/6cKCYVgIYPxeUtSJrRgyHAS2o8TDPjhWCT5oRwSkmhd+5D2JKjVqAycetbIzKWWvqScO09z0bF66bbKSfO1s44JwKjnUUW7W9tzrPvMPouBBoFtQ+dQVgxYLajgmjprVvIwzlHxgq/zP8YwL8i7vyRJFiQXyveSxZfBagN2qrUM72HWBPLLW4AeAdLDHYWon88GDU0p+cy2mVeSe67fBPVDopAEGij7MNJCBWV1/SRRKQcEb2U823+1GSB13OvaOGTn9rYsJP5zLKu77ATbHPi22nMfWOAzdEJJ+uFu9XW4nwUO/j79zPC1mEsRZDJlDrmTc4XZQJRKkCUjSl/J53vbdy4JQfos8B2V15tzx1baswQVPZuNiwuP4dOupI34FohJSVXQrsOoWVWVEX5Tfod6s3kpivW6lzwM68I2qXFa/4H8RPU2m0eVpfQslOO8TaGnbodudbQ1LSi/d5W6XWrMVqWGH910JG3jlJgHn5J7yQlI4VqnOpCjGsx/5xincuJZ7hBhcu5q5zcAGem7TrYSNkrx6neBYKmpZBHOWalIGw8wI9uViEsGQ6fayFee8=
   gem: cookbook-release
   on:
     tags: true

data/README.md

@@ -1,6 +1,9 @@
 CookbookRelease
 ===============
 
+[![Build Status](https://travis-ci.org/criteo/cookbook-release.svg?branch=master)](https://travis-ci.org/criteo/cookbook-release)
+[![Gem Version](https://badge.fury.io/rb/cookbook-release.svg)](https://badge.fury.io/rb/cookbook-release)
+
 Helper to release cookbooks. This motivation is to publish new version at each commit on master branch from the CI.
 
 This helper will create tags, push them and publish to supermarket.
@@ -33,4 +36,10 @@ export NO_PROMPT=""
 rake release!
 ```
 
+Optional environment variables:
+
+```
+export COOKBOOK_CATEGORY="Other" # defaults to Other
+```
+
 Note: this setup is intended to be used in a CI system such as jenkins or travis.

data/cookbook-release.gemspec

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

@@ -19,7 +19,8 @@ module CookbookRelease
         desc "Prepare cookbook release and push tag to git"
         task "release!" do
           opts = {
-            no_prompt: ENV['NO_PROMPT']
+            no_prompt: ENV['NO_PROMPT'],
+            category: ENV['COOKBOOK_CATEGORY'],
           }
           git = GitUtilities.new
           Release.new(git, opts).release!

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

@@ -8,7 +8,10 @@ class GitUtilities
   attr_accessor :no_prompt
 
   def initialize(options={})
-    @tag_prefix = options['tag_prefix'] || ''
+    @tag_prefix = options[:tag_prefix] || ''
+    @shellout_opts = {
+      cwd: options[:cwd]
+    }
   end
 
   def reset_command(new_version)
@@ -16,9 +19,9 @@ class GitUtilities
   end
 
   def clean_index?
-    clean_index = Mixlib::ShellOut.new("git diff --exit-code")
+    clean_index = Mixlib::ShellOut.new("git diff --exit-code", @shellout_opts)
     clean_index.run_command
-    clean_staged = Mixlib::ShellOut.new("git diff --exit-code --cached")
+    clean_staged = Mixlib::ShellOut.new("git diff --exit-code --cached", @shellout_opts)
     clean_staged.run_command
     !clean_index.error? && !clean_staged.error?
   end
@@ -33,18 +36,22 @@ class GitUtilities
       'git describe',
       "--tags",
       "--match \"#{@tag_prefix}[0-9]\.[0-9]*\.[0-9]*\""
-    ].join " ")
+    ].join(" "), @shellout_opts)
     tag.run_command
     tag.stdout.split('-').first.to_version
   end
 
+  # This string is used to split one-line git commit summary
+  # it just needs to be unlikely in a commit message
+  MAGIC_SEP = '@+-+@+-+@+-+@'
+
   def compute_changelog(since)
     # TODO use whole commit message instead of title only
-    log_cmd = Mixlib::ShellOut.new("git log --pretty='format:%an <%ae>::%s::%h' #{since}..HEAD")
+    log_cmd = Mixlib::ShellOut.new("git log --pretty='format:%an <%ae>#{MAGIC_SEP}%s#{MAGIC_SEP}%h' #{since}..HEAD", @shellout_opts)
     log_cmd.run_command
     log = log_cmd.stdout
     log.split("\n").map do |entry|
-      author, subject, hash = entry.chomp.split("::")
+      author, subject, hash = entry.chomp.split(MAGIC_SEP)
       Commit.new({
         author: author,
         subject: subject,
@@ -54,13 +61,13 @@ class GitUtilities
   end
 
   def tag(version)
-    cmd = Mixlib::ShellOut.new("git tag #{@tag_prefix}#{version}")
+    cmd = Mixlib::ShellOut.new("git tag #{@tag_prefix}#{version}", @shellout_opts)
     cmd.run_command
     cmd.error!
   end
 
   def choose_remote
-    cmd = Mixlib::ShellOut.new("git remote")
+    cmd = Mixlib::ShellOut.new("git remote", @shellout_opts)
     cmd.run_command
     cmd.error!
     remotes = cmd.stdout.split("\n")
@@ -74,7 +81,7 @@ class GitUtilities
 
   def push_tag(version)
     remote = choose_remote
-    cmd = Mixlib::ShellOut.new("git push #{remote} #{@tag_prefix}#{version}")
+    cmd = Mixlib::ShellOut.new("git push #{remote} #{@tag_prefix}#{version}", @shellout_opts)
     cmd.run_command
     cmd.error!
   end

data/lib/cookbook-release/release.rb

@@ -1,7 +1,8 @@
 class Release
 
-  def self.current_version
-    r = Release.new(GitUtilities.new)
+  # file will be used to determine the git directory
+  def self.current_version(file)
+    r = Release.new(GitUtilities.new(cwd: File.dirname(file)))
     begin
       r.new_version.first
     rescue ExistingRelease
@@ -18,6 +19,7 @@ class Release
     @git         = git
     @no_prompt   = opts[:no_prompt]
     @git.no_prompt = @no_prompt
+    @category    = opts[:category] || 'Other'
   end
 
   def last_release
@@ -83,10 +85,11 @@ class Release
       exit 1 unless agreed
       git.push_tag(new_version)
       supermarket = Supermarket.new
-      supermarket.publish_ck('Others')
-    ensure
+      supermarket.publish_ck(@category)
+    rescue
       puts HighLine.color("Release aborted, you have to reset to previous state manually", :red)
       puts ":use with care: #{git.reset_command(new_version)}"
+      raise
     end
   end
 end

data/spec/release_spec.rb

@@ -19,6 +19,32 @@ describe Release do
     end
   end
 
+  describe '.release!' do
+    it 'calls category with a valid default category' do
+
+      c = double('c',
+                 :major? => true,
+                 :[]     => '',
+                 :color  => :red,
+                )
+      git = double('git',
+                   :clean_index! => true,
+                   :compute_last_release => '1.0.0'.to_version,
+                   :compute_changelog => [c],
+                   :tag => true,
+                   :push_tag => true,
+                  )
+      allow(git).to receive(:no_prompt=)
+      release = Release.new(git, no_prompt: true)
+
+      supermarket = double('supermarket')
+      expect(Supermarket).to receive(:new).and_return(supermarket)
+
+      expect(supermarket).to receive(:publish_ck).with('Other')
+      release.release!
+    end
+  end
+
 
   describe '.new_version' do
 

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cookbook-release
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
   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: highline
   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: mixlib-shellout
   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: chef
   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
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provide primitives (and rake tasks) to release a cookbook
@@ -128,8 +128,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -155,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provide primitives (and rake tasks) to release a cookbook
@@ -175,4 +175,3 @@ test_files:
 - spec/release_spec.rb
 - spec/spec_helper.rb
 - spec/supermarket_spec.rb
-has_rdoc: