gem-path 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7c02bbe30c19779d0ed58d7a5d555825cef64ba7
-  data.tar.gz: 49cedbebd2932c7600e7bb0abdcb4035ee7d6903
+SHA256:
+  metadata.gz: 15f18939d8e50af9c2fae87af1fe73ec1e05b286da7e0b2f025e978b96cf48a9
+  data.tar.gz: 02cf2bca584af9727c520ad61278c6fa3959422a57e0598cc611bf0a93719d0c
 SHA512:
-  metadata.gz: fde3f4884832c4f263304c5468f5dd91747abfa1c8ba70a12c5df171cfe77cbb6d35f4cf19217b178e3c6de159822ef65007224c47944848ed3587a7c78aaf4f
-  data.tar.gz: 35d3470a139d8449d74e348e58445b676eb4de9ffb5f55f29e2bbd60eb10c8d71b5055b86f71393c70e4a8a7452014dbbb76f610e5fb4b0167ac9c780950759a
+  metadata.gz: 3e445e9f58fe8839b17885347ddc8b821967f20a012883c7f3ae976627a213d823edc30049c36a633f46043fa37a170bbdfeb7522bd822ff79a158581b6417a8
+  data.tar.gz: 5ed3e277e1ec364403613d58bd8b2eb2942ccff0cd6bd69263f9052ab14abea2308785f1d757e911c58f11a8ec1ef9f081b3a8913734e1f093492071d4282a95

data/CHANGES.md

@@ -1,5 +1,17 @@
 # CHANGES
 
+## gem-path 0.6.2 -- 2017-03-23
+
+* Fixed finding gems like google-protobuf which could have platform postfix.
+
+## gem-path 0.6.1 -- 2014-10-27
+
+* Updated that gem-beit could search against bundler installed gems.
+
+## gem-path 0.6.0 -- 2014-10-27
+
+* Internal cleanup and make find_gem_path a public method.
+
 ## gem-path 0.5.1 -- 2013-11-22
 
 * Fixed a bug where it cannot find a gem if the version is not specified.

data/README.md

@@ -17,15 +17,14 @@ For examples, under [fish](http://fishshell.com/):
     vim (gem path gem-path)
     grep require -R (gem path gem-path)
 
-Or checkout [gem-cd][], [gem-eit][], [gem-grep][] for shorthands.
+Or checkout [gem-eit][], [gem-grep][] for shorthands.
 
-[gem-cd]: https://github.com/godfat/gem-cd
 [gem-eit]: https://github.com/godfat/gem-eit
 [gem-grep]: https://github.com/godfat/gem-grep
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby), Rubinius and JRuby.
 
 ## INSTALLATION:
 
@@ -63,9 +62,9 @@ This was extracted from [eit-gem][].
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2013, Lin Jen-Shin (godfat)
+Copyright (c) 2013-2021, 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

@@ -1,12 +1,12 @@
 
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__) do |s|
   s.name    = 'gem-path'
-  s.version = '0.5.1'
+  s.version = '0.7.0'
 end

data/gem-path.gemspec

@@ -1,31 +1,32 @@
 # -*- encoding: utf-8 -*-
-# stub: gem-path 0.5.1 ruby lib
+# stub: gem-path 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "gem-path"
-  s.version = "0.5.1"
+  s.name = "gem-path".freeze
+  s.version = "0.7.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-11-22"
-  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-cd][], [gem-eit][], [gem-grep][] for shorthands.\n\n[gem-cd]: https://github.com/godfat/gem-cd\n[gem-eit]: https://github.com/godfat/gem-eit\n[gem-grep]: https://github.com/godfat/gem-grep"
-  s.email = ["godfat (XD) godfat.org"]
+  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 = "2021-08-11"
+  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 = [
-  ".gitignore",
-  ".gitmodules",
-  ".travis.yml",
-  "CHANGES.md",
-  "LICENSE",
-  "README.md",
-  "Rakefile",
-  "gem-path.gemspec",
-  "lib/rubygems/commands/path_command.rb",
-  "lib/rubygems_plugin.rb",
-  "task/README.md",
-  "task/gemgem.rb"]
-  s.homepage = "https://github.com/godfat/gem-path"
-  s.licenses = ["Apache License 2.0"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
-  s.summary = "Find the path for a given gem or require path for editing or greping."
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  ".travis.yml".freeze,
+  "CHANGES.md".freeze,
+  "LICENSE".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "gem-path.gemspec".freeze,
+  "lib/rubygems/commands/path_command.rb".freeze,
+  "lib/rubygems_plugin.rb".freeze,
+  "task/README.md".freeze,
+  "task/gemgem.rb".freeze,
+  "test/test.rb".freeze]
+  s.homepage = "https://github.com/godfat/gem-path".freeze
+  s.licenses = ["Apache-2.0".freeze]
+  s.rubygems_version = "3.2.25".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

