git-browse-remote 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d53544ee6d46516eacca0cdffd3d41717e550c1
-  data.tar.gz: c4a7bcac64a6a4d730500c9b915cffca91a8abe5
+  metadata.gz: 03838bd1fa4034f16f770aabd9e668a43ff66591
+  data.tar.gz: 3926c8b5d0aef8d0c051f8307f3e89da25f97d55
 SHA512:
-  metadata.gz: 50e226a70a929a512e1ae9d7bf24a9b16b2386a6f7f8c2b7d75c31e9485e056ba9fc8ce197e033895cfe7b7ce95d0551ba560b2470eabef510b910893c3a3016
-  data.tar.gz: 453d60928880551b838853267590d04879c8d81a123df8db78daa43ae8fbb0fa2635fa186d649ed620b62839e896ea2925fdbc77801ac260d5d4df06bc10fbc9
+  metadata.gz: 403e7f3f6b99a8b856b6d6601e5508dd8ae6d8b0dfca86a3d9f9783ac6186601d4840b2c1df5fe360b1737960ce1b8b9e8ac738602a7631bffd789743ecb40ad
+  data.tar.gz: c75a96cef9c44e2ff24d21deefdc540034a9a24c1f05fd611e8073418988642c1c81651051f8d2213c06000a41552dd5327d77d1e90b0160094c5bb6839d0a75

data/git-browse-remote.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec', '~> 2'
   spec.add_development_dependency 'simplecov', '0.7.1'
-  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard', '~> 1'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'terminal-notifier-guard'
 end

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

@@ -1,4 +1,5 @@
 require 'git/browse/remote/git'
+require 'pathname'
 
 module Git::Browse::Remote
   class Path < Array
@@ -7,6 +8,12 @@ module Git::Browse::Remote
     end
   end
 
+  class Filepath < Pathname
+    def to_s
+      Pathname.new(Git.show_prefix).join(super).cleanpath.to_s
+    end
+  end
+
   class Core
     attr_accessor :line, :file
 
@@ -15,7 +22,7 @@ module Git::Browse::Remote
         :top  => 'https://{host}/{path}',
         :ref  => 'https://{host}/{path}/tree/{short_ref}',
         :rev  => 'https://{host}/{path}/commit/{commit}',
-        :file => 'https://{host}/{path}/blob/{short_rev}/{file}{line && "#L%d" % line}'
+        :file => 'https://{host}/{path}/{file.directory? and :tree or :blob}/{short_rev}/{file}{line && "#L%d" % line}',
       },
 
       :gitweb => {
@@ -47,6 +54,10 @@ module Git::Browse::Remote
         self.target, @file = nil, target
       end
 
+      if @file && File.exists?(@file)
+        @file = Filepath.new(@file)
+      end
+
       if target
         if Git.is_valid_rev? target
           @ref = Git.full_name_of_rev(target)

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

@@ -32,5 +32,9 @@ module Git::Browse::Remote
     def self.symbolic_name_of_head
       name_rev('HEAD').sub(%r(\^0$), '') # some workaround for ^0
     end
+
+    def self.show_prefix
+      `git rev-parse --show-prefix`.chomp
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 module Git
   module Browse
     module Remote
-      VERSION = '0.0.3'
+      VERSION = '0.0.4'
     end
   end
 end

data/spec/bin_spec.rb

@@ -57,7 +57,10 @@ RSpec.configure do |config|
     git :add, 'README.md'
     git :commit, '-m' '1st commit'
 
-    git :commit, '-m' '2nd commit', '--allow-empty'
+    FileUtils.mkdir_p 'foo/bar'
+    FileUtils.touch   'foo/bar/baz.txt'
+    git :add, 'foo/bar/baz.txt'
+    git :commit, '-m' '2nd commit'
 
     git :checkout, '-b', 'branch-1'
 
@@ -327,6 +330,29 @@ describe 'git-browse-remote' do
     end
   end
 
+  when_run_with_args 'foo/bar' do
+    it 'should accept directory as an argument' do
+      expect(opened_url).to eq("https://github.com/user/repo/tree/master/foo/bar")
+    end
+  end
+
+  context 'when at non-toplevel directory' do
+    before { @_pwd = Dir.pwd; Dir.chdir 'foo' }
+    after { Dir.chdir @_pwd }
+
+    when_run_with_args '../README.md' do
+      it 'should resolve relative path' do
+        expect(opened_url).to eq("https://github.com/user/repo/blob/master/README.md")
+      end
+    end
+
+    when_run_with_args '.' do
+      it 'should resolve relative path' do
+        expect(opened_url).to eq("https://github.com/user/repo/tree/master/foo")
+      end
+    end
+  end
+
   it 'should abort on invalid ref' do
     expect { git_browse_remote([ 'xxx-nonexistent-ref' ]) }.to raise_error SystemExit
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-browse-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement