Merge pull request #104 from calabash/release/1.2.1

Release/1.2.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+### 1.2.1
+
+* #101 Escape binary path in argument to lipo. @gredman
+
 ### 1.2.0
 
 * Improved :host strategy.

lib/run_loop/lipo.rb

@@ -81,13 +81,13 @@ def expect_compatible_arch(device)
     # @return [Array<String>] A list of architecture.
     # @raise [RuntimeError] If the output of lipo cannot be parsed.
     def info
-      execute_lipo("-info #{binary_path}") do |stdout, stderr, wait_thr|
+      execute_lipo("-info \"#{binary_path}\"") do |stdout, stderr, wait_thr|
         output = stdout.read.strip
         begin
           output.split(':')[-1].strip.split
         rescue Exception => e
           msg = ['Expected to be able to parse the output of lipo.',
-                 "cmd:    'lipo -info #{binary_path}'",
+                 "cmd:    'lipo -info #{escaped_binary_path}'",
                  "stdout: '#{output}'",
                  "stderr: '#{stderr.read.strip}'",
                  "exit code: '#{wait_thr.value}'",
@@ -99,6 +99,9 @@ def info
 
     private
 
+    # Caller is responsible for correctly escaping arguments.
+    # For example, the caller must proper quote `"` paths to avoid errors
+    # when dealing with paths that contain spaces.
     def execute_lipo(argument)
       command = "xcrun lipo #{argument}"
       Open3.popen3(command) do |_, stdout, stderr, wait_thr|

lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   # A model of a software release version that can be used to compare two versions.
   #

spec/lib/lipo_spec.rb

@@ -1,3 +1,6 @@
+require 'tmpdir'
+require 'fileutils'
+
 describe RunLoop::Lipo do
 
   let(:app_bundle_path) { Resources.shared.app_bundle_path }
@@ -33,14 +36,27 @@
 
     it 'raises an error if lipo output cannot be parsed' do
       stream = lambda { |string|  StringIO.new(string, 'r') }
-      class RunLoop::Lipo::RSpec::ProcessStatus
+      class RunLoop::Lipo::ProcessStatus
         def value() 1 end
       end
       expect(lipo).to receive(:execute_lipo).and_yield(stream.call(''),
                                                        stream.call('stderr output'),
-                                                       RunLoop::Lipo::RSpec::ProcessStatus.new)
+                                                       RunLoop::Lipo::ProcessStatus.new)
       expect { lipo.info }.to raise_error
     end
+
+    context 'bundle path has spaces' do
+      let(:app_bundle_path) {
+        tmpdir = Dir.mktmpdir
+        working_dir = File.join(tmpdir, 'a path with spaces')
+        FileUtils.mkdir_p(working_dir)
+        original = Resources.shared.app_bundle_path_i386
+        FileUtils.cp_r(original, working_dir)
+        File.join(working_dir, File.basename(original))
+      }
+      it { is_expected.to be_a Array  }
+      it { is_expected.to match_array ['i386']  }
+    end
   end
 
   describe '#expect_compatible_arch' do