propel 0.3.3 → 0.4.0

data/Gemfile.lock

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

data/lib/propel.rb

@@ -2,5 +2,6 @@ require 'propel/configuration'
 require 'propel/git_repository'
 require 'propel/logger'
 require 'propel/option_parser'
+require 'propel/propel'
 require 'propel/remote_build'
 require 'propel/runner'

data/lib/propel/configuration.rb

@@ -44,7 +44,7 @@ module Propel
     end
 
     def parse(option_array)
-      Propel::OptionParser.parse!(option_array)
+      ::Propel::OptionParser.parse!(option_array)
     end
   end
 end

data/lib/propel/git_repository.rb

@@ -1,57 +1,101 @@
 module Propel
   class GitRepository
+    Result = Struct.new(:result, :exitstatus)
+
+    attr_accessor :logger, :options
+
+    def initialize
+      @options = { :verbose => false }
+    end
+
     def self.changed?
       new.changed?
     end
 
     def project_root
-      git("rev-parse --show-toplevel")
+      git("rev-parse --show-toplevel").result
     end
 
     def changed?
       local_last_commit != remote_last_commit
     end
 
+    def pull(rebase)
+      pull_cmd = 'pull'
+      pull_cmd << ' --rebase' if rebase
+      git pull_cmd
+    end
+
+    def push
+      logger.report_operation "Pushing to #{remote_config} #{merge_config}"
+
+      git(verbosity_for('push')).tap do |result|
+        if result.exitstatus != 0
+          logger.report_status("FAILING", :red)
+          exit_with_error "Your push failed!  Please try again later."
+        end
+
+        logger.report_status('DONE', :green)
+      end
+    end
+
     def remote_config
-      git("config branch.#{current_branch}.remote").tap do |remote|
+      git("config branch.#{current_branch}.remote").result.tap do |remote|
         if remote.empty?
-          warn  "We could not determine the remote repository for branch '#{current_branch}.' " +
-                "Please set it with git config branch.#{current_branch}.remote REMOTE_REPO."
-          exit 1
+          exit_with_error  "We could not determine the remote repository for branch '#{current_branch}.' " +
+                           "Please set it with git config branch.#{current_branch}.remote REMOTE_REPO."
         end
       end
     end
 
     def merge_config
-      git("config branch.#{current_branch}.merge").tap do |merge|
+      git("config branch.#{current_branch}.merge").result.tap do |merge|
         if merge.empty?
-          warn  "We could not determine the remote branch for local branch '#{current_branch}.' " +
-                "Please set it with git config branch.#{current_branch}.merge REMOTE_BRANCH."
-          exit 1
+          exit_with_error  "We could not determine the remote branch for local branch '#{current_branch}.' " +
+                           "Please set it with git config branch.#{current_branch}.merge REMOTE_BRANCH."
         end
       end
     end
 
+    def fetch!
+      logger.report_operation "Retrieving remote objects"
+
+      git(verbosity_for('fetch')).tap do |result|
+        if result.exitstatus != 0
+          exit_with_error "Fetch of remote repository failed, exiting."
+        end
+
+        logger.report_status("DONE", :green)
+      end
+    end
+
     private
+    def exit_with_error(message)
+      warn message
+      exit 1
+    end
+
     def git git_args
-      `git #{git_args}`.strip
+      output = `git #{git_args}`.strip
+      Result.new(output, $?)
     end
 
     def local_last_commit
-      git("rev-parse HEAD")
+      git("rev-parse HEAD").result
     end
 
     def remote_last_commit
       fetch!
-      git("ls-remote #{remote_config} #{merge_config}").gsub(/\t.*/, '')
+      git("ls-remote #{remote_config} #{merge_config}").result.gsub(/\t.*/, '')
     end
 
     def current_branch
-      git("branch").split("\n").detect{|l| l =~ /^\*/ }.gsub(/^\* /, '')
+      # TODO - replace with git symbolic-ref HEAD
+      git("branch").result.split("\n").detect{|l| l =~ /^\*/ }.gsub(/^\* /, '')
     end
 
-    def fetch!
-      git("fetch")
+    def verbosity_for(git_operation)
+      @options[:verbose] ? git_operation : "#{git_operation} -q"
     end
   end
 end

data/lib/propel/logger.rb

@@ -18,11 +18,28 @@ module Propel
     end
 
     def puts(message, color_sym = nil)
-      Kernel.puts color(message, color_sym) unless @configuration[:quiet]
+      Kernel.puts color(message, color_sym)
     end
 
     def warn(message, color_sym = nil)
-      Kernel.warn color(message, color_sym) unless @configuration[:quiet]
+      Kernel.warn color(message, color_sym)
+    end
+
+    def report_operation(message)
+      if @configuration[:verbose]
+        Kernel.puts("#{message}...")
+      else
+        Kernel.print("%-60s" % "#{message}:")
+        STDOUT.flush
+      end
+    end
+
+    def report_status(message, color_sym)
+      if @configuration[:verbose]
+        Kernel.puts(color(message.capitalize, color_sym))
+      else
+        Kernel.puts("[ #{color(message.upcase, color_sym)} ]")
+      end
     end
 
     private

data/lib/propel/option_parser.rb

@@ -17,26 +17,26 @@ module Propel
       ::OptionParser.new do |parser|
         parser.banner = "Usage: propel [options]\n\n"
 
-        parser.on('-c', '--[no-]color', '--[no-]colour', 'Turn on or off colored output. Color is off by default.') do |o|
+        parser.on('-c', '--[no-]color', '--[no-]colour', 'Toggle colored output. Color is off by default.') do |o|
           options[:color] = o
         end
 
-        parser.on('-f', '--fix-ci', 'Use when fixing the CI build') do |o|
+        parser.on('-f', '--fix-ci', 'When CI is broken use --fix-ci to fix the build.') do |o|
           options[:fix_ci] = o
         end
 
-        parser.on('-q', '--[no-]quiet', 'Silences normal output messages.') do |o|
-          options[:quiet] = o
-        end
-
-        parser.on('-r', '--[no-]rebase', 'Use pull with --rebase.  Rebase is used by default.') do |o|
+        parser.on('-r', '--[no-]rebase', 'Use --no-rebase when you don\'t want to rebase.  Rebase is used by default.') do |o|
           options[:rebase] = o
         end
 
-        parser.on('-s', '--status-url STATUS_URL', 'Location of build status feed') do |build_status_url|
+        parser.on('-s', '--status-url STATUS_URL', 'Location of build status feed.') do |build_status_url|
           options[:status_url] = build_status_url
         end
 
+        parser.on('-v', '--[no-]verbose', 'Turn on verbose output from git.') do |o|
+          options[:verbose] = o
+        end
+
         parser.on('-w', '--[no-]wait', 'Waits for fixes to remote build.') do |o|
           options[:wait] = o
         end

data/lib/propel/propel.rb

@@ -0,0 +1,17 @@
+module Propel
+  class Propel
+    def initialize(repository, rebase)
+      @repository = repository
+      @rebase     = rebase
+    end
+
+    def start
+      @repository.pull(@rebase) && rake && @repository.push
+    end
+
+    private
+    def rake
+      system('rake')
+    end
+  end
+end

data/lib/propel/runner.rb

@@ -1,40 +1,42 @@
 module Propel
   class Runner
-    attr_reader :logger
+    attr_reader :logger, :repository
     
     def initialize(args = [ ])
       @repository = GitRepository.new
       @options    = Configuration.new(args, @repository).options
       @logger     = Logger.new(@options)
+
+      @repository.logger  = @logger
+      @repository.options = @options
     end
 
     def start
       if @repository.changed?
         if remote_build_configured?
-          
+
           if @options[:fix_ci]
-            @logger.puts("Thanks for trying to fix the build!", :green)
+            logger.puts("Thanks for trying to fix the build!", :green)
           else
             check_remote_build!
           end
 
         else
-          @logger.warn "Remote build is not configured, you should point propel to the status URL of your CI server."
-          
+          logger.warn "Remote build is not configured. You should point propel to the status URL of your CI server."
+
         end
 
         propel!
       else
