Revamped how files are required.

jacius · Oct 18, 2009 · 3da0eb8 · 3da0eb8
1 parent 2b81402
commit 3da0eb8
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 32 deletions.
diff --git a/lib/nice-ffi.rb b/lib/nice-ffi.rb
@@ -28,21 +28,26 @@
 #++
 
 
-require 'need'
+require 'ffi'
 
 
 module NiceFFI
 end
 
 
+this_dir = File.expand_path( File.dirname(__FILE__) )
+
 %w{
 
+  typedpointer
+  pathset
   nicelibrary
+  autorelease
   nicestruct
   opaquestruct
 
 }.each do |f|
 
-  need { File.join( 'nice-ffi', f ) }
+  require File.join( this_dir, 'nice-ffi', f )
 
 end
diff --git a/lib/nice-ffi/autorelease.rb b/lib/nice-ffi/autorelease.rb
@@ -28,7 +28,6 @@
 #++
 
 
-require 'ffi'
 
 #--
 # Don't scan this module for RDoc/RI.

diff --git a/lib/nice-ffi/nicelibrary.rb b/lib/nice-ffi/nicelibrary.rb
@@ -28,12 +28,6 @@
 #++
 
 
-require 'ffi'
-
-need{ 'typedpointer' }
-need{ 'pathset' }
-
-
 # A module to be used in place of FFI::Library. It acts mostly
 # like FFI::Library, but with some nice extra features and
 # conveniences to make life easier:

diff --git a/lib/nice-ffi/nicestruct.rb b/lib/nice-ffi/nicestruct.rb
@@ -28,12 +28,6 @@
 #++
 
 
-require 'ffi'
-
-need{ 'typedpointer' }
-need{ 'autorelease' }
-
-
 # A class to be used as a baseclass where you would use FFI::Struct.
 # It acts mostly like FFI::Struct, but with nice extra features and
 # conveniences to make life easier:

diff --git a/lib/nice-ffi/opaquestruct.rb b/lib/nice-ffi/opaquestruct.rb
@@ -28,11 +28,6 @@
 #++
 
 
-
-require 'ffi'
-need{ 'autorelease' }
-
-
 # OpaqueStruct represents a Struct with an unknown layout.
 # This is meant to be used when the C library designer has
 # intentionally hidden the layout (e.g. to prevent user access).
@@ -88,7 +83,6 @@ def initialize( val, options={} )
     when FFI::Pointer
       if( val.instance_of? FFI::Pointer ) # not MemoryPointer or Buffer
         @pointer = _make_autopointer( val, options[:autorelease] )
-
       else
         raise TypeError, "unsupported pointer type #{val.class.name}"
       end

diff --git a/lib/nice-ffi/typedpointer.rb b/lib/nice-ffi/typedpointer.rb
@@ -28,9 +28,6 @@
 #++
 
 
-require 'ffi'
-
-
 # TypedPointer represents a :pointer (FFI type) that is a specific
 # struct type. You can use TypedPointer( SomeStructClass ) instead
 # of :pointer in these situations:

diff --git a/spec/autorelease_spec.rb b/spec/autorelease_spec.rb
@@ -1,6 +1,4 @@
-require 'need'
-need { File.join("..", "lib", "nice-ffi") }
-
+require 'spec_helper.rb'
 
 # NOTE: When using $open_pointers, always use different pointer
 # addresses than any other specs have used! Otherwise, a pointer from

diff --git a/spec/opaquestruct_spec.rb b/spec/opaquestruct_spec.rb
@@ -1,5 +1,4 @@
-require 'need'
-need { File.join("..", "lib", "nice-ffi") }
+require 'spec_helper.rb'
 
 
 class OpaqueThing < NiceFFI::OpaqueStruct

diff --git a/spec/pathset_spec.rb b/spec/pathset_spec.rb
@@ -1,6 +1,4 @@
-require 'need'
-need { File.join("..", "lib", "nice-ffi") }
-
+require 'spec_helper.rb'
 
 
 describe NiceFFI::PathSet do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -0,0 +1,3 @@
+
+require File.join( File.expand_path( File.dirname(__FILE__) ),
+                   "..","lib","nice-ffi" )