Improve support for gems in “Open Require” (⇧⌘D)

The previously reworked command would only handle the root gem file, e.g. ‘sinatra’ but not ‘sinatra/base’. It would also fail for gems that have a slash/dash in their name, for example ‘rack/protection’ is one gem named ‘rack-protection’ (and not a file named ‘protection’ in the ‘rack’ gem).

Author: sorbits

Commands/Open Require.tmCommand

@@ -8,49 +8,31 @@
 	<string>#!/usr/bin/env ruby
 require 'shellwords'
 
-# Return ‘mail-2.7.1’ given: ‘/path/to/mail-2.7.1/lib/mail.rb’, ‘/path/to’
-def get_child_of_directory(descendent, directory)
-  parent, child = File.split(descendent)
-  unless child.start_with?('/')
-    parent == directory ? child : get_child_of_directory(parent, directory)
-  end
-end
-
-def global_search_paths
-  res = $LOAD_PATH
-
-  if current_file = ENV['TM_FILEPATH']
-    gem_dirs = Gem::Specification.dirs.map { |dir| File.expand_path('../gems', dir) }
-    if gem_dir = gem_dirs.find { |dir| current_file.start_with?(dir) }
-      if full_name = get_child_of_directory(current_file, gem_dir)
-        Gem::Specification.find_all_by_full_name(full_name).each do |spec|
-          res = spec.full_require_paths + res
-        end
-      end
+def require_paths_for_gem(path)
+  begin
+    if gem_spec = Gem::Specification.find_by_name(path.tr('/', '-'))
+      return gem_spec.full_require_paths
     end
+  rescue Gem::MissingSpecError =&gt; e
   end
 
-  res
-end
-
-def find_in_search_path(file, search_paths)
-  search_paths.map { |path| File.join(path, file) }.find { |path| File.exist?(path) }
+  if path.include?('/')
+    require_paths_for_gem(File.dirname(path))
+  end
 end
 
 if ENV['TM_CURRENT_LINE'] =~ /^\s*(?:require(_relative)?|load)\s*(['"])(.+?)(?:\.rb)?\2(?:\s+|$)?/
-  search_paths = $1 ? [ ENV['TM_DIRECTORY'] ] : global_search_paths
-  name, file   = $3, "#$3.rb"
+  name, file = $3, "#$3.rb"
 
-  unless path = find_in_search_path(file, search_paths)
-    begin
-      if gem_spec = Gem::Specification.find_by_name(name)
-        path = find_in_search_path(file, gem_spec.full_require_paths)
-      end
-    rescue Gem::MissingSpecError =&gt; e
-    end
+  if $1 == '_relative'
+    search_paths = [ ENV['TM_DIRECTORY'] ]
+  elsif paths = require_paths_for_gem(name)
+    search_paths = $LOAD_PATH + paths
+  else
+    search_paths = $LOAD_PATH
   end
 
-  if path
+  if path = search_paths.map { |path| File.join(path, file) }.find { |path| File.exist?(path) }
     %x{ "$TM_MATE" #{path.shellescape} }
   else
     puts "Unable to locate ‘#{file}’. Locations searched:"