repertoire 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.2 / 2009-04-13
+
+* Rewrote Repository.name to not use the URI module.
+* Rewrote Media.guess_from_uri to not use the URI module.
+
 === 0.2.1 / 2009-03-26
 
 * Fixed typo in Repository#update.

data/README.txt

@@ -26,26 +26,26 @@ Git, Mercurial and even RSync.
 
 * Checkout a repository using a URI:
 
-  Repertoire.checkout(
-    :uri => 'svn://rubyforge.org/var/svn/repertoire/trunk',
-    :path => 'repertoire'
-  )
+    Repertoire.checkout(
+      :uri => 'svn://rubyforge.org/var/svn/repertoire/trunk',
+      :path => 'repertoire'
+    )
 
 * Checkout a repository of a specific media type:
 
-  Repertoire.checkout(
-    :uri => 'http://repertoire.rubyforge.org/svn/trunk',
-    :media => :svn,
-    :path => 'repertoire'
-  )
+    Repertoire.checkout(
+      :uri => 'http://repertoire.rubyforge.org/svn/trunk',
+      :media => :svn,
+      :path => 'repertoire'
+    )
 
 * Update a previously checked-out repository:
 
-  Repertoire.update(:path => 'repertoire')
+    Repertoire.update(:path => 'repertoire')
 
 * Update a previously checked-out repository of a specific media type:
 
-  Repertoire.update(:path => 'path/to/rsynced_data', :media => :rsync)
+    Repertoire.update(:path => 'path/to/rsynced_data', :media => :rsync)
 
 == LICENSE:
 

data/lib/repertoire/media/media.rb

@@ -108,7 +108,7 @@ module Repertoire
     # specified _uri_.
     #
     def Media.guess_from_uri(uri)
-      Media.supports_scheme(URI(uri).scheme)
+      Media.supports_scheme(uri.to_s.scan(/^[^:\/@]+:/).first.chop)
     end
 
     #

data/lib/repertoire/repository.rb

@@ -1,8 +1,6 @@
 require 'repertoire/media'
 require 'repertoire/repository'
 
-require 'uri'
-
 module Repertoire
   class Repository
 
@@ -36,9 +34,9 @@ module Repertoire
     end
 
     #
-    # Returns the +basename+ of the specified _uri_, unless the +basename+ is
-    # +'trunk'+ then the +basename+ of the parent directory within the _uri_
-    # is returned.
+    # Returns the _basename_ of the specified _uri_, unless the _basename_
+    # is +trunk+ then the _basename_ of the parent directory within the
+    # _uri_ is returned.
     #
     #   Repertoire.name('http://www.today.com/is/now')
     #   # => "now"
@@ -47,24 +45,20 @@ module Repertoire
     #   # => "awesome"
     #
     def Repository.name(uri)
-      uri = URI(uri.to_s)
-
-      if uri.path.empty?
-        path = File::SEPARATOR
-      else
-        path = File.expand_path(uri.path)
-      end
-
-      name = File.basename(path)
-
-      if name == 'trunk'
-        name = File.basename(File.dirname(path))
-      elsif name =~ /\.git$/
-        name.gsub!(/\.git$/,'')
+      names = uri.to_s.split(/[:\/@]+/)
+      name = nil
+
+      names.reverse_each do |part|
+        unless (part == 'trunk' || part == '.' || part == '..')
+          name = part
+          break
+        end
       end
 
-      if (name.empty? || name == File::SEPARATOR)
-        name = uri.host
+      if name
+        if name =~ /\.git$/
+          name.gsub!(/\.git$/,'')
+        end
       end
 
       return name

data/lib/repertoire/version.rb

@@ -1,4 +1,4 @@
 module Repertoire
   # Repertoire version
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: repertoire
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Postmodern
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-26 00:00:00 -07:00
+date: 2009-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 1.12.1
     version: 
 description: R'epertoire is a Ruby library for quickly checking-out and updating code-bases from various SCMs. R'epertoire currently supports Subversion, Git, Mercurial and even RSync.
 email: