bard 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf832c9ca785371c3ac3aa9c6b052858711a7770
-  data.tar.gz: 3ed216bee4dc97a030dedfe391604fd2a542f00b
+  metadata.gz: 97a79b2af2e7ae7a9afd5d7e434b729e0bd24b85
+  data.tar.gz: 595482343ae58ccfc2a299af485ad5bbfa2d3cd5
 SHA512:
-  metadata.gz: 6e4822f3481d7f77075e496721d3fe2e27c7388fbf16ecc17323636f6701688f42210bb65c88e0f72b8eed63023f2e36d571f269ecac3ee11e9d8ccbc8f1ab83
-  data.tar.gz: 6cb54d8b02de420f590bc1ef609e623ad394011956e7664d407d05fcb105b7cfedc005914f7375ae904e58562f704be28c39eb1ed6f1cbdb934bee83a762b845
+  metadata.gz: c5287460bab058902c8debb9ea03b01c89bd50a75f4f5dcf23c8fe14290030bdcf8e14c0c3da963b167d27b89b9e148d49582fcc10a69e746b004aaeff45a903
+  data.tar.gz: db1a20487b7ad786497cffb20a7a70abd065e710315384ea6148163dd6f1f28cccade4f967f180d97b8ca5105bdc4783093b7f84936ad803301f170cc08488fc

data/VERSION

@@ -1 +1 @@
-0.21.0
+0.22.0

data/lib/bard.rb

@@ -54,14 +54,16 @@ class Bard::CLI < Thor
   def deploy
     invoke :push
 
-    run_crucial "git fetch origin"
-    run_crucial "git checkout master"
-    run_crucial "git pull --rebase origin master"
-    raise MasterNonFastForwardError if not fast_forward_merge? "master", "integration"
-
-    run_crucial "git merge integration"
-    run_crucial "git push origin master"
-    run_crucial "git checkout integration"
+    if has_integration_branch?
+      run_crucial "git fetch origin"
+      run_crucial "git checkout master"
+      run_crucial "git pull --rebase origin master"
+      raise MasterNonFastForwardError if not fast_forward_merge? "master", "integration"
+
+      run_crucial "git merge integration"
+      run_crucial "git push origin master"
+      run_crucial "git checkout integration"
+    end
 
     invoke :ci
 
@@ -121,6 +123,10 @@ class Bard::CLI < Thor
 
   private
 
+  def has_integration_branch?
+    system 'git show-ref --verify --quiet "refs/heads/integration"'
+  end
+
   def heroku?
     `git remote -v`.include? "production\tgit@heroku.com:"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for collaborating with Bot and Rose Design.