verat 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 558d686008c7621a267d29f97c8e8d06f0d4eb24
-  data.tar.gz: db56ef5136825c86c58301c34dcc562248fb3326
+  metadata.gz: 077d85a7478e3ad5fe4254d31326644b950fffb8
+  data.tar.gz: 3468c56625539ef9c9df0e47124faa1dab2b0f76
 SHA512:
-  metadata.gz: 37c9dc413421977ba7f63aea9fe3fd7482ade68a1aafecf04bf84f8ba0b6eef78d353bd0a194b34571414ff6aaf899c514202d2cc31fa1506565b5d02501fef7
-  data.tar.gz: 2622558b9a118525e4740679037f8bd09452b763f6d3bb0baa5dd03d66f8e06c47f42c59e3a75f20e8147f8429d1d5e2dba06d452fe9649044b8c76d4f762355
+  metadata.gz: 1cdbc3413e727a6ff44acab7b3e01fc6977d2270706e31c26327283e2a056249c301f539fc5351de6ac41303ccb0c739d8b4b3d3903a48df08b0efbe8959be7b
+  data.tar.gz: 1c3c0d405ebc67c29c220b9ebe146da635bcdd1bc9764df64f846a22a3d873f4706acaeccb54ad33393e825262456f8e26d1cf368d100298461d7380dccd4e4b

data/README.md

@@ -38,7 +38,10 @@ To start a new release run this command, *RELEASE* will be the version of the re
 verat release start RELEASE
 ```
 
-Once you finished the release run this command. It will checkout to master branch, merge the release branch and then checkout to the develop branch and merge the release branch. Optionally you can pass the ```-t``` or ```--tag``` to create a tag with the name of the branch
+Once you finished the release run this command. It will checkout to master branch, merge the release branch and then checkout to the develop branch and merge the release branch.
+
+Optionally you can pass the ```--no-tag``` to prevent that Verat creats automatically a tag, so you can later make the tag by yourself.
+
 ```
 verat release finish RELEASE
 ```

data/bin/verat

@@ -74,7 +74,7 @@ Mercenary.program(:verat) do |p|
       finish.syntax 'finish RELEASE [options]'
       finish.description 'Finishes a release branch'
       finish.option 'delete', '-d', '--delete', 'Deletes release branch'
-      finish.option 'tag', '-t', '--tag', 'Creates a tag with the release version'
+      finish.option 'tag', '--no-tag', 'Prevents that Verat creates a release version tag'
 
       finish.action do |args, options|
         Verat::Release.finish(args.first, options)

data/lib/verat/feature.rb

@@ -27,8 +27,8 @@ module Verat
         system("git merge --no-ff #{branch}")
       end
 
-      if options['delete'] then
-        repo.branch("#{branch}").delete
+      if options['delete']
+        repo.branch(branch).delete
         puts "Deleting branch: #{branch}"
       end
 

data/lib/verat/hotfix.rb

@@ -35,8 +35,8 @@ module Verat
         end
       end
 
-      if options['delete'] then
-        repo.branch("#{branch}").delete
+      if options['delete']
+        repo.branch(branch).delete
         puts "Deleting branch: #{branch}"
       end
 

data/lib/verat/release.rb

@@ -23,8 +23,10 @@ module Verat
         # Temporary fix until git adds options to the merge method
         status = system("git merge --no-ff #{branch}")
         if status
-          puts "Creating release tag: #{release}"
-          repo.add_tag("#{release}",  {:a => true, :message => "v#{release}"})
+          if options['tag'] != false
+            puts "Creating release tag: #{release}"
+            repo.add_tag("#{release}",  {:a => true, :message => "v#{release}"})
+          end
 
           repo.checkout('develop')
           system("git merge --no-ff #{branch}")
@@ -38,8 +40,8 @@ module Verat
         end
       end
 
-      if options['delete'] then
-        repo.branch("#{branch}").delete
+      if options['delete']
+        repo.branch(branch).delete
         puts "Deleting release branch: #{branch}"
       end
 

data/lib/verat/version.rb

@@ -1,3 +1,3 @@
 module Verat
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Adrian Ayala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git