bard 0.8.21 → 0.8.22

data/VERSION

@@ -1 +1 @@
-0.8.21
+0.8.22

data/bard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard}
-  s.version = "0.8.21"
+  s.version = "0.8.22"
 
   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-03-02}
+  s.date = %q{2010-03-04}
   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}
@@ -65,8 +65,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Tools for collaborating with Bot and Rose Design.}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/bard_spec.rb"
+    "spec/bard_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/bard.rb

@@ -44,23 +44,25 @@ class Bard < Thor
     exec "cap data:pull"
   end
 
+  method_options %w( verbose -v ) => :boolean
   desc "pull", "pull changes to your local machine"
   def pull
     ensure_sanity!
 
-    warn NonFastForwardError unless fast_forward_merge?
+    warn NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
 
-    run_crucial "git pull --rebase origin #{current_branch}"
-    run_crucial "rake bootstrap:test"
+    run_crucial "git pull --rebase origin #{current_branch}", options.verbose?
+    run_crucial "rake bootstrap:test", options.verbose?
   end
 
+  method_options %w( verbose -v ) => :boolean
   desc "push", "push local changes out to the remote"
   def push
     ensure_sanity!
 
     raise SubmoduleDirtyError if submodule_dirty?
     raise SubmoduleUnpushedError if submodule_unpushed?
-    raise NonFastForwardError unless fast_forward_merge?
+    raise NonFastForwardError unless fast_forward_merge?("origin/#{current_branch}")
 
     run_crucial "git push origin #{current_branch}", true
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bard
 version: !ruby/object:Gem::Version 
-  version: 0.8.21
+  version: 0.8.22
 platform: ruby
 authors: 
 - Micah Geisel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -08:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: bard
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -181,5 +181,5 @@ signing_key:
 specification_version: 3
 summary: Tools for collaborating with Bot and Rose Design.
 test_files: 
-- spec/spec_helper.rb
 - spec/bard_spec.rb
+- spec/spec_helper.rb