propel 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    propel (0.0.3)
+    propel (0.0.4)
       json
 
 GEM

data/lib/propel/runner.rb

@@ -8,7 +8,13 @@ module Propel
       git_repository = GitRepository.new
 
       if git_repository.changed?
-        check_remote_build! unless ignore_remote_build?
+        if remote_build_configured?
+          check_remote_build! unless ignore_remote_build?
+
+        else
+          puts "Remote build is not configured, skipping check." if @options[:verbose]
+        end
+
         propel!
       else
         puts "There is nothing to propel - your HEAD is identical to #{git_repository.remote_config} #{git_repository.merge_config}."
@@ -18,17 +24,42 @@ module Propel
     private
 
     def check_remote_build!
-      if remote_build_configured?
-
-        if !remote_build_passing?
-          raise "The remote build is broken. If your commit fixes the build, run propel with the --force (-f) option."
+      if @options[:wait]
+        unless remote_build_green?
+          wait_with_notice do
+            log_wait_notice
+            wait until remote_build_green?
+            puts "\nThe build has been fixed."
+          end
         end
 
       else
-        puts "Remote build is not configured, skipping check." if @options[:verbose]
+        
+        alert_broken_build_and_exit unless remote_build_green?
       end
     end
 
+    def wait_with_notice
+      start_time = Time.now
+      yield
+      end_time = Time.now
+      puts "We waited for #{(end_time - start_time).round} seconds while the build was failing."
+    end
+
+    def log_wait_notice
+      puts "The remote build is failing, waiting until it is green to proceed."
+    end
+
+    def alert_broken_build_and_exit
+      msg = <<-EOS
+        The remote build is broken. If your commit fixes the build, run propel with the --force (-f) option.
+        If you're waiting for someone else to fix the build, use propel with --wait (-w).
+      EOS
+
+      $stderr.puts msg.split("\n").map(&:strip)
+      exit 1
+    end
+
     def ignore_remote_build?
       @options[:force]
     end
@@ -37,17 +68,10 @@ module Propel
       !@options[:status_url].nil?
     end
 
-    def remote_build_passing?
-      if @options[:wait]
-        until remote_build_green? do
-          print "."
-          sleep 10
-        end
-
-        true
-      else
-        remote_build_green?
-      end
+    def wait
+      print "."
+      STDOUT.flush
+      sleep 5
     end
 
     def remote_build_green?

data/lib/propel/version.rb

@@ -1,3 +1,3 @@
 module Propel
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/propel/runner_spec.rb

@@ -29,8 +29,8 @@ describe Propel::Runner do
 
     it "should call propel! if the remote build is configured and passing" do
       runner = Propel::Runner.new(%w[ --status-url http://ci.example.com/status ])
-      runner.stub!(:remote_build_passing?).and_return(true)
       runner.stub!(:remote_build_configured?).and_return(true)
+      runner.stub!(:remote_build_green?).and_return(true)
 
       runner.should_receive(:propel!)
 
@@ -45,16 +45,18 @@ describe Propel::Runner do
       runner.start
     end
 
-    it "should raise an error and not call propel! if the remote build is configured but not passing" do
+    class TestError < StandardError ; end
+    it "should send an alert about the broken build if the remote build is configured but not passing" do
       runner = Propel::Runner.new
       runner.stub!(:remote_build_configured?).and_return true
-      runner.stub!(:remote_build_passing?).and_return false
-      
+      runner.stub!(:remote_build_green?).and_return false
+
+      runner.should_receive(:alert_broken_build_and_exit).and_raise(TestError.new("Execution should be aborted here"))
       runner.should_not_receive(:propel!)
 
       lambda {
         runner.start
-      }.should raise_error(RuntimeError, "The remote build is broken. If your commit fixes the build, run propel with the --force (-f) option.")
+      }.should raise_error(TestError)
     end
 
     it "should call propel! when the remote build is failing if --force is specified" do
@@ -94,8 +96,13 @@ describe Propel::Runner do
 
       runner.should_receive(:remote_build_green?).twice.and_return(false, true)
 
+      runner.should_receive(:log_wait_notice)
+
+      runner.should_receive(:wait_with_notice).and_yield
+
+      runner.stub!(:puts)
       runner.stub!(:print).with('.')
-      runner.stub!(:sleep).with(10)
+      runner.stub!(:sleep).with(5)
       
       runner.should_receive(:propel!)
       runner.start

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Justin Leitgeb