Merge pull request #1726 from cainlevy/fix_require_from_source
restore ability to load fog from source without bundler
This commit is contained in:
commit
12390f0813
|
@ -1,3 +1,8 @@
|
||||||
|
# necessary when requiring fog without rubygems while also
|
||||||
|
# maintaining ruby 1.8.7 support (can't use require_relative)
|
||||||
|
__LIB_DIR__ = File.expand_path(File.dirname(__FILE__))
|
||||||
|
$LOAD_PATH.unshift __LIB_DIR__ unless $LOAD_PATH.include?(__LIB_DIR__)
|
||||||
|
|
||||||
# any one of these can be required separately.
|
# any one of these can be required separately.
|
||||||
# they all depend on fog/core for shared functionality.
|
# they all depend on fog/core for shared functionality.
|
||||||
require 'fog/atmos'
|
require 'fog/atmos'
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
__LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), '..'))
|
|
||||||
|
|
||||||
$LOAD_PATH.unshift __LIB_DIR__ unless
|
|
||||||
$LOAD_PATH.include?(__LIB_DIR__)
|
|
||||||
|
|
||||||
# external core dependencies
|
# external core dependencies
|
||||||
require 'base64'
|
require 'base64'
|
||||||
require 'cgi'
|
require 'cgi'
|
||||||
|
|
Loading…
Reference in New Issue