papa 1.0.0 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/README.md +6 -0
- data/lib/papa/cli/release.rb +3 -1
- data/lib/papa/task/common/start.rb +2 -0
- data/lib/papa/task/release/finish.rb +3 -2
- data/lib/papa/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: ce70540dead41684251bf8b645acbef540c4ae70
|
4
|
+
data.tar.gz: 91f2e872e23ada8658d1a838aab027dff320eb14
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3ebb3b43866d7b6d662b32a2f44c27fb654588decc8df2a0e54d5857e979421366e359d9dfbb55e48b3f70a9a06615a1dfc07312dd315e933c1e460a69beae64
|
7
|
+
data.tar.gz: 6356f191cce45628d6f4cd8a09fe631ab1bd53a8201d483579a9ba7d95dccb25d887accb29e69f85c3882ae1713a491096bd2f0c82485d1c1d4430608ed7ac88
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## 1.1.0
|
4
|
+
* Allow merging release branches to other branches upon finishing by adding `-b` to `papa release finish`
|
5
|
+
* Upon starting a new release or hotfix branch, reset base branch from origin after checking out
|
6
|
+
|
3
7
|
## 1.0.0
|
4
8
|
* Add `whoami` and `hostname` to deployment message
|
5
9
|
* Hard reset build branch before starting `papa [hotfix, release] finish`
|
data/README.md
CHANGED
@@ -74,6 +74,12 @@ $ papa release add -v 17.12.0
|
|
74
74
|
$ papa release finish -v 17.12.0
|
75
75
|
```
|
76
76
|
|
77
|
+
If the release branch will also be merged to another branch:
|
78
|
+
|
79
|
+
```
|
80
|
+
$ papa release finish -v 17.12.0 -b release/17.11.0
|
81
|
+
```
|
82
|
+
|
77
83
|
### `papa hotfix`
|
78
84
|
|
79
85
|
#### Starting a hotfix branch
|
data/lib/papa/cli/release.rb
CHANGED
@@ -23,11 +23,13 @@ module Papa
|
|
23
23
|
|
24
24
|
desc 'finish', 'Merge the release branch to master and develop'
|
25
25
|
option :version, aliases: '-v', required: true
|
26
|
+
option :additional_branches, aliases: '-b', type: :array
|
26
27
|
def finish
|
27
28
|
version = options[:version]
|
29
|
+
additional_branches = options[:additional_branches]
|
28
30
|
|
29
31
|
require 'papa/task/release/finish'
|
30
|
-
Task::Release::Finish.new(version).run
|
32
|
+
Task::Release::Finish.new(version, additional_branches).run
|
31
33
|
end
|
32
34
|
end
|
33
35
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'papa/task/base'
|
2
2
|
require 'papa/command/git/branch'
|
3
3
|
require 'papa/command/git/push'
|
4
|
+
require 'papa/command/git/reset_hard'
|
4
5
|
|
5
6
|
module Papa
|
6
7
|
module Task
|
@@ -12,6 +13,7 @@ module Papa
|
|
12
13
|
[
|
13
14
|
Command::Git::Fetch.new('origin'),
|
14
15
|
Command::Git::Checkout.new(@base_branch),
|
16
|
+
Command::Git::ResetHard.new('origin', @base_branch),
|
15
17
|
Command::Git::Branch.new(build_branch),
|
16
18
|
Command::Git::Checkout.new(build_branch),
|
17
19
|
Command::Git::Push.new('origin', build_branch)
|
@@ -4,11 +4,12 @@ module Papa
|
|
4
4
|
module Task
|
5
5
|
module Release
|
6
6
|
class Finish < Common::Finish
|
7
|
-
def initialize(version)
|
7
|
+
def initialize(version, additional_branches)
|
8
8
|
@build_type = 'release'
|
9
9
|
@version = version
|
10
|
+
additional_branches ||= []
|
10
11
|
@tag_name = version
|
11
|
-
@base_branches = ['develop', 'master']
|
12
|
+
@base_branches = ['develop', 'master'] + additional_branches
|
12
13
|
super()
|
13
14
|
end
|
14
15
|
end
|
data/lib/papa/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: papa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- boggs
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-09-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|