From 23b3a53c077d45178756e6bff6868a47752a08d7 Mon Sep 17 00:00:00 2001
From: Petko Bordjukov <bordjukov@gmail.com>
Date: Thu, 9 Apr 2015 13:33:03 +0300
Subject: [PATCH] Escape the library and include paths

The library and include flags were not escaped until now and this caused
issues when there were spaces in them. This fixes #164.
---
 ext/libv8/paths.rb    | 7 +++++--
 spec/location_spec.rb | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ext/libv8/paths.rb b/ext/libv8/paths.rb
index 2c4e6ef..12eccdd 100644
--- a/ext/libv8/paths.rb
+++ b/ext/libv8/paths.rb
@@ -1,4 +1,5 @@
 require 'rbconfig'
+require 'shellwords'
 require File.expand_path '../arch', __FILE__
 
 module Libv8
@@ -6,11 +7,13 @@ module Libv8
     module_function
 
     def include_paths
-      ["#{vendored_source_path}/include"]
+      [Shellwords.escape("#{vendored_source_path}/include")]
     end
 
     def object_paths
-      [libv8_object(:base), libv8_object(:snapshot)]
+      [libv8_object(:base), libv8_object(:snapshot)].map do |path|
+        Shellwords.escape path
+      end
     end
 
     def config
diff --git a/spec/location_spec.rb b/spec/location_spec.rb
index 6b7aa98..c48e2c1 100644
--- a/spec/location_spec.rb
+++ b/spec/location_spec.rb
@@ -54,17 +54,17 @@ describe "libv8 locations" do
       @context.stub(:incflags) {@incflags ||= "-I/usr/include -I/usr/local/include"}
       @context.stub(:ldflags) {@ldflags ||= "-lobjc -lpthread"}
 
-      Libv8::Paths.stub(:include_paths) {["/frp/v8/include"]}
-      Libv8::Paths.stub(:object_paths) {["/frp/v8/obj/libv8_base.a", "/frp/v8/obj/libv8_snapshot.a"]}
+      Libv8::Paths.stub(:vendored_source_path) {"/foo bar/v8"}
+      Libv8::Arch.stub(:libv8_arch) {'x64'}
       @location.configure @context
     end
 
     it "prepends its own incflags before any pre-existing ones" do
-      @context.incflags.should eql "-I/frp/v8/include -I/usr/include -I/usr/local/include"
+      @context.incflags.should eql "-I/foo\\ bar/v8/include -I/usr/include -I/usr/local/include"
     end
 
     it "prepends the locations of any libv8 objects on the the ldflags" do
-      @context.ldflags.should eql "/frp/v8/obj/libv8_base.a /frp/v8/obj/libv8_snapshot.a -lobjc -lpthread"
+      @context.ldflags.should eql "/foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_base.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_snapshot.a -lobjc -lpthread"
     end
   end
 end