git-process 1.1.3 → 1.1.4

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# CHANGELOG - 1.1.3 #
+# CHANGELOG - 1.1.4 #
+
+### Since 1.1.3 ###
+
+* Improved URI handling of repo names. ([GH-108](https://github.com/jdigger/git-process/issues/108))
 
 ### Since 1.1.2 ###
 

data/Gemfile

@@ -5,6 +5,7 @@ group :default do
   gem "json", "~> 1.7.3"
   gem "trollop", "~> 1.16.2" # CLI options parser
   gem "highline", "1.6.13" # user CLI interaction. There is a bug in 1.6.14
+  gem "addressable", "~> 2.3.4" # URI processing
 end
 
 group :development do

data/Gemfile.lock

@@ -41,6 +41,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable (~> 2.3.4)
   highline (= 1.6.13)
   json (~> 1.7.3)
   octokit (~> 1.24)

data/git-process.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "json", "~> 1.7.3"
   gem.add_dependency "trollop", "~> 1.16.2" # CLI options parser
   gem.add_dependency "highline", "1.6.13" # user CLI interaction. There is a bug in 1.6.14
+  gem.add_dependency "addressable", "~> 2.3.4" # URI processing
 
   gem.files = `git ls-files`.split($\).delete_if { |f| f =~ /^\./ }
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }

data/lib/git-process/git_remote.rb

@@ -11,6 +11,7 @@
 # limitations under the License.
 
 require 'git-process/git_config'
+require 'addressable/uri'
 #require 'git-process/git_branches'
 #require 'git-process/git_status'
 #require 'git-process/git_process_error'
@@ -80,7 +81,8 @@ module GitProc
       unless @repo_name
         url = config["remote.#{name}.url"]
         raise GitProcessError.new("There is no #{name} url set up.") if url.nil? or url.empty?
-        @repo_name = url.sub(/^.*:(.*?)(.git)?$/, '\1')
+        uri = Addressable::URI.parse(url)
+        @repo_name = uri.path.sub(/\.git/, '').sub(/^\//, '')
       end
       @repo_name
     end

data/lib/git-process/version.rb

@@ -14,7 +14,7 @@ module GitProc
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 3
+    PATCH = 4
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/git_remote_spec.rb

@@ -84,6 +84,45 @@ describe GitRemote do
   end
 
 
+  describe "#repo_name" do
+    include GitRepoHelper
+
+    it "should work for an ssh address" do
+      remote.add('torigin', 'tuser@github.myco.com:jdigger/git-process.git')
+
+      remote.repo_name.should == 'jdigger/git-process'
+    end
+
+
+    it 'should work for an http address' do
+      remote.add('torigin', 'http://github.myco.com:8080/jdigger/git-process.git')
+
+      remote.repo_name.should == 'jdigger/git-process'
+    end
+
+
+    it "should work for an https address" do
+      remote.add('torigin', 'https://github.myco.com/jdigger/git-process.git')
+
+      remote.repo_name.should == 'jdigger/git-process'
+    end
+
+
+    it "should work for an ssh-configured url address" do
+      remote.add('origin', 'mygithub:jdigger/git-process.git')
+
+      content = "\nHost mygithub\n"+
+          "  User tuser\n"+
+          "  HostName github.myco.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        remote.repo_name.should == 'jdigger/git-process'
+      end
+    end
+
+  end
+
+
   describe "#hostname_and_user_from_ssh_config" do
     include GitRepoHelper
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Jim Moore
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-29 00:00:00 Z
+date: 2013-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: octokit
@@ -80,6 +80,22 @@ dependencies:
         - 13
         version: 1.6.13
   requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  prerelease: false
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  requirement: *id005
 description: A set of scripts to make working with git easier and more consistent
 email: 
 - moore.jim@gmail.com