gitable 0.2.1 → 0.2.2

data/gitable.gemspec

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

data/lib/gitable/scp_uri.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'gitable/uri'
 
 module Gitable
@@ -85,6 +86,13 @@ module Gitable
       true
     end
 
+    # Is this an scp formatted uri? (Yes, always)
+    #
+    # @return [true] always scp formatted uri
+    def scp?
+      true
+    end
+
     protected
 
     def validate

data/lib/gitable/uri.rb

@@ -59,7 +59,8 @@ module Gitable
       !!normalized_host.to_s.match(/\.?github.com$/)
     end
 
-    # Create a web uri for repositories that follow the github pattern.
+    # Create a web link uri for repositories that follow the github pattern.
+    #
     # This probably won't work for all git hosts, so it's a good idea to use
     # this in conjunction with #github? to help ensure correct links.
     #
@@ -67,7 +68,7 @@ module Gitable
     # @return [Addressable::URI] https://#{host}/#{path_without_git_extension}
     def to_web_uri(uri_scheme='https')
       return nil if normalized_host.to_s.empty?
-      Addressable::URI.new(:scheme => uri_scheme, :host => normalized_host, :port => normalized_port, :path => normalized_path.sub(%r#\.git/?#, ''))
+      Addressable::URI.new(:scheme => uri_scheme, :host => normalized_host, :port => normalized_port, :path => normalized_path.sub(%r#\.git/?$#, ''))
     end
 
     # Tries to guess the project name of the repository.
@@ -102,6 +103,13 @@ module Gitable
       !!normalized_scheme.to_s.match(/ssh/)
     end
 
+    # Is this an scp formatted uri? (No, always)
+    #
+    # @return [false] always false (overridden by scp formatted uris)
+    def scp?
+      false
+    end
+
     # Detect URIs that will require some sort of authentication
     #
     # @return [Boolean] true if the URI uses ssh or has a user but no password
@@ -116,6 +124,35 @@ module Gitable
       authenticated? && !ssh?
     end
 
+    # Detect if two URIs are equivalent versions of the same uri.
+    #
+    # When both uris are github repositories, uses a more lenient matching
+    # system is used that takes github's repository organization into account.
+    #
+    # For non-github URIs this method requires the two URIs to have the same
+    # host, equivalent paths, and either the same user or an absolute path.
+    #
+    # @return [Boolean] true if the URI probably indicates the same repository.
+    def equivalent?(other_uri)
+      other = Gitable::URI.parse(other_uri)
+
+      same_host = normalized_host.to_s == other.normalized_host.to_s
+
+      if github? && other.github?
+        # github doesn't care about relative vs absolute paths in scp uris (so we can remove leading / for comparison)
+        same_path = normalized_path.sub(%r#\.git/?$#, '').sub(%r#^/#,'') == other.normalized_path.sub(%r#\.git/?$#, '').sub(%r#^/#,'')
+        same_host && same_path
+      else
+        same_path = normalized_path.sub(%r#/$#,'').to_s == other.normalized_path.sub(%r#/$#,'').to_s # remove trailing slashes.
+        same_user = normalized_user == other.normalized_user
+
+        # if the path is absolute, we can assume it's the same for all users (so the user doesn't have to match).
+        same_host && same_path && (path =~ %r#^/# || same_user)
+      end
+    rescue Gitable::URI::InvalidURIError
+      false
+    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

data/spec/gitable_spec.rb

@@ -387,6 +387,11 @@ describe Gitable::URI do
 
     describe_uri "user@host.xz:/path/to/repo.git/" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent('ssh://user@host.xz/path/to/repo.git') }
+      it { subject.should be_equivalent('user@host.xz:/path/to/repo.git') }
+      it { subject.should_not be_equivalent('user@host.xz:path/to/repo.git') } # not absolute
+      it { subject.should_not be_equivalent('/path/to/repo.git') }
+      it { subject.should_not be_equivalent('host.xz:path/to/repo.git') }
       it_sets expected.merge({
         :scheme            => nil,
         :inferred_scheme   => 'ssh',
@@ -437,6 +442,10 @@ describe Gitable::URI do
 
     describe_uri "user@host.xz:path/to/repo.git" do
       it { subject.to_s.should == @uri }
+      it { subject.should_not be_equivalent('ssh://user@host.xz/path/to/repo.git') } # not absolute
+      it { subject.should_not be_equivalent('path/to/repo.git') }
+      it { subject.should_not be_equivalent('host.xz:path/to/repo.git') }
+      it { subject.should_not be_equivalent('user@host.xz:/path/to/repo.git') }
       it_sets expected.merge({
         :scheme            => nil,
         :inferred_scheme   => "ssh",
@@ -449,6 +458,12 @@ describe Gitable::URI do
 
     describe_uri "/path/to/repo.git/" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('/path/to/repo.git') }
+      it { subject.should be_equivalent('file:///path/to/repo.git') }
+      it { subject.should be_equivalent('file:///path/to/repo.git/') }
+      it { subject.should_not be_equivalent('/path/to/repo/.git') }
+      it { subject.should_not be_equivalent('file:///not/path/repo.git') }
       it_sets expected.merge({
         :scheme          => nil,
         :inferred_scheme => "file",
@@ -461,6 +476,12 @@ describe Gitable::URI do
 
     describe_uri "file:///path/to/repo.git/" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('/path/to/repo.git') }
+      it { subject.should be_equivalent('file:///path/to/repo.git') }
+      it { subject.should be_equivalent('/path/to/repo.git/') }
+      it { subject.should_not be_equivalent('/path/to/repo/.git') }
+      it { subject.should_not be_equivalent('file:///not/path/repo.git') }
       it_sets expected.merge({
         :scheme          => "file",
         :inferred_scheme => "file",
@@ -473,6 +494,13 @@ describe Gitable::URI do
 
     describe_uri "ssh://git@github.com/martinemde/gitable.git" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('git://github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:/martinemde/gitable.git') }
+      it { subject.should be_equivalent('https://martinemde@github.com/martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@othergit.com:martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@github.com:martinemde/not_gitable.git') }
       it_sets({
         :scheme            => "ssh",
         :user              => "git",
@@ -483,7 +511,9 @@ describe Gitable::URI do
         :fragment          => nil,
         :basename          => "gitable.git",
         :ssh?              => true,
+        :scp?              => false,
         :authenticated?    => true,
+        :interactive_authenticated? => false,
         :github?           => true,
         :to_web_uri        => Addressable::URI.parse("https://github.com/martinemde/gitable"),
       })
@@ -491,6 +521,13 @@ describe Gitable::URI do
 
     describe_uri "https://github.com/martinemde/gitable.git" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('ssh://git@github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git://github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:/martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@othergit.com:martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@github.com:martinemde/not_gitable.git') }
       it_sets({
         :scheme            => "https",
         :user              => nil,
@@ -500,13 +537,50 @@ describe Gitable::URI do
         :path              => "/martinemde/gitable.git",
         :fragment          => nil,
         :basename          => "gitable.git",
+        :ssh?              => false,
+        :scp?              => false,
         :github?           => true,
         :to_web_uri        => Addressable::URI.parse("https://github.com/martinemde/gitable"),
       })
     end
 
+    describe_uri "https://martinemde@github.com/martinemde/gitable.git" do
+      it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('ssh://git@github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git://github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:/martinemde/gitable.git') }
+      it { subject.should be_equivalent('https://github.com/martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@othergit.com:martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@github.com:martinemde/not_gitable.git') }
+      it_sets({
+        :scheme            => "https",
+        :user              => "martinemde",
+        :password          => nil,
+        :host              => "github.com",
+        :port              => nil,
+        :path              => "/martinemde/gitable.git",
+        :fragment          => nil,
+        :basename          => "gitable.git",
+        :ssh?              => false,
+        :scp?              => false,
+        :github?           => true,
+        :authenticated?    => true,
+        :interactive_authenticated? => true,
+        :to_web_uri        => Addressable::URI.parse("https://github.com/martinemde/gitable"),
+      })
+    end
+
     describe_uri "git://github.com/martinemde/gitable.git" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('ssh://git@github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:martinemde/gitable.git') }
+      it { subject.should be_equivalent('git@github.com:/martinemde/gitable.git') }
+      it { subject.should be_equivalent('https://martinemde@github.com/martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@othergit.com:martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@github.com:martinemde/not_gitable.git') }
       it_sets({
         :scheme            => "git",
         :user              => nil,
@@ -516,13 +590,23 @@ describe Gitable::URI do
         :path              => "/martinemde/gitable.git",
         :fragment          => nil,
         :basename          => "gitable.git",
+        :ssh?              => false,
+        :scp?              => false,
         :github?           => true,
+        :authenticated?    => false,
+        :interactive_authenticated? => false,
         :to_web_uri        => Addressable::URI.parse("https://github.com/martinemde/gitable"),
       })
     end
 
     describe_uri "git@github.com:martinemde/gitable.git" do
       it { subject.to_s.should == @uri }
+      it { subject.should be_equivalent(@uri) }
+      it { subject.should be_equivalent('ssh://git@github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('git://github.com/martinemde/gitable.git') }
+      it { subject.should be_equivalent('https://martinemde@github.com/martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@othergit.com:martinemde/gitable.git') }
+      it { subject.should_not be_equivalent('git@github.com:martinemde/not_gitable.git') }
       it_sets({
         :scheme            => nil,
         :inferred_scheme   => 'ssh',
@@ -535,7 +619,9 @@ describe Gitable::URI do
         :basename          => "gitable.git",
         :project_name      => "gitable",
         :ssh?              => true,
+        :scp?              => true,
         :authenticated?    => true,
+        :interactive_authenticated? => false,
         :github?           => true,
         :to_web_uri        => Addressable::URI.parse("https://github.com/martinemde/gitable"),
       })

metadata

@@ -1,91 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitable
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Martin Emde
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-22 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70179914661980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70179914661980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70179914661440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70179914661440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70179914661020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70179914661020
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70179914660560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Addressable::URI for Git URIs with special handling for scp-style URIs that Addressable doesn't like.
-email: 
+  prerelease: false
+  version_requirements: *70179914660560
+description: Addressable::URI for Git URIs with special handling for scp-style URIs
+  that Addressable doesn't like.
+email:
 - martin.emde@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -100,41 +79,37 @@ files:
 - spec/gitable_spec.rb
 - spec/heuristic_parse_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.org/martinemde/gitable
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 925310224133331721
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 925310224133331721
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Addressable::URI for Git. Gitable::URI.
-test_files: 
+test_files:
 - spec/describe_uri.rb
 - spec/gitable_spec.rb
 - spec/heuristic_parse_spec.rb