bard 0.24.2 → 0.24.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bard.rb +12 -4
  3. data/lib/bard/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 82a54dd4e3163fba16dce8b894801c4a114019c9
4
- data.tar.gz: 3395553f49eddd7650046ad6ea3d49f7226822f5
3
+ metadata.gz: 09f5a184f0a330e3a96a3a9e6e21a2d658f87771
4
+ data.tar.gz: 47636d82e92dcac0d9fea2ef718df679c670fcfd
5
5
  SHA512:
6
- metadata.gz: 0bce6de60b3e150c9e4250c6f3a03c1de4cdfb419f09e6cdb7d481f4a91b2d9b59a2c2825d384784125416305bf56503e8af229ac3b2b2f9f5940d6489457422
7
- data.tar.gz: 6d3c6830569761058173d44a7d7accbebd7fe6c96263cb8d8a52bae1f055cf6126a46ac7cd12b7f795bd53c05b6bb48e9268c0c2ae8931e39214b233726ce790
6
+ metadata.gz: 3f49ca1ad35bb563ba7d9ea27a04805568539a06335a25586582c487b6357fdbf1bbc6151e847d0bb8e20f7eda852b062e7b99c6a2906abcff203c2e3601949e
7
+ data.tar.gz: 28620246c7cf89c01171f5319a04c582032e5c520ae9596491868feb89224a13565ca0c21b721fcdb8af078d397dac0596ec0afe4f2272a915ac8bb1dd1d4fab
@@ -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
- run_crucial "git branch -d #{branch}"
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
 
@@ -1,4 +1,4 @@
1
1
  module Bard
2
- VERSION = "0.24.2"
2
+ VERSION = "0.24.4"
3
3
  end
4
4
 
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.2
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-01 00:00:00.000000000 Z
11
+ date: 2014-12-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor