verat 0.1.1 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +4 -1
- data/bin/verat +1 -1
- data/lib/verat/feature.rb +2 -2
- data/lib/verat/hotfix.rb +2 -2
- data/lib/verat/release.rb +6 -4
- data/lib/verat/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 077d85a7478e3ad5fe4254d31326644b950fffb8
|
4
|
+
data.tar.gz: 3468c56625539ef9c9df0e47124faa1dab2b0f76
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1cdbc3413e727a6ff44acab7b3e01fc6977d2270706e31c26327283e2a056249c301f539fc5351de6ac41303ccb0c739d8b4b3d3903a48df08b0efbe8959be7b
|
7
|
+
data.tar.gz: 1c3c0d405ebc67c29c220b9ebe146da635bcdd1bc9764df64f846a22a3d873f4706acaeccb54ad33393e825262456f8e26d1cf368d100298461d7380dccd4e4b
|
data/README.md
CHANGED
@@ -38,7 +38,10 @@ To start a new release run this command, *RELEASE* will be the version of the re
|
|
38
38
|
verat release start RELEASE
|
39
39
|
```
|
40
40
|
|
41
|
-
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.
|
41
|
+
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.
|
42
|
+
|
43
|
+
Optionally you can pass the ```--no-tag``` to prevent that Verat creats automatically a tag, so you can later make the tag by yourself.
|
44
|
+
|
42
45
|
```
|
43
46
|
verat release finish RELEASE
|
44
47
|
```
|
data/bin/verat
CHANGED
@@ -74,7 +74,7 @@ Mercenary.program(:verat) do |p|
|
|
74
74
|
finish.syntax 'finish RELEASE [options]'
|
75
75
|
finish.description 'Finishes a release branch'
|
76
76
|
finish.option 'delete', '-d', '--delete', 'Deletes release branch'
|
77
|
-
finish.option 'tag', '-
|
77
|
+
finish.option 'tag', '--no-tag', 'Prevents that Verat creates a release version tag'
|
78
78
|
|
79
79
|
finish.action do |args, options|
|
80
80
|
Verat::Release.finish(args.first, options)
|
data/lib/verat/feature.rb
CHANGED
data/lib/verat/hotfix.rb
CHANGED
data/lib/verat/release.rb
CHANGED
@@ -23,8 +23,10 @@ module Verat
|
|
23
23
|
# Temporary fix until git adds options to the merge method
|
24
24
|
status = system("git merge --no-ff #{branch}")
|
25
25
|
if status
|
26
|
-
|
27
|
-
|
26
|
+
if options['tag'] != false
|
27
|
+
puts "Creating release tag: #{release}"
|
28
|
+
repo.add_tag("#{release}", {:a => true, :message => "v#{release}"})
|
29
|
+
end
|
28
30
|
|
29
31
|
repo.checkout('develop')
|
30
32
|
system("git merge --no-ff #{branch}")
|
@@ -38,8 +40,8 @@ module Verat
|
|
38
40
|
end
|
39
41
|
end
|
40
42
|
|
41
|
-
if options['delete']
|
42
|
-
repo.branch(
|
43
|
+
if options['delete']
|
44
|
+
repo.branch(branch).delete
|
43
45
|
puts "Deleting release branch: #{branch}"
|
44
46
|
end
|
45
47
|
|
data/lib/verat/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: verat
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adrian Ayala
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-06-
|
11
|
+
date: 2014-06-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: git
|