Update the Rakefile to work with ruby 1.9.2

pauldix · Jan 2, 2011 · 6f1e58b · 6f1e58b
1 parent 3097f9d
commit 6f1e58b
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 15 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,8 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require "spec"
 require "spec/rake/spectask"
-require 'lib/typhoeus.rb'
+require 'lib/typhoeus'
 
 begin
   require 'jeweler'

diff --git a/spec/typhoeus/easy_spec.rb b/spec/typhoeus/easy_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::Easy do
   describe "#supports_zlib" do

diff --git a/spec/typhoeus/filter_spec.rb b/spec/typhoeus/filter_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::Filter do
   it "should take a method name and optionally take options" do
@@ -32,4 +32,4 @@
       filter.apply_filter?(:foo).should be_false
     end
   end
-end
+end
diff --git a/spec/typhoeus/hydra_mock_spec.rb b/spec/typhoeus/hydra_mock_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Typhoeus::HydraMock do
   it "should mark all responses as mocks" do

diff --git a/spec/typhoeus/hydra_spec.rb b/spec/typhoeus/hydra_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 # some of these tests assume that you have some local services running.
 # ruby spec/servers/app.rb -p 3000

diff --git a/spec/typhoeus/multi_spec.rb b/spec/typhoeus/multi_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::Easy do
   it "should save easy handles that get added" do

diff --git a/spec/typhoeus/normalized_header_hash_spec.rb b/spec/typhoeus/normalized_header_hash_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Typhoeus::NormalizedHeaderHash do
   before(:all) do

diff --git a/spec/typhoeus/remote_method_spec.rb b/spec/typhoeus/remote_method_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::RemoteMethod do
   it "should take options" do
@@ -138,4 +138,4 @@
       Typhoeus::RemoteMethod.new(:cache_responses => 30).cache_ttl.should == 30
     end
   end
-end
+end
diff --git a/spec/typhoeus/remote_proxy_object_spec.rb b/spec/typhoeus/remote_proxy_object_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::RemoteProxyObject do
   before(:each) do

diff --git a/spec/typhoeus/remote_spec.rb b/spec/typhoeus/remote_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus do
   it "should be deprecated" do

diff --git a/spec/typhoeus/request_spec.rb b/spec/typhoeus/request_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::Request do
   describe "#inspect" do

diff --git a/spec/typhoeus/response_spec.rb b/spec/typhoeus/response_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Typhoeus::Response do
   describe "initialize" do

diff --git a/spec/typhoeus/utils_spec.rb b/spec/typhoeus/utils_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Typhoeus::Utils do
   # Taken from Rack 1.2.1