Merge pull request #235 from econya/peace_for_loadpath_bundler

Do not fiddle with load_path or bundle/require in bin/vedeu and lib/v…
gavinlaking · Sep 28, 2015 · 117584e · 117584e
2 parents 415ddbb + e36732c
commit 117584e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/bin/vedeu b/bin/vedeu
@@ -11,13 +11,6 @@ end
 
 fail bundler_message unless defined?(Bundler)
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-Bundler.setup
-
-gem_dir = File.expand_path('..', File.dirname(__FILE__))
-$LOAD_PATH.unshift(gem_dir) unless $LOAD_PATH.include?(gem_dir)
-
 require 'vedeu'
 require 'vedeu_cli'
 

diff --git a/lib/vedeu.rb b/lib/vedeu.rb
@@ -1,8 +1,3 @@
-$LIB_DIR = File.dirname(__FILE__) + '/../lib'
-$LOAD_PATH.unshift($LIB_DIR) unless $LOAD_PATH.include?($LIB_DIR)
-
-require 'bundler/setup'
-
 require 'base64'
 require 'date'
 require 'drb'