git-browse-remote 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7604534269d3542a8be61db5f95efcbd175a3347
-  data.tar.gz: 9ea9f7eff7777cade451b9443cc0b23b91b72943
+  metadata.gz: 84c7c1cdde0ec934fd09d23ed6e43b47bc6fae85
+  data.tar.gz: ae732ca4fe86a98a4f0d4cf77cf0f5709ad4ca1f
 SHA512:
-  metadata.gz: b28ee1b89f121eb58715e0d91fae7655d8a758099c9ac951ca70663d6fcaa2b82019f66ee3f201e209345a32a58a0c05ac305ec737c223d6844672157ad0c5cd
-  data.tar.gz: 9226f355535e88501718eedcb46dd588c1c22f1ef22ea7b39f8e472d17f7c27b90a607bc41934ba98d3633f7c29820ce799029a5d8402782aba27da120cf3959
+  metadata.gz: 5311b353f6adb40226f98d684d4695df80060323bd52ae6056bca62ba388b2d1978f9bd5be03177b3f55ce02b1ecc0e440a9d75ab8238d435aef3e05f1ae62eb
+  data.tar.gz: 2c79fbd27cee8ec1f78b5b585dc203c17821ab774413f841704d038b7429e3ff46e81e1ab0f1293fddc1c294635235fb5823f8fc17335c250a3eebc562196027

data/lib/git/browse/remote/core.rb

@@ -1,5 +1,6 @@
 require 'git/browse/remote/git'
 require 'pathname'
+require 'uri'
 
 module Git::Browse::Remote
   class Path < Array
@@ -77,7 +78,18 @@ module Git::Browse::Remote
       remote_url = `git config remote.#{remote}.url`[/.+/] or
           abort "Could not get remote url: #{remote}"
 
-      host, *path = remote_url.sub(%r(^\w+://), '').sub(/^[\w-]+@/, '').split(/[\/:]+/)
+      unless %r(^\w+://) === remote_url
+        # SCP-like URLs of form "[user@]host.xz:path/to/repo.git"
+        # will be converted to "ssh://[user@]host.xz/path/to/repo.git"
+        remote_url = 'ssh://' + remote_url.sub(/:/, '/')
+      end
+
+      # Normal URLs
+      u = URI(remote_url)
+      host = u.host
+      port = u.port
+      host_port = if port == u.default_port then host else "#{host}:#{port}" end
+      path = u.path.sub(%r(^/), '').split('/')
       path.last.sub!(/\.git$/, '')
       path = Path.new(path)
 

data/lib/git/browse/remote/version.rb

@@ -1,7 +1,7 @@
 module Git
   module Browse
     module Remote
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/spec/bin_spec.rb

@@ -53,6 +53,15 @@ RSpec.configure do |config|
     git :remote, 'add', 'origin', 'https://github.com/user/repo.git'
     git :remote, 'add', 'origin2', 'git@gh-mirror.host:user/repo2'
 
+    git :remote, 'add', 'origin3', 'ssh://git@my-git-host.com:9999/user/repo2'
+    git :config, '--local', 'browse-remote.my-git-host.com.top',  'https://{host}/{path}'
+
+    git :remote, 'add', 'origin4', 'ssh://git@my-git-host2.com:9999/user/repo2'
+    git :config, '--local', 'browse-remote.my-git-host2.com.top',  'https://{host_port}/{path}'
+
+    git :remote, 'add', 'origin5', 'git@my-git-host3.com:9999/user/repo2' # here 9999 is a part of path
+    git :config, '--local', 'browse-remote.my-git-host3.com.top',  'https://{host_port}/{path}'
+
     FileUtils.copy_file ROOT + 'README.md', 'README.md'
     git :add, 'README.md'
     git :commit, '-m' '1st commit'
@@ -245,6 +254,24 @@ describe 'git-browse-remote' do
         expect(opened_url).to eq("https://gh-mirror.host/user/repo2")
       end
     end
+
+    when_run_with_args '--remote', 'origin3' do
+      it 'should open the specified remote page, `host` does not include port' do
+        expect(opened_url).to eq("https://my-git-host.com/user/repo2")
+      end
+    end
+
+    when_run_with_args '--remote', 'origin4' do
+      it 'should open the specified remote page, using `host_port` variable' do
+        expect(opened_url).to eq("https://my-git-host2.com:9999/user/repo2")
+      end
+    end
+
+    when_run_with_args '--remote', 'origin5' do
+      it 'should open the specified remote page on a SCP-like URL' do
+        expect(opened_url).to eq("https://my-git-host3.com/9999/user/repo2")
+      end
+    end
   end
 
   context 'on some branch' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-browse-remote
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler