propel 0.3.2 → 0.3.3

data/lib/propel/git_repository.rb

@@ -13,11 +13,23 @@ module Propel
     end
 
     def remote_config
-      git("config branch.#{current_branch}.remote")
+      git("config branch.#{current_branch}.remote").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
+        end
+      end
     end
 
     def merge_config
-      git("config branch.#{current_branch}.merge")
+      git("config branch.#{current_branch}.merge").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
+        end
+      end
     end
 
     private

data/lib/propel/version.rb

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

data/spec/propel/git_repository_spec.rb

@@ -56,6 +56,18 @@ describe Propel::GitRepository do
 
       git_repository.remote_config.should == 'origin'
     end
+
+    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.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
+    end
   end
 
   describe "#merge_config" do
@@ -66,5 +78,16 @@ describe Propel::GitRepository do
 
       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("* foo\n  testbranch")
+      git_repository.stub!(:git).with("config branch.foo.merge").and_return("")
+
+      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
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: propel
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Justin Leitgeb