gitable 0.0.3 → 0.1.0

data/.gitignore

@@ -25,4 +25,3 @@ vendor/gems
 Gemfile.lock
 
 ## PROJECT::SPECIFIC
-gitable.gemspec

data/Gemfile

@@ -1,26 +1,3 @@
-source :gemcutter
+source "http://rubygems.org"
 
-group :runtime do
-  gem 'addressable', :require => 'addressable/uri'
-end
-
-group :release do
-  gem 'bundler'
-  gem 'jeweler'
-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
+gemspec

data/Rakefile

@@ -1,25 +1,5 @@
-require 'rubygems'
 require 'bundler'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gitable"
-    gem.summary = %Q{Addressable::URI for Git}
-    gem.description = %Q{It's like Addressable::URI but for Git. Gitable.}
-    gem.email = "martin.emde@gmail.com"
-    gem.homepage = "http://github.com/martinemde/gitable"
-    gem.authors = ["Martin Emde"]
-
-    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
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+Bundler::GemHelper.install_tasks
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -27,45 +7,11 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
+task :default => :spec
+
 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
-
-begin
-  require 'reek/adapters/rake_task'
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
-  end
-end
-
-task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
+  spec.rcov_opts << '--exclude' << 'spec,vendor,Library,.bundle'
 end

data/gitable.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name        = "gitable"
+  s.version     = "0.1.0"
+  s.authors     = ["Martin Emde"]
+  s.email       = ["martin.emde@gmail.com"]
+  s.homepage    = "http://github.org/martinemde/gitable"
+  s.summary     = %q{Addressable::URI for Git. Gitable::URI.}
+  s.description = %q{Addressable::URI for Git URIs with special handling for scp-style URIs that Addressable doesn't like.}
+
+  s.add_dependency "addressable"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
+end

data/lib/gitable/scp_uri.rb

@@ -15,7 +15,7 @@ module Gitable
     # @return [String] The same path passed in.
     def path=(new_path)
       super
-      @path = path.sub(%r|^/|,'') if new_path[0] != ?/
+      @path = path.sub(%r|^/|,'') if new_path[0] != ?/ # addressable likes to add a /
       @path
     end
 
@@ -38,21 +38,21 @@ module Gitable
     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}'"
+      return if @validation_deferred
+
+      if !scheme.to_s.empty? && host.to_s.empty? && path.to_s.empty?
+        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
+
+      if host.nil? && !path_only?
+        raise InvalidURIError, "Hostname not supplied: '#{to_s}'"
       end
-      return nil
+
+      nil
+    end
+
+    def path_only?
+      host.nil? && port.nil? && user.nil? && password.nil?
     end
   end
 end

data/lib/gitable/uri.rb

@@ -81,12 +81,11 @@ module Gitable
       extname
     end
 
-    # Addressable does basename wrong with there's no basename.
+    # Addressable does basename wrong when there's no basename.
     # It returns "/" for something like "http://host.com/"
     def basename
       base = super
-      return "" if base == "/"
-      base
+      base == "/" ? "" : base
     end
 
     # Set the basename, replacing it if it exists.
@@ -104,5 +103,16 @@ module Gitable
       end
       basename
     end
+
+    protected
+
+    def validate
+      return if @validation_deferred
+      super
+
+      if user && scheme != 'ssh'
+        raise InvalidURIError, "Git does not support URIs with 'user@' other than ssh:// and scp-style"
+      end
+    end
   end
 end

data/spec/gitable_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Gitable::URI do
   before do
@@ -41,28 +41,29 @@ describe Gitable::URI do
   # Valid Git URIs according to git-clone documentation at this url:
   # http://www.kernel.org/pub/software/scm/git/docs/git-clone.html#_git_urls_a_id_urls_a
   #
-  # rsync://host.xz/path/to/repo.git/
-  # http://host.xz[:port]/path/to/repo.git/
-  # https://host.xz[:port]/path/to/repo.git/
-  # git://host.xz[:port]/path/to/repo.git/
-  # git://host.xz[:port]/~user/path/to/repo.git/
+  # Git natively supports ssh, git, http, https, ftp, ftps, and rsync protocols. The following syntaxes may be used with them:
+  #
   # ssh://[user@]host.xz[:port]/path/to/repo.git/
-  # ssh://[user@]host.xz/path/to/repo.git/
-  # ssh://[user@]host.xz/~user/path/to/repo.git/
-  # ssh://[user@]host.xz/~/path/to/repo.git
+  # git://host.xz[:port]/path/to/repo.git/
+  # http[s]://host.xz[:port]/path/to/repo.git/
+  # ftp[s]://host.xz[:port]/path/to/repo.git/
+  # rsync://host.xz/path/to/repo.git/
+  #
+  # An alternative scp-like syntax may also be used with the ssh protocol:
   #
-  # (from the git docs)
-  # SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support username expansion, as does the native git protocol, but only the former supports port specification. The following three are identical to the last three above, respectively:
+  # [user@]host.xz:path/to/repo.git/
   #
-  # [user@]host.xz:/path/to/repo.git/
-  # [user@]host.xz:~user/path/to/repo.git/
-  # [user@]host.xz:path/to/repo.git
+  # The ssh and git protocols additionally support ~username expansion:
   #
-  # To sync with a local directory, you can use:
+  # ssh://[user@]host.xz[:port]/~[user]/path/to/repo.git/
+  # git://host.xz[:port]/~[user]/path/to/repo.git/
+  # [user@]host.xz:/~[user]/path/to/repo.git/
+  #
+  # For local repositories, also supported by git natively, the following syntaxes may be used:
   #
   # /path/to/repo.git/
   # file:///path/to/repo.git/
-  # 
+  #
 
   describe ".parse" do
     it "returns a Gitable::URI" do
@@ -87,7 +88,8 @@ describe Gitable::URI do
     context "(bad uris)" do
       [
         "http://",
-        "blah:"
+        "blah:",
+        "git://user@are.not/allowed/on/normal/uris.git" # if I'm reading the docs correctly
       ].each do |uri|
         it "raises an Gitable::URI::InvalidURIError with #{uri.inspect}" do
           lambda {

data/spec/spec_helper.rb

@@ -1,9 +1,15 @@
+unless defined? Bundler
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+end
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'gitable'
 require 'spec'
 require 'spec/autorun'
-require File.join(File.dirname(__FILE__), 'describe_uri')
+require 'describe_uri'
 
 Spec::Runner.configure do |config|
   config.extend DescribeURI

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitable
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Martin Emde
@@ -14,23 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -07:00
+date: 2010-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  name: addressable
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-description: It's like Addressable::URI but for Git. Gitable.
-email: martin.emde@gmail.com
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+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: []
@@ -46,6 +78,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- gitable.gemspec
 - lib/gitable.rb
 - lib/gitable/scp_uri.rb
 - lib/gitable/uri.rb
@@ -55,37 +88,42 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/martinemde/gitable
+homepage: http://github.org/martinemde/gitable
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Addressable::URI for Git
+summary: Addressable::URI for Git. Gitable::URI.
 test_files: 
 - spec/describe_uri.rb
 - spec/gitable_spec.rb
 - spec/heuristic_parse_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb