1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

Merge pull request #1726 from cainlevy/fix_require_from_source

restore ability to load fog from source without bundler
This commit is contained in:
Wesley Beary 2013-04-02 14:39:47 -07:00
commit 12390f0813
2 changed files with 5 additions and 5 deletions

View file

@ -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.
# they all depend on fog/core for shared functionality.
require 'fog/atmos'

View file

@ -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
require 'base64'
require 'cgi'