hx 0.25.0 → 0.26.0

data/VERSION

@@ -1 +1 @@
-0.25.0
+0.26.0

data/lib/hx.rb

@@ -376,21 +376,13 @@ def self.get_default_author(options)
   options.fetch(:default_author, "nobody")
 end
 
-def self.local_require(options, library)
-  saved_require_path = $:.dup
-  begin
-    $:.delete(".")
-    lib_dir = Hx.get_pathname(options, :lib_dir)
-    if lib_dir.relative?
-      $:.push "./#{lib_dir}"
-    else
-      $:.push lib_dir.to_s
-    end
-    require library
-  rescue LoadError
-    raise
-  ensure
-    $:[0..-1] = saved_require_path
+def self.setup_require_path(options)
+  $:.delete(".")
+  lib_dir = Hx.get_pathname(options, :lib_dir)
+  if lib_dir.relative?
+    $:.push "./#{lib_dir}"
+  else
+    $:.push lib_dir.to_s
   end
 end
 
@@ -463,7 +455,7 @@ def self.build_source(options, default_input, sources, raw_source)
       factory = Hx.resolve_constant(filter)
     rescue NameError
       library = filter.gsub(/::/, '/').downcase
-      Hx.local_require(options, library)
+      require library
       factory = Hx.resolve_constant(filter)
     end
     source = factory.new(source, filter_options)
@@ -518,9 +510,11 @@ class Site
       options[:config_file] = config_file
       options.update(option_overrides)
 
+      Hx.setup_require_path(options)
+
       if raw_config.has_key? 'require'
         for library in raw_config['require']
-          Hx.local_require(options, library)
+          require library
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 119
   prerelease: 
   segments: 
   - 0
-  - 25
+  - 26
   - 0
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -07:00
+date: 2011-04-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency