gitable 0.2.0 → 0.2.1

data/gitable.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "gitable"
-  s.version     = "0.2.0"
+  s.version     = "0.2.1"
   s.authors     = ["Martin Emde"]
   s.email       = ["martin.emde@gmail.com"]
   s.homepage    = "http://github.org/martinemde/gitable"

data/lib/gitable/uri.rb

@@ -20,7 +20,6 @@ module Gitable
       add = super # >:( at inconsistency
 
       if Gitable::ScpURI.scp?(uri)
-        # nil host is an Addressable misunderstanding (therefore it might be scp style)
         Gitable::ScpURI.parse(uri)
       else
         new(add.omit(:password,:query,:fragment).to_hash)
@@ -110,6 +109,13 @@ module Gitable
       ssh? || (!normalized_user.nil? && normalized_password.nil?)
     end
 
+    # Detect URIs that will require interactive authentication
+    #
+    # @return [Boolean] true if the URI has a user, but is not using ssh
+    def interactive_authenticated?
+      authenticated? && !ssh?
+    end
+
     # Set an extension name, replacing one if it exists.
     #
     # If there is no basename (i.e. no words in the path) this method call will
@@ -156,16 +162,5 @@ module Gitable
       end
       basename
     end
-
-    protected
-
-    def validate
-      return if @validation_deferred
-      super
-
-      if normalized_user && normalized_scheme != 'ssh'
-        raise InvalidURIError, "URIs with 'user@' other than ssh:// and scp-style are not supported."
-      end
-    end
   end
 end

data/spec/gitable_spec.rb

@@ -94,7 +94,6 @@ describe Gitable::URI do
       [
         "http://", # nothing but scheme
         "blah:", # pretty much nothing
-        "http://user@example.com/path.git", # unsupported http with user part
         "user@:path.git", # no host
         "user@host:", # no path
       ].each do |uri|
@@ -151,6 +150,7 @@ describe Gitable::URI do
       :local?         => false,
       :ssh?           => false,
       :authenticated? => false,
+      :interactive_authenticated? => false,
       :to_web_uri     => Addressable::URI.parse("https://host.xz/path/to/repo"),
     }
 
@@ -202,6 +202,16 @@ describe Gitable::URI do
       })
     end
 
+    describe_uri "https://user@host.xz/path/to/repo.git/" do
+      it { subject.to_s.should == @uri }
+      it_sets expected.merge({
+        :scheme                     => "https",
+        :user                       => "user",
+        :interactive_authenticated? => true,
+        :authenticated?             => true,
+      })
+    end
+
     describe_uri "https://host.xz:8888/path/to/repo.git/" do
       it { subject.to_s.should == @uri }
       it_sets expected.merge({

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Martin Emde
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency