pathological 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,18 +1,16 @@
 PATH
   remote: .
   specs:
-    pathological (0.1.4)
+    pathological (0.2.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     fakefs (0.4.0)
     minitest (2.5.1)
-    rdiscount (1.6.8)
     rr (1.0.3)
     scope (0.2.3)
       minitest
-    yard (0.7.2)
 
 PLATFORMS
   ruby
@@ -20,7 +18,5 @@ PLATFORMS
 DEPENDENCIES
   fakefs
   pathological!
-  rdiscount (~> 1.6.8)
   rr (>= 1.0.3)
   scope (>= 0.2.3)
-  yard (~> 0.7.2)

data/lib/pathological/base.rb

@@ -57,8 +57,8 @@ module Pathological
     end
     return nil if directory && !File.directory?(directory)
     # Find the full, absolute path of this directory, resolving symlinks. If no directory was given, use the
-    # directory where the executed file resides.
-    full_path = real_path(directory || $0)
+    # directory where the file requiring pathological resides.
+    full_path = real_path(directory || requiring_filename)
     current_path = directory ? full_path : File.dirname(full_path)
     loop do
       debug "Searching <#{current_path}> for Pathfile."
@@ -155,6 +155,18 @@ module Pathological
     @@exclude_root ? paths.reject { |path| File.expand_path(path) == File.expand_path(root) } : paths
   end
 
+  # Searches the call stack for the file that required pathological.
+  # If no file can be found, falls back to the currently executing file ($0).
+  # This handles the case where the app was launched by another executable (rake, thin, rackup, etc.)
+  #
+  # @return [String] name of file requiring pathological, or the currently executing file.
+  def self.requiring_filename
+    requiring_file = Kernel.caller.find do |stack_line|
+      stack_line.include?("top (required)") && !stack_line.include?("pathological.rb")
+    end
+    requiring_file ? requiring_file.match(/(.+):\d+:in/)[1] : $0 rescue $0
+  end
+
   private_class_method :debug, :real_path, :parse_pathfile
 
   # Reset options

data/lib/pathological/version.rb

@@ -1,3 +1,3 @@
 module Pathological
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/pathological.gemspec

@@ -27,7 +27,5 @@ Gem::Specification.new do |s|
   # Require rr >= 1.0.3 and scope >= 0.2.3 for mutual compatibility.
   s.add_development_dependency "rr", ">= 1.0.3"
   s.add_development_dependency "scope", ">= 0.2.3"
-  s.add_development_dependency "yard", "~> 0.7.2"
-  s.add_development_dependency "rdiscount", "~> 1.6.8"
   s.add_development_dependency "fakefs"
 end

data/test/pathological/base_test.rb

@@ -100,6 +100,41 @@ module Pathological
         end
       end
 
+      context "#requiring_filename" do
+        setup do
+          @full_stacktrace = %Q{
+/Users/test/ruby/gems/1.9.1/gems/pathological-0.2.2.1/lib/pathological/base.rb:61:in `find_pathfile'
+/Users/test/gems/pathological-0.2.2.1/lib/pathological/base.rb:36:in `find_load_paths'
+/Users/test/gems/pathological-0.2.2.1/lib/pathological/base.rb:15:in `add_paths!'
+/Users/test/gems/pathological-0.2.2.1/lib/pathological.rb:3:in `<top (required)>'
+/Users/test/ruby/1.9.1/rubygems/custom_require.rb:59:in `require'
+/Users/test/ruby/1.9.1/rubygems/custom_require.rb:59:in `rescue in require'
+/Users/test/ruby/1.9.1/rubygems/custom_require.rb:35:in `require'
+/Users/test/repos/pathological/test/rackup/app.rb:1:in `<top (required)>'
+/Users/test/.rubies/1.9.2-p290/lib/ruby/site_ruby/1.9.1/rubygems/custom_require.rb:36:in `require'
+          }.split("\n")
+          @bad_stacktrace = %Q{
+/Users/test/repos/pathological/test/rackup/app.rb !!! `<top (required)>'
+          }.split("\n")
+          @empty_stacktrace = []
+        end
+
+        should "find root file from a stacktrace" do
+          stub(Kernel).caller { @full_stacktrace }
+          assert_equal "app.rb", File.basename(Pathological.requiring_filename)
+        end
+
+        should "return executing file from malformed stacktrace" do
+          stub(Kernel).caller { @bad_stacktrace }
+          assert Pathological.requiring_filename
+        end
+
+        should "return executing file if unable to find root file in stacktrace" do
+          stub(Kernel).caller { @empty_stacktrace }
+          assert Pathological.requiring_filename
+        end
+      end
+
       context "loading pathological" do
         setup do
           @pathfile_contents = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pathological
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70361439567920 !ruby/object:Gem::Requirement
+  requirement: &2165564740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70361439567920
+  version_requirements: *2165564740
 - !ruby/object:Gem::Dependency
   name: scope
-  requirement: &70361439567420 !ruby/object:Gem::Requirement
+  requirement: &2165564280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,32 +33,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *70361439567420
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70361439566960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-  type: :development
-  prerelease: false
-  version_requirements: *70361439566960
-- !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &70361439566380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-  type: :development
-  prerelease: false
-  version_requirements: *70361439566380
+  version_requirements: *2165564280
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70361439565940 !ruby/object:Gem::Requirement
+  requirement: &2165563900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361439565940
+  version_requirements: *2165563900
 description: ! "    Pathological provides a way to manage a project's require paths
   by using a small config file that\n    indicates all directories to include in the
   load path.\n"
@@ -77,7 +55,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .rvmrc
 - .yardopts
 - Gemfile
 - Gemfile.lock

data/.rvmrc

@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-# WARNING: DO NOT MANUALLY EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING.
-# This file was generated automatically using ofe/tools/rvmrc_create.sh (which is in turn a wrapper around the
-# rvm command rvm --rvmrc). It was generated in the following way:
-#
-#   $ rvmrc_create.sh use 1.9.2@pathological --create
-#
-# Please use rvmrc_create.sh if you want to change what this project rvmrc does.
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@pathological"
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficicent compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  [[ -s ".rvm/hooks/after_use" ]] && . ".rvm/hooks/after_use"
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create use  "$environment_id"
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]] ; then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-#
-# If you use bundler and would like to run bundle each time you enter the
-# directory, you can uncomment the following code.
-#
-#   # Ensure that Bundler is installed. Install it if it is not.
-#   if ! command -v bundle >/dev/null; then
-#      printf "The rubygem 'bundler' is not installed. Installing it now.\n"
-#      gem install bundler
-#   fi
-#
-#   # Bundle while reducing excess noise.
-#   printf "Bundling your gems. This may take a few minutes on a fresh clone.\n"
-#   bundle | grep -v '^Using ' | grep -v ' is complete' | sed '/^$/d'
-#
-