bard 0.21.0 → 0.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/bard.rb +14 -8
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 97a79b2af2e7ae7a9afd5d7e434b729e0bd24b85
|
|
4
|
+
data.tar.gz: 595482343ae58ccfc2a299af485ad5bbfa2d3cd5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c5287460bab058902c8debb9ea03b01c89bd50a75f4f5dcf23c8fe14290030bdcf8e14c0c3da963b167d27b89b9e148d49582fcc10a69e746b004aaeff45a903
|
|
7
|
+
data.tar.gz: db1a20487b7ad786497cffb20a7a70abd065e710315384ea6148163dd6f1f28cccade4f967f180d97b8ca5105bdc4783093b7f84936ad803301f170cc08488fc
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.22.0
|
data/lib/bard.rb
CHANGED
|
@@ -54,14 +54,16 @@ class Bard::CLI < Thor
|
|
|
54
54
|
def deploy
|
|
55
55
|
invoke :push
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
57
|
+
if has_integration_branch?
|
|
58
|
+
run_crucial "git fetch origin"
|
|
59
|
+
run_crucial "git checkout master"
|
|
60
|
+
run_crucial "git pull --rebase origin master"
|
|
61
|
+
raise MasterNonFastForwardError if not fast_forward_merge? "master", "integration"
|
|
62
|
+
|
|
63
|
+
run_crucial "git merge integration"
|
|
64
|
+
run_crucial "git push origin master"
|
|
65
|
+
run_crucial "git checkout integration"
|
|
66
|
+
end
|
|
65
67
|
|
|
66
68
|
invoke :ci
|
|
67
69
|
|
|
@@ -121,6 +123,10 @@ class Bard::CLI < Thor
|
|
|
121
123
|
|
|
122
124
|
private
|
|
123
125
|
|
|
126
|
+
def has_integration_branch?
|
|
127
|
+
system 'git show-ref --verify --quiet "refs/heads/integration"'
|
|
128
|
+
end
|
|
129
|
+
|
|
124
130
|
def heroku?
|
|
125
131
|
`git remote -v`.include? "production\tgit@heroku.com:"
|
|
126
132
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bard
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.22.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Micah Geisel
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-
|
|
12
|
+
date: 2014-06-25 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: thor
|
|
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
181
181
|
version: '0'
|
|
182
182
|
requirements: []
|
|
183
183
|
rubyforge_project:
|
|
184
|
-
rubygems_version: 2.2.
|
|
184
|
+
rubygems_version: 2.2.2
|
|
185
185
|
signing_key:
|
|
186
186
|
specification_version: 4
|
|
187
187
|
summary: Tools for collaborating with Bot and Rose Design.
|