finder 0.1.1 → 0.2.0

data/.ruby

@@ -8,8 +8,6 @@ copyrights:
 - holder: Rubyworks
   year: '2009'
   license: BSD-2-Clause
-replacements: []
-alternatives: []
 requirements:
 - name: detroit
   groups:
@@ -24,6 +22,7 @@ requirements:
   - test
   development: true
 dependencies: []
+alternatives: []
 conflicts: []
 repositories:
 - uri: git://github.com/rubyworks/plugin.git
@@ -39,7 +38,7 @@ load_path:
 revision: 0
 name: finder
 title: Finder
-version: 0.1.1
+version: 0.2.0
 summary: Robust library file locator
 created: '2009-11-24'
 description: Finder is a general purpose file finder for Ruby. Finder can search RubyGems,
@@ -47,4 +46,4 @@ description: Finder is a general purpose file finder for Ruby. Finder can search
   active or the most current library files. It is especially useful for implementing
   library-based plugin systems.
 organization: rubyworks
-date: '2012-02-11'
+date: '2012-03-14'

data/HISTORY.md

@@ -1,5 +1,18 @@
 # RELEASE HISTORY
 
+## 0.2.0 / 2012-03-14
+
+This release adds the `:from` option which allows searching
+to be limited to a specific library/gem. It also fixes 
+a bug with the Find.path method where one of the arguments
+was mis-named.
+
+Changes:
+
+* Add support for `:from` option.
+* Fix typo in `Find.path` arguments.
+
+
 ## 0.1.1 / 2012-02-11
 
 Fixes a few oversites in last release.

data/README.md

@@ -23,14 +23,14 @@ To find finders, simply provide a glob to the appropriate Finder function,
 and it will return all matches found within current and/or most recent versions
 of a library.
 
-For example, a common use case is for a pluggable application is to require all
+For example, a common use case is for a plugin-in enabled application is to require all
 the finders found in library load paths:
 
-  require 'finder'
+    require 'finder'
 
-  Find.load_path('myapp/*.rb').each do |file|
-    require(file)
-  end
+    Find.load_path('myapp/*.rb').each do |file|
+      require(file)
+    end
 
 Alternately you might load finders only as needed. For instance, if a command-line
 option calls for it.
@@ -38,9 +38,9 @@ option calls for it.
 
 ## COPYRIGHTS
 
-Copyright (c) 2009 Thomas Sawyer
+Copyright (c) 2009 Rubyworks
 
 Finder is release under the terms of the **BSD-2-Clause** license.
 
-See COPYING for details.
+See LICENSE.txt file for details.
 

data/lib/finder/find.rb

@@ -18,7 +18,7 @@ module Finder
     # @example
     #   Find.path('lib/foo/*')
     #
-    def path(glob, options={})
+    def path(match, options={})
       found = []
       systems.each do |system|
         found.concat system.path(match, options)

data/lib/finder/gem.rb

@@ -15,18 +15,31 @@ module Finder
       # @param [Hash] options
       #   Search options.
       #
+      # @option options [String] :from
+      #   Specific gem to search.
+      #
       # @return [Array<String>] List of absolute paths.
       #
       def path(match, options={})
+        if from = options[:from] || options[:gem]
+          begin
+            specs = ::Gem::Specification.find_by_name(from.to_s)
+          rescue ::Gem::LoadError
+            return []
+          end
+        else
+          specs = ::Gem::Specification.current_specs
+        end
+
         matches = []
-        ::Gem::Specification.current_specs.each do |spec|
+        specs.each do |spec|
           list = []
           glob = File.join(spec.full_gem_path, match)
           list = Dir[glob] #.map{ |f| f.untaint }
           list = list.map{ |d| d.chomp('/') }
           matches.concat(list)
           # activate the library if activate flag
-          lib.activate if options[:activate] && !list.empty?
+          spec.activate if options[:activate] && !list.empty?
         end
         matches
       end
@@ -40,6 +53,9 @@ module Finder
       # @param [Hash] options
       #   Search options.
       #
+      # @option options [String] :from
+      #   Specific gem to search.
+      #
       # @option options [true,false] :absolute
       #   Return absolute paths instead of relative to load path.
       #
@@ -49,8 +65,14 @@ module Finder
       # @return [Array<String>] List of paths.
       #
       def load_path(match, options={})
+        if from = options[:from] || options[:gem]
+          specs = ::Gem::Specification.find_by_name(from.to_s)
+        else
+          specs = ::Gem::Specification.current_specs
+        end
+
         matches = []
-        ::Gem::Specification.current_specs.each do |spec|
+        specs.each do |spec|
           list = []
           spec.require_paths.each do |path|
             glob = File.join(spec.full_gem_path, path, match)
@@ -64,7 +86,7 @@ module Finder
             matches.concat(list)
           end
           # activate the library if activate flag
-          lib.activate if options[:activate] && !list.empty?
+          spec.activate if options[:activate] && !list.empty?
         end
         matches
       end
@@ -81,15 +103,21 @@ module Finder
       # @return [Array<String>] List of absolute paths.
       #
       def data_path(match, options={})
+        if from = options[:from] || options[:gem]
+          specs = ::Gem::Specification.find_by_name(from.to_s)
+        else
+          specs = ::Gem::Specification.current_specs
+        end
+
         matches = []
