xcodeproj 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c5baea015a74f760845e1088a8248cea2a4e9a
-  data.tar.gz: f2304115edad58e7babba2267ce0155f83415552
+  metadata.gz: 80889f1543d932a364554166034555b0838ab081
+  data.tar.gz: 67b60068200d0226b81fb02441ad0a61919588b9
 SHA512:
-  metadata.gz: 58bf0a3f1696676cea1bcd991207b57e954a6aa77a216aa35a58c4a56e86c1804189cc676d8add8c1e811710314c3cbb2f66635522c1bb25514c4515aa274284
-  data.tar.gz: 34f5300506484186ea25e7b6720dc1c84339579adefa28f380d6c25b6db02c4a458fd232be25058a7998777da5dae22acc5a5413b46f8bc4f43e0f6260d08bba
+  metadata.gz: f4a9cbd8cdece69a9118f93eaebccf888448db9bd67c3af3e7fa0cc0375339ae70683d48a3db6af5c4f1df44726e13da47f9f41119bc6ef5d7483d0e64a7e852
+  data.tar.gz: 7f96eb1680c4ad7e70cb9318266204fb03e88f81bfda553420bef222b93ab01043a7204f47efed0e89ee3b6c6f1ff100b92b90408a85c117a5dbf01744c22358

data/lib/xcodeproj/constants.rb

@@ -25,7 +25,7 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION = 47
+    LAST_KNOWN_OBJECT_VERSION = 48
 
     # @return [String] The last known object version to Xcodeproj.
     #

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.3.0'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.3.1'.freeze unless defined? Xcodeproj::VERSION
 end

data/lib/xcodeproj/plist/ffi.rb

@@ -1,5 +1,35 @@
 module Xcodeproj
   module Plist
+    module Extensions
+      # Since Xcode 8 beta 4, calling `PBXProject.projectWithFile` breaks subsequent calls to
+      # `chdir`. While sounding ridiculous, this is unfortunately true and debugging it from the
+      # userland side showed no difference at all to successful calls to `chdir`, but the working
+      # directory is simply not changed in the end. This workaround is even more absurd, monkey
+      # patching all calls to `chdir` to use `__pthread_chdir` which appears to work.
+      module Dir
+        def self.chdir(path)
+          old_dir = Dir.getwd
+          res = actually_chdir(path)
+
+          if block_given?
+            begin
+              return yield
+            ensure
+              actually_chdir(old_dir)
+            end
+          end
+
+          res
+        end
+
+        def self.actually_chdir(path)
+          libc = Fiddle.dlopen '/usr/lib/libc.dylib'
+          f = Fiddle::Function.new(libc['__pthread_chdir'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+          f.call(path.to_s)
+        end
+      end
+    end
+
     # Provides support for loading and serializing property list files via
     # Fiddle and CoreFoundation / Xcode.
     #
@@ -36,9 +66,12 @@ module Xcodeproj
         def write_to_path(hash, path)
           raise ThreadError, 'Can only write plists from the main thread.' unless Thread.current == Thread.main
 
-          if DevToolsCore.load_xcode_frameworks && path.end_with?('pbxproj')
-            ruby_hash_write_xcode(hash, path)
-          else
+          path = File.expand_path(path)
+
+          should_fork = ENV['FORK_XCODE_WRITING']
+          success = ruby_hash_write_xcode(hash, path, should_fork)
+
+          unless success
             CoreFoundation.RubyHashPropertyListWrite(hash, path)
             fix_encoding(path)
           end
@@ -95,8 +128,31 @@ module Xcodeproj
         # @param  [String] path
         #         The path of the file.
         #
-        def ruby_hash_write_xcode(hash, path)
-          path = File.expand_path(path)
+        def ruby_hash_write_xcode(hash, path, should_fork)
+          return false unless path.end_with?('pbxproj')
+          if should_fork
+            require 'open3'
+            _output, status = Open3.capture2e(Gem.ruby, '-e', <<-RUBY, path, :stdin_data => Marshal.dump(hash))
+            $LOAD_PATH.replace #{$LOAD_PATH}
+            path = ARGV.first
+            hash = Marshal.load(STDIN)
+            require "xcodeproj"
+            require "xcodeproj/plist/ffi"
+            ffi = Xcodeproj::Plist::FFI
+            success = ffi::DevToolsCore.load_xcode_frameworks && ffi.send(:ruby_hash_write_devtoolscore, hash, path)
+            exit(success ? 0 : 1)
+            RUBY
+
+            status.success?
+          else
+            monkey_patch_chdir
+            success = DevToolsCore.load_xcode_frameworks && ruby_hash_write_devtoolscore(hash, path)
+
+            success
+          end
+        end
+
+        def ruby_hash_write_devtoolscore(hash, path)
           success = true
 
           begin
@@ -111,7 +167,11 @@ module Xcodeproj
             success = false
           end
 
-          CoreFoundation.RubyHashPropertyListWrite(hash, path) unless success
+          success
+        end
+
+        def monkey_patch_chdir
+          Dir.send(:include, Extensions::Dir)
         end
       end
     end

data/lib/xcodeproj/plist/ffi/dev_tools_core.rb

@@ -5,14 +5,11 @@ module Xcodeproj
     module FFI
       module DevToolsCore
         def self.silence_stderr
-          begin
-            orig_stderr = $stderr.clone
-            $stderr.reopen File.new('/dev/null', 'w')
-            retval = yield
-          ensure
-            $stderr.reopen orig_stderr
-          end
-          retval
+          orig_stderr = $stderr.clone
+          $stderr.reopen File.new('/dev/null', 'w')
+          yield
+        ensure
+          $stderr.reopen orig_stderr
         end
 
         # rubocop:disable Style/MethodName

data/lib/xcodeproj/project.rb

@@ -216,6 +216,7 @@ module Xcodeproj
       if object_version.to_i > Constants::LAST_KNOWN_OBJECT_VERSION
         raise '[Xcodeproj] Unknown object version.'
       end
+      root_object.product_ref_group = root_object.main_group['Products'] || root_object.main_group.new_group('Products')
     end
 
     public

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport