blastr 0.0.15 → 0.0.16

data/History.txt

@@ -1,6 +1,10 @@
+== 0.0.16 2009-02-22
+
+* Added support for HTTP-based, SSH-based, Rsync-based, and file system-based Git URLs.
+
 == 0.0.15 2009-02-21
 
-* Added support for local Mercurial repositories.
+* Added preliminary support for local Mercurial repositories.
 
 == 0.0.14 2009-02-20
 

data/lib/blastr.rb

@@ -6,7 +6,7 @@ module Blastr
   require 'tts/tts.rb'
   require 'people/people.rb'
 
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
   COPYRIGHT = 'Copyright (c) 2009, Lasse Koskela. All Rights Reserved.'
   puts "Blastr #{VERSION}\n#{COPYRIGHT}\n"
   

data/lib/scm/git.rb

@@ -35,7 +35,11 @@ module Blastr::SourceControl
     def name; "Git"; end
 
     def self.understands_url?(url)
-      url.index("git://") == 0
+      patterns = [ /^(git:)(.*)$/, /^(.*)(\.git)(\/?)$/ ]
+      patterns.each do |regex|
+        return true if url =~ regex
+      end
+      false
     end
 
     def initialize(git_url)

data/lib/scm/scm.rb

@@ -18,12 +18,10 @@ module Blastr::SourceControl
   @@implementations = []
   
   def self.implementation_for(url)
-    @@implementations.each do |impl|
-      if impl.understands_url?(url)
-        return impl.new(url)
-      end
-    end
-    raise "No SCM implementation found that would understand #{url}"
+    matching_implementations = @@implementations.find_all { |impl| impl.understands_url?(url) }
+    raise "No SCM implementation found that would understand #{url}" if matching_implementations.empty?
+    raise "Ambiguous SCM URL #{url} - please prefix it with the type of repository ('svn:', 'git:', 'hg:')" if matching_implementations.size > 1
+    return matching_implementations.first.new(url)
   end
   
   def self.register_implementation(implementation)

data/lib/scm/svn.rb

@@ -29,7 +29,7 @@ module Blastr::SourceControl
     def name; "Subversion"; end
     
     def self.understands_url?(url)
-      not url.match(/^(https?|svn):\/\/.+$/u).nil?
+      not url.match(/^(https?:|svn:)(.+)$/).nil?
     end
     
     def initialize(svn_url)

data/test/test_scm_url_matching.rb

@@ -2,10 +2,40 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestScmURLMatching < Test::Unit::TestCase
 
-  GIT_URLS = [ "git://foo.com/bar.git" ]
-  MERCURIAL_URLS = [ "hg:http://foo.com/hg", "hg:/tmp/hg/repo" ]
-  SVN_URLS = [ "http://foo.com/svn", "https://foo.com/svn", "svn://foo.com/svn" ]
-  ALL_URLS = [ SVN_URLS, GIT_URLS, MERCURIAL_URLS ].flatten
+  GIT_URLS = [
+    "git://foo.com/bar.git",
+    "git:/path/to/repo",
+    "git:http://repo.com/project",
+    "http://github.com/user/project.git",
+    "http://github.com/user/project.git/",
+    "https://github.com/user/project.git",
+    "rsync://host.xz/repo.git",
+    "rsync://host.xz/repo.git/",
+    "ssh://host.xz/repo.git/",
+    "host.xz/repo.git",
+    "host.xz/repo.git/",
+    "user@host.xz/repo.git",
+    "user@host.xz/repo.git/",
+    "ssh://user@host.xz/repo.git/",
+    "ssh://user@host.xz:1234/path/to/repo.git",
+    "file:///path/to/local/repo.git",
+    "file:///path/to/local/repo.git/",
+    "/path/to/repo.git",
+    "/path/to/repo.git/" ]
+  MERCURIAL_URLS = [ 
+    "hg:http://foo.com/hg", 
+    "hg:http://foo.com/hg/", 
+    "hg:/tmp/hg/repo",
+    "hg:/tmp/hg/repo/" ]
+  SVN_URLS = [
+    "http://foo.com/repo",
+    "http://foo.com/repo/",
+    "https://foo.com/repo",
+    "https://foo.com/repo/",
+    "svn:http://foo.com/svn",
+    "svn:http://foo.com/svn/",
+    "svn:https://foo.com/svn",
+    "svn://foo.com/svn" ]
   
   def test_subversion
     assert_urls_are_understood_by(Blastr::SourceControl::Subversion, SVN_URLS)
@@ -24,8 +54,5 @@ class TestScmURLMatching < Test::Unit::TestCase
     list_of_urls.each do |url|
       assert scm.understands_url?(url), "#{url} should be understood by #{scm}!"
     end
-    ALL_URLS.reject {|url| list_of_urls.include?(url) }.each do |url|
-      assert scm.understands_url?(url) == false, "#{url} should not be understood by #{scm}!"
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - Lasse Koskela