From 72d6db8bc417ef966c5dff16b6baa885140c96dc Mon Sep 17 00:00:00 2001 From: William Light Date: Tue, 1 Oct 2013 21:26:04 +0200 Subject: Fix for caller_dir relative gems --- tasks/mruby_build_gem.rake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/mruby_build_gem.rake b/tasks/mruby_build_gem.rake index 4b8b79682..ea1307132 100644 --- a/tasks/mruby_build_gem.rake +++ b/tasks/mruby_build_gem.rake @@ -8,17 +8,21 @@ module MRuby GemBox.path = gembox instance_eval File.read(gembox) + + GemBox.path = nil end def gem(gemdir, &block) caller_dir = File.expand_path(File.dirname(/^(.*?):\d/.match(caller.first).to_a[1])) + if gemdir.is_a?(Hash) gemdir = load_special_path_gem(gemdir) - elsif gemdir.is_a?(String) - gemdir = "#{File.dirname(GemBox.path)}/#{gemdir}" + elsif GemBox.path && gemdir.is_a?(String) + gemdir = File.expand_path(gemdir, File.dirname(GemBox.path)) else gemdir = File.expand_path(gemdir, caller_dir) end + gemrake = File.join(gemdir, "mrbgem.rake") fail "Can't find #{gemrake}" unless File.exists?(gemrake) -- cgit v1.2.3