pathological 0.2.6 → 0.3.0

data/lib/pathological/base.rb

@@ -89,20 +89,23 @@ module Pathological
   #
   # @param [String] copy_outside_paths the directory to stage dependencies in
   # @param [String] dependency_directory the subdir within destination to put dependencies in
+  # @param [String] pathfile_search_path the directory at which to begin the search for the Pathfile by
+  #                 walking up the directory tree
   #
   # TODO(ev): Break this function up into a set of more functional primitives
-  def self.copy_outside_paths!(destination, dependency_directory = "pathological_dependencies")
+  def self.copy_outside_paths!(destination, options = {})
+    options = { :dependency_directory => "pathological_dependencies" }.merge(options)
     saved_exclude_root = @@exclude_root
     begin
       self.excluderoot_mode
-      pathfile = self.find_pathfile
+      pathfile = self.find_pathfile(options[:pathfile_search_path])
       # Nothing to do if there's no Pathfile
       return unless pathfile && File.file?(pathfile)
 
       foreign_paths = self.find_load_paths(pathfile).uniq
       return if foreign_paths.empty?
 
-      path_root = File.join(destination, dependency_directory)
+      path_root = File.join(destination, options[:dependency_directory])
       FileUtils.mkdir_p path_root
 
       # Copy in each path and save the relative paths to write to the rewritten Pathfile. We copy each unique
@@ -116,7 +119,7 @@ module Pathological
         FileUtils.mkdir_p File.split(symlinked_name)[0]
         debug "About to move #{foreign_path} to #{symlinked_name}..."
         copy_directory(foreign_path, symlinked_name)
-        File.join(dependency_directory, path_short_name)
+        File.join(options[:dependency_directory], path_short_name)
       end
       # Overwrite the Pathfile with the new relative paths.
       File.open(File.join(destination, "Pathfile"), "w") do |file|
@@ -131,7 +134,7 @@ module Pathological
 
   def self.debug_mode; @@debug = true; end
   def self.bundlerize_mode
-    pathfile = Pathological.find_pathfile
+    pathfile = self.find_pathfile
     raise NoPathfileException unless pathfile
     bundle_gemfile = File.join(File.dirname(pathfile), "Gemfile")
     unless File.file? bundle_gemfile
@@ -187,7 +190,7 @@ module Pathological
       # Trim comments
       line = line.split(/#/, 2)[0].strip
       next if line.empty?
-      raw_path = File.expand_path(File.join(root, line.strip))
+      raw_path = Pathname.new(line).absolute? ? line : File.expand_path(File.join(root, line))
       raw_paths << (@@add_parents ? File.dirname(raw_path) : raw_path)
     end
 

data/lib/pathological/version.rb

@@ -1,3 +1,3 @@
 module Pathological
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/pathological.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "scope", ">= 0.2.3"
   s.add_development_dependency "fakefs"
   s.add_development_dependency "rake"
+  s.add_development_dependency "dedent"
 end

data/test/unit/pathological/base_test.rb

@@ -4,6 +4,7 @@ require "rr"
 require "minitest/autorun"
 require "stringio"
 require "fakefs/safe"
+require "dedent"
 
 # It's kind of funny that we need to do this hack, given that Pathological is intended to work around it...
 $:.unshift(File.join(File.dirname(__FILE__), "../../lib"))
@@ -102,29 +103,29 @@ module Pathological
 
       context "#requiring_filename" do
         setup do
-          @full_19_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").reject(&:empty?)
-          @full_18_stacktrace = %Q{
-/Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological/base.rb:61:in `find_pathfile'
-/Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological/base.rb:36:in `find_load_paths'
-/Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological/base.rb:15:in `add_paths!'
-/Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological.rb:3
-/Users/test/ruby/site_ruby/1.8/rubygems/custom_require.rb:58:in `gem_original_require'
-/Users/test/ruby/site_ruby/1.8/rubygems/custom_require.rb:58:in `require'
-app.rb:2
-          }.split("\n").reject(&:empty?)
-          @bad_stacktrace = %Q{
-/Users/test/repos/pathological/test/rackup/app.rb !!! `<top (required)>'
-          }.split("\n").reject(&:empty?)
+          @full_19_stacktrace = <<-EOS.dedent.split("\n").reject(&:empty?)
+            /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'
+          EOS
+          @full_18_stacktrace = <<-EOS.dedent.split("\n").reject(&:empty?)
+            /Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological/base.rb:61:in `find_pathfile'
+            /Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological/base.rb:36:in `find_load_paths'
+            /Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological/base.rb:15:in `add_paths!'
+            /Users/test/ruby/gems/1.8/gems/pathological-0.2.5/lib/pathological.rb:3
+            /Users/test/ruby/site_ruby/1.8/rubygems/custom_require.rb:58:in `gem_original_require'
+            /Users/test/ruby/site_ruby/1.8/rubygems/custom_require.rb:58:in `require'
+            app.rb:2
+          EOS
+          @bad_stacktrace = <<-EOS.dedent.split("\n").reject(&:empty?)
+            /Users/test/repos/pathological/test/rackup/app.rb !!! `<top (required)>'
+          EOS
           @empty_stacktrace = []
         end
 
@@ -184,6 +185,16 @@ app.rb:2
           assert_raises(PathologicalException) { load_and_run! }
         end
 
+        should "respect absolute paths" do
+          other = "/a/b"
+          @pathfile = "/src/Pathfile"
+          FileUtils.mkdir "/src"
+          FileUtils.mkdir_p other
+          FileUtils.touch @pathfile
+          File.open(@pathfile, "w") { |f| f.write(other) }
+          assert Pathological.find_load_paths("/src/Pathfile").include? other
+        end
+
         should "print some debug info in debug mode" do
           Pathological.debug_mode
           mock(Pathological).puts(anything).at_least(3)
@@ -235,7 +246,7 @@ app.rb:2
         end
 
         should "return immediately if there is no Pathfile" do
-          mock(Pathological).find_pathfile { nil }
+          mock(Pathological).find_pathfile(nil) { nil }
           Pathological.copy_outside_paths! @destination
           refute File.directory?(File.join(@destination, "pathological_dependencies"))
         end
@@ -261,6 +272,24 @@ app.rb:2
           end
           assert_equal destination_paths, File.read(File.join(@destination, "Pathfile")).split("\n")
         end
+
+        should "copy source dirs as links and rewrite Pathfile in a different directory" do
+          other = "other/dir"
+          FileUtils.mkdir_p other
+          File.open(File.join(other, "Pathfile"), "w") { |f| f.puts @source_paths.join("\n") }
+
+          final_path = File.join(@destination, "pathological_dependencies")
+          @source_paths.each do |source_path|
+            mock(Pathological).copy_directory(source_path, final_path + source_path.gsub("/src", "")).once
+          end
+          Pathological.copy_outside_paths! @destination, :pathfile_search_path => other
+
+          assert File.directory?(final_path)
+          destination_paths = @source_paths.map do |source_path|
+            "pathological_dependencies#{source_path.gsub("/src", "")}"
+          end
+          assert_equal destination_paths, File.read(File.join(@destination, "Pathfile")).split("\n")
+        end
       end
     end
   end

metadata

@@ -1,73 +1,111 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pathological
-version: !ruby/object:Gem::Version
-  version: 0.2.6
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Daniel MacDougall
 - Caleb Spare
 - Evan Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-20 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rr
-  requirement: &19178940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 0
+        - 3
         version: 1.0.3
   type: :development
-  prerelease: false
-  version_requirements: *19178940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: scope
-  requirement: &19178380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 2
+        - 3
         version: 0.2.3
   type: :development
-  prerelease: false
-  version_requirements: *19178380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &19177920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19177920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &19171820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: dedent
   prerelease: false
-  version_requirements: *19171820
-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"
-email:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+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"
+email: 
 - dmac@ooyala.com
 - caleb@ooyala.com
 - ev@ooyala.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -85,29 +123,39 @@ files:
 - lib/pathological/version.rb
 - pathological.gemspec
 - test/unit/pathological/base_test.rb
+has_rdoc: true
 homepage: http://www.ooyala.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: pathological
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: A nice way to manage your project's require paths.
 test_files: []
-has_rdoc: 
+