@@ -12,16 +12,16 @@ class Gem::Commands::PathCommand < Gem::Command
     name, version = extract!(options[:args])
 
     # find the exact gem
-    if path_gem = find_path_gem(name)
-      say(path_gem)
+    if gem_path = find_gem_path(name)
+      say(gem_path)
 
     # find the require file
     elsif path = Gem.find_files("#{name}.rb").first
       # favor gem first (e.g. rake gem)
-      if path_gem = Gem.path.find{ |p|
+      if gem_path = Gem.path.find{ |p|
            break $1 if path =~ %r{(#{p}(/[^/]+){2})}
          }
-        say(path_gem)
+        say(gem_path)
       else
         say(path)
       end
@@ -31,6 +31,29 @@ class Gem::Commands::PathCommand < Gem::Command
     end
   end
 
+  def find_gem_path name
+    gem_path = Gem.path.find do |base|
+      gem_path = $LOAD_PATH.find do |path|
+        platforms = [
+          'ruby',
+          sitearch,
+          *univeral_darwin
+        ].map(&Regexp.method(:escape)).join('|')
+
+        gem_path = path[
+          %r{\A#{base}/
+             (?:bundler/)?
+             gems/
+             #{name}\-[^/-]+(?:\-(?:#{platforms}))?/
+          }x
+        ]
+        break gem_path if gem_path
+      end
+      break gem_path if gem_path
+    end
+    gem_path.chop if gem_path
+  end
+
   private
   def extract! args
     gem(*args)
@@ -44,14 +67,13 @@ class Gem::Commands::PathCommand < Gem::Command
     end
   end
 
-  def find_path_gem name
-    path_gem = Gem.path.find do |base|
-      path_gem = $LOAD_PATH.find do |path|
-                   path_gem = path[%r{#{base}/gems/#{name}\-[^/-]+/}]
-                   break path_gem if path_gem
-                 end
-      break path_gem if path_gem
+  def sitearch
+    @sitearch ||= RbConfig::CONFIG['sitearch']
+  end
+
+  def univeral_darwin
+    if sitearch.include?('darwin')
+      'universal-darwin'
     end
-    path_gem[0...-1] if path_gem
   end
 end

data/task/README.md

@@ -4,16 +4,16 @@
 
 Provided tasks:
 
-    rake clean        # Remove ignored files
+    rake clean        # Trash ignored files
     rake gem:build    # Build gem
     rake gem:install  # Install gem
     rake gem:release  # Release gem
     rake gem:spec     # Generate gemspec
-    rake test         # Run tests in memory
+    rake test         # Run tests
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -23,13 +23,13 @@ And in Rakefile:
 
 ``` ruby
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__, :submodules => %w[your-dep]) do |s|
   s.name    = 'your-gem'
   s.version = '0.1.0'
 end
@@ -37,9 +37,9 @@ end
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2021, 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/task/gemgem.rb

@@ -1,7 +1,7 @@
 
 module Gemgem
   class << self
-    attr_accessor :dir, :spec, :spec_create
+    attr_accessor :dir, :spec, :submodules, :spec_create
   end
 
   module_function
@@ -11,12 +11,14 @@ module Gemgem
   def pkg_dir    ; "#{dir}/pkg"                       ; end
   def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
 
-  def init dir, &block
+  def init dir, options={}, &block
     self.dir = dir
-    $LOAD_PATH.unshift("#{dir}/lib")
     ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
     ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.submodules  = options[:submodules] || []
     self.spec_create = block
+
+    $LOAD_PATH.unshift("#{dir}/lib", *submodules_libs)
   end
 
   def create
@@ -26,7 +28,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
+      s.license     = license
 
       s.date        = Time.now.strftime('%Y-%m-%d')
       s.files       = gem_files
@@ -34,10 +36,115 @@ module Gemgem
       s.executables = bin_files
     end
     spec_create.call(spec)
-    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
     self.spec = spec
   end
 
+  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]
+
+    # setup install options
+    cmd = Gem::Commands::InstallCommand.new
+    cmd.handle_options([])
+
+    # install
+    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
+
+  def gem_spec
+    create
+    write
+  end
+
+  def gem_build
+    require 'fileutils'
+    require 'rubygems/package'
+    gem = nil
+    Dir.chdir(dir) do
+      gem = Gem::Package.build(Gem::Specification.load(spec_path))
+      FileUtils.mkdir_p(pkg_dir)
+      FileUtils.mv(gem, pkg_dir) # gem is relative path, but might be ok
+    end
+    puts "\e[35mGem built: \e[33m#{strip_path("#{pkg_dir}/#{gem}")}\e[0m"
+  end
+
+  def gem_release
+    sh_git('tag', gem_tag)
+    # sh_git('push')
+    # sh_git('push', '--tags')
+    sh_gem('push', gem_path)
+  end
+
+  def gem_check
+    unless git('status', '--porcelain').empty?
+      puts("\e[35mWorking copy is not clean.\e[0m")
+      exit(3)
+    end
+
+    ver = spec.version.to_s
+
+    if ENV['VERSION'].nil?
+      puts("\e[35mExpected "                                  \
+           "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
+      exit(1)
+
+    elsif ENV['VERSION'] != ver
+      puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+           "\e[35mbut got\n         "                         \
+           "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
+      exit(2)
+    end
+  end
+
+  def test
+    return if test_files.empty?
+
+    if ENV['COV'] || ENV['CI']
+      require 'simplecov'
+      if ENV['CI']
+        begin
+          require 'coveralls'
+          SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+        rescue LoadError => e
+          puts "Cannot load coveralls, skip: #{e}"
+        end
+      end
+      SimpleCov.start do
+        add_filter('test/')
+        add_filter('test.rb')
+        submodules_libs.each(&method(:add_filter))
+      end
+    end
+
+    test_files.each{ |file| require "#{dir}/#{file[0..-4]}" }
+  end
+
+  def clean
+    return if ignored_files.empty?
+
+    require 'fileutils'
+    trash = File.expand_path("~/.Trash/#{spec.name}")
+    puts "Move the following files into: \e[35m#{strip_path(trash)}\e[33m"
+
+    ignored_files.each do |file|
+      from = "#{dir}/#{file}"
+      to   = "#{trash}/#{File.dirname(file)}"
+      puts strip_path(from)
+
+      FileUtils.mkdir_p(to)
+      FileUtils.mv(from, to)
+    end
+
+    print "\e[0m"
+  end
+
   def write
     File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
   end
@@ -57,11 +164,15 @@ module Gemgem
   end
 
   def strip_home_path path
-    path.sub(ENV['HOME'], '~')
+    path.sub(/\A#{Regexp.escape(ENV['HOME'])}\//, '~/')
   end
 
   def strip_cwd_path path
-    path.sub(Dir.pwd, '.')
+    path.sub(/\A#{Regexp.escape(Dir.pwd)}\//, '')
+  end
+
+  def submodules_libs
+    submodules.map{ |path| "#{dir}/#{path}/lib" }
   end
 
   def git *args
@@ -99,6 +210,11 @@ module Gemgem
     @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
     @all_files ||= fold_files(glob).sort
   end
@@ -119,7 +235,8 @@ module Gemgem
 
   def gem_files
     @gem_files ||= all_files.reject{ |f|
-      f =~ ignored_pattern && !git_files.include?(f)
+      f =~ submodules_pattern ||
+        (f =~ ignored_pattern && !git_files.include?(f))
     }
   end
 
@@ -151,17 +268,20 @@ module Gemgem
                          end
   end
 
+  def submodules_pattern
+    @submodules_pattern ||= if submodules.empty?
+                              /^$/
+                            else
+                              Regexp.new(submodules.map{ |path|
+                                "^#{Regexp.escape(path)}/" }.join('|'))
+                            end
+  end
+
   def expand_patterns pathes
     # http://git-scm.com/docs/gitignore
     pathes.flat_map{ |path|
-      case path
-      when %r{\*}
-        Regexp.escape(path).gsub(/\\\*/, '[^/]*')
-      when %r{^/}
-        "^#{Regexp.escape(path[1..-1])}"
-      else # we didn't implement negative pattern for now
-        Regexp.escape(path)
-      end
+      # we didn't implement negative pattern for now
+      Regexp.escape(path).sub(%r{^/}, '^').gsub(/\\\*/, '[^/]*')
     }
   end
 
@@ -179,86 +299,38 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  Gemgem.sh_gem('install', Gemgem.gem_path)
+  Gemgem.gem_install
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  require 'fileutils'
-  require 'rubygems/package'
-  gem = nil
-  Dir.chdir(Gemgem.dir) do
-    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
-    FileUtils.mkdir_p(Gemgem.pkg_dir)
-    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
-  end
-  puts "\e[35mGem built: \e[33m" \
-       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+  Gemgem.gem_build
 end
 
 desc 'Generate gemspec'
 task :spec do
-  Gemgem.create
-  Gemgem.write
+  Gemgem.gem_spec
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  Gemgem.module_eval do
-    sh_git('tag', Gemgem.gem_tag)
-    sh_git('push')
-    sh_git('push', '--tags')
-    sh_gem('push', Gemgem.gem_path)
-  end
+  Gemgem.gem_release
 end
 
 task :check do
-  ver = Gemgem.spec.version.to_s
-
-  if ENV['VERSION'].nil?
-    puts("\e[35mExpected "                                  \
-         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
-    exit(1)
-
-  elsif ENV['VERSION'] != ver
-    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
-         "\e[35mbut got\n         "                         \
-         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
-    exit(2)
-  end
+  # Gemgem.gem_check
 end
 
 end # of gem namespace
 
 desc 'Run tests'
 task :test do
-  next if Gemgem.test_files.empty?
-
-  require 'bacon'
-  Bacon.extend(Bacon::TestUnitOutput)
-  Bacon.summary_on_exit
-  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
+  Gemgem.test
 end
 
 desc 'Trash ignored files'
 task :clean => ['gem:spec'] do
-  next if Gemgem.ignored_files.empty?
-
-  require 'fileutils'
-  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
-  puts "Move the following files into:" \
-       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
-
-  Gemgem.ignored_files.each do |file|
-    from = "#{Gemgem.dir}/#{file}"
-    to   = "#{trash}/#{File.dirname(file)}"
-    puts Gemgem.strip_path(from)
-
-    FileUtils.mkdir_p(to)
-    FileUtils.mv(from, to)
-  end
-
-  print "\e[0m"
+  Gemgem.clean
 end
 
 task :default do

data/test/test.rb

@@ -0,0 +1,7 @@
+
+eit-gem rib/version
+eit-gem rib/version '~>1.0.0'
+eit-gem rib
+eit-gem rib 1.0.0
+eit-gem yaml
+eit-gem yaml/store

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-path
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Find the path for a given gem or require path for editing or greping.
@@ -19,9 +19,8 @@ description: |-
       vim (gem path gem-path)
       grep require -R (gem path gem-path)
 
-  Or checkout [gem-cd][], [gem-eit][], [gem-grep][] for shorthands.
+  Or checkout [gem-eit][], [gem-grep][] for shorthands.
 
-  [gem-cd]: https://github.com/godfat/gem-cd
   [gem-eit]: https://github.com/godfat/gem-eit
   [gem-grep]: https://github.com/godfat/gem-grep
 email:
@@ -30,9 +29,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
 - LICENSE
 - README.md
@@ -42,28 +41,28 @@ files:
 - lib/rubygems_plugin.rb
 - task/README.md
 - task/gemgem.rb
+- test/test.rb
 homepage: https://github.com/godfat/gem-path
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
-signing_key: 
+rubygems_version: 3.2.25
+signing_key:
 specification_version: 4
 summary: Find the path for a given gem or require path for editing or greping.
 test_files: []