bard 0.8.12 → 0.8.13

data/VERSION

@@ -1 +1 @@
-0.8.12
+0.8.13

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.8.12"
+  s.version = "0.8.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]

data/lib/bard.rb

@@ -103,7 +103,8 @@ class Bard < Thor
     ensure_sanity!
 
     run_crucial "git fetch"
-    run_crucial "git reset --hard origin/integration"
+    run_crucial "git checkout master && git reset --hard origin master"
+    run_crucial "git checkout integration && reset --hard origin integration"
     run_crucial "rake bootstrap RAILS_ENV=staging"
   end
 

data/lib/bard/capistrano.rb

@@ -29,7 +29,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "push app from staging to production"
   task :deploy, :roles => :production do
     system "git push github" if `git remote` =~ /\bgithub\b/
-    run "cd #{application} && git pull origin/master && rake bootstrap:production"
+    run "cd #{application} && git pull origin master && rake bootstrap:production"
     puts "Deploy Succeeded"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors: 
 - Micah Geisel