diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-02-05 00:27:47 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-02-05 00:27:47 -0500 |
commit | bd5e94912c594372eca319e75e15c364b7e124ea (patch) | |
tree | f18f7aec63b42bb9062a22ac000d197a241d1536 /lib/sisu/v6/composite.rb | |
parent | v5 v6: html, cleaning, minor (diff) |
v5 v6: wrappers round require
Diffstat (limited to 'lib/sisu/v6/composite.rb')
-rw-r--r-- | lib/sisu/v6/composite.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sisu/v6/composite.rb b/lib/sisu/v6/composite.rb index 044f31c4..ebbd14f6 100644 --- a/lib/sisu/v6/composite.rb +++ b/lib/sisu/v6/composite.rb @@ -178,10 +178,14 @@ module SiSU_Assemble end tuned_file << if loadfile =~ /(?:https?|file):\/\/\S+?\.ss[ti]$/ # and NetTest imagedir = /((?:https?|file):\/\/\S+?)\/[^\/]+?\.ss[ti]$/.match(loadfile).captures.join + '/_sisu/image' #watch - require 'uri' + begin + require 'uri' + require 'open-uri' + require 'pp' + rescue LoadError + SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('uri, open-uri or pp NOT FOUND (LoadError)') + end image_uri=URI.parse(imagedir) - require 'open-uri' - require 'pp' insert=open(loadfile) insert_array=insert.dup insert.close |