-        @logger.puts("There is nothing to propel - your HEAD is identical to #{@repository.remote_config} #{@repository.merge_config}.", :green)
-        
+        logger.puts("There is nothing to propel - your HEAD is identical to #{@repository.remote_config} #{@repository.merge_config}.", :green)
+
       end
     end
 
     private
 
     def check_remote_build!
-      @logger.print "CI server status:\t"
-      STDOUT.flush
+      logger.report_operation "CI server status"
 
       waited_for_build = false
       if @options[:wait]
@@ -42,10 +44,10 @@ module Propel
           waited_for_build = true
           
           say_duration do
-            @logger.puts("FAILING", :red)
-            @logger.puts "Waiting until the CI build is green."
+            logger.report_status("FAILING", :red)
+            logger.puts "Waiting until the CI build is green."
             wait until remote_build_green?
-            @logger.puts("\nThe CI build has been fixed.", :green)
+            logger.puts("\nThe CI build has been fixed.", :green)
           end
         end
 
@@ -54,25 +56,25 @@ module Propel
         alert_broken_build_and_exit unless remote_build_green?
       end
 
-      @logger.puts("PASSING", :green) unless waited_for_build
+      logger.report_status("PASSING", :green) unless waited_for_build
     end
 
     def say_duration
       start_time = Time.now
       yield
       end_time = Time.now
-      @logger.puts("We waited for #{(end_time - start_time).round} seconds while the build was failing.")
+      logger.puts("We waited for #{(end_time - start_time).round} seconds while the build was failing.")
     end
 
     def alert_broken_build_and_exit
-      @logger.puts("FAILING", :red)
+      logger.puts("FAILING", :red)
 
       msg = <<-EOS
 The remote build is broken. If your commit fixes the build, run propel with --fix-ci (-f).
 If you're waiting for someone else to fix the build, use propel with --wait (-w).
       EOS
 
-      @logger.puts("")
+      logger.puts("")
       warn msg
       exit 1
     end
@@ -82,7 +84,7 @@ If you're waiting for someone else to fix the build, use propel with --wait (-w)
     end
 
     def wait
-      @logger.print(".", :yellow)
+      logger.print(".", :yellow)
       sleep 5
     end
 
@@ -91,9 +93,7 @@ If you're waiting for someone else to fix the build, use propel with --wait (-w)
     end
 
     def propel!
-      pull_cmd = 'git pull'
-      pull_cmd << ' --rebase' if @options[:rebase]
-      system [ pull_cmd, 'rake', 'git push' ].join(' && ')
+      Propel.new(@repository, @options[:rebase]).start
     end
   end
 end

data/lib/propel/version.rb

@@ -1,3 +1,3 @@
 module Propel
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/spec/propel/configuration_spec.rb

@@ -24,7 +24,7 @@ describe Propel::Configuration do
     end
 
     it "should correct the color setting if on a Windows 32 system that does not support color" do
-      configuration = Propel::Configuration.new(['--color', '--quiet'], Propel::GitRepository.new)
+      configuration = Propel::Configuration.new(['--color'], Propel::GitRepository.new)
       configuration.stub(:ruby_platform).and_return('mswin')
       configuration.stub!(:warn)
       configuration.options[:color].should be_false

data/spec/propel/git_repository_spec.rb

@@ -1,13 +1,56 @@
 require 'spec_helper'
 
 describe Propel::GitRepository do
-  describe ".changed?" do
-    it "should call #changed? on a new instance of the GitRepository" do
+  describe "#pull" do
+    it "should use --rebase when argument is true" do
       git_repository = Propel::GitRepository.new
-      git_repository.should_receive(:changed?)
-      Propel::GitRepository.should_receive(:new).and_return git_repository
+      git_repository.should_receive(:git).with("pull --rebase")
+      git_repository.pull(true)
+    end
+
+    it "should not use --rebase when argument as false" do
+      git_repository = Propel::GitRepository.new
+      git_repository.should_receive(:git).with("pull")
+      git_repository.pull(false)
+    end
+  end
+
+  describe "#push" do
+    it "should call 'push -q' by default" do
+      git_repository = Propel::GitRepository.new
+      git_repository.logger = stub_logger
+
+      git_repository.should_receive(:git).with('push -q').and_return(Propel::GitRepository::Result.new('all good', 0))
+      git_repository.stub!(:remote_config)
+      git_repository.stub!(:merge_config)
+
+      git_repository.push
+    end
+    
+    it "should call push without -q if --verbose is specified" do
+      git_repository = Propel::GitRepository.new
+      git_repository.logger = stub_logger
+      git_repository.options = {:verbose => true}
       
-      Propel::GitRepository.changed?
+      git_repository.should_receive(:git).with('push').and_return(Propel::GitRepository::Result.new('all good', 0))
+      git_repository.stub!(:remote_config)
+      git_repository.stub!(:merge_config)
+      git_repository.push
+    end
+
+    it "should warn the user and exit with a status of 1 if the push fails" do
+      git_repository = Propel::GitRepository.new
+      git_repository.logger = stub_logger
+
+      git_repository.should_receive(:git).with('push -q').and_return(Propel::GitRepository::Result.new('bad!', 1))
+      
+      git_repository.stub!(:remote_config)
+      git_repository.stub!(:merge_config)
+
+      git_repository.should_receive(:warn).with("Your push failed!  Please try again later.")
+      git_repository.should_receive(:exit).with(1)
+      
+      git_repository.push
     end
   end
 
@@ -17,18 +60,52 @@ describe Propel::GitRepository do
       Propel::GitRepository.new.project_root.should == project_root
     end
   end
-  
+
+  describe ".changed?" do
+    it "should call #changed? on a new instance of the GitRepository" do
+      git_repository = Propel::GitRepository.new
+      git_repository.should_receive(:changed?)
+      Propel::GitRepository.should_receive(:new).and_return git_repository
+
+      Propel::GitRepository.changed?
+    end
+  end
+
+  describe "#fetch!" do
+    it "should exit with a not-0 status and warn the user if the fetch fails" do
+      git_repository = Propel::GitRepository.new
+      git_repository.logger = stub_logger
+
+      git_repository.should_receive(:git).with('fetch -q').and_return(Propel::GitRepository::Result.new('', 1))
+
+      git_repository.should_receive(:exit).with(1)
+      git_repository.should_receive(:warn).with('Fetch of remote repository failed, exiting.')
+
+      git_repository.fetch!
+    end
+
+    it "should call fetch without the quiet option (-q) if --verbose is specified" do
+      git_repository = Propel::GitRepository.new
+      git_repository.logger = stub_logger
+      git_repository.options = {:verbose => true}
+
+      git_repository.should_receive(:git).with('fetch').and_return(Propel::GitRepository::Result.new('', 0))
+
+      git_repository.fetch!
+    end
+  end
+
   describe "#changed?" do
     it "should return false when the remote branch has the same SHA1 as the local HEAD" do
       git_repository = Propel::GitRepository.new
       git_repository.stub!(:fetch!)
-      git_repository.stub!(:git).with("branch").and_return("* master\n  testbranch")
+      git_repository.stub!(:git).with("branch").and_return(Propel::GitRepository::Result.new("* master\n  testbranch", 0))
 
-      git_repository.should_receive(:git).with("rev-parse HEAD").and_return("ef2c8125b1923950a9cd776298516ad9ed3eb568")
-      git_repository.should_receive(:git).with("config branch.master.remote").and_return("origin")
-      git_repository.should_receive(:git).with("config branch.master.merge").and_return("refs/heads/master")
+      git_repository.should_receive(:git).with("rev-parse HEAD").and_return(Propel::GitRepository::Result.new("ef2c8125b1923950a9cd776298516ad9ed3eb568", 0))
+      git_repository.should_receive(:git).with("config branch.master.remote").and_return(Propel::GitRepository::Result.new("origin", 0))
+      git_repository.should_receive(:git).with("config branch.master.merge").and_return(Propel::GitRepository::Result.new("refs/heads/master", 0))
 
-      git_repository.should_receive(:git).with("ls-remote origin refs/heads/master").and_return("ef2c8125b1923950a9cd776298516ad9ed3eb568\trefs/heads/master")
+      git_repository.should_receive(:git).with("ls-remote origin refs/heads/master").and_return(Propel::GitRepository::Result.new("ef2c8125b1923950a9cd776298516ad9ed3eb568\trefs/heads/master", 0))
 
       git_repository.should_not be_changed
     end
@@ -36,13 +113,13 @@ describe Propel::GitRepository do
     it "should return true when the remote branch has a different SHA1 than the local HEAD" do
       git_repository = Propel::GitRepository.new
       git_repository.stub!(:fetch!)
-      git_repository.stub!(:git).with("branch").and_return("* master\n  testbranch")
+      git_repository.stub!(:git).with("branch").and_return(Propel::GitRepository::Result.new("* master\n  testbranch", 0))
 
-      git_repository.should_receive(:git).with("rev-parse HEAD").and_return("ef2c8125b1923950a9cd776298516ad9ed3eb568")
-      git_repository.should_receive(:git).with("config branch.master.remote").and_return("origin")
-      git_repository.should_receive(:git).with("config branch.master.merge").and_return("refs/heads/master")
+      git_repository.should_receive(:git).with("rev-parse HEAD").and_return(Propel::GitRepository::Result.new("ef2c8125b1923950a9cd776298516ad9ed3eb568", 0))
+      git_repository.should_receive(:git).with("config branch.master.remote").and_return(Propel::GitRepository::Result.new("origin", 0))
+      git_repository.should_receive(:git).with("config branch.master.merge").and_return(Propel::GitRepository::Result.new("refs/heads/master", 0))
 
-      git_repository.should_receive(:git).with("ls-remote origin refs/heads/master").and_return("bf2c8125b1923950a9cd776298516ad9ed3eb568\trefs/heads/master")
+      git_repository.should_receive(:git).with("ls-remote origin refs/heads/master").and_return(Propel::GitRepository::Result.new("bf2c8125b1923950a9cd776298516ad9ed3eb568\trefs/heads/master", 0))
 
       git_repository.should be_changed
     end
@@ -51,8 +128,8 @@ describe Propel::GitRepository do
   describe "#remote_config" do
     it "should call the git command to determine the remote repository" do
       git_repository = Propel::GitRepository.new
-      git_repository.stub!(:git).with("branch").and_return("* master\n  testbranch")
-      git_repository.should_receive(:git).with("config branch.master.remote").and_return("origin")
+      git_repository.stub!(:git).with("branch").and_return(Propel::GitRepository::Result.new("* master\n  testbranch", 0))
+      git_repository.should_receive(:git).with("config branch.master.remote").and_return(Propel::GitRepository::Result.new("origin", 0))
 
       git_repository.remote_config.should == 'origin'
     end
@@ -60,8 +137,8 @@ describe Propel::GitRepository do
     it "should raise an error if the remote repository cannot be determined" do
       git_repository = Propel::GitRepository.new
 
-      git_repository.stub!(:git).with("branch").and_return("* foo\n  testbranch")
-      git_repository.stub!(:git).with("config branch.foo.remote").and_return("")
+      git_repository.stub!(:git).with("branch").and_return(Propel::GitRepository::Result.new("* foo\n  testbranch", 0))
+      git_repository.stub!(:git).with("config branch.foo.remote").and_return(Propel::GitRepository::Result.new("", 0))
 
       git_repository.should_receive(:warn).with("We could not determine the remote repository for branch 'foo.' Please set it with git config branch.foo.remote REMOTE_REPO.")
       git_repository.should_receive(:exit).with(1)
@@ -73,8 +150,8 @@ describe Propel::GitRepository do
   describe "#merge_config" do
     it "should call the git command to determine the remote branch" do
       git_repository = Propel::GitRepository.new
-      git_repository.stub!(:git).with("branch").and_return("* master\n  testbranch")
-      git_repository.should_receive(:git).with("config branch.master.merge").and_return("refs/heads/master")
+      git_repository.stub!(:git).with("branch").and_return(Propel::GitRepository::Result.new("* master\n  testbranch", 0))
+      git_repository.should_receive(:git).with("config branch.master.merge").and_return(Propel::GitRepository::Result.new("refs/heads/master", 0))
 
       git_repository.merge_config.should == 'refs/heads/master'
     end
@@ -82,8 +159,8 @@ describe Propel::GitRepository do
     it "should raise an error if the remote branch cannot be determined" do
       git_repository = Propel::GitRepository.new
 
-      git_repository.stub!(:git).with("branch").and_return("* foo\n  testbranch")
-      git_repository.stub!(:git).with("config branch.foo.merge").and_return("")
+      git_repository.stub!(:git).with("branch").and_return(Propel::GitRepository::Result.new("* foo\n  testbranch", 0))
+      git_repository.stub!(:git).with("config branch.foo.merge").and_return(Propel::GitRepository::Result.new("", 0))
 
       git_repository.should_receive(:warn).with("We could not determine the remote branch for local branch 'foo.' Please set it with git config branch.foo.merge REMOTE_BRANCH.")
       git_repository.should_receive(:exit).with(1)

data/spec/propel/logger_spec.rb

@@ -2,22 +2,8 @@ require 'spec_helper'
 
 describe Propel::Logger do
   describe "#print" do
-    it "should print the message when quiet mode is disabled" do
-      logger = Propel::Logger.new({:quiet => false})
-      Kernel.should_receive(:print).with('Hi')
-
-      logger.print('Hi')
-    end
-
-    it "should not print the message when quiet mode is enabled" do
-      logger = Propel::Logger.new({:quiet => true})
-      Kernel.should_not_receive(:print).with('Hi')
-
-      logger.print('Hi')
-    end
-
     it "should colorize the method when color is enabled and a color is provided" do
-      logger = Propel::Logger.new({:quiet => false, :color => true})
+      logger = Propel::Logger.new({:color => true})
       Kernel.should_receive(:print).with("\e[32mHi\e[0m")
 
       logger.print('Hi', :green)
@@ -25,22 +11,8 @@ describe Propel::Logger do
   end
 
   describe "#puts" do
-    it "should puts the message when quiet mode is disabled" do
-      logger = Propel::Logger.new({:quiet => false})
-      Kernel.should_receive(:puts).with('Hi')
-
-      logger.puts('Hi')
-    end
-
-    it "should not puts the message when quiet mode is enabled" do
-      logger = Propel::Logger.new({:quiet => true})
-      Kernel.should_not_receive(:puts).with('Hi')
-
-      logger.puts('Hi')
-    end
-
     it "should colorize the method when color is enabled and a color is provided" do
-      logger = Propel::Logger.new({:quiet => false, :color => true})
+      logger = Propel::Logger.new({:color => true})
       Kernel.should_receive(:puts).with("\e[31mHi\e[0m")
 
       logger.puts('Hi', :red)
@@ -48,25 +20,39 @@ describe Propel::Logger do
   end
 
   describe "#warn" do
-    it "should warn the message when quiet mode is disabled" do
-      logger = Propel::Logger.new({:quiet => false})
-      Kernel.should_receive(:warn).with('Hi')
+    it "should colorize the method when color is enabled and a color is provided" do
+      logger = Propel::Logger.new({:color => true})
+      Kernel.should_receive(:warn).with("\e[33mHi\e[0m")
 
-      logger.warn('Hi')
-    end
+      logger.warn('Hi', :yellow)
+    end    
+  end
 
-    it "should not warn the message when quiet mode is enabled" do
-      logger = Propel::Logger.new({:quiet => true})
-      Kernel.should_not_receive(:warn).with('Hi')
+  describe "#report_operation" do
+    it "should return a formatted string by default" do
+      logger = Propel::Logger.new({:color => true})
+      Kernel.should_receive(:print).with("Doing something:                                            ")
+      logger.report_operation('Doing something')
+    end
 
-      logger.warn('Hi')
+    it "should print a string with an ellipsis at the end when verbose is true" do
+      logger = Propel::Logger.new({:verbose => true})
+      Kernel.should_receive(:puts).with("Doing something...")
+      logger.report_operation('Doing something')
     end
+  end
 
-    it "should colorize the method when color is enabled and a color is provided" do
-      logger = Propel::Logger.new({:quiet => false, :color => true})
-      Kernel.should_receive(:warn).with("\e[33mHi\e[0m")
+  describe "#report_status" do
+    it "should return a formatted, colorized string" do
+      logger = Propel::Logger.new({:color => true})
+      Kernel.should_receive(:puts).with("[ \e[31mDONE\e[0m ]")
+      logger.report_status('done', :red)
+    end
 
-      logger.warn('Hi', :yellow)
-    end    
+    it "should print a string that can appear on its own output line when verbose is true" do
+      logger = Propel::Logger.new({:color => true, :verbose => true})
+      Kernel.should_receive(:puts).with("\e[31mDone\e[0m")
+      logger.report_status('done', :red)
+    end
   end
 end

data/spec/propel/option_parser_spec.rb

@@ -14,8 +14,8 @@ describe Propel::OptionParser do
       Propel::OptionParser.parse!(['--wait'])[:wait].should be_true
     end
 
-    it "should set quiet to true when given as an option" do
-      Propel::OptionParser.parse!(['--quiet'])[:quiet].should be_true
+    it "should set verbose to true when given as an option" do
+      Propel::OptionParser.parse!(['--verbose'])[:verbose].should be_true
     end
 
     it "should set the status url based on the given parameters" do

data/spec/propel/propel_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Propel::Propel do
+  describe "#start" do
+    before do
+      @repository = Propel::GitRepository.new
+    end
+    
+    it "should call pull on the repository with rebase when rebase is true" do
+      propel = Propel::Propel.new(@repository, true)
+      @repository.should_receive(:pull).with(true)
+
+      propel.start
+    end
+
+    it "should call pull on the repository without rebase when rebase is false" do
+      propel = Propel::Propel.new(@repository, false)
+      @repository.should_receive(:pull).with(false).and_return(false)
+
+      propel.start
+    end
+
+    it"should call rake if the pull passes" do
+      propel = Propel::Propel.new(@repository, true)
+      @repository.should_receive(:pull).and_return(true)
+      propel.should_receive(:rake).and_return(false)
+
+      propel.start
+    end
+
+    it "should not call rake if the pull fails" do
+      propel = Propel::Propel.new(@repository, true)
+      @repository.should_receive(:pull).and_return(false)
+      propel.should_not_receive(:rake)
+
+      propel.start
+    end
+
+    it"should call push if rake passes" do
+      propel = Propel::Propel.new(@repository, true)
+      @repository.should_receive(:pull).and_return(true)
+      propel.should_receive(:rake).and_return(true)
+      @repository.should_receive(:push)
+
+      propel.start
+    end
+
+    it "should not call push if rake fails" do
+      propel = Propel::Propel.new(@repository, true)
+      @repository.should_receive(:pull).and_return(true)
+      propel.should_receive(:rake).and_return(false)
+      @repository.should_not_receive(:push)
+
+      propel.start
+    end    
+  end
+end

data/spec/propel/runner_spec.rb

@@ -9,14 +9,17 @@ describe Propel::Runner do
 
   describe ".start" do
     it "should not call propel! if there is nothing to push" do
-      runner = Propel::Runner.new(%w[--quiet])
+      runner = Propel::Runner.new
+      runner.stub!(:logger).and_return(stub_logger)
+
       @git_repository.should_receive(:changed?).and_return(false)
       runner.should_not_receive(:propel!)
       runner.start
     end
 
     it "should call propel! if there are changes to the current branch" do
-      runner = Propel::Runner.new(%w[--quiet])
+      runner = Propel::Runner.new
+      runner.stub!(:logger).and_return(stub_logger)
 
       @git_repository.stub!(:changed?).and_return(true)
       @git_repository.stub!(:remote_config).and_return('origin')
@@ -27,33 +30,39 @@ describe Propel::Runner do
     end
 
     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 --quiet ])
+      runner = Propel::Runner.new(%w[ --status-url http://ci.example.com/status ])
       
       runner.stub!(:remote_build_configured?).and_return(true)
       runner.stub!(:remote_build_green?).and_return(true)
 
+      runner.stub!(:logger).and_return(stub_logger)
+
       runner.should_receive(:propel!)
       runner.start
     end
 
     it "should call propel! if the remote build is not configured" do
-      runner = Propel::Runner.new(%w[--quiet])
+      runner = Propel::Runner.new
       runner.stub!(:remote_build_configured?).and_return false
       runner.should_receive(:propel!)
-      runner.logger.should_receive(:warn).with("Remote build is not configured, you should point propel to the status URL of your CI server.")
+      runner.stub!(:logger).and_return(stub_logger)
+
+      runner.logger.should_receive(:warn).with("Remote build is not configured. You should point propel to the status URL of your CI server.")
 
       runner.start
     end
 
     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(%w[--quiet])
+      runner = Propel::Runner.new
       runner.stub!(:remote_build_configured?).and_return true
       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!)
 
+      runner.stub!(:logger).and_return(stub_logger)
+      
       lambda {
         runner.start
       }.should raise_error(TestError)
@@ -73,33 +82,17 @@ describe Propel::Runner do
       runner = Propel::Runner.new %w[ --fix-ci ]
       runner.stub!(:remote_build_configured?).and_return false
 
-      runner.logger.should_receive(:warn).with("Remote build is not configured, you should point propel to the status URL of your CI server.")
+      runner.logger.should_receive(:warn).with("Remote build is not configured. You should point propel to the status URL of your CI server.")
       runner.should_receive(:propel!)
 
       runner.start
     end
 
-    it "should run a command using pull --rebase by default" do
-      runner = Propel::Runner.new(%w[--quiet])
-
-      runner.logger.should_receive(:warn).with("Remote build is not configured, you should point propel to the status URL of your CI server.")
-
-      runner.should_receive(:system).with("git pull --rebase && rake && git push")
-      runner.start
-    end
-
-    it "should run a command using pull without --rebase when --no-rebase is specified" do
-      runner = Propel::Runner.new(['--no-rebase'])
-      runner.should_receive(:system).with("git pull && rake && git push")
-      runner.logger.should_receive(:warn).with("Remote build is not configured, you should point propel to the status URL of your CI server.")
-
-      runner.start
-    end
-
     it "should wait for the build to pass if the user specifies the --wait option" do
-      runner = Propel::Runner.new(%w[--wait --quiet])
+      runner = Propel::Runner.new(%w[--wait])
       runner.stub!(:remote_build_configured?).and_return true
-
+      runner.stub!(:logger).and_return(stub_logger)
+      
       runner.should_receive(:remote_build_green?).twice.and_return(false, true)
 
       runner.should_receive(:say_duration).and_yield

data/spec/spec_helper.rb

@@ -3,4 +3,8 @@ Bundler.setup
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-require 'propel'
+require 'propel'
+
+def stub_logger
+  double('logger', :report_operation => true, :report_status => true, :puts => true, :warn => true)
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Justin Leitgeb
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -05:00
+date: 2011-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id002
@@ -71,6 +58,7 @@ files:
 - lib/propel/git_repository.rb
 - lib/propel/logger.rb
 - lib/propel/option_parser.rb
+- lib/propel/propel.rb
 - lib/propel/remote_build.rb
 - lib/propel/runner.rb
 - lib/propel/version.rb
@@ -85,6 +73,7 @@ files:
 - spec/propel/git_repository_spec.rb
 - spec/propel/logger_spec.rb
 - spec/propel/option_parser_spec.rb
+- spec/propel/propel_spec.rb
 - spec/propel/remote_build_spec.rb
 - spec/propel/runner_spec.rb
 - spec/spec_helper.rb
@@ -102,23 +91,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Propel helps you to follow best practices for pushing code to a remote git repo