bard 0.24.2 → 0.24.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/bard.rb +12 -4
- data/lib/bard/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: 09f5a184f0a330e3a96a3a9e6e21a2d658f87771
|
4
|
+
data.tar.gz: 47636d82e92dcac0d9fea2ef718df679c670fcfd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3f49ca1ad35bb563ba7d9ea27a04805568539a06335a25586582c487b6357fdbf1bbc6151e847d0bb8e20f7eda852b062e7b99c6a2906abcff203c2e3601949e
|
7
|
+
data.tar.gz: 28620246c7cf89c01171f5319a04c582032e5c520ae9596491868feb89224a13565ca0c21b721fcdb8af078d397dac0596ec0afe4f2272a915ac8bb1dd1d4fab
|
data/lib/bard.rb
CHANGED
@@ -38,13 +38,13 @@ class Bard::CLI < Thor
|
|
38
38
|
def deploy
|
39
39
|
branch = Git.current_branch
|
40
40
|
|
41
|
-
run_crucial "git fetch origin master:master"
|
42
|
-
|
43
41
|
if branch == "master"
|
44
42
|
run_crucial "git push origin master:master"
|
45
43
|
invoke :ci
|
46
44
|
|
47
45
|
else
|
46
|
+
run_crucial "git fetch origin master:master"
|
47
|
+
|
48
48
|
if not Git.fast_forward_merge? "master", branch
|
49
49
|
raise "The master branch has advanced since last deploy, probably due to a bugfix.\n Rebase your branch on top of it, and check for breakage."
|
50
50
|
end
|
@@ -63,9 +63,17 @@ class Bard::CLI < Thor
|
|
63
63
|
|
64
64
|
if branch != "master"
|
65
65
|
puts "Deleting branch: #{branch}"
|
66
|
-
run_crucial "git checkout master" if Git.current_branch == branch
|
67
66
|
run_crucial "git push --delete origin #{branch}"
|
68
|
-
|
67
|
+
|
68
|
+
case Git.current_branch
|
69
|
+
when branch
|
70
|
+
run_crucial "git checkout master"
|
71
|
+
run_crucial "git branch -d #{branch}"
|
72
|
+
when "master"
|
73
|
+
run_crucial "git branch -d #{branch}"
|
74
|
+
else
|
75
|
+
run_crucial "git branch -D #{branch}"
|
76
|
+
end
|
69
77
|
end
|
70
78
|
end
|
71
79
|
|
data/lib/bard/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bard
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.24.
|
4
|
+
version: 0.24.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Micah Geisel
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-12-
|
11
|
+
date: 2014-12-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|