-        ::Gem::Specification.current_specs.each do |spec|
+        specs.each do |spec|
           list = []
           glob = File.join(spec.full_gem_path, 'data', match)
           list = Dir[glob] #.map{ |f| f.untaint }
           list = list.map{ |d| d.chomp('/') }
           matches.concat(list)
           # activate the library if activate flag
-          lib.activate if options[:activate] && !list.empty?
+          spec.activate if options[:activate] && !list.empty?
         end
         matches
       end

data/lib/finder/roll.rb

@@ -19,14 +19,23 @@ module Finder
       #
       def path(match, options={})
         return [] unless defined?(::Library)
+
+        if from = options[:from]
+          ledger = {from.to_s => ::Library.ledger[from.to_s]}
+        else
+          ledger = ::Library.ledger
+        end
+
         matches = []
-        ::Library.ledger.each do |name, lib|
+
+        ledger.each do |name, lib|
           lib  = lib.sort.first if Array===lib
           find = File.join(lib.location, match)
           list = Dir.glob(find)
           list = list.map{ |d| d.chomp('/') }
           matches.concat(list)
         end
+
         matches
       end
 
@@ -52,8 +61,17 @@ module Finder
       # @return [Array<String>] List of paths.
       #
       def load_path(match, options={})
+        return [] unless defined?(::Library)
+
+        if from = options[:from]
+          ledger = {from.to_s => ::Library.ledger[from.to_s]}
+        else
+          ledger = ::Library.ledger
+        end
+
         matches = []
-        ::Library.ledger.each do |name, lib|
+
+        ledger.each do |name, lib|
           list = []
           lib  = lib.sort.first if Array===lib
           lib.loadpath.each do |path|
@@ -70,6 +88,7 @@ module Finder
           # activate the library if activate flag
           lib.activate if options[:activate] && !list.empty?
         end
+
         matches
       end
 
@@ -82,8 +101,17 @@ module Finder
       #end
 
       def data_path(match, options={})
+        return [] unless defined?(::Library)
+
+        if from = options[:from]
+          ledger = {from.to_s => ::Library.ledger[from.to_s]}
+        else
+          ledger = ::Library.ledger
+        end
+
         matches = []
-        ::Library.ledger.each do |name, lib|
+
+        ledger.each do |name, lib|
           list = []
           lib  = lib.sort.first if Array===lib
           find = File.join(lib.location, 'data', match)
@@ -93,6 +121,7 @@ module Finder
           # activate the library if activate flag
           lib.activate if options[:activate] && !list.empty?
         end
+
         matches
       end
 

data/lib/finder/site.rb

@@ -10,6 +10,9 @@ module Finder
 
       DATA_PATH = RbConfig::CONFIG['datadir']
 
+      # TODO: Might this support `:from` option via
+      #       `File.join(options[:from], match)`?
+
       #
       # Search load path for matching patterns.
       #
@@ -22,6 +25,8 @@ module Finder
       # @return [Array<String>] List of paths.
       #    
       def path(match, options={})
+        return [] if options[:from]
+
         found = []
         $LOAD_PATH.uniq.map do |path|
           list = Dir.glob(File.join(File.expand_path(path), match))
@@ -46,6 +51,8 @@ module Finder
       # @return [Array<String>] List of paths.
       #
       def load_path(match, options={})
+        return [] if options[:from]
+
         found = []
         $LOAD_PATH.uniq.map do |path|
           list = Dir.glob(File.join(File.expand_path(path), match))
@@ -63,6 +70,8 @@ module Finder
       # Search data path.
       #
       def data_path(match, options={})
+        return [] if options[:from]
+
         Dir.glob(File.join(DATA_PATH, match)).uniq
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &18914200 !ruby/object:Gem::Requirement
+  requirement: &17355120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18914200
+  version_requirements: *17355120
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &18913660 !ruby/object:Gem::Requirement
+  requirement: &17352400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18913660
+  version_requirements: *17352400
 - !ruby/object:Gem::Dependency
   name: ae
-  requirement: &18913160 !ruby/object:Gem::Requirement
+  requirement: &17350740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18913160
+  version_requirements: *17350740
 description: Finder is a general purpose file finder for Ruby. Finder can search RubyGems,
   Roll libraries and Ruby's standard $LOAD_PATH and system data directory for the
   active or the most current library files. It is especially useful for implementing
@@ -53,7 +53,6 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- COPYING.rdoc
 - HISTORY.md
 - README.md
 files:
@@ -70,7 +69,6 @@ files:
 - lib/finder.rb
 - HISTORY.md
 - README.md
-- COPYING.rdoc
 homepage: http://rubyworks.github.com/finder
 licenses:
 - BSD-2-Clause

data/COPYING.rdoc

@@ -1,38 +0,0 @@
-= COPYRIGHT
-
-== NOTICES
-
-=== Finder
-
-Copyright:: (c) 2012 RubyWorks
-License::   (r) BSD-2-Clause
-Website::   http://rubyworks.github.com/finder
-
-== LICENSES
-
-=== BSD-2-Clause License
-
-    Assay
-
-    Copyright (c) 2012 Rubyworks. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-       1. Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-
-       2. Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR  SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.