cruisestatus 1.3.1 → 1.3.2

data/README.rdoc

@@ -44,28 +44,28 @@ enters 'y' at the prompt, +cruisestatus+ will return a zero status regardless
 of build failures.
 
 For example:
-    toby@Tobys-Mac:(git)cruisestatus[master]/$ cruisestatus -p http://runcoderun.com/api/v1/json/tobytripp
+    $ cruisestatus -p http://runcoderun.com/api/v1/json/tobytripp
 
     Build FAILURES: cruisestatus
     Are you sure you want to check in? (y/n): y
     
-    toby@Tobys-Mac:(git)cruisestatus[master]/$ echo $?
+    $ echo $?
     0
     
-    toby@Tobys-Mac:(git)cruisestatus[master]/$ cruisestatus -p http://runcoderun.com/api/v1/json/tobytripp
+    $ cruisestatus -p http://runcoderun.com/api/v1/json/tobytripp
 
     Build FAILURES: cruisestatus
     Are you sure you want to check in? (y/n): n
     
-    toby@Tobys-Mac:(git)cruisestatus[master]/$ echo $?
+    $ echo $?
     1
-    toby@Tobys-Mac:(git)cruisestatus[master]/$
 
 You can use this to abort check-ins onto broken builds. (See the post-commit
-hook in http://github.com/tobytripp/git-pre-commit for example). As you know,
-if the CI build is broken, no one should be checking in new code unless
-they're fixing the build. You can use +cruisestatus+ to help keep developers
-honest in that regard.
+hook in
+http://github.com/tobytripp/git-pre-commit/blob/master/git-hooks/post-commit
+for example). As you know, if the CI build is broken, no one should be
+checking in new code unless they're fixing the build. You can use
++cruisestatus+ to help keep developers honest in that regard.
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -8,11 +8,16 @@ begin
     gem.name        = "cruisestatus"
     gem.summary     = %Q{Check the build status on a cruise.rb server}
     gem.description = %Q{Allows scripts and applications to check the status of your project's build.}
+    
     gem.email       = "toby.tripp+git@gmail.com"
     gem.homepage    = "http://github.com/tobytripp/cruisestatus"
     gem.authors     = ["Toby Tripp"]
+    
     gem.version     = CruiseStatus::Version::STRING
+    
     gem.add_dependency "json_pure", ">= 1.2.0"
+    gem.add_dependency "highline",  ">= 1.5.2"
+    
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -27,6 +32,8 @@ Spec::Rake::SpecTask.new
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  
+  spec.rcov_opts = ['--exclude', 'lib\/spec,bin\/spec,gems,spec_helper']
 end
 
 task :spec => :check_dependencies

data/cruisestatus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cruisestatus}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Toby Tripp"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-11}
   s.default_executable = %q{cruisestatus}
   s.description = %q{Allows scripts and applications to check the status of your project's build.}
   s.email = %q{toby.tripp+git@gmail.com}
@@ -61,13 +61,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<highline>, [">= 1.5.2"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
+      s.add_dependency(%q<highline>, [">= 1.5.2"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
+    s.add_dependency(%q<highline>, [">= 1.5.2"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/lib/cruisestatus/command.rb

@@ -1,20 +1,14 @@
-require "readline"
 require "optparse"
+
+require "highline"
+require "highline/import"
 require "cruisestatus/version"
 
 class CruiseStatus::Command
-  DEFAULT_PROMPT = "Are you sure you want to check in? (y/n): "
-  
-  def self.run!( argv )
-    @prompt  = nil
-
-    opts = OptionParser.new do |o|
-      o.version = CruiseStatus::Version::STRING
-      o.release = CruiseStatus::Version::RELEASE
-      o.banner = <<-EOS
+  USAGE = <<-EOS
   Usage: #{File.basename($0)} [options] BUILD_URL
 
-    Reads the feed at BUILD_URL and reports if the build[s] passed.
+  Reads the feed at BUILD_URL and reports if the build[s] passed.
 
   Examples:
     # CruiseControl.rb:
@@ -24,47 +18,70 @@ class CruiseStatus::Command
 
     # RunCodeRun.com:
     #{File.basename($0)} http://runcoderun.com/api/v1/json/myusername
-    
+
   Options:
-      EOS
-      
-      o.on(
+  EOS
+  
+  DEFAULT_PROMPT = "Are you <%= color 'sure', :underline %> you want to check in? (y/n): "
+  
+  attr_writer :prompt
+  
+  def self.run!( argv )
+    self.new.run( argv )
+  end
+
+  def are_you_sure?( status )
+    agree( prompt ) ? 0 : 1
+  end
+  
+  def initialize()
+    @prompt = false
+  end
+  
+  def run( argv )
+    argv = parse_options( argv )
+    
+    return Kernel.abort( @options.to_s ) if argv.empty?
+
+    status = CruiseStatus.new argv.last
+    
+    if status.pass?
+      say "Build <%= color 'PASSED', :green, :bold %>"
+      0
+    else
+      say "Build <%= color 'FAILURES', :red, :bold %>:"
+      status.failures.each do |failure|
+        say "  * " + $terminal.color( failure, :red )
+      end
+      return are_you_sure?( status ) if @prompt
+      1
+    end
+  end
+  
+  def parse_options( argv )
+    @options = OptionParser.new do |option|
+      option.version = CruiseStatus::Version::STRING
+      option.release = CruiseStatus::Version::RELEASE
+      option.banner  = CruiseStatus::Command::USAGE
+
+      option.on(
         "-p", "--prompt", "=[PROMPT]",
         "Prompt the user if the build has failed.",
-        "#{File.basename($0)} will exit with a non-zero status if the user does not respond 'y' to the prompt."
+        "#{File.basename($0)} will exit with a non-zero status if the user " \
+          "does not respond 'y' to the prompt."
       ) do |val|
         if val == true
-          @prompt = DEFAULT_PROMPT
+          self.prompt = DEFAULT_PROMPT
         else
-          @prompt = val
+          self.prompt = val
         end
       end
     end
-    
-    opts.parse! argv
-    
-    if argv.empty?
-      abort opts.to_s
-    else
-      status = CruiseStatus.new argv.last
-      
-      if status.pass?
-        puts "Build PASSED"
-        0
-      else
-        return are_you_sure?( status ) if @prompt
-        1
-      end
-    end
+
+    @options.parse! argv
   end
   
-  def self.are_you_sure?( status )
-    puts "\n", "Build FAILURES: #{status.failure_message}"
-    input = ""
-    while( input && input.strip.empty? )
-      input = Readline.readline @prompt
-    end
-    
-    input.strip.downcase[0,1] == "y" ? 0 : 1
+  def prompt
+    @prompt || DEFAULT_PROMPT
   end
 end

data/lib/cruisestatus/version.rb

@@ -2,7 +2,7 @@ class CruiseStatus
   module Version
     MAJOR = 1
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     
     STRING  = "#{MAJOR}.#{MINOR}.#{PATCH}"
     RELEASE = "10 Feb 2010" # date "+%d %b %Y" # ^R

data/spec/cruisestatus/command_spec.rb

@@ -1,12 +1,20 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper"
 
 describe CruiseStatus::Command do
   before :each do
     @status = mock( "cruisestatus" )
     @status.stub!( :pass? ).and_return true
     @status.stub!( :failure_message ).and_return "FAILURES"
+    @status.stub!( :failures ).and_return %w[failedBuild1 failedBuild2]
     
     CruiseStatus.stub!( :new ).with( "url" ).and_return @status
+    
+    @old_terminal = $terminal
+    $terminal = HighLine.new( StringIO.new, @output = StringIO.new )
+  end
+  
+  after :each do
+    $terminal = @old_terminal
   end
   
   it "passes the given url to the cruise status checker" do
@@ -25,48 +33,46 @@ describe CruiseStatus::Command do
   end
   
   it "aborts if no url is provided" do
-    CruiseStatus::Command.should_receive( :abort )
+    Kernel.should_receive( :abort )
     CruiseStatus::Command.run! []
   end
   
-  
   describe "when given the 'prompt' option" do
     before :each do
       @status.stub!( :pass? ).and_return false
     end
     
     it "passes the url to the status checker" do
-      Readline.should_receive( :readline ).
+      $terminal.should_receive( :agree ).
         with( CruiseStatus::Command::DEFAULT_PROMPT ).
-        and_return "y"
+        and_return true
+      CruiseStatus.should_receive( :new ).with( "url" ).and_return @status
 
       CruiseStatus::Command.run! %w[-p url]
     end
 
     it "prompts the user if the build has failed" do
-      Readline.should_receive( :readline ).
+      $terminal.should_receive( :agree ).
         with( CruiseStatus::Command::DEFAULT_PROMPT ).
-        and_return "y"
+        and_return true
 
-      output = capture_stdout do
-        CruiseStatus::Command.run! %w[-p url]
-      end
+      CruiseStatus::Command.run! %w[-p url]
       
-      output.should == "\nBuild FAILURES: FAILURES\n"
+      @output.string.should =~ /Build.*FAILURES/
     end
     
     it "returns 0 if the user enters 'y' at the prompt" do
-      Readline.should_receive( :readline ).
+      $terminal.should_receive( :agree ).
         with( CruiseStatus::Command::DEFAULT_PROMPT ).
-        and_return "y"
+        and_return true
       
       CruiseStatus::Command.run!( %w[-p url] ).should == 0
     end
     
     it "returns 1 if the user enters 'n' at the prompt" do
-      Readline.should_receive( :readline ).
+      $terminal.should_receive( :agree ).
         with( CruiseStatus::Command::DEFAULT_PROMPT ).
-        and_return "n"
+        and_return false
       
       CruiseStatus::Command.run!( %w[-p url] ).should == 1
     end

data/spec/cruisestatus/run_code_run_parser_spec.rb

@@ -25,6 +25,22 @@ describe CruiseStatus::RunCodeRunParser do
       @parser.failures.should == ["cruisestatus"]
     end
   end
+  
+  describe "on connection error" do
+    before :each do
+      io = StringIO.new "/"
+      io.stub!( :read ).and_raise Exception
+      
+      @parser = CruiseStatus::RunCodeRunParser.new io
+      @parser.check
+    end
+    
+    it "reports the error as a failure" do
+      @parser.failures.should_not be_empty
+    end
+    
+  end
+  
 end
 
 RCR_PASS_RESPONSE = <<-EOS

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift( File.dirname(__FILE__) )
+$LOAD_PATH.unshift( File.join(File.dirname(__FILE__), '..', 'lib') )
 
 require "rubygems"
 require 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cruisestatus
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Toby Tripp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -06:00
+date: 2010-02-11 00:00:00 -06:00
 default_executable: cruisestatus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development