gitable 0.0.2 → 0.0.3

data/.gitignore

@@ -21,5 +21,8 @@ rdoc
 pkg
 vendor/gems
 .yardoc
+.bundle
+Gemfile.lock
 
 ## PROJECT::SPECIFIC
+gitable.gemspec

data/Gemfile

@@ -1,20 +1,26 @@
-source 'http://gemcutter.org'
- 
-bin_path 'gbin'
-disable_system_gems
+source :gemcutter
 
-only :runtime do
-  gem 'addressable', :require_as => 'addressable/uri'
+group :runtime do
+  gem 'addressable', :require => 'addressable/uri'
 end
- 
-only :development do
+
+group :release do
   gem 'bundler'
   gem 'jeweler'
-  gem 'bundler'
-  gem 'rspec', :require_as => 'spec'
+end
+ 
+group :development do
+  gem 'rspec', :require => 'spec'
   gem 'ZenTest'
   gem 'rake'
   gem 'rcov'
   gem 'ruby-debug'
   gem 'yard'
+  gem 'reek'
+  gem 'roodi'
+end
+
+group :release do
+  gem 'jeweler'
+  gem 'bundler', '>=0.9.7'
 end

data/README.rdoc

@@ -1,8 +1,8 @@
 = Gitable
 
-== +Addressable::URI+ for Git.
+== Addressable::URI for Git.
 
-Works with any valid Git URI.
+Works with any valid Git URI, because Addressable doesn't.
 
 == Example!?
 
@@ -13,13 +13,18 @@ Works with any valid Git URI.
     uri.user   # => 'git'
     uri.host   # => 'github.com'
 
+    # Maintain the same url format.
     uri.to_s   # => 'git@github.com:martinemde/gitable.git'
+
+    # If it can't guess the name, you named your repository wrong.
     uri.project_name   # => 'gitable'
+
+    # Inherited from Addressable::URI
     uri.kind_of?(Addressable::URI)   # => true
 
 == heuristic_parse
 
-You can use +Gitable::URI.heuristic_parse+ to take user input.
+You can use Gitable::URI.heuristic_parse to take user input.
 
 Currently this supports the mistake of copying the url bar instead of the git
 uri for a few of the popular git webhosts. It also runs through Addressable's
@@ -28,13 +33,13 @@ heuristic_parse so it will correct some poorly typed URIs.
     uri = Gitable::URI.heuristic_parse('http://github.com:martinemde/gitable')
     uri.to_s   # => 'git://github.com/martinemde/gitable.git'
 
-Heuristic parse is currently fairly limited. If the url doesn't end in .git, it
-switches +http://+ to +git://+ and adds .git to the basename. This works fine for
-github.com and gitorious.org.
+heuristic_parse is currently very limited. If the url doesn't end in .git, it
+switches http:// to git:// and adds .git to the basename.
+This works fine for github.com and gitorious.org but will happily screw up other URIs.
 
 == That's it?
 
-yep. What else did you expect? (let me know or write a patch)
+Yep. What else did you expect? (let me know or write a patch)
 
 == Copyright
 

data/Rakefile

@@ -1,6 +1,5 @@
+require 'rubygems'
 require 'bundler'
-Bundler.require_env
-require 'rake'
 
 begin
   require 'jeweler'
@@ -12,11 +11,9 @@ begin
     gem.homepage = "http://github.com/martinemde/gitable"
     gem.authors = ["Martin Emde"]
 
-    bundle = Bundler::Bundle.load(File.dirname(__FILE__) + '/Gemfile')
-    bundle.environment.dependencies.each do |d|
-      if d.only && d.only.include?('runtime')
-        gem.add_dependency d.name, d.version.to_s
-      end
+    bundle = Bundler::Definition.from_gemfile('Gemfile')
+    bundle.dependencies.each do |dep|
+      gem.add_dependency(dep.name, dep.requirement.to_s) if dep.groups.include?(:runtime)
     end
   end
   Jeweler::GemcutterTasks.new
@@ -34,10 +31,9 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts << '--exclude' << 'spec,vendor,Library'
 end
 
-task :spec => :check_dependencies
-
 begin
   require 'reek/adapters/rake_task'
   Reek::RakeTask.new do |t|

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 2
+:patch: 3
 

data/lib/gitable/scp_uri.rb

@@ -3,7 +3,7 @@ require 'gitable/uri'
 module Gitable
   class ScpURI < Gitable::URI
 
-    # Keep URIs like this relative:
+    # Keep URIs like this as they were input:
     #
     #     git@github.com:martinemde/gitable.git
     #
@@ -15,23 +15,44 @@ module Gitable
     # @return [String] The same path passed in.
     def path=(new_path)
       super
-      if new_path[0..0] != "/"
-        @path = path.sub(%r|^/|,'')
-      end
-      path
+      @path = path.sub(%r|^/|,'') if new_path[0] != ?/
+      @path
     end
 
     # Get the URI as a string in the same form it was input.
     #
+    # Taken from Addressable::URI.
+    #
     # @return [String] The URI as a string.
     def to_s
-      @uri_string ||= begin
-                        uri_string = "#{authority}:#{path.to_s}"
-                        if uri_string.respond_to?(:force_encoding)
-                          uri_string.force_encoding(Encoding::UTF_8)
-                        end
-                        uri_string
-                      end
+      @uri_string ||=
+        begin
+          uri_string = "#{authority}:#{path}"
+          if uri_string.respond_to?(:force_encoding)
+            uri_string.force_encoding(Encoding::UTF_8)
+          end
+          uri_string
+        end
+    end
+
+    protected
+
+    def validate
+      return if !!@validation_deferred
+      if scheme != nil &&
+          (host == nil || host == "") &&
+          (path == nil || path == "")
+        raise InvalidURIError,
+          "Absolute URI missing hierarchical segment: '#{to_s}'"
+      end
+      if host == nil
+        if port != nil ||
+            user != nil ||
+            password != nil
+          raise InvalidURIError, "Hostname not supplied: '#{to_s}'"
+        end
+      end
+      return nil
     end
   end
 end

data/lib/gitable/uri.rb

@@ -5,7 +5,7 @@ module Gitable
     SCP_URI_REGEXP = %r|^([^:/?#]+):([^?#]*)$|
 
     ##
-    # Parse a git repository uri into a URI object.
+    # Parse a git repository URI into a URI object.
     #
     # @param [Addressable::URI, #to_str] uri URI of a git repository.
     #
@@ -18,11 +18,9 @@ module Gitable
       return uri if uri.nil? || uri.kind_of?(self)
 
       # addressable::URI.parse always returns an instance of Addressable::URI.
-      add = super # >:(
+      add = super # >:( at inconsistency
 
-      scan = uri.scan(SCP_URI_REGEXP)
-      fragments = scan[0]
-      authority = fragments && fragments[0]
+      authority = uri.scan(SCP_URI_REGEXP).flatten.first
 
       if add.host.nil? && authority
         Gitable::ScpURI.new(
@@ -35,9 +33,9 @@ module Gitable
     end
 
     ##
-    # Attempts to make a copied url bar into a git repo uri
-    # 
-    # First line of defense is for urls without .git as a basename:
+    # Attempts to make a copied URL bar into a git repository URI.
+    #
+    # First line of defense is for URIs without .git as a basename:
     # * Change the scheme from http:// to git://
     # * Add .git to the basename
     #
@@ -51,15 +49,12 @@ module Gitable
     def self.heuristic_parse(uri)
       return uri if uri.nil? || uri.kind_of?(self)
 
-      add = super
-      return add if add.extname == "git"
-      add.scheme = "git" if add.scheme == "http"
-      unless add.basename.nil?
-        # replace the last occurance of the basename with basename.git
-        # please tell me if there's a better way (besides rindex/slice/insert)
-        rpath = add.path.reverse
-        rbase = add.basename.reverse
-        add.path = rpath.sub(%r|#{Regexp.escape(rbase)}|,"tig."+rbase).reverse
+      # Addressable::URI.heuristic_parse _does_ return the correct type :)
+      add = super # boo inconsistency
+
+      if add.extname != ".git"
+        add.extname = "git"
+        add.scheme = "git" if add.scheme == "http"
       end
       add
     end
@@ -71,5 +66,43 @@ module Gitable
     def project_name
       basename.sub(/\.git$/,'')
     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
+    # be ignored because it is likely to break the uri.
+    #
+    # @param [String] New extension name
+    # @return [String] extname result
+    def extname=(ext)
+      base = basename
+      return nil if base.nil? || base == ""
+      self.basename = "#{base}.#{ext.sub(/^\.+/,'')}"
+      extname
+    end
+
+    # Addressable does basename wrong with there's no basename.
+    # It returns "/" for something like "http://host.com/"
+    def basename
+      base = super
+      return "" if base == "/"
+      base
+    end
+
+    # Set the basename, replacing it if it exists.
+    #
+    # @param [String] New basename
+    # @return [String] basename result
+    def basename=(new_basename)
+      base = basename
+      if base.nil? || base == ""
+        self.path += new_basename
+      else
+        rpath = path.reverse
+        # replace the last occurrence of the basename with basename.ext
+        self.path = rpath.sub(%r|#{Regexp.escape(base.reverse)}|, new_basename.reverse).reverse
+      end
+      basename
+    end
   end
 end

data/spec/describe_uri.rb

@@ -0,0 +1,28 @@
+module DescribeURI
+  def describe_uri(uri, &block)
+    describe "with uri: #{uri.inspect}" do
+      before { @uri = uri }
+      subject { Gitable::URI.parse(@uri) }
+      URIChecker.new(self, &block)
+    end
+  end
+
+  class URIChecker
+    def initialize(example_group, &block)
+      @example_group = example_group
+      instance_eval(&block)
+    end
+
+    def it_sets(parts)
+      parts.each do |part, value|
+        it "sets #{part} to #{value.inspect}" do
+          subject.send(part).should == value
+        end
+      end
+    end
+
+    def method_missing(*args, &block)
+      @example_group.send(*args, &block)
+    end
+  end
+end

data/spec/gitable_spec.rb

@@ -5,30 +5,36 @@ describe Gitable::URI do
     @uri = "ssh://git@github.com/martinemde/gitable.git"
   end
 
-  def self.describe_uri(uri, &block)
-    describe "with uri: #{uri.inspect}" do
-      before { @uri = uri }
-      subject { Gitable::URI.parse(@uri) }
-      URIChecker.new(self, &block)
+  describe_uri "git://github.com/martinemde/gitable" do
+    it "sets a new extname" do
+      subject.extname.should == ""
+      subject.extname = "git"
+      subject.extname.should == ".git"
+      subject.to_s.should == @uri + ".git"
     end
-  end
 
-  class URIChecker
-    def initialize(example_group, &block)
-      @example_group = example_group
-      instance_eval(&block)
+    it "sets a new basename" do
+      subject.basename.should == "gitable"
+      subject.basename = "gitable.git"
+      subject.basename.should == "gitable.git"
+      subject.extname.should == ".git"
     end
+  end
 
-    def it_sets(parts)
-      parts.each do |part, value|
-        it "sets #{part} to #{value.inspect}" do
-          subject.send(part).should == value
-        end
-      end
+  describe_uri "git://github.com/" do
+    it "does not set a new extname" do
+      subject.extname.should == ""
+      subject.extname = "git"
+      subject.extname.should == ""
+      subject.to_s.should == @uri
     end
 
-    def method_missing(*args, &block)
-      @example_group.send(*args, &block)
+    it "sets a new basename" do
+      subject.basename.should == ""
+      subject.basename = "gitable.git"
+      subject.basename.should == "gitable.git"
+      subject.extname.should == ".git"
+      subject.to_s.should == @uri + "gitable.git"
     end
   end
 
@@ -57,17 +63,6 @@ describe Gitable::URI do
   # /path/to/repo.git/
   # file:///path/to/repo.git/
   # 
-  expected = {
-    :user         => nil,
-    :password     => nil,
-    :host         => "host.xz",
-    :port         => nil,
-    :path         => "/path/to/repo.git/",
-    :basename     => "repo.git",
-    :query        => nil,
-    :fragment     => nil,
-    :project_name => "repo"
-  }
 
   describe ".parse" do
     it "returns a Gitable::URI" do
@@ -89,12 +84,31 @@ describe Gitable::URI do
       }.should raise_error(TypeError)
     end
 
-    it "raises an Gitable::URI::InvalidURIError on a bad uri" do
-      lambda {
-        Gitable::URI.parse("http://")
-      }.should raise_error(Gitable::URI::InvalidURIError)
+    context "(bad uris)" do
+      [
+        "http://",
+        "blah:"
+      ].each do |uri|
+        it "raises an Gitable::URI::InvalidURIError with #{uri.inspect}" do
+          lambda {
+            Gitable::URI.parse(uri)
+          }.should raise_error(Gitable::URI::InvalidURIError)
+        end
+      end
     end
 
+    expected = {
+      :user         => nil,
+      :password     => nil,
+      :host         => "host.xz",
+      :port         => nil,
+      :path         => "/path/to/repo.git/",
+      :basename     => "repo.git",
+      :query        => nil,
+      :fragment     => nil,
+      :project_name => "repo"
+    }
+
     describe_uri "rsync://host.xz/path/to/repo.git/" do
       it { subject.to_s.should == @uri }
       it_sets expected.merge({
@@ -399,29 +413,4 @@ describe Gitable::URI do
       })
     end
   end
-
-  describe ".heuristic_parse" do
-    it "returns a Gitable::URI" do
-      uri = "http://github.com/martinemde/gitable"
-      Gitable::URI.heuristic_parse(uri).should be_a_kind_of(Gitable::URI)
-    end
-
-    it "guesses git://github.com/martinemde/gitable.git if I pass in the url bar" do
-      uri = "http://github.com/martinemde/gitable"
-      gitable = Gitable::URI.heuristic_parse(uri)
-      gitable.to_s.should == "git://github.com/martinemde/gitable.git"
-    end
-
-    it "isn't upset by trailing slashes" do
-      uri = "http://github.com/martinemde/gitable/"
-      gitable = Gitable::URI.heuristic_parse(uri)
-      gitable.to_s.should == "git://github.com/martinemde/gitable.git/"
-    end
-
-    it "handles URIs with the name of the project in the path twice" do
-      uri = "http://gitorious.org/project/project"
-      gitable = Gitable::URI.heuristic_parse(uri)
-      gitable.to_s.should == "git://gitorious.org/project/project.git"
-    end
-  end
 end

data/spec/heuristic_parse_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Gitable::URI, ".heuristic_parse" do
+  it "returns a Gitable::URI" do
+    uri = "http://github.com/martinemde/gitable"
+    Gitable::URI.heuristic_parse(uri).should be_a_kind_of(Gitable::URI)
+  end
+
+  [
+    "http://host.xz/path/to/repo.git/",
+    "http://host.xz/path/to/repo.git",
+    "ssh://user@host.xz/path/to/repo.git/",
+    "ssh://user@host.xz:1234/path/to/repo.git/",
+    "user@host.xz:path/to/repo.git",
+    "user@host.xz:path/to/repo.git/",
+    "git@github.com:martinemde/gitable.git",
+  ].each do |uri|
+    it "doesn't break the already valid URI: #{uri.inspect}" do
+      Gitable::URI.heuristic_parse(uri).to_s.should == uri
+    end
+  end
+
+  it "guesses git://github.com/martinemde/gitable.git if I pass in the url bar" do
+    uri = "http://github.com/martinemde/gitable"
+    gitable = Gitable::URI.heuristic_parse(uri)
+    gitable.to_s.should == "git://github.com/martinemde/gitable.git"
+  end
+
+  it "isn't upset by trailing slashes" do
+    uri = "http://github.com/martinemde/gitable/"
+    gitable = Gitable::URI.heuristic_parse(uri)
+    gitable.to_s.should == "git://github.com/martinemde/gitable.git/"
+  end
+
+  it "handles URIs with the name of the project in the path twice" do
+    uri = "http://gitorious.org/project/project"
+    gitable = Gitable::URI.heuristic_parse(uri)
+    gitable.to_s.should == "git://gitorious.org/project/project.git"
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'gitable'
 require 'spec'
 require 'spec/autorun'
+require File.join(File.dirname(__FILE__), 'describe_uri')
 
 Spec::Runner.configure do |config|
-
+  config.extend DescribeURI
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gitable
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Martin Emde
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -08:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: addressable
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  requirement: *id001
+  name: addressable
+  prerelease: false
 description: It's like Addressable::URI but for Git. Gitable.
 email: martin.emde@gmail.com
 executables: []
@@ -39,11 +46,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
-- gitable.gemspec
 - lib/gitable.rb
 - lib/gitable/scp_uri.rb
 - lib/gitable/uri.rb
+- spec/describe_uri.rb
 - spec/gitable_spec.rb
+- spec/heuristic_parse_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -59,21 +67,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Addressable::URI for Git
 test_files: 
+- spec/describe_uri.rb
 - spec/gitable_spec.rb
+- spec/heuristic_parse_spec.rb
 - spec/spec_helper.rb

data/gitable.gemspec

@@ -1,58 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{gitable}
-  s.version = "0.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Emde"]
-  s.date = %q{2010-01-14}
-  s.description = %q{It's like Addressable::URI but for Git. Gitable.}
-  s.email = %q{martin.emde@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "gitable.gemspec",
-     "lib/gitable.rb",
-     "lib/gitable/scp_uri.rb",
-     "lib/gitable/uri.rb",
-     "spec/gitable_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/martinemde/gitable}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Addressable::URI for Git}
-  s.test_files = [
-    "spec/gitable_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<addressable>, [">= 0"])
-    else
-      s.add_dependency(%q<addressable>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<addressable>, [">= 0"])
-  end
-end
-