gem-path 0.6.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1e2e0c0438bf3d62b91111d9b60dcad158520503
-  data.tar.gz: 923a754d023996b109f68e39fca432d9d31d411d
+SHA256:
+  metadata.gz: 4786a967e6d67052d64ae4a5bb5264d21afe2a57fca6d3b3eff326c16da5a325
+  data.tar.gz: 7f4b5583b9c2ae3cb4361bab1d2447549f5be2f097ade91deb9555fcc09e5b70
 SHA512:
-  metadata.gz: a4a72b830609426ff2de8afd351a2ddfcb42aeb2fe01a42397d94e6616240378550aef709d07ab26c20066663c00406421a4783dfc13b4ecc917744348f246df
-  data.tar.gz: 2f2b5cabae2aa78dfac58949552143e485ef343fc40693063b1d3212f5d93bdb1e4f8c1bcfe5a5f748ba47b2a4a9835e2e821afb5bcdc9599e09c34f37a8874d
+  metadata.gz: fc857e7a5176cc260bfd5a9825e8a2938f56d4432120901f7c2ac541a6530bbf99143a407406f5eab3d7c91d693684fc3001b6bdcefe1caa24a82327866f2b1e
+  data.tar.gz: 972fae17e38c6feaccabbc73e9a5e865784fd3c5a1833ddf090a2b795efe04fcd1e620a25c263c52fb53e4b3dd92079552077a04652b12ccaa4398e350964942

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "task"]
 	path = task
-	url = git://github.com/godfat/gemgem.git
+	url = https://github.com/godfat/gemgem.git

data/CHANGES.md

@@ -1,5 +1,14 @@
 # CHANGES
 
+## gem-path 1.0.0 -- 2024-08-01
+
+* Fixed looking up local gems specified in bundler.
+
+## gem-path 0.7.0 -- 2021-08-11
+
+* Fixed finding gems like google-protobuf again on Mac where it may not be
+  using `x86_64-darwin20` but `universal-darwin`.
+
 ## gem-path 0.6.2 -- 2017-03-23
 
 * Fixed finding gems like google-protobuf which could have platform postfix.

data/README.md

@@ -24,7 +24,7 @@ Or checkout [gem-eit][], [gem-grep][] for shorthands.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -62,9 +62,9 @@ This was extracted from [eit-gem][].
 
 ## LICENSE:
 
-Apache License 2.0 (Apache-2)
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2013-2017, Lin Jen-Shin (godfat)
+Copyright (c) 2013-2024, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -8,5 +8,5 @@ end
 
 Gemgem.init(__dir__) do |s|
   s.name    = 'gem-path'
-  s.version = '0.6.2'
+  s.version = '1.0.0'
 end

data/gem-path.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: gem-path 0.6.2 ruby lib
+# stub: gem-path 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "gem-path".freeze
-  s.version = "0.6.2"
+  s.version = "1.0.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2017-03-23"
+  s.date = "2024-08-01"
   s.description = "Find the path for a given gem or require path for editing or greping.\n\nFor examples, under [fish](http://fishshell.com/):\n\n    cd (gem path gem-path)\n    vim (gem path gem-path)\n    grep require -R (gem path gem-path)\n\nOr checkout [gem-eit][], [gem-grep][] for shorthands.\n\n[gem-eit]: https://github.com/godfat/gem-eit\n[gem-grep]: https://github.com/godfat/gem-grep".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   "task/gemgem.rb".freeze,
   "test/test.rb".freeze]
   s.homepage = "https://github.com/godfat/gem-path".freeze
-  s.licenses = ["Apache-2".freeze]
-  s.rubygems_version = "2.6.10".freeze
+  s.licenses = ["Apache-2.0".freeze]
+  s.rubygems_version = "3.5.16".freeze
   s.summary = "Find the path for a given gem or require path for editing or greping.".freeze
 end

data/lib/rubygems/commands/path_command.rb

@@ -34,8 +34,12 @@ class Gem::Commands::PathCommand < Gem::Command
   def find_gem_path name
     gem_path = Gem.path.find do |base|
       gem_path = $LOAD_PATH.find do |path|
-        platforms = Gem.platforms.
-          map(&:to_s).map(&Regexp.method(:escape)).join('|')
+        platforms = [
+          'ruby',
+          sitearch,
+          *univeral_darwin
+        ].map(&Regexp.method(:escape)).join('|')
+
         gem_path = path[
           %r{\A#{base}/
              (?:bundler/)?
@@ -44,10 +48,15 @@ class Gem::Commands::PathCommand < Gem::Command
           }x
         ]
         break gem_path if gem_path
+
+        if Object.const_defined?(:Bundler)
+          gem_path = bundler_gem_name_to_path[name]
+          break gem_path if gem_path
+        end
       end
       break gem_path if gem_path
     end
-    gem_path.chop if gem_path
+    gem_path.chomp('/') if gem_path
   end
 
   private
@@ -62,4 +71,22 @@ class Gem::Commands::PathCommand < Gem::Command
       args # this could be a require path, go on searching
     end
   end
+
+  def bundler_gem_name_to_path
+    @bundler_gem_name_to_path ||= Bundler.load.
+      requested_specs.inject({}) do |result, spec|
+        result[spec.name] = spec.full_gem_path
+        result
+      end
+  end
+
+  def sitearch
+    @sitearch ||= RbConfig::CONFIG['sitearch']
+  end
+
+  def univeral_darwin
+    if sitearch.include?('darwin')
+      'universal-darwin'
+    end
+  end
 end

data/task/README.md

@@ -13,11 +13,11 @@ Provided tasks:
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
-    git submodule add git://github.com/godfat/gemgem.git task
+    git submodule add https://github.com/godfat/gemgem.git task
 
 And in Rakefile:
 
@@ -39,13 +39,13 @@ end
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2023, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-<http://www.apache.org/licenses/LICENSE-2.0>
+<https://www.apache.org/licenses/LICENSE-2.0>
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

data/task/gemgem.rb

@@ -42,6 +42,7 @@ module Gemgem
 
   def gem_install
     require 'rubygems/commands/install_command'
+    require 'rubygems/package'
     # read ~/.gemrc
     Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
     Gem::Command.extra_args = Gem.configuration[:gem]
@@ -51,7 +52,8 @@ module Gemgem
     cmd.handle_options([])
 
     # install
-    install = Gem::Installer.new(gem_path, cmd.options)
+    gem_package = Gem::Package.new(gem_path)
+    install = Gem::Installer.new(gem_package, cmd.options)
     install.install
     puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-path
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Find the path for a given gem or require path for editing or greping.
@@ -44,9 +44,9 @@ files:
 - test/test.rb
 homepage: https://github.com/godfat/gem-path
 licenses:
-- Apache-2
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -61,9 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Find the path for a given gem or require path for editing or greping.
 test_files: []