basepath 0.4.0 → 0.5.0

data/Rakefile

@@ -4,12 +4,12 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "basepath"
-    gem.summary = %Q{Define you application base path for easy requires and general access to files.}
+    gem.name        = "basepath"
+    gem.summary     = %Q{Define you application base path for easy requires and general access to files.}
     gem.description = %Q{By adding a .base file to your application base dir, helps you augment $LOAD_PATH, auto-require files, and set constants to important paths.}
-    gem.email = "dev@caiochassot.com"
-    gem.homepage = "http://github.com/kch/basepath"
-    gem.authors = ["Caio Chassot"]
+    gem.email       = "dev@caiochassot.com"
+    gem.homepage    = "http://github.com/kch/basepath"
+    gem.authors     = ["Caio Chassot"]
     gem.add_development_dependency "bacon", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/basepath.rb

@@ -1,4 +1,6 @@
+# encoding: UTF-8
 require 'pathname'
+require 'yaml'
 
 module Basepath
   DOT_BASE = '.base'
@@ -23,16 +25,19 @@ module Basepath
 
   def find_base!
     paths_tried = []
-    index_of_require_line = caller.index { |line| line =~ /`require'$/ } \
-      and caller_line_before_require = caller[index_of_require_line.succ]
-    if index_of_require_line && caller_line_before_require
+    caller_line_before_require = caller.inject(false) do |was_in_require, line|
+      is_in_require = line.force_encoding(__ENCODING__) =~ /`(rescue in )?require'$/
+      break line if was_in_require && !is_in_require
+      is_in_require
+    end
+    if caller_line_before_require
       path_from_requirer = Pathname.new(path_from_caller_line(caller_line_before_require)).realpath.dirname
       base_from_requirer = find_base(path_from_requirer)
       return base_from_requirer if base_from_requirer
       paths_tried << path_from_requirer
     end
     path_from_pwd = Pathname.new(Dir.pwd).realpath
-    pwd_path_parent_of_requirer_path = index_of_require_line && "#{path_from_requirer}/".index("#{path_from_pwd}/") == 0
+    pwd_path_parent_of_requirer_path = caller_line_before_require && "#{path_from_requirer}/".index("#{path_from_pwd}/") == 0
     if not pwd_path_parent_of_requirer_path
       base_from_pwd = find_base(path_from_pwd)
       return base_from_pwd if base_from_pwd
@@ -73,7 +78,7 @@ module Basepath
     $LOAD_PATH.unshift(*load_paths)
 
     # requires
-    loaded = caller(0).map { |s| s[/\A(.+?)(?:\.rb)?:\d+(?::in `.*?')?\z/, 1] }.compact.uniq
+    loaded = caller(0).map { |s| s.force_encoding(__ENCODING__)[/\A(.+?)(?:\.rb)?:\d+(?::in `.*?')?\z/, 1] }.compact.uniq
     globs, names = base_conf[:requires].split("\n").partition { |s| s =~ /\*/ }
     names.map! { |s| const_expand! s, false }.concat \
       globs.map { |s| Dir[const_expand!(s).to_s + ".rb"] }\

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Caio Chassot
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -03:00
+date: 2010-08-02 00:00:00 -03:00
 default_executable: basepath-init
 dependencies: 
 - !ruby/object:Gem::Dependency