xcodeproj 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: a6d41966c286020a61f2c4949fa22b2482db9036
-  data.tar.gz: 4d8ca5070e741ca5026c55730625b14025c3b0a2
-SHA512:
-  metadata.gz: 0b032960ff420b5922f581cb18d1e4b0632890f107a0a91e2f9cb6ed571eee0cf9201b3a5e9fb921d28ae3c325086717ddd534219070b6e5b05c94ca51f7b89e
-  data.tar.gz: b3f72482cdd5fedc0769f878d51b8119e386bfd7e466a34246527598b1968c4cbce10e63efce4ab488df97966b75b2d922121490f4fb7967f2367d9e8db0dddf
+--- 
+SHA512: 
+  metadata.gz: 351a1fb41b97253c60d3c98cb49f40afd0a9524bf7f32d2f4980ef7e1bd79917b01ad1f1c9744e5a0a28dc6c4be72d6a936e316ae8a9d69ffaa739184c8870ab
+  data.tar.gz: 670743ec71585ed4947346781d55c367a9268b51e85abb8baebd24edf44e06b70998c9094da7b40023b085582b8069a5d0ae2d3370c0977b8248b7c4b9b8a682
+SHA1: 
+  metadata.gz: 46aff37bf34d1243b63df3624720605bfe432430
+  data.tar.gz: e34469dacd968ad842532427b7c44620bd767455

data/ext/xcodeproj/Rakefile

@@ -0,0 +1,36 @@
+desc 'Creates a Makefile only if needed. (Explicitly control with XCODEPROJ_BUILD)'
+task :ext do
+  use_prebuilt = case ENV['XCODEPROJ_BUILD']
+                 when '1'
+                   false
+                 when '0'
+                   true
+                 else
+                   require 'rbconfig'
+                   if RbConfig::CONFIG['prefix'] =~ %r{^/System/Library/Frameworks/Ruby.framework/}
+                     prebuilt_ext = File.join('prebuilt', "#{RUBY_PLATFORM}-#{RUBY_VERSION}", 'xcodeproj_ext.bundle')
+                     File.exist?(prebuilt_ext)
+                   else
+                     false
+                   end
+                 end
+
+  if use_prebuilt
+    # TODO It might be important that we communicate this, but there is no other way than this hack.
+    #      Can't change the spec anymore to have a post install message nor can we output to stdout/stderr,
+    #      because RubyGems catches all output and only shows it in case of a build failure.
+    #
+    #      Do we want this?
+    #
+    if File.writable?('/dev/tty')
+      File.open('/dev/tty', 'w') do |out|
+        out.puts "[!] You are using the prebuilt binary version of the xcodeproj gem."
+      end
+    end
+  else
+    ruby 'extconf.rb'
+    sh 'make'
+  end
+end
+
+task :default => :ext

data/ext/xcodeproj/extconf.rb

@@ -42,10 +42,10 @@ unless have_framework('CoreFoundation')
   end
 end
 
-have_header 'CoreFoundation/CoreFoundation.h'
-have_header 'CoreFoundation/CFStream.h'
-have_header 'CoreFoundation/CFPropertyList.h'
-have_header 'ruby/st.h' or have_header 'st.h' or abort 'xcodeproj currently requires the (ruby/)st.h header'
+have_header('CoreFoundation/CoreFoundation.h')
+have_header('CoreFoundation/CFStream.h')
+have_header('CoreFoundation/CFPropertyList.h')
+have_header('ruby/st.h') || have_header('st.h') || abort('xcodeproj currently requires the (ruby/)st.h header')
 
 create_header
 create_makefile 'xcodeproj_ext'

data/lib/xcodeproj/ext.rb

@@ -0,0 +1,7 @@
+# In case a binary built for the current Ruby exists, use that, otherwise see
+# if a prebuilt binary exists for the current platform and Ruby version.
+begin
+  require 'xcodeproj/xcodeproj_ext'
+rescue LoadError
+  require "xcodeproj/prebuilt/#{RUBY_PLATFORM}-#{RUBY_VERSION}/xcodeproj_ext"
+end

data/lib/xcodeproj/gem_version.rb

@@ -1,6 +1,6 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '0.13.1' unless defined? Xcodeproj::VERSION
+  VERSION = '0.14.0' unless defined? Xcodeproj::VERSION
 end
 

data/lib/xcodeproj/project.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'pathname'
-require 'xcodeproj/xcodeproj_ext'
+
+require 'xcodeproj/ext'
 require 'xcodeproj/project/object'
 require 'xcodeproj/project/project_helper'
 require 'xcodeproj/project/xcproj_helper'
@@ -469,6 +470,24 @@ module Xcodeproj
       objects.select { |obj| obj.class == PBXFileReference }
     end
 
+    # Returns the file reference for the given absolute path.
+    #
+    # @param  [#to_s] absolute_path
+    #         The absolute path of the file whose reference is needed.
+    #
+    # @return [PBXFileReference] The file reference.
+    # @return [Nil] If no file reference could be found.
+    #
+    def reference_for_path(absolute_path)
+      unless Pathname.new(absolute_path).absolute?
+        raise ArgumentError, "Paths must be absolute #{absolute_path}"
+      end
+
+      objects.find do |child|
+        child.isa == 'PBXFileReference' && child.real_path == absolute_path
+      end
+    end
+
     # @return [ObjectList<PBXNativeTarget>] A list of all the targets in the
     #         project.
     #

data/lib/xcodeproj/project/object/helpers/file_references_factory.rb

@@ -138,7 +138,7 @@ module Xcodeproj
                   child_ref = new_file_reference(ref, child_path, :group)
                   last_child_ref = child_ref
                 elsif File.basename(child_path) == '.xccurrentversion'
-                  full_path = path + child_path
+                  full_path = path + File.basename(child_path)
                   xccurrentversion = Xcodeproj.read_plist(full_path)
                   current_version_name = xccurrentversion['_XCCurrentVersionName']
                 end

data/lib/xcodeproj/project/object/native_target.rb

@@ -124,7 +124,8 @@ module Xcodeproj
         end
 
         # Adds a new build configuration to the target and populates its with
-        # default settings according to the provided type.
+        # default settings according to the provided type if one doesn't
+        # exists.
         #
         # @note   If a build configuration with the given name is already
         #         present no new build configuration is added.
@@ -136,8 +137,13 @@ module Xcodeproj
         #         The type of the build configuration used to populate the build
         #         settings, must be :debug or :release.
         #
-        def add_build_configuration(name, type, skip_existing_names = true)
-          unless build_configuration_list[name]
+        # @return [XCBuildConfiguration] the created build configuration or the
+        #         existing one with the same name.
+        #
+        def add_build_configuration(name, type)
+          if existing = build_configuration_list[name]
+            existing
+          else
             build_configuration = project.new(XCBuildConfiguration)
             build_configuration.name = name
             build_configuration.build_settings = ProjectHelper.common_build_settings(type, platform_name, deployment_target, product_type)
@@ -184,14 +190,22 @@ module Xcodeproj
         #
         # @param  [AbstractTarget] target
         #         the target which should be added to the dependencies list of
-        #         the receiver.
+        #         the receiver. The target may be a target of this target's
+        #         project or of a subproject of this project. Note that the
+        #         subproject must already be added to this target's project.
         #
         # @return [void]
         #
         def add_dependency(target)
           unless dependencies.map(&:target).include?(target)
             container_proxy = project.new(Xcodeproj::Project::PBXContainerItemProxy)
-            container_proxy.container_portal = project.root_object.uuid
+            if target.project == project
+              container_proxy.container_portal = project.root_object.uuid
+            else
+              subproject_reference = project.reference_for_path(target.project.path)
+              raise ArgumentError, "add_dependency got target that belongs to a project is not this project and is not a subproject of this project" unless subproject_reference
+              container_proxy.container_portal = subproject_reference.uuid
+            end
             container_proxy.proxy_type = '1'
             container_proxy.remote_global_id_string = target.uuid
             container_proxy.remote_info = target.name

data/lib/xcodeproj/scheme.rb

@@ -90,9 +90,9 @@ module Xcodeproj
       buildable_reference = build_action_entry.add_element 'BuildableReference'
       buildable_reference.attributes['BuildableIdentifier'] = 'primary'
       buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
-      buildable_reference.attributes['BuildableName'] = File.basename(build_target.product_reference.path)
+      buildable_reference.attributes['BuildableName'] = construct_buildable_name(build_target)
       buildable_reference.attributes['BlueprintName'] = build_target.name
-      buildable_reference.attributes['ReferencedContainer'] = "container:#{build_target.project.path.basename}"
+      buildable_reference.attributes['ReferencedContainer'] = construct_referenced_container_uri(build_target)
     end
 
     # Add a target to the list of targets to build in the build action.
@@ -109,7 +109,7 @@ module Xcodeproj
       buildable_reference.attributes['BlueprintIdentifier'] = test_target.uuid
       buildable_reference.attributes['BuildableName'] = "#{test_target.name}.octest"
       buildable_reference.attributes['BlueprintName'] = test_target.name
-      buildable_reference.attributes['ReferencedContainer'] = "container:#{test_target.project.path.basename}"
+      buildable_reference.attributes['ReferencedContainer'] = construct_referenced_container_uri(test_target)
     end
 
     # Sets a runnable target target to be the target of the launch action of the scheme.
@@ -125,7 +125,7 @@ module Xcodeproj
       launch_buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
       launch_buildable_reference.attributes['BuildableName'] = "#{build_target.name}.app"
       launch_buildable_reference.attributes['BlueprintName'] = build_target.name
-      launch_buildable_reference.attributes['ReferencedContainer'] = "container:#{build_target.project.path.basename}"
+      launch_buildable_reference.attributes['ReferencedContainer'] = construct_referenced_container_uri(build_target)
 
       profile_product_runnable = @profile_action.add_element 'BuildableProductRunnable'
 
@@ -134,7 +134,7 @@ module Xcodeproj
       profile_buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
       profile_buildable_reference.attributes['BuildableName'] = "#{build_target.name}.app"
       profile_buildable_reference.attributes['BlueprintName'] = build_target.name
-      profile_buildable_reference.attributes['ReferencedContainer'] = "container:#{build_target.project.path.basename}"
+      profile_buildable_reference.attributes['ReferencedContainer'] = construct_referenced_container_uri(build_target)
 
       macro_expansion = @test_action.add_element 'MacroExpansion'
 
@@ -143,7 +143,7 @@ module Xcodeproj
       buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
       buildable_reference.attributes['BuildableName'] = File.basename(build_target.product_reference.path)
       buildable_reference.attributes['BlueprintName'] = build_target.name
-      buildable_reference.attributes['ReferencedContainer'] = "container:#{build_target.project.path.basename}"
+      buildable_reference.attributes['ReferencedContainer'] = construct_referenced_container_uri(build_target)
     end
 
     # @!group Class methods
@@ -271,5 +271,39 @@ module Xcodeproj
 
     #-------------------------------------------------------------------------#
 
+    private
+
+    # @!group Private helpers
+
+    # @param [Xcodeproj::Project::Object::AbstractTarget] target
+    #
+    # @return [String] The buildable name of the scheme.
+    #
+    def construct_buildable_name(build_target)
+      case build_target.isa
+      when 'PBXNativeTarget'
+        File.basename(build_target.product_reference.path)
+      when 'PBXAggregateTarget'
+        build_target.name
+      else
+        raise ArgumentError, "Unsupported build target type #{build_target.isa}"
+      end
+    end
+
+    # @param [Xcodeproj::Project::Object::AbstractTarget] target
+    #
+    # @return [String] A string in the format "container:[path to the project
+    #                  file relative to the project_dir_path, always ending with
+    #                  the actual project directory name]"
+    #
+    def construct_referenced_container_uri(target)
+      project = target.project
+      relative_path = project.path.relative_path_from(project.path + project.root_object.project_dir_path).to_s
+      relative_path = project.path.basename if relative_path == '.'
+      "container:#{relative_path}"
+    end
+
+    #-------------------------------------------------------------------------#
+
   end
 end

metadata

@@ -1,53 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: xcodeproj
-version: !ruby/object:Gem::Version
-  version: 0.13.1
+version: !ruby/object:Gem::Version 
+  version: 0.14.0
 platform: ruby
-authors:
+authors: 
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-10-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        version: "3.0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
-  boring management tasks or build Xcode-friendly libraries. Also includes support
-  for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
+description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script boring management tasks or build Xcode-friendly libraries. Also includes support for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
 email: eloy.de.enige@gmail.com
-executables:
+executables: 
 - xcodeproj
-extensions:
-- ext/xcodeproj/extconf.rb
+extensions: 
+- ext/xcodeproj/Rakefile
 extra_rdoc_files: []
-files:
+
+files: 
+- README.md
+- LICENSE
 - lib/xcodeproj/command/project_diff.rb
 - lib/xcodeproj/command/show.rb
 - lib/xcodeproj/command/sort.rb
@@ -56,6 +50,7 @@ files:
 - lib/xcodeproj/config.rb
 - lib/xcodeproj/constants.rb
 - lib/xcodeproj/differ.rb
+- lib/xcodeproj/ext.rb
 - lib/xcodeproj/gem_version.rb
 - lib/xcodeproj/helper.rb
 - lib/xcodeproj/project/object/build_configuration.rb
@@ -84,35 +79,40 @@ files:
 - lib/xcodeproj/workspace.rb
 - lib/xcodeproj/xcodebuild_helper.rb
 - lib/xcodeproj.rb
+- ext/xcodeproj/Rakefile
 - ext/xcodeproj/extconf.rb
 - ext/xcodeproj/xcodeproj_ext.c
-- README.md
-- LICENSE
+- ext/xcodeproj/prebuilt/universal-darwin12.0-1.8.7/xcodeproj_ext.bundle
+- ext/xcodeproj/prebuilt/universal.x86_64-darwin13-2.0.0/xcodeproj_ext.bundle
 - bin/xcodeproj
 homepage: https://github.com/cocoapods/xcodeproj
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
-rdoc_options: []
-require_paths:
+rdoc_options: 
+- -x
+- ext/.+\.(o|bundle)
+require_paths: 
 - ext
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id003 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.
 test_files: []
+
 has_rdoc: