propel 0.4.2 → 0.4.3

data/.gitignore

@@ -1,2 +1,3 @@
 pkg/*
-.propel
+.propel
+tags

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.2@propel --create

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-2.0
+  - jruby
+  - ruby-head
+  - ree

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    propel (0.4.1)
+    propel (0.4.2)
       json
+      rake
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
     json (1.5.1)
+    rake (0.9.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -17,6 +19,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    stub_shell (0.0.2)
 
 PLATFORMS
   ruby
@@ -24,3 +27,4 @@ PLATFORMS
 DEPENDENCIES
   propel!
   rspec (~> 2.5.0)
+  stub_shell (= 0.0.2)

data/README.md

@@ -1,4 +1,5 @@
-# Propel
+# Propel [![Build Status](https://secure.travis-ci.org/stackbuilders/propel.png)](http://travis-ci.org/stackbuilders/propel)
+
 
 Propel is a command that helps you to push to remote repositories while following best practices for
 continuous integration.  We believe that before you push to a shared git repository, you should check that

data/lib/propel/git_repository.rb

@@ -74,6 +74,7 @@ module Propel
     end
 
     private
+
     def exit_with_error(message)
       warn message
       exit 1
@@ -81,14 +82,9 @@ module Propel
 
     def git git_args
       output, exitcode = run_command(git_args)
-
-      if exitcode == 0
-        Result.new(output, exitcode)
-        
-      else
-        puts output
-        exit exitcode
-      end
+      logger.puts(output) unless exitcode == 0
+      
+      Result.new(output, exitcode)
     end
 
     def run_command(cmd)
@@ -113,4 +109,4 @@ module Propel
       @options[:verbose] ? git_operation : "#{git_operation} -q"
     end
   end
-end
+end

data/lib/propel/runner.rb

@@ -1,7 +1,7 @@
 module Propel
   class Runner
     attr_reader :logger, :repository
-    
+
     def initialize(args = [ ])
       @repository = GitRepository.new
       @options    = Configuration.new(args, @repository).options
@@ -44,7 +44,7 @@ module Propel
       if @options[:wait]
         unless remote_build_green?
           waited_for_build = true
-          
+
           say_duration do
             logger.report_status("FAILING", :red)
             logger.puts "Waiting until the CI build is green."
@@ -54,7 +54,7 @@ module Propel
         end
 
       else
-        
+
         alert_broken_build_and_exit unless remote_build_green?
       end
 
@@ -98,4 +98,4 @@ If you're waiting for someone else to fix the build, use propel with --wait (-w)
       Propel.new(@repository, @options[:rebase]).start
     end
   end
-end
+end

data/lib/propel/version.rb

@@ -1,3 +1,3 @@
 module Propel
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/propel.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
+  s.add_dependency('rake')
   s.add_dependency('json')
 
   s.add_development_dependency('rspec', ["~> 2.5.0"])
+  s.add_development_dependency('stub_shell', ["0.0.2"])
 end

data/spec/propel/configuration_spec.rb

@@ -3,28 +3,28 @@ require 'spec_helper'
 describe Propel::Configuration do
   describe "#options" do
     it "should prefer options given on the command line over options in a configuration file" do
-      configuration = Propel::Configuration.new(['--rebase'], Propel::GitRepository.new)
+      configuration = Propel::Configuration.new(['--rebase'], mock('git repository'))
       configuration.stub!(:options_from_config_file).and_return(['--no-rebase'])
 
       configuration.options[:rebase].should be_true
     end
 
     it "should not overwrite options from config file with defaults" do
-      configuration = Propel::Configuration.new([], Propel::GitRepository.new)
+      configuration = Propel::Configuration.new([], mock('git repository'))
       configuration.stub!(:options_from_config_file).and_return(['--wait'])
 
       configuration.options[:wait].should be_true
     end
 
     it "should set default options" do
-      configuration = Propel::Configuration.new([], Propel::GitRepository.new)
+      configuration = Propel::Configuration.new([], mock('git repository'))
       configuration.stub!(:options_from_config_file).and_return([])
 
       configuration.options.should == { :rebase => true, :fix_ci => false, :verbose => false, :wait => false, :color => false }
     end
 
     it "should correct the color setting if on a Windows 32 system that does not support color" do
-      configuration = Propel::Configuration.new(['--color'], Propel::GitRepository.new)
+      configuration = Propel::Configuration.new(['--color'], mock('git repository', project_root: '/tmp/foobar'))
       configuration.stub(:ruby_platform).and_return('mswin')
       configuration.stub!(:warn)
       configuration.options[:color].should be_false
@@ -33,10 +33,7 @@ describe Propel::Configuration do
 
   describe "#config_file" do
     it "should return a file located in the project root" do
-      git_repository = Propel::GitRepository.new
-      git_repository.stub!(:project_root).and_return('/foo/testdirectory')
-
-      configuration = Propel::Configuration.new([], git_repository)
+      configuration = Propel::Configuration.new([], mock('git repository', project_root: '/foo/testdirectory'))
       configuration.config_file.should == '/foo/testdirectory/.propel'
     end
   end

data/spec/propel/git_repository_spec.rb

@@ -18,11 +18,17 @@ describe Propel::GitRepository do
 
     describe "when the process exits with a non-zero exit status" do
       it "should print the process stdout to the console and exit with the exit code of the process" do
+        stub_shell do
+          command 'git pull --rebase' do
+            stdout 'my message'
+            exitstatus 127
+          end
+        end
+        
         git_repository = Propel::GitRepository.new
+        git_repository.logger = stub_logger
 
-        git_repository.should_receive(:run_command).with('pull --rebase').and_return([ 'my message', 127 ])
-        git_repository.should_receive(:exit).with(127)
-        git_repository.should_receive(:puts).with('my message')
+        git_repository.logger.should_receive(:puts).with('my message')
         git_repository.pull(true)
       end
     end
@@ -33,7 +39,8 @@ describe Propel::GitRepository do
 
     it "should warn the user and exit with a status of 1 when the head is detached" do
       git_repository = Propel::GitRepository.new
-      git_repository.stub!(:current_branch).and_return('(no branch)')
+      
+      stub_shell { command('git branch') { stdout "* (no branch)\nmaster\n"  } }
       git_repository.should_receive(:exit_with_error).with('You are operating with a detached HEAD, aborting.').and_raise(DetachedHeadTrap)
 
       lambda {
@@ -43,7 +50,7 @@ describe Propel::GitRepository do
 
     it "should not exit when on master branch" do
       git_repository = Propel::GitRepository.new
-      git_repository.stub!(:current_branch).and_return('master')
+      stub_shell { command('git branch') { stdout "* master\notherbranch\n"  } }
       git_repository.should_not_receive(:exit_with_error)
 
       lambda {
@@ -79,21 +86,23 @@ describe Propel::GitRepository 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))
+      stub_shell { command('git push -q') { exitstatus 1; stdout 'it failed'  } }
       
       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
+      lambda {
+        git_repository.push  
+      }.should raise_error(SystemExit)      
     end
   end
 
   describe "#project_root" do
     it "should return the root of the project" do
       project_root = File.expand_path(File.join(File.dirname(__FILE__), %w[ .. .. ]))
+      stub_shell { command('git rev-parse --show-toplevel') { exitstatus 0; stdout project_root } }
       Propel::GitRepository.new.project_root.should == project_root
     end
   end
@@ -113,12 +122,10 @@ describe Propel::GitRepository 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)
+      stub_shell { command('git fetch -q') { exitstatus 1; stdout 'it failed!'  } }
       git_repository.should_receive(:warn).with('Fetch of remote repository failed, exiting.')
 
-      git_repository.fetch!
+      lambda { git_repository.fetch! }.should raise_error SystemExit
     end
 
     it "should call fetch without the quiet option (-q) if --verbose is specified" do
@@ -126,7 +133,7 @@ describe Propel::GitRepository do
       git_repository.logger = stub_logger
       git_repository.options = {:verbose => true}
 
-      git_repository.should_receive(:git).with('fetch').and_return(Propel::GitRepository::Result.new('', 0))
+      stub_shell { command('git fetch') { stdout 'it worked!'  } }
 
       git_repository.fetch!
     end
@@ -135,29 +142,33 @@ describe Propel::GitRepository do
   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(Propel::GitRepository::Result.new("* master\n  testbranch", 0))
-
-      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.logger = stub_logger
 
-      git_repository.should_receive(:git).with("ls-remote origin refs/heads/master").and_return(Propel::GitRepository::Result.new("ef2c8125b1923950a9cd776298516ad9ed3eb568\trefs/heads/master", 0))
+      stub_shell { 
+        command('git fetch -q') { stdout 'ok, I fetched' }
+        command('git branch') { stdout "* master\n  testbranch"  }
+        command('git rev-parse HEAD') { stdout "ef2c8125b1923950a9cd776298516ad9ed3eb568\n"  }
+        command('git config branch.master.remote') { stdout "origin\n"  }
+        command('git config branch.master.merge') { stdout "refs/heads/master\n"  }
+        command('git ls-remote origin refs/heads/master') { stdout "ef2c8125b1923950a9cd776298516ad9ed3eb568\n"  }
+      }
 
       git_repository.should_not be_changed
     end
 
     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(Propel::GitRepository::Result.new("* master\n  testbranch", 0))
-
-      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(Propel::GitRepository::Result.new("bf2c8125b1923950a9cd776298516ad9ed3eb568\trefs/heads/master", 0))
-
+      git_repository.logger = stub_logger
+      
+      stub_shell { 
+        command('git fetch -q') { stdout 'ok, I fetched' }
+        command('git branch') { stdout "* master\n  testbranch"  }
+        command('git rev-parse HEAD') { stdout "ef2c8125b1923950a9cd776298516ad9ed3eb568\n"  }
+        command('git config branch.master.remote') { stdout "origin\n"  }
+        command('git config branch.master.merge') { stdout "refs/heads/master\n"  }
+        command('git ls-remote origin refs/heads/master') { stdout "bf2c8125b1923950a9cd776298516ad9ed3eb568\n"  }
+      }
+      
       git_repository.should be_changed
     end
   end
@@ -165,8 +176,10 @@ 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(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))
+      stub_shell { 
+        command('git branch') { stdout "* master\n  testbranch"  } 
+        command('git config branch.master.remote') { stdout "origin\n"  }
+      }
 
       git_repository.remote_config.should == 'origin'
     end
@@ -174,34 +187,39 @@ 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(Propel::GitRepository::Result.new("* foo\n  testbranch", 0))
-      git_repository.stub!(:git).with("config branch.foo.remote").and_return(Propel::GitRepository::Result.new("", 0))
+      stub_shell { 
+        command('git branch') { stdout "* foo\n  testbranch"  } 
+        command('git config branch.foo.remote') { stdout "\n"  }
+      }
 
       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)
 
-      git_repository.remote_config
+      lambda { git_repository.remote_config }.should raise_error SystemExit
     end
   end
 
   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(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))
-
+      
+      stub_shell { 
+        command('git branch') { stdout "* master\n  testbranch"  } 
+        command('git config branch.master.merge') { stdout "refs/heads/master\n"  }
+      }
+      
       git_repository.merge_config.should == 'refs/heads/master'
     end
 
     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(Propel::GitRepository::Result.new("* foo\n  testbranch", 0))
-      git_repository.stub!(:git).with("config branch.foo.merge").and_return(Propel::GitRepository::Result.new("", 0))
-
+      stub_shell { 
+        command('git branch') { stdout "* foo\n  testbranch"  } 
+        command('git config branch.foo.merge') { stdout "\n"  }
+      }
+      
       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)
-      git_repository.merge_config
+      lambda { git_repository.merge_config }.should raise_error SystemExit
     end
   end
 end

data/spec/propel/runner_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe Propel::Runner do
   before do
-    @git_repository = Propel::GitRepository.new
+    @git_repository = mock('git repository', :changed? => true, :project_root => '/tmp/foobar', :current_branch => 'master', 
+                                             :logger= => nil, :options= => nil, :ensure_attached_head! => true)
+    
     Propel::GitRepository.should_receive(:new).and_return(@git_repository)
-    @git_repository.stub!(:changed?).and_return(true)
   end
 
   describe ".start" do
@@ -21,13 +22,17 @@ describe Propel::Runner do
         runner.start
       }.should raise_error(DetachedHeadTrap)
     end
-    
+
     it "should not call propel! if there is nothing to push" do
       runner = Propel::Runner.new
       runner.stub!(:logger).and_return(stub_logger)
 
       @git_repository.should_receive(:changed?).and_return(false)
+      @git_repository.stub!(:remote_config).and_return('REMOTE REPO')
+      @git_repository.stub!(:merge_config).and_return('MERGE CONFIG')
+
       runner.should_not_receive(:propel!)
+      
       runner.start
     end
 
@@ -45,7 +50,7 @@ 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_configured?).and_return(true)
       runner.stub!(:remote_build_green?).and_return(true)
 
@@ -76,7 +81,7 @@ describe Propel::Runner do
       runner.should_not_receive(:propel!)
 
       runner.stub!(:logger).and_return(stub_logger)
-      
+
       lambda {
         runner.start
       }.should raise_error(TestError)
@@ -106,7 +111,7 @@ describe Propel::Runner do
       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
@@ -115,4 +120,4 @@ describe Propel::Runner do
       runner.start
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,12 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'propel'
 
+require 'stub_shell'
+
+RSpec.configure do |config|
+  config.include StubShell::TestHelpers
+end
+
 def stub_logger
   double('logger', :report_operation => true, :report_status => true, :puts => true, :warn => true)
 end

metadata

@@ -1,65 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: propel
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.4.3
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Justin Leitgeb
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
+date: 2012-02-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70261464056860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70261464056860
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70261474860640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70261474860640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70261474860120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id002
-description: "    The 'propel' script helps you to push your code to a remote server while following Continuous Integration (CI)\n    best practices.  Propel first checks the CI server to make sure it's passing, and then runs the local spec\n    suite and pushes changes.  If the remote server is failing, just have propel wait for it to pass while you get\n    a coffee.\n"
-email: 
+  prerelease: false
+  version_requirements: *70261474860120
+- !ruby/object:Gem::Dependency
+  name: stub_shell
+  requirement: &70261474859600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: *70261474859600
+description: ! "    The 'propel' script helps you to push your code to a remote server
+  while following Continuous Integration (CI)\n    best practices.  Propel first checks
+  the CI server to make sure it's passing, and then runs the local spec\n    suite
+  and pushes changes.  If the remote server is failing, just have propel wait for
+  it to pass while you get\n    a coffee.\n"
+email:
 - justin@stackbuilders.com
-executables: 
+executables:
 - propel
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -90,39 +101,29 @@ files:
 - spec/propel/remote_build_spec.rb
 - spec/propel/runner_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/stackbuilders/propel
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Propel helps you to follow best practices for pushing code to a remote git repo
+summary: Propel helps you to follow best practices for pushing code to a remote git
+  repo
 test_files: []
-