dirge 0.0.2 → 0.0.3

data/Rakefile

@@ -12,3 +12,18 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
+
+require 'spec'
+require 'spec/rake/spectask'
+task :spec => 'spec:all'
+namespace(:spec) do
+  Spec::Rake::SpecTask.new(:all) do |t|
+    t.spec_opts ||= []
+    t.spec_opts << "-rubygems"
+    t.spec_opts << '-rlib/dirge'
+    t.spec_opts << "--options" << "spec/spec.opts"
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/dirge.rb

@@ -1,25 +1,34 @@
 module Kernel
-  def __DIR__(called_from = nil)
+  def __DIR_REL__(called_from = nil)
     called_from ||= caller.first
-    caller_path = called_from[/(.*?(?=:\d))/, 1]
+    caller_path = called_from[/(.*?(?=:\d+(:|$)))/, 1]
     caller_path = '.' if caller_path == ''
     File.expand_path(File.dirname(caller_path))
   end
 
-  def require_relative(path)
-    require File.join(__DIR__(caller.first), path)
+  unless method_defined?(:__DIR__)
+    alias_method :__DIR__, :__DIR_REL__
   end
 
+  unless method_defined?(:require_relative)
+    def require_relative(path)
+      require File.join(__DIR_REL__(caller.first), path)
+    end
+  end
 end
 
 class Module
-  def self.autoload_relative(name, filename)
-    autoload name, File.join(__DIR__(caller.first), filename)
+  unless method_defined?(:autoload_relative)
+    def autoload_relative(name, filename)
+      autoload name, File.join(__DIR_REL__(caller.first), filename)
+    end
   end
 end
 
 class String
-  def ~@
-    File.expand_path(File.join(__DIR__(caller.first), self))
+  unless method_defined?(:~@)
+    def ~@
+      File.expand_path(File.join(__DIR_REL__(caller.first), self))
+    end
   end
 end

data/spec/dirge_spec.rb

@@ -0,0 +1,29 @@
+describe 'Dirge' do
+  it "should resolve a path" do
+    (~'test:2test/test').should == File.expand_path(File.join(File.dirname(__FILE__), 'test:2test', 'test'))
+  end
+  
+  it 'should require a relative path' do
+    proc {
+      require_relative 'test:2test/test'
+    }.should raise_error(RuntimeError, 'okay okay, you included me')
+  end
+  
+  it 'should autoload a relative path' do
+    proc {
+      mod = Module.new do
+        autoload_relative :TestingTime, 'test:2test/test'
+      end
+      mod::TestingTime
+    }.should raise_error(RuntimeError, 'okay okay, you included me')
+  end
+  
+  it "should define __DIR__" do
+    __DIR__.should == File.expand_path(File.dirname(__FILE__))
+  end
+  
+  it "should define __DIR__ with a custom caller" do
+    __DIR__('testing/test.rb:3').should == File.expand_path('testing')
+  end
+  
+end

data/spec/test:2test/test.rb

@@ -0,0 +1 @@
+raise 'okay okay, you included me'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dirge
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -54,5 +54,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Relative require, relative autoload and __DIR__
-test_files: []
-
+test_files: 
+- spec/dirge_spec.rb
+- spec/test:2test/test.rb