bard 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/bard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   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

@@ -99,6 +99,8 @@ class Bard < Thor
     run_crucial "git merge integration"
     run_crucial "git push origin master"
     run_crucial "git checkout integration"
+
+    run_crucial "cap ROLES=staging COMMAND='cd #{project_name} && cap deploy' invoke"
   end
 
   if ENV['RAILS_ENV'] == "staging"
@@ -114,8 +116,6 @@ class Bard < Thor
         ENV['GIT_DIR'] = '.git'
       end
 
-      run_crucial "git reset --hard"
-
       # find out the current branch
       head = File.read('.git/HEAD').chomp
       # abort if we're on a detached head
@@ -123,9 +123,9 @@ class Bard < Thor
       revs = gets.split ' '  
       old_rev, new_rev, branch = revs
 
-      if branch == "master"
-        run_crucial "cap deploy"
-      elsif head == branch
+      if head == branch
+        run_crucial "git reset --hard"
+
         changed_files = run_crucial("git diff #{old_rev} #{new_rev} --diff-filter=ACMRD --name-only").split("\n") 
 
         if changed_files.any? { |f| f =~ %r(^db/migrate/.+) }

data/lib/bard/io.rb

@@ -19,4 +19,8 @@ module BardIO
       end
       stdout.chomp
     end
+
+    def project_name
+      @project_name ||= File.expand_path(".").split("/").last
+    end
 end

metadata

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