Merge branch 'boson' of github.com:rsanheim/nachos into boson

rsanheim · Mar 21, 2012 · a5bd267 · a5bd267
2 parents f56ed10 + 3b05c89
commit a5bd267
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,7 +11,7 @@ GEM
   specs:
     bahia (0.6.0)
       open4 (~> 1.3.0)
-    boson (1.1.1)
+    boson (1.2.0)
     crack (0.1.8)
     diff-lcs (1.1.3)
     faker (0.9.5)

diff --git a/lib/nachos/cli.rb b/lib/nachos/cli.rb
@@ -1,4 +1,3 @@
-require 'boson'
 require 'boson/runner'
 
 class Nachos::CLI < Boson::Runner
@@ -15,6 +14,18 @@ def self.setup_dry_run
     option :dry_run, :type => :boolean, :desc => "If specified, the converter will just print the commands and not actually execute them"
   end
 
+  # extend default help
+  def self.display_help
+    super
+    # TODO: actually check github info
+    puts "Your github info is not setup"
+  end
+
+  # extend command help
+  def self.display_command_help(cmd)
+    super
+  end
+
   desc "Displays current setup for Nachos"
   def info
     say main.info

diff --git a/spec/nachos_acceptance_spec.rb b/spec/nachos_acceptance_spec.rb
@@ -14,7 +14,6 @@
       end
 
       it "display github message" do
-        pending "depends on changes to boson to allow overriding help message"
         nachos
         process.should be_success
         puts stdout