hike 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 43eec4acb751a2c1c31260cfb077ce8dd15363d4
+  data.tar.gz: ee1ef167fd5ada201bf64325b154ede3ca6312c3
+SHA512:
+  metadata.gz: fd38b8b3dae6aeb0d3c1a936251816d6d6f46ff1f1c635b67ddc06fe9a8505ce7adc8d47ed0ceca8a22fef3c4040a5f4af99bf01d6d6aac533cd6d92fb6a1fd7
+  data.tar.gz: f55ece855a07db30efc55ce1f913c33933c6685da9032a5121b518fd97c59d7e340e403245199991290eeb2f1dcab099ce95e82d0017e124a1707eaa58e7ffea

data/lib/hike.rb

@@ -1,8 +1,9 @@
 module Hike
-  VERSION = "1.2.0"
+  VERSION = "2.1.0"
 
   autoload :CachedTrail,     "hike/cached_trail"
   autoload :Extensions,      "hike/extensions"
+  autoload :FileUtils,       "hike/fileutils"
   autoload :NormalizedArray, "hike/normalized_array"
   autoload :Paths,           "hike/paths"
   autoload :Trail,           "hike/trail"

data/lib/hike/cached_trail.rb

@@ -5,6 +5,8 @@ module Hike
   # file system does not change between `find` calls. All `stat` and
   # `entries` calls are cached for the lifetime of the `CachedTrail` object.
   class CachedTrail
+    include FileUtils
+
     # `CachedTrail#paths` is an immutable `Paths` collection.
     attr_reader :paths
 
@@ -83,14 +85,7 @@ module Hike
     # `~` swap files. Returns an empty `Array` if the directory does
     # not exist.
     def entries(path)
-      @entries[path.to_s] ||= begin
-        pathname = Pathname.new(path)
-        if pathname.directory?
-          pathname.entries.reject { |entry| entry.to_s =~ /^\.|~$|^\#.*\#$/ }.sort
-        else
-          []
-        end
-      end
+      @entries[path.to_s] ||= super
     end
 
     # A cached version of `File.stat`. Returns nil if the file does
@@ -99,10 +94,8 @@ module Hike
       key = path.to_s
       if @stats.key?(key)
         @stats[key]
-      elsif File.exist?(path)
-        @stats[key] = File.stat(path)
       else
-        @stats[key] = nil
+        @stats[key] = super
       end
     end
 
@@ -138,7 +131,7 @@ module Hike
         matches = entries(dirname)
 
         pattern = pattern_for(basename)
-        matches = matches.select { |m| m.to_s =~ pattern }
+        matches = matches.select { |m| m =~ pattern }
 
         sort_matches(matches, basename).each do |path|
           pathname = dirname.join(path)
@@ -190,7 +183,7 @@ module Hike
         aliases = find_aliases_for(basename.extname)
 
         matches.sort_by do |match|
-          extnames = match.sub(basename.to_s, '').to_s.scan(/\.[^.]+/)
+          extnames = match.sub(basename.to_s, '').scan(/\.[^.]+/)
           extnames.inject(0) do |sum, ext|
             if i = extensions.index(ext)
               sum + i + 1

data/lib/hike/fileutils.rb

@@ -0,0 +1,24 @@
+module Hike
+  module FileUtils
+    extend self
+
+    # Like `File.stat`. Returns nil if the file does not exist.
+    def stat(path)
+      if File.exist?(path)
+        File.stat(path.to_s)
+      else
+        nil
+      end
+    end
+
+    # A version of `Dir.entries` that filters out `.` files and `~` swap files.
+    # Returns an empty `Array` if the directory does not exist.
+    def entries(path)
+      if File.directory?(path)
+        Dir.entries(path).reject { |entry| entry =~ /^\.|~$|^\#.*\#$/ }.sort
+      else
+        []
+      end
+    end
+  end
+end

data/lib/hike/trail.rb

@@ -6,6 +6,8 @@ require 'hike/paths'
 module Hike
   # `Trail` is the public container class for holding paths and extensions.
   class Trail
+    include FileUtils
+
     # `Trail#paths` is a mutable `Paths` collection.
     #
     #     trail = Hike::Trail.new
@@ -160,29 +162,6 @@ module Hike
     # Deprecated alias for `cached`.
     alias_method :index, :cached
 
-    # `Trail#entries` is equivalent to `Dir#entries`. It is not
-    # recommend to use this method for general purposes. It exists for
-    # parity with `CachedTrail#entries`.
-    def entries(path)
-      pathname = Pathname.new(path)
-      if pathname.directory?
-        pathname.entries.reject { |entry| entry.to_s =~ /^\.|~$|^\#.*\#$/ }.sort
-      else
-        []
-      end
-    end
-
-    # `Trail#stat` is equivalent to `File#stat`. It is not
-    # recommend to use this method for general purposes. It exists for
-    # parity with `CachedTrail#stat`.
-    def stat(path)
-      if File.exist?(path)
-        File.stat(path.to_s)
-      else
-        nil
-      end
-    end
-
     private
       def normalize_extension(extension)
         if extension[/^\./]

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: hike
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Sam Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby library for finding files in a set of paths.
@@ -38,6 +35,7 @@ files:
 - LICENSE
 - lib/hike/cached_trail.rb
 - lib/hike/extensions.rb
+- lib/hike/fileutils.rb
 - lib/hike/normalized_array.rb
 - lib/hike/paths.rb
 - lib/hike/trail.rb
@@ -45,26 +43,26 @@ files:
 homepage: http://github.com/sstephenson/hike
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Find files in a set of paths
 test_files: []
+has_rdoc: