clean up include paths, require newer rake version.

3 files changed, 17 insertions, 1 deletions

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index 714211a..1921357 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -2,6 +2,7 @@ module LeapCli; end
 
 require 'leap_cli/version.rb'
 require 'leap_cli/requirements.rb'
+
 require 'leap_cli/leapfile.rb'
 require 'core_ext/hash'
 require 'core_ext/boolean'
diff --git a/lib/leap_cli/load_paths.rb b/lib/leap_cli/load_paths.rb
new file mode 100644
index 0000000..265a644
--- /dev/null
+++ b/lib/leap_cli/load_paths.rb
@@ -0,0 +1,15 @@
+#
+# Bundle and rubygems each have their own way of modifying $LOAD_PATH.
+#
+# We want to make sure that the right paths are loaded, including the
+# vendored gems, regardless of how leap is run.
+#
+#
+
+require File.expand_path('../version', __FILE__)
+
+base_leap_dir = File.expand_path('../../..', __FILE__)
+LeapCli::LOAD_PATHS.each do |path|
+  path = File.expand_path(path, base_leap_dir)
+  $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+end
\ No newline at end of file
diff --git a/lib/leap_cli/version.rb b/lib/leap_cli/version.rb
index fa7ec92..baf3fe9 100644
--- a/lib/leap_cli/version.rb
+++ b/lib/leap_cli/version.rb
@@ -3,6 +3,6 @@ module LeapCli
     VERSION = '0.1.6'
     SUMMARY = 'Command line interface to the LEAP platform'
     DESCRIPTION = 'The command "leap" can be used to manage a bevy of servers running the LEAP platform from the comfort of your own home.'
-    REQUIRE_PATHS = ['lib', 'vendor/supply_drop/lib', 'vendor/certificate_authority/lib']
+    LOAD_PATHS = ['lib', 'vendor/supply_drop/lib', 'vendor/certificate_authority/lib']
   end
 end