papa 0.7.0 → 0.7.1
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 +23 -15
- data/USAGE.md +8 -1
- data/lib/papa/cli/integration.rb +6 -2
- data/lib/papa/command/slack/send_message.rb +1 -1
- data/lib/papa/task/integration/add.rb +4 -5
- data/lib/papa/task/integration/deploy.rb +2 -2
- data/lib/papa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 285f47870177f6ef71e7bc121621a2435fd2f1dab19ebd9e7691fa90203a135c
|
4
|
+
data.tar.gz: fc85b82f7e2bf51e784fa3b7ea660d31650e7b808798169ab63843e8c3b9aac8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2422f3bae3108b7d6afc44d1879da26f34132b8c28821b4b70591e2db1259771d6a1ccc490e0b6d4eecff96344d1e30df228ca3310dde2fa9e245d319657ae11
|
7
|
+
data.tar.gz: 13586d90a60695d0fe5c66a51ec2278ce225b92011edcf220424106e225cc540b30872aba891aeddf9345a36ec5b55265c5c340439c5211d0c53dad2eb29eb24
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## 0.7.1
|
4
|
+
* Add ability to specify subdomain/hostname when deploying integration branches
|
5
|
+
* Fetch only once when adding feature or bugfix branches to an integration branch
|
6
|
+
|
3
7
|
## 0.7.0
|
4
8
|
* All output will be logged to a log file in the current working directory
|
5
9
|
* Properly determine whether to build or redeploy an integration or hotfix environment
|
data/README.md
CHANGED
@@ -6,21 +6,21 @@ Helper tool for inDinero's git workflow. Ako ang papa mo.
|
|
6
6
|
|
7
7
|
* [Getting Started](#getting-started)
|
8
8
|
* [Commands](#commands)
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
9
|
+
* [papa release](#papa-release)
|
10
|
+
* [start](#starting-a-release-branch)
|
11
|
+
* [add](#adding-feature-branches-to-a-release-branch)
|
12
|
+
* [finish](#finishing-a-release-branch)
|
13
|
+
* [papa hotfix](#papa-hotfix)
|
14
|
+
* [start](#starting-a-hotfix-branch)
|
15
|
+
* [add](#adding-bugfix-branches-to-a-hotfix-branch)
|
16
|
+
* [deploy](#deploying-a-hotfix-branch-to-a-hotfix-environment)
|
17
|
+
* [finish](#finishing-a-hotfix-branch)
|
18
|
+
* [papa integration](#papa-integration)
|
19
|
+
* [start](#starting-an-integration-branch)
|
20
|
+
* [add](#adding-branches-to-an-integration-branch)
|
21
|
+
* [deploy](#deploying-an-integration-branch-to-an-integration-environment)
|
22
|
+
* [papa sandbox](#papa-sandbox)
|
23
|
+
* [generate](#papa-sandbox)
|
24
24
|
|
25
25
|
## Getting Started
|
26
26
|
|
@@ -109,6 +109,8 @@ $ papa hotfix deploy -v 17.12.0
|
|
109
109
|
$ papa hotfix finish -v 17.12.0
|
110
110
|
```
|
111
111
|
|
112
|
+
If the hotfix branch will also be merged to a release branch:
|
113
|
+
|
112
114
|
```
|
113
115
|
$ papa hotfix finish -v 17.12.0 -b release/17.11.0
|
114
116
|
```
|
@@ -141,6 +143,12 @@ $ papa integration add -v 17.12.0
|
|
141
143
|
$ papa integration deploy -v 17.12.7.18.20.30
|
142
144
|
```
|
143
145
|
|
146
|
+
If you want to specify a different subdomain for the environment:
|
147
|
+
|
148
|
+
```
|
149
|
+
$ papa integration deploy -v 17.12.7.18.20.30 -s diomar
|
150
|
+
```
|
151
|
+
|
144
152
|
### `papa sandbox`
|
145
153
|
|
146
154
|
```
|
data/USAGE.md
CHANGED
@@ -183,7 +183,7 @@ $ papa integration add -v 17.12.0
|
|
183
183
|
This will deploy the specified integration branch to an integration environment.
|
184
184
|
|
185
185
|
```
|
186
|
-
$ papa integration deploy -v, --version=VERSION
|
186
|
+
$ papa integration deploy -v, --version=VERSION [-s, --subdomain=SUBDOMAIN]
|
187
187
|
```
|
188
188
|
|
189
189
|
#### Sample Usage:
|
@@ -192,6 +192,13 @@ $ papa integration deploy -v, --version=VERSION
|
|
192
192
|
$ papa integration deploy -v 17.12.7.18.20.30
|
193
193
|
```
|
194
194
|
|
195
|
+
If you want to specify a different subdomain for the environment:
|
196
|
+
|
197
|
+
```
|
198
|
+
$ papa integration deploy -v 17.12.7.18.20.30 -s diomar
|
199
|
+
```
|
200
|
+
|
201
|
+
|
195
202
|
## `papa sandbox`
|
196
203
|
|
197
204
|
### Generating a new sandbox
|
data/lib/papa/cli/integration.rb
CHANGED
@@ -23,13 +23,17 @@ module Papa
|
|
23
23
|
Task::Integration::Add.new(version, branches).run
|
24
24
|
end
|
25
25
|
|
26
|
-
desc 'deploy', 'Deploy the integration branch to
|
26
|
+
desc 'deploy', 'Deploy the integration branch to SUBDOMAIN.indinerocorp.com'
|
27
27
|
option :version, aliases: '-v', required: true
|
28
|
+
option :subdomain, aliases: '-s'
|
28
29
|
def deploy
|
29
30
|
version = options[:version]
|
31
|
+
# Renamed to subdomain because `-h` is already assigned to `papa integration help`.
|
32
|
+
# Will still be referred to as `hostname` from here onwards.
|
33
|
+
hostname = options[:subdomain]
|
30
34
|
|
31
35
|
require 'papa/task/integration/deploy'
|
32
|
-
Task::Integration::Deploy.new(version).run
|
36
|
+
Task::Integration::Deploy.new(version, hostname).run
|
33
37
|
end
|
34
38
|
end
|
35
39
|
end
|
@@ -13,15 +13,14 @@ module Papa
|
|
13
13
|
|
14
14
|
def queue(branch)
|
15
15
|
[
|
16
|
-
Command::Git::
|
17
|
-
Command::Git::Checkout.new(@build_branch),
|
16
|
+
Command::Git::Checkout.new(build_branch),
|
18
17
|
Command::Git::Checkout.new(branch),
|
19
18
|
Command::Git::ResetHard.new('origin', branch),
|
20
|
-
Command::Git::Rebase.new(
|
21
|
-
Command::Git::Checkout.new(
|
19
|
+
Command::Git::Rebase.new(build_branch),
|
20
|
+
Command::Git::Checkout.new(build_branch),
|
22
21
|
Command::Git::Merge.new(branch),
|
23
22
|
Command::Git::BranchDelete.new(branch),
|
24
|
-
Command::Git::Push.new('origin',
|
23
|
+
Command::Git::Push.new('origin', build_branch)
|
25
24
|
]
|
26
25
|
end
|
27
26
|
end
|
@@ -4,10 +4,10 @@ module Papa
|
|
4
4
|
module Task
|
5
5
|
module Integration
|
6
6
|
class Deploy < Common::Deploy
|
7
|
-
def initialize(version)
|
7
|
+
def initialize(version, hostname)
|
8
8
|
@build_type = 'integration'
|
9
9
|
@version = version
|
10
|
-
@hostname = 'integration'
|
10
|
+
@hostname = hostname || 'integration'
|
11
11
|
super()
|
12
12
|
end
|
13
13
|
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: 0.7.
|
4
|
+
version: 0.7.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- boggs
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-01-
|
11
|
+
date: 2018-01-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|