bard 0.11.3 → 0.12.0

data/VERSION

@@ -1 +1 @@
-0.11.3
+0.12.0

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.11.3"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel", "Nick Hogle"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2010-12-23}
   s.default_executable = %q{bard}
   s.description = %q{This immaculate work of engineering genius allows mere mortals to collaborate with beings of transcendent intelligence like Micah, Michael, and Nick.}
   s.email = %q{info@botandrose.com}

data/lib/bard.rb

@@ -65,7 +65,16 @@ class Bard < Thor
     raise NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
 
     run_crucial "git push origin #{current_branch}", true
-    run_crucial "cap stage", options.verbose?
+  end
+
+  method_options %w( verbose -v ) => :boolean
+  desc "stage", "pushes current branch, and stages it"
+  def stage
+    invoke :push
+
+    run_crucial "cap stage BRANCH=#{current_branch}", options.verbose?
+
+    puts green("Stage Succeeded")
   end
 
   method_options %w( verbose -v ) => :boolean
@@ -98,6 +107,8 @@ class Bard < Thor
     end
 
     run_crucial "cap deploy", options.verbose?
+
+    puts green("Deploy Succeeded")
   end
 
   private

data/lib/bard/capistrano.rb

@@ -37,12 +37,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   task :deploy, :roles => :production do
     system "git push github" if `git remote` =~ /\bgithub\b/
     run "cd #{application} && git pull origin master && rake bootstrap:production"
-    puts "Deploy Succeeded"
   end
 
   desc "push app to staging"
   task :stage, :roles => :staging do
-    run "cd #{application} && git fetch && git checkout -f origin/integration && rake bootstrap"
-    puts "Stage Succeeded"
+    branch = ENV.has_key?("BRANCH") ? ENV["BRANCH"] : "integration"
+    run "cd #{application} && git fetch && git checkout -f origin/#{branch} && rake bootstrap"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 47
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 3
-  version: 0.11.3
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Micah Geisel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
+date: 2010-12-23 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency