cookbook-release 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQzZWMzNGFjMmFiOWViYzY3NjBmNDFkNDNlMmNmODNmNGExOGI2NQ==
+    MTRmMzIxZmY5MjlmZjQ4MjQyMDI2YzcxZTcyNjFmNWZmMDZiN2Q2OQ==
   data.tar.gz: !binary |-
-    MTI4ZjA0M2Y1Yzc1YjgwZjJlN2VmMWEyNmRjMDNmZTViMDQxOTUzNA==
+    YjAxYjA3YTM0MGU5MDBjYmYxZjg3Y2MwZDgxOTRhNGI4NWQyOTcxMQ==
 SHA512:
   metadata.gz: !binary |-
-    OTMwOGEyYzZmYjczYjkwODhkODdlYTI5OWVjOGZkZTRlMDMzZDc4M2UwNTQw
-    NGNhOGQwYTQwZjAyMjMwYjM0YWVkMmE4NmJiMTJkMjM1YjA0OGY3YTAyMzc4
-    YmQ0ODBmY2E0NjY3YzVjM2UyYzJlMTMwMDhjN2MzZDQ3ZmY2YzI=
+    MzliNjE0NzM1NjFlNWQwNWE3YjU3NjhmZDY0NjU1OGEyNTA3MzZlNjU4ZmM5
+    OTAyMGVkNDMyYWE0YTI1NzBkYTVkZTIzMzYwM2Y5ZmIyYjlmZWE2Yzg4MDZj
+    ZjY3OTYyYThkOGZkOGMwZjY2YTM4MmViYjMxYWU5M2Q4ODdmNzU=
   data.tar.gz: !binary |-
-    MzgzMGZmNDdlN2U0ZmQ4ZjA5MTQ5OGNiM2EzZDM1NTFlMjliNjUxMzZiNDll
-    YWI0NGRkOTg4MzJlYTdiYmRhOWRkNDFiYTBhM2Q4M2EwYTVjYTRmMTJjNWNl
-    NjAxYjkxZDI0YTE4OWU5NGIxYTY2NDA3NmUzZTMyMDI4NGJiNGQ=
+    MTA3Y2VlYzNmYWFhMjU5NzMxODIyYmUxZTgwMzJmZDIwOWZkNWFkZWJmOTI5
+    MzUyODkwMGI3YzY3ZDdhZDBiMTcyZTE3Y2NlNzhiMmJjNTc4ZmVjZDFhMWMy
+    NTVjMjdkNmVmMTk5MmYyOTliYWI4ZWE0M2JkMTVkN2Q5NjQ4OTY=

data/README.md

@@ -8,7 +8,27 @@ Helper to release cookbooks. This motivation is to publish new version at each c
 
 This helper will create tags, push them and publish to supermarket.
 
-Usage
+Daily use
+---------
+
+cookbook-release reads commit messages since last release and suggest a new version accordingly.
+
+The following table describes the word used to detect patch/minor/major version changes:
+
+| Version change | Words                                     |
+|----------------|-------------------------------------------|
+| Patch          | _fix_, _bugfix_, _[Patch]_                |
+| Major          | _breaking_, _[Major]_                     |
+| Minor          | Default case if none of the above matches |
+
+Those words are detected in the commit subject only (not in the fully message).
+
+Examples of messages:
+- [Breaking] Remove all migration code
+- Fix migration code for old centos versions
+
+
+One-time setup
 -----
 
 Include cookbook-release into your `Gemfile`.

data/cookbook-release.gemspec

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

@@ -7,11 +7,22 @@ class Commit
   end
 
   def major?
-    !!(self[:subject] =~ /breaking/i)
+    [
+      /breaking/i,
+      /\[major\]/i
+    ].any? do |r|
+      self[:subject] =~ r
+    end
   end
 
   def patch?
-    !!(self[:subject] =~ /\bfix\b/i) || !!(self[:subject] =~ /\bbugfix\b/i)
+    [
+      /\bfix\b/i,
+      /\bbugfix\b/i,
+      /\[patch\]/i
+    ].any? do |r|
+      self[:subject] =~ r
+    end
   end
 
   def minor?

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

@@ -19,7 +19,8 @@ class GitUtilities
   end
 
   def reset_command(new_version)
-    "git reset --hard HEAD^ && git tag -d #{new_version}"
+    remote = choose_remote
+    "git tag -d #{new_version} ; git push #{remote} :#{new_version}"
   end
 
   def clean_index?
@@ -42,7 +43,12 @@ class GitUtilities
       "--match \"#{@tag_prefix}[0-9]\.[0-9]*\.[0-9]*\""
     ].join(" "), @shellout_opts)
     tag.run_command
-    tag.stdout.split('-').first.to_version
+    last = tag.stdout.split('-').first
+    unless last
+      $stderr.puts "No last release found, defaulting to 0.1.0"
+      last = '0.1.0'
+    end
+    last.to_version
   end
 
   # This string is used to split one-line git commit summary
@@ -51,7 +57,7 @@ class GitUtilities
 
   def compute_changelog(since)
     # TODO use whole commit message instead of title only
-    log_cmd = Mixlib::ShellOut.new("git log --pretty='format:%an <%ae>#{MAGIC_SEP}%s#{MAGIC_SEP}%h' #{since}..HEAD", @shellout_opts)
+    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|

metadata

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