[PlistHelper] Import build of old C ext for Ruby 1.8.7 only.

Author: alloy

ext/xcodeproj/xcodeproj_ext-1.8.7.bundle

@@ -20,13 +20,6 @@ def message
   autoload :Workspace,        'xcodeproj/workspace'
   autoload :XCScheme,         'xcodeproj/scheme'
   autoload :XcodebuildHelper, 'xcodeproj/xcodebuild_helper'
-
-  # TODO: Delete me (compatibility with CocoaPods 0.33.1)
-  def self.read_plist(path)
-    PlistHelper.read(path)
-  end
-
-  def self.write_plist(hash, path)
-    PlistHelper.write(hash, path)
-  end
 end
+
+require 'xcodeproj/ext'

lib/xcodeproj.rb

@@ -1,5 +1,12 @@
 begin
   require 'xcodeproj/plist_helper'
 rescue LoadError
-  raise 'TODO: Load Ruby 1.8.7 C ext?'
+  require 'rbconfig'
+  if RUBY_VERSION == '1.8.7' && RbConfig::CONFIG['prefix'] =~ %r{^/System/Library/Frameworks/Ruby.framework/}
+    $:.unshift(File.expand_path('../../../ext', __FILE__))
+    require 'xcodeproj/xcodeproj_ext-1.8.7'
+  else
+    raise 'The xcodeproj gem is only supported on Ruby versions that include' \
+          'the Fiddle API or with Ruby 1.8.7 that came with OS X 10.8.x.'
+  end
 end

lib/xcodeproj/ext.rb

@@ -1,6 +1,16 @@
 require 'fiddle'
 
 module Xcodeproj
+  # TODO: Delete me (compatibility with Ruby 1.8.7 C ext bundle)
+  def self.read_plist(path)
+    PlistHelper.read(path)
+  end
+
+  # TODO: Delete me (compatibility with Ruby 1.8.7 C ext bundle)
+  def self.write_plist(hash, path)
+    PlistHelper.write(hash, path)
+  end
+
   # Provides support for loading and serializing property list files.
   #
   module PlistHelper

lib/xcodeproj/plist_helper.rb

@@ -14,16 +14,16 @@ module ProjectSpecs
 
       it 'writes an XML plist file' do
         hash = { 'archiveVersion' => '1.0' }
-        Xcodeproj::PlistHelper.write(hash, @plist)
-        result = Xcodeproj::PlistHelper.read(@plist)
+        Xcodeproj.write_plist(hash, @plist)
+        result = Xcodeproj.read_plist(@plist)
         result.should == hash
         @plist.read.should.include('?xml')
       end
 
       it 'reads an ASCII plist file' do
         dir = 'Sample Project/Cocoa Application.xcodeproj/'
         path = fixture_path(dir + 'project.pbxproj')
-        result = Xcodeproj::PlistHelper.read(path)
+        result = Xcodeproj.read_plist(path)
         result.keys.should.include?('archiveVersion')
       end
 
@@ -42,7 +42,7 @@ module ProjectSpecs
         # rubocop:enable Style/Tab
 
         hash = { 'archiveVersion' => '1.0' }
-        Xcodeproj::PlistHelper.write(hash, @plist)
+        Xcodeproj.write_plist(hash, @plist)
         @plist.read.should == output
       end
 
@@ -55,34 +55,34 @@ module ProjectSpecs
 
       it 'coerces the given path object to a string path' do
         # @plist is a Pathname
-        Xcodeproj::PlistHelper.write({}, @plist)
-        Xcodeproj::PlistHelper.read(@plist).should == {}
+        Xcodeproj.write_plist({}, @plist)
+        Xcodeproj.read_plist(@plist).should == {}
       end
 
       it "raises when the given path can't be coerced into a string path" do
-        lambda { Xcodeproj::PlistHelper.write({}, Object.new) }.should.raise TypeError
+        lambda { Xcodeproj.write_plist({}, Object.new) }.should.raise TypeError
       end
 
       it "raises if the given path doesn't exist" do
-        lambda { Xcodeproj::PlistHelper.read('doesnotexist') }.should.raise ArgumentError
+        lambda { Xcodeproj.read_plist('doesnotexist') }.should.raise ArgumentError
       end
 
       it 'coerces the given hash to a Hash' do
         o = Object.new
         def o.to_hash
           { 'from' => 'object' }
         end
-        Xcodeproj::PlistHelper.write(o, @plist)
-        Xcodeproj::PlistHelper.read(@plist).should == { 'from' => 'object' }
+        Xcodeproj.write_plist(o, @plist)
+        Xcodeproj.read_plist(@plist).should == { 'from' => 'object' }
       end
 
       it "raises when given a hash that can't be coerced to a Hash" do
-        lambda { Xcodeproj::PlistHelper.write(Object.new, @plist) }.should.raise TypeError
+        lambda { Xcodeproj.write_plist(Object.new, @plist) }.should.raise TypeError
       end
 
       it 'coerces keys to strings' do
-        Xcodeproj::PlistHelper.write({ 1 => '1', :symbol => 'symbol' }, @plist)
-        Xcodeproj::PlistHelper.read(@plist).should == { '1' => '1', 'symbol' => 'symbol' }
+        Xcodeproj.write_plist({ 1 => '1', :symbol => 'symbol' }, @plist)
+        Xcodeproj.read_plist(@plist).should == { '1' => '1', 'symbol' => 'symbol' }
       end
 
       it 'allows hashes, strings, booleans, and arrays of hashes and strings as values' do
@@ -93,19 +93,19 @@ def o.to_hash
           'false_bool' => false,
           'array'  => ['string in an array', { 'a hash' => 'in an array' }],
         }
-        Xcodeproj::PlistHelper.write(hash, @plist)
-        Xcodeproj::PlistHelper.read(@plist).should == hash
+        Xcodeproj.write_plist(hash, @plist)
+        Xcodeproj.read_plist(@plist).should == hash
       end
 
       it 'coerces values to strings if it is a disallowed type' do
-        Xcodeproj::PlistHelper.write({ '1' => 1, 'symbol' => :symbol }, @plist)
-        Xcodeproj::PlistHelper.read(@plist).should == { '1' => '1', 'symbol' => 'symbol' }
+        Xcodeproj.write_plist({ '1' => 1, 'symbol' => :symbol }, @plist)
+        Xcodeproj.read_plist(@plist).should == { '1' => '1', 'symbol' => 'symbol' }
       end
 
       it 'handles unicode characters in paths and strings' do
         plist = @plist.to_s + 'øµ'
-        Xcodeproj::PlistHelper.write({ 'café' => 'før yoµ' }, plist)
-        Xcodeproj::PlistHelper.read(plist).should == { 'café' => 'før yoµ' }
+        Xcodeproj.write_plist({ 'café' => 'før yoµ' }, plist)
+        Xcodeproj.read_plist(plist).should == { 'café' => 'før yoµ' }
       end
 
       it 'raises if a plist contains any other object type as value than string, dictionary, and array' do
@@ -121,7 +121,7 @@ def o.to_hash
 </plist>
 EOS
         end
-        lambda { Xcodeproj::PlistHelper.read(@plist) }.should.raise TypeError
+        lambda { Xcodeproj.read_plist(@plist) }.should.raise TypeError
       end
 
       it 'raises if a plist array value contains any other object type than string, or dictionary' do
@@ -139,12 +139,12 @@ def o.to_hash
 </plist>
 EOS
         end
-        lambda { Xcodeproj::PlistHelper.read(@plist) }.should.raise TypeError
+        lambda { Xcodeproj.read_plist(@plist) }.should.raise TypeError
       end
 
       it 'raises if for whatever reason the value could not be converted to a CFTypeRef' do
         lambda do
-          Xcodeproj::PlistHelper.write({ 'invalid' => "\xCA" }, @plist)
+          Xcodeproj.write_plist({ 'invalid' => "\xCA" }, @plist)
         end.should.raise TypeError
       end