propel 0.4.1 → 0.4.2

data/lib/propel/git_repository.rb

@@ -20,6 +20,10 @@ module Propel
       local_last_commit != remote_last_commit
     end
 
+    def ensure_attached_head!
+      exit_with_error('You are operating with a detached HEAD, aborting.') if current_branch == '(no branch)'
+    end
+
     def pull(rebase)
       pull_cmd = 'pull'
       pull_cmd << ' --rebase' if rebase
@@ -76,8 +80,20 @@ module Propel
     end
 
     def git git_args
-      output = `git #{git_args}`.strip
-      Result.new(output, $?)
+      output, exitcode = run_command(git_args)
+
+      if exitcode == 0
+        Result.new(output, exitcode)
+        
+      else
+        puts output
+        exit exitcode
+      end
+    end
+
+    def run_command(cmd)
+      output = `git #{cmd}`.strip
+      [ output, $?.exitstatus ]
     end
 
     def local_last_commit
@@ -90,7 +106,6 @@ module Propel
     end
 
     def current_branch
-      # TODO - replace with git symbolic-ref HEAD
       git("branch").result.split("\n").detect{|l| l =~ /^\*/ }.gsub(/^\* /, '')
     end
 

data/lib/propel/runner.rb

@@ -12,6 +12,8 @@ module Propel
     end
 
     def start
+      @repository.ensure_attached_head!
+
       if @repository.changed?
         if remote_build_configured?
 

data/lib/propel/version.rb

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

data/spec/propel/git_repository_spec.rb

@@ -5,14 +5,51 @@ describe Propel::GitRepository do
     it "should use --rebase when argument is true" do
       git_repository = Propel::GitRepository.new
       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
+
+    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
+        git_repository = Propel::GitRepository.new
+
+        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.pull(true)
+      end
+    end
+  end
+
+  describe "#ensure_attached_head!" do
+    class DetachedHeadTrap < StandardError ; end
+
+    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)')
+      git_repository.should_receive(:exit_with_error).with('You are operating with a detached HEAD, aborting.').and_raise(DetachedHeadTrap)
+
+      lambda {
+        git_repository.ensure_attached_head!
+      }.should raise_error(DetachedHeadTrap)
+    end
+
+    it "should not exit when on master branch" do
+      git_repository = Propel::GitRepository.new
+      git_repository.stub!(:current_branch).and_return('master')
+      git_repository.should_not_receive(:exit_with_error)
+
+      lambda {
+        git_repository.ensure_attached_head!
+      }.should_not raise_error(DetachedHeadTrap)
+    end
   end
 
   describe "#push" do

data/spec/propel/runner_spec.rb

@@ -8,6 +8,20 @@ describe Propel::Runner do
   end
 
   describe ".start" do
+    class DetachedHeadTrap < StandardError ; end
+
+    it "should not call propel! if HEAD is detached" do
+      runner = Propel::Runner.new
+      runner.stub!(:logger).and_return(stub_logger)
+      @git_repository.stub!(:ensure_attached_head!).and_raise(DetachedHeadTrap)
+
+      runner.should_not_receive(:propel!)
+
+      lambda {
+        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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Justin Leitgeb
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -05:00
+date: 2011-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency