0
@@ -1,7 +1,8 @@
0
 GitHub.helper :user_and_repo_from do |url|
0
   case url
0
-  when %r|^git://github\.com/(.*)$|: $1.split('/')
0
-  when %r|^git@github\.com:(.*)$|: $1.split('/')
0
+  when %r|^git://github\.com/([^/]+/[^/]+)$|: $1.split('/')
0
+  when %r|^(?:ssh://)?(?:git@)?github\.com:([^/]+/[^/]+)$|: $1.split('/')
0
+  else ['', '']
0
   end
0
 end
0
 
0
@@ -18,7 +19,16 @@
0
 end
0
 
0
 GitHub.helper :project do
0
-  repo_for(:origin).chomp('.git')
0
+  repo = repo_for(:origin)
0
+  if repo == ""
0
+    if url_for(:origin) == ""
0
+      STDERR.puts "Error: missing remote 'origin'"
0
+    else
0
+      STDERR.puts "Error: remote 'origin' is not a github URL"
0
+    end
0
+    exit 1
0
+  end
0
+  repo.chomp('.git')
0
 end
0
 
0
 GitHub.helper :url_for do |remote|

0
@@ -9,5 +9,17 @@
0
     @helper.should_receive(:url_for).with(:origin).and_return("git://github.com/user/project-awesome.git")
0
     @helper.project.should == "project-awesome"
0
   end
0
+
0
+  it "should exit due to missing origin" do
0
+    @helper.should_receive(:url_for).twice.with(:origin).and_return("")
0
+    STDERR.should_receive(:puts).with("Error: missing remote 'origin'")
0
+    lambda { @helper.project }.should raise_error(SystemExit)
0
+  end
0
+
0
+  it "should exit due to non-github origin" do
0
+    @helper.should_receive(:url_for).twice.with(:origin).and_return("home:path/to/repo.git")
0
+    STDERR.should_receive(:puts).with("Error: remote 'origin' is not a github URL")
0
+    lambda { @helper.project }.should raise_error(SystemExit)
0
+  end
0
 end

0
@@ -12,5 +12,27 @@
0
   it "should parse a ssh-based url" do
0
     @helper.user_and_repo_from("git@github.com:mojombo/god.git").should == ["mojombo", "god.git"]
0
   end
0
+
0
+  it "should parse a non-standard ssh-based url" do
0
+    @helper.user_and_repo_from("ssh://git@github.com:mojombo/god.git").should == ["mojombo", "god.git"]
0
+    @helper.user_and_repo_from("github.com:mojombo/god.git").should == ["mojombo", "god.git"]
0
+    @helper.user_and_repo_from("ssh://github.com:mojombo/god.git").should == ["mojombo", "god.git"]
0
+  end
0
+
0
+  it "should return nothing for other urls" do
0
+    @helper.user_and_repo_from("home:path/to/repo.git").should == ['', '']
0
+  end
0
+
0
+  it "should return nothing for invalid git:// urls" do
0
+    @helper.user_and_repo_from("git://github.com/foo").should == ['', '']
0
+  end
0
+
0
+  it "should return nothing for invalid ssh-based urls" do
0
+    @helper.user_and_repo_from("git@github.com:kballard").should == ['', '']
0
+    @helper.user_and_repo_from("git@github.com:kballard/test/repo.git").should == ['', '']
0
+    @helper.user_and_repo_from("ssh://git@github.com:kballard").should == ['', '']
0
+    @helper.user_and_repo_from("github.com:kballard").should == ['', '']
0
+    @helper.user_and_repo_from("ssh://github.com:kballard").should == ['', '']
0
+  end
0
 end