xcodeproj 0.8.1 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 529ed72e9f63e78ad2b0ca1a550ff4316ef1606f
+  data.tar.gz: 43bfe6819ebde4b4e6d1a1f4ce8bd49891663254
+SHA512:
+  metadata.gz: 16a8b646d24a0cf360732816343f08daa455271e8909ae6c2ccc7b1fe9f05f4f4750544ea9af40798969e8aa4f7de30efc7ec53adc42f928fdc71897b3e75e25
+  data.tar.gz: ba101e58ee80931f8991c64f23b0a001bfb59ec27f6decd7c22e22b625f15b65da3aa1c0ec032ef336db39b92e7ef23a483d2853492418c049663f5d1ed61698

data/lib/xcodeproj/constants.rb

@@ -20,6 +20,10 @@ module Xcodeproj
     #
     LAST_KNOWN_OBJECT_VERSION  = 46
 
+    # @return [String] The last known object version to Xcodeproj.
+    #
+    LAST_UPGRADE_CHECK  = '0450'
+
     # @return [Hash] The all the known ISAs grouped by superclass.
     #
     KNOWN_ISAS = {
@@ -69,6 +73,7 @@ module Xcodeproj
       'application' => 'wrapper.application',
       'dylib'       => 'compiled.mach-o.dylib',
       'framework'   => 'wrapper.framework',
+      'bundle'      => 'wrapper.plug-in',
       'h'           => 'sourcecode.c.h',
       'm'           => 'sourcecode.c.objc',
       'pch'         => 'sourcecode.c.h',
@@ -83,10 +88,11 @@ module Xcodeproj
     # @return [Hash] The uniform type identifier of various product types.
     #
     PRODUCT_TYPE_UTI = {
-      :application     => 'com.apple.product-type.application',
-      :framework       => 'com.apple.product-type.framework',
-      :dynamic_library => 'com.apple.product-type.library.dynamic',
-      :static_library  => 'com.apple.product-type.library.static',
+      :application      => 'com.apple.product-type.application',
+      :framework        => 'com.apple.product-type.framework',
+      :dynamic_library  => 'com.apple.product-type.library.dynamic',
+      :static_library   => 'com.apple.product-type.library.static',
+      :bundle           => 'com.apple.product-type.bundle',
     }.freeze
 
     # @return [Hash] The common build settings grouped by platform, and build

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

@@ -99,6 +99,18 @@ module Xcodeproj
           children.select { |obj| obj.class == PBXGroup }
         end
 
+        # @return [Array<PBXGroup,PBXFileReference,PBXReferenceProxy>] the
+        #         recursive children of the group.
+        #
+        def recursive_children_groups
+          result = []
+          groups.each do |child|
+            result << child
+            result.concat(child.recursive_children_groups)
+          end
+          result
+        end
+
         # @return [Array<XCVersionGroup>] the version groups in the group
         #         children.
         #
@@ -125,20 +137,99 @@ module Xcodeproj
         #
         # @return [PBXFileReference] the new file reference.
         #
-        def new_file(path, sub_group_path = nil, set_name = true)
-          file = project.new(PBXFileReference)
-          file.path = path.to_s
-          file.update_last_known_file_type
+        def new_file(path, sub_group_path = nil)
+          extname = File.extname(path)
+          case
+          when extname == '.framework' then new_framework(path, sub_group_path)
+          when extname == '.xcdatamodeld' then new_xcdatamodeld(path, sub_group_path)
+          else new_file_reference(path, sub_group_path)
+          end
+        end
 
-          target = find_subpath(sub_group_path, true)
-          target.children << file
+        # Creates a new file reference with the given path and adds it to the
+        # group or to an optional subpath.
+        #
+        # @note   @see #new_file
+        #
+        # @param  @see #new_file
+        #
+        # @return [PBXFileReference] the new file reference.
+        #
+        def new_file_reference(path, sub_group_path = nil)
+          ref = project.new(PBXFileReference)
+          ref.path = path.to_s
+          ref.update_last_known_file_type
 
-          same_path_of_group = target.path == file.pathname.dirname.to_s
-          same_path_project = file.pathname.dirname.to_s == '.' && target.path.nil?
+          parent_group = find_subpath(sub_group_path, true)
+          parent_group.children << ref
+          set_file_refenrece_name_if_needed(ref, parent_group)
+          ref
+        end
+
+        # Sets the name of a reference if needed, to match Xcode behaviour.
+        #
+        # @param  [PBXFileReference, XCVersionGroup] ref
+        #         the reference which needs the name optionally set.
+        #
+        # @return [void]
+        #
+        def set_file_refenrece_name_if_needed(ref, parent_group)
+          same_path_of_group = (parent_group.path == Pathname(ref.path).dirname.to_s)
+          same_path_project = (Pathname(ref.path).dirname.to_s == '.' && parent_group.path.nil?)
           unless same_path_of_group || same_path_project
-            file.name = file.pathname.basename.to_s
+            ref.name = Pathname(ref.path).basename.to_s
           end
-          file
+        end
+
+        # Creates a new file reference to a framework bundle.
+        #
+        # @note   @see #new_file
+        #
+        # @param  @see #new_file
+        #
+        # @return [PBXFileReference] the new file reference.
+        #
+        def new_framework(path, sub_group_path = nil)
+          ref = new_file_reference(path, sub_group_path = nil)
+          ref.include_in_index = nil
+          ref
+        end
+
+        # Creates a new version group reference to an xcdatamodeled adding the
+        # xcdatamodel files included in the wrapper as chidren file references.
+        #
+        # @note  To match Xcode behaviour the last xcdatamodel according to its
+        #        path is set as the current version.
+        #
+        # @note   @see #new_file
+        #
+        # @param  @see #new_file
+        #
+        # @return [XCVersionGroup] the new reference.
+        #
+        def new_xcdatamodeld(path, sub_group_path = nil)
+          path = Pathname.new(path)
+          ref = project.new(XCVersionGroup)
+          ref.path = path.to_s
+          ref.source_tree = '<group>'
+          ref.version_group_type = 'wrapper.xcdatamodel'
+
+          last_child_ref = nil
+          if path.exist?
+            path.children.each do |child_path|
+              if File.extname(child_path) == '.xcdatamodel'
+                child_ref = ref.new_file_reference(child_path)
+                child_ref.source_tree = '<group>'
+                last_child_ref = child_ref
+              end
+            end
+            ref.current_version = last_child_ref
+          end
+
+          parent_group = find_subpath(sub_group_path, true)
+          parent_group.children << ref
+          set_file_refenrece_name_if_needed(ref, parent_group)
+          ref
         end
 
         # Creates a new group with the given name and adds it to the children
@@ -172,7 +263,7 @@ module Xcodeproj
         #
         # @param  [String] sub_group_path @see new_file
         #
-        # @return [PBXFileReference] the new group.
+        # @return [PBXFileReference] the new file reference.
         #
         def new_static_library(product_name, sub_group_path = nil)
           file = new_file("lib#{product_name}.a", sub_group_path)
@@ -183,6 +274,22 @@ module Xcodeproj
           file
         end
 
+        # Creates a file reference to a new bundle.
+        #
+        # @param  [#to_s] product_name
+        #         the name of the bundle.
+        #
+        # @return [PBXFileReference] the new file reference.
+        #
+        def new_bundle(product_name)
+          file = new_file("#{product_name}.bundle")
+          file.explicit_file_type = 'wrapper.cfbundle'
+          file.include_in_index = '0'
+          file.source_tree = 'BUILT_PRODUCTS_DIR'
+          file.last_known_file_type = nil
+          file
+        end
+
         # Creates a new group to represent a `xcdatamodel` file.
         #
         # @return [XCVersionGroup] The new group.
@@ -283,7 +390,6 @@ module Xcodeproj
             end
           end
         end
-
       end
 
       #-----------------------------------------------------------------------#

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

@@ -36,6 +36,8 @@ module Xcodeproj
 
         # @!group Helpers
 
+        # @return [String] the SDK that the target should use.
+        #
         def sdk
           build_configurations.first.build_settings['SDKROOT'] \
             || project.build_configurations.first.build_settings['SDKROOT']
@@ -103,6 +105,28 @@ module Xcodeproj
           build_phases.select { |bp| bp.class == PBXShellScriptBuildPhase }
         end
 
+        # Adds a dependency on the given target.
+        #
+        # @param  [AbstractTarget] target
+        #         the target which should be added to the dependencies list of
+        #         the receiver.
+        #
+        # @return [void]
+        #
+        def add_dependency(target)
+          container_proxy = project.new(Xcodeproj::Project::PBXContainerItemProxy)
+          container_proxy.container_portal = project.root_object.uuid
+          container_proxy.proxy_type = '1'
+          container_proxy.remote_global_id_string = target.uuid
+          container_proxy.remote_info = target.name
+
+          dependency = project.new(Xcodeproj::Project::PBXTargetDependency)
+          dependency.target = target
+          dependency.target_proxy = container_proxy
+
+          dependencies << dependency
+        end
+
         # Creates a new copy files build phase.
         #
         # @param  [String] name
@@ -217,6 +241,21 @@ module Xcodeproj
           end
         end
 
+        # Adds resource files to the resources build phase of the target.
+        #
+        # @param  [Array<PBXFileReference>] resource_file_references
+        #         the files references of the resources to the target.
+        #
+        # @return [void]
+        #
+        def add_resources(resource_file_references)
+          resource_file_references.each do |file|
+            build_file = project.new(PBXBuildFile)
+            build_file.file_ref = file
+            resources_build_phase.files << build_file
+          end
+        end
+
         # Finds or creates the headers build phase of the target.
         #
         # @note   A target should have only one headers build phase.

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

@@ -22,7 +22,7 @@ module Xcodeproj
         #         - `LastUpgradeCheck`
         #         - `ORGANIZATIONNAME`
         #
-        attribute :attributes, Hash, {'LastUpgradeCheck' => '0450'}
+        attribute :attributes, Hash, {'LastUpgradeCheck' => Constants::LAST_UPGRADE_CHECK }
 
         # @return [XCConfigurationList] the configuration list of the project.
         #

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

@@ -19,7 +19,7 @@ module Xcodeproj
         # @note   Apparently to support targets in other projects of the same
         #         workspace.
         #
-        has_one :targetProxy, PBXContainerItemProxy
+        has_one :target_proxy, PBXContainerItemProxy
 
         # @return [String] the name of the target.
         #

data/lib/xcodeproj/project/project_helper.rb

@@ -0,0 +1,254 @@
+module Xcodeproj
+  class Project
+    module ProjectHelper
+
+      include Object
+
+      # @!group Targets
+
+      #-----------------------------------------------------------------------#
+
+      # Creates a new target and adds it to the project.
+      #
+      # The target is configured for the given platform and its file reference it
+      # is added to the {products_group}.
+      #
+      # The target is pre-populated with common build settings, and the
+      # appropriate Framework according to the platform is added to to its
+      # Frameworks phase.
+      #
+      # @param  [Project] project
+      #         the project to which the target should be added.
+      #
+      # @param  [Symbol] type
+      #         the type of target. Can be `:application`, `:dynamic_library` or
+      #         `:static_library`.
+      #
+      # @param  [String] name
+      #         the name of the static library product.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the static library. Can be `:ios` or `:osx`.
+      #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
+      # @return [PBXNativeTarget] the target.
+      #
+      def self.new_target(project, type, name, platform, deployment_target, product_group)
+
+        # Target
+        target = project.new(PBXNativeTarget)
+        project.targets << target
+        target.name = name
+        target.product_name = name
+        target.product_type = Constants::PRODUCT_TYPE_UTI[type]
+        target.build_configuration_list = configuration_list(project, platform, deployment_target)
+
+        # Product
+        product = product_group.new_static_library(name)
+        target.product_reference = product
+
+        # Frameworks
+        framework_name = (platform == :ios) ? 'Foundation' : 'Cocoa'
+        framework_ref = project.add_system_framework(framework_name, target)
+
+        # Build phases
+        target.build_phases << project.new(PBXSourcesBuildPhase)
+        frameworks_phase = project.new(PBXFrameworksBuildPhase)
+        frameworks_phase.add_file_reference(framework_ref)
+        target.build_phases << frameworks_phase
+
+        target
+      end
+
+      # Creates a new resource bundles target and adds it to the project.
+      #
+      # The target is configured for the given platform and its file reference it
+      # is added to the {products_group}.
+      #
+      # The target is pre-populated with common build settings
+      #
+      # @param  [Project] project
+      #         the project to which the target should be added.
+      #
+      # @param  [String] name
+      #         the name of the resources bundle.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the resources bundle. Can be `:ios` or `:osx`.
+      #
+      # @return [PBXNativeTarget] the target.
+      #
+      def self.new_resources_bundle(project, name, platform, product_group)
+        # Target
+        target = project.new(PBXNativeTarget)
+        project.targets << target
+        target.name = name
+        target.product_name = name
+        target.product_type = Constants::PRODUCT_TYPE_UTI[:bundle]
+
+        # Configuration List
+        build_settings = {
+          'PRODUCT_NAME' => '$(TARGET_NAME)',
+          'WRAPPER_EXTENSION' => 'bundle',
+          'SKIP_INSTALL' => 'YES'
+        }
+
+        if platform == :osx
+          build_settings['COMBINE_HIDPI_IMAGES'] = 'YES'
+          build_settings['SDKROOT'] = 'macosx'
+        else
+          build_settings['SDKROOT'] = 'iphoneos'
+        end
+
+        cl = project.new(XCConfigurationList)
+        cl.default_configuration_is_visible = '0'
+        cl.default_configuration_name = 'Release'
+        release_conf = project.new(XCBuildConfiguration)
+        release_conf.name = 'Release'
+        release_conf.build_settings = build_settings
+        debug_conf = project.new(XCBuildConfiguration)
+        debug_conf.name = 'Debug'
+        debug_conf.build_settings = build_settings
+        cl.build_configurations << release_conf
+        cl.build_configurations << debug_conf
+        cl
+        target.build_configuration_list = cl
+
+        # Product
+        product = product_group.new_bundle(name)
+        target.product_reference = product
+
+        # Build phases
+        target.build_phases << project.new(PBXSourcesBuildPhase)
+        target.build_phases << project.new(PBXFrameworksBuildPhase)
+        target.build_phases << project.new(PBXResourcesBuildPhase)
+
+        target
+      end
+
+      # @!group System Frameworks
+
+      #-----------------------------------------------------------------------#
+
+      # Adds a file reference for a system framework to the project.
+      #
+      # The file reference can then be added to the build files of a
+      # {PBXFrameworksBuildPhase}.
+      #
+      # @param  [Project] project
+      #         the project to which the configuration list should be added.
+      #
+      # @param  [String] name
+      #         The name of a framework.
+      #
+      # @param  [PBXNativeTarget] target
+      #         The target for which to add the framework.
+      #
+      # @note   This method adds a reference to the highest know SDK for the
+      #         given platform.
+      #
+      # @return [PBXFileReference] The generated file reference.
+      #
+      def self.add_system_framework(project, name, target)
+        sdk = target.sdk
+        raise "Unable to find and SDK for the target `#{target.name}`" unless sdk
+        if sdk.include?('iphoneos')
+          if sdk == 'iphoneos'
+            version = XcodebuildHelper.instance.last_ios_sdk || Constants::LAST_KNOWN_IOS_SDK
+            base_dir = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS#{version}.sdk/"
+          else
+            base_dir = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS#{sdk.gsub('iphoneos', '')}.sdk/"
+          end
+        elsif sdk.include?('macosx')
+          if sdk == 'macosx'
+            version = XcodebuildHelper.instance.last_osx_sdk || Constants::LAST_KNOWN_OSX_SDK
+            base_dir = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{version}.sdk/"
+          else
+            base_dir = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{sdk.gsub('macosx', '')}.sdk/"
+          end
+        end
+
+        path = base_dir + "System/Library/Frameworks/#{name}.framework"
+        if ref = project.frameworks_group.files.find { |f| f.path == path }
+          ref
+        else
+          ref = project.frameworks_group.new_file(path)
+          ref.source_tree = 'DEVELOPER_DIR'
+          ref
+        end
+      end
+
+      # @!group Private Helpers
+
+      #-----------------------------------------------------------------------#
+
+      # Returns a new configuration list, populated with release and debug
+      # configurations with common build settings for the given platform.
+      #
+      # @param  [Project] project
+      #         the project to which the configuration list should be added.
+      #
+      # @param  [Symbol] platform
+      #         the platform for the configuration list, can be `:ios` or `:osx`.
+      #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
+      # @return [XCConfigurationList] the generated configuration list.
+      #
+      def self.configuration_list(project, platform, deployment_target = nil)
+        cl = project.new(XCConfigurationList)
+        cl.default_configuration_is_visible = '0'
+        cl.default_configuration_name = 'Release'
+
+        release_conf = project.new(XCBuildConfiguration)
+        release_conf.name = 'Release'
+        release_conf.build_settings = common_build_settings(:release, platform, deployment_target)
+
+        debug_conf = project.new(XCBuildConfiguration)
+        debug_conf.name = 'Debug'
+        debug_conf.build_settings = common_build_settings(:debug, platform, deployment_target)
+
+        cl.build_configurations << release_conf
+        cl.build_configurations << debug_conf
+        cl
+      end
+
+      # Returns the common build settings for a given platform and configuration
+      # name.
+      #
+      # @param  [Symbol] type
+      #         the type of the build configuration, can be `:release` or
+      #         `:debug`.
+      #
+      # @param  [Symbol] platform
+      #         the platform for the build settings, can be `:ios` or `:osx`.
+      #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
+      # @return [Hash] The common build settings
+      #
+      def self.common_build_settings(type, platform, deployment_target = nil)
+        common_settings = Constants::COMMON_BUILD_SETTINGS
+        settings = common_settings[:all].dup
+        settings.merge!(common_settings[type])
+        settings.merge!(common_settings[platform])
+        settings.merge!(common_settings[[platform, type]])
+        if deployment_target
+          if platform == :ios
+            settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
+          elsif platform == :osx
+            settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+          end
+        end
+        settings
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

data/lib/xcodeproj/project.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'xcodeproj/xcodeproj_ext'
 require 'xcodeproj/project/object'
+require 'xcodeproj/project/project_helper'
 
 module Xcodeproj
 
@@ -511,32 +512,7 @@ module Xcodeproj
     # @return [PBXFileReference] The generated file reference.
     #
     def add_system_framework(name, target)
-      sdk = target.sdk
-      raise "Unable to find and SDK for the target `#{target.name}`" unless sdk
-      if sdk.include?('iphoneos')
-        if sdk == 'iphoneos'
-          base_dir = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS#{Constants::LAST_KNOWN_IOS_SDK}.sdk/"
-        else
-          base_dir = "Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS#{sdk.gsub('iphoneos', '')}.sdk/"
-        end
-      elsif sdk.include?('macosx')
-        if sdk == 'macosx'
-          base_dir = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{Constants::LAST_KNOWN_OSX_SDK}.sdk/"
-        else
-          base_dir = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX#{sdk.gsub('iphoneos', '')}.sdk/"
-        end
-      end
-      path = base_dir + "System/Library/Frameworks/#{name}.framework"
-
-      if file = frameworks_group.files.find { |f| f.path == path }
-        file
-      else
-        framework_ref = frameworks_group.new_file(path)
-        framework_ref.name = "#{name}.framework"
-        framework_ref.source_tree = 'DEVELOPER_DIR'
-        framework_ref.last_known_file_type = "wrapper.framework"
-        framework_ref
-      end
+      ProjectHelper.add_system_framework(self, name, target)
     end
 
     # Creates a new target and adds it to the project.
@@ -544,11 +520,9 @@ module Xcodeproj
     # The target is configured for the given platform and its file reference it
     # is added to the {products_group}.
     #
-    # The target is pre-populated with common build phases, and all the
-    # Frameworks of the project are added to to its Frameworks phase.
-    #
-    # @todo   Adding all the Frameworks is required by CocoaPods and should be
-    #         performed there.
+    # The target is pre-populated with common build settings, and the
+    # appropriate Framework according to the platform is added to to its
+    # Frameworks phase.
     #
     # @param  [Symbol] type
     #         the type of target. Can be `:application`, `:dynamic_library` or
@@ -565,91 +539,29 @@ module Xcodeproj
     #
     # @return [PBXNativeTarget] the target.
     #
-    def new_target(type, name, platform, deployment_target = nil)
-
-      # Target
-      target = new(PBXNativeTarget)
-      targets << target
-      target.name = name
-      target.product_name = name
-      target.product_type = Constants::PRODUCT_TYPE_UTI[type]
-      target.build_configuration_list = configuration_list(platform, deployment_target)
-
-      # Product
-      product = products_group.new_static_library(name)
-      target.product_reference = product
-
-      # Frameworks
-      framework_name = (platform == :ios) ? 'Foundation' : 'Cocoa'
-      framework_ref = add_system_framework(framework_name, target)
-
-      # Build phases
-      target.build_phases << new(PBXSourcesBuildPhase)
-      frameworks_phase = new(PBXFrameworksBuildPhase)
-      frameworks_phase.add_file_reference(framework_ref)
-      target.build_phases << frameworks_phase
-
-      target
+    def new_target(type, name, platform, deployment_target = nil, product_group = nil)
+      product_group ||= products_group
+      ProjectHelper.new_target(self, type, name, platform, deployment_target, product_group)
     end
 
-    # Returns a new configuration list, populated with release and debug
-    # configurations with common build settings for the given platform.
-    #
-    # @param  [Symbol] platform
-    #         the platform for the configuration list, can be `:ios` or `:osx`.
+    # Creates a new resource bundles target and adds it to the project.
     #
-    # @param  [String] deployment_target
-    #         the deployment target for the platform.
-    #
-    # @return [XCConfigurationList] the generated configuration list.
+    # The target is configured for the given platform and its file reference it
+    # is added to the {products_group}.
     #
-    def configuration_list(platform, deployment_target = nil)
-      cl = new(XCConfigurationList)
-      cl.default_configuration_is_visible = '0'
-      cl.default_configuration_name = 'Release'
-
-      release_conf = new(XCBuildConfiguration)
-      release_conf.name = 'Release'
-      release_conf.build_settings = common_build_settings(:release, platform, deployment_target)
-
-      debug_conf = new(XCBuildConfiguration)
-      debug_conf.name = 'Debug'
-      debug_conf.build_settings = common_build_settings(:debug, platform, deployment_target)
-
-      cl.build_configurations << release_conf
-      cl.build_configurations << debug_conf
-      cl
-    end
-
-    # Returns the common build settings for a given platform and configuration
-    # name.
+    # The target is pre-populated with common build settings
     #
-    # @param  [Symbol] type
-    #         the type of the build configuration, can be `:release` or
-    #         `:debug`.
+    # @param  [String] name
+    #         the name of the resources bundle.
     #
     # @param  [Symbol] platform
-    #         the platform for the build settings, can be `:ios` or `:osx`.
+    #         the platform of the resources bundle. Can be `:ios` or `:osx`.
     #
-    # @param  [String] deployment_target
-    #         the deployment target for the platform.
+    # @return [PBXNativeTarget] the target.
     #
-    # @return [Hash] The common build settings
-    #
-    def common_build_settings(type, platform, deployment_target = nil)
-      common_settings = Constants::COMMON_BUILD_SETTINGS
-      settings = common_settings[:all].dup
-      settings.merge!(common_settings[type])
-      settings.merge!(common_settings[platform])
-      settings.merge!(common_settings[[platform, type]])
-      if deployment_target
-        if platform == :ios
-          settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-        elsif platform == :osx
-          settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
-        end
-      end
-      settings
+    def new_resources_bundle(name, platform, product_group = nil)
+      product_group ||= products_group
+      ProjectHelper.new_resources_bundle(self, name, platform, product_group)
     end
 
     #-------------------------------------------------------------------------#

data/lib/xcodeproj/scheme.rb

@@ -1,46 +1,33 @@
 require 'rexml/document'
 
 module Xcodeproj
-      
-  # This class represents a Scheme document represented by a ".xcscheme" file usually stored
-  # in a xcuserdata or xcshareddata (for a shared scheme) folder.
-  # 
+
+  # This class represents a Scheme document represented by a ".xcscheme" file
+  # usually stored in a xcuserdata or xcshareddata (for a shared scheme)
+  # folder.
+  #
   class XCScheme
-    
-    # @return [REXML::Document] the XML object that will be manipulated to save the scheme file after.
+
+    # @return [REXML::Document] the XML object that will be manipulated to save
+    #         the scheme file after.
     #
     attr_reader :doc
-    
-    # @return [String] the name of the container (the project name file without the extension) that have the targets
-    # used by the scheme.
+
+    # @return [String] the name of the container (the project name file without
+    #         the extension) that have the targets used by the scheme.
     #
     attr_reader :container
 
-    # @return [Xcodeproj::Project::Object::AbstractTarget] the target used by scheme in the build step.
+    # @return [Xcodeproj::Project::Object::AbstractTarget] the target used by
+    #         scheme in the build step.
     #
     attr_reader :build_target
 
-    # @return [Xcodeproj::Project::Object::AbstractTarget] the target used by scheme in the test step.
+    # @return [Xcodeproj::Project::Object::AbstractTarget] the target used by
+    #         scheme in the test step.
     #
     attr_reader :test_target
 
-    # Share a User Scheme. Basically this method move the xcscheme file from the xcuserdata folder to xcshareddata
-    # folder.
-    #
-    # @param project_path [String] Path of the .xcodeproj folder.
-    #
-    # @param scheme_name [String] The name of scheme that will be shared.
-    #
-    # @param user [String] The user name that have the scheme
-    #
-    def self.share_scheme(project_path, scheme_name, user = ENV['USER'])
-      from = File.join project_path, 'xcuserdata', "#{user}.xcuserdatad", 'xcschemes', "#{scheme_name}.xcscheme"
-      to_folder = File.join project_path, 'xcshareddata', 'xcschemes'
-      Pathname(to_folder).mkpath
-      to = File.join to_folder, "#{scheme_name}.xcscheme"
-      FileUtils.mv from, to
-    end
-
     # Create a new XCScheme instance
     #
     # @param [String] container
@@ -60,29 +47,29 @@ module Xcodeproj
       @container = container
       @build_target = build_target
       @test_target = test_target
-      
+
       @doc = REXML::Document.new
       @doc << REXML::XMLDecl.new(REXML::XMLDecl::DEFAULT_VERSION, 'UTF-8')
       @doc.context[:attribute_quote] = :quote
-      
+
       scheme = @doc.add_element 'Scheme'
-      scheme.attributes['LastUpgradeVersion'] = build_target.project.root_object.attributes['LastUpgradeCheck']
+      scheme.attributes['LastUpgradeVersion'] = Constants::LAST_UPGRADE_CHECK
       scheme.attributes['version'] = '1.3'
-      
+
       build_action = scheme.add_element 'BuildAction'
       build_action.attributes['parallelizeBuildables'] = 'YES'
       build_action.attributes['buildImplicitDependencies'] = 'YES'
-      
+
       if (build_target.product_type == 'com.apple.product-type.application') then
         build_action_entries = build_action.add_element 'BuildActionEntries'
-        
+
         build_action_entry = build_action_entries.add_element 'BuildActionEntry'
         build_action_entry.attributes['buildForTesting'] = 'YES'
         build_action_entry.attributes['buildForRunning'] = 'YES'
         build_action_entry.attributes['buildForProfiling'] = 'YES'
         build_action_entry.attributes['buildForArchiving'] = 'YES'
         build_action_entry.attributes['buildForAnalyzing'] = 'YES'
-      
+
         buildable_reference = build_action_entry.add_element 'BuildableReference'
         buildable_reference.attributes['BuildableIdentifier'] = 'primary'
         buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
@@ -90,13 +77,13 @@ module Xcodeproj
         buildable_reference.attributes['BlueprintName'] = build_target.name
         buildable_reference.attributes['ReferencedContainer'] = "container:#{container}.xcodeproj"
       end
-      
+
       test_action = scheme.add_element 'TestAction'
       test_action.attributes['selectedDebuggerIdentifier'] = 'Xcode.DebuggerFoundation.Debugger.LLDB'
       test_action.attributes['selectedLauncherIdentifier'] = 'Xcode.DebuggerFoundation.Launcher.LLDB'
       test_action.attributes['shouldUseLaunchSchemeArgsEnv'] = 'YES'
       test_action.attributes['buildConfiguration'] = 'Debug'
-      
+
       testables = test_action.add_element 'Testables'
 
       if (test_target != nil) then
@@ -121,7 +108,7 @@ module Xcodeproj
           buildable_reference.attributes['ReferencedContainer'] = "container:#{container}.xcodeproj"
         end
       end
-      
+
       launch_action = scheme.add_element 'LaunchAction'
       launch_action.attributes['selectedDebuggerIdentifier'] = 'Xcode.DebuggerFoundation.Debugger.LLDB'
       launch_action.attributes['selectedLauncherIdentifier'] = 'Xcode.DebuggerFoundation.Launcher.LLDB'
@@ -131,10 +118,10 @@ module Xcodeproj
       launch_action.attributes['ignoresPersistentStateOnLaunch'] = 'NO'
       launch_action.attributes['debugDocumentVersioning'] = 'YES'
       launch_action.attributes['allowLocationSimulation'] = 'YES'
-      
+
       if (build_target.product_type == 'com.apple.product-type.application') then
         buildable_product_runnable = launch_action.add_element 'BuildableProductRunnable'
-      
+
         buildable_reference = buildable_product_runnable.add_element 'BuildableReference'
         buildable_reference.attributes['BuildableIdentifier'] = 'primary'
         buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
@@ -142,19 +129,19 @@ module Xcodeproj
         buildable_reference.attributes['BlueprintName'] = build_target.name
         buildable_reference.attributes['ReferencedContainer'] = "container:#{container}.xcodeproj"
       end
-      
+
       additional_options = launch_action.add_element 'AdditionalOptions'
-      
+
       profile_action = scheme.add_element 'ProfileAction'
       profile_action.attributes['shouldUseLaunchSchemeArgsEnv'] = 'YES'
       profile_action.attributes['savedToolIdentifier'] = ''
       profile_action.attributes['useCustomWorkingDirectory'] = 'NO'
       profile_action.attributes['buildConfiguration'] = 'Release'
       profile_action.attributes['debugDocumentVersioning'] = 'YES'
-      
+
       if (build_target.product_type == 'com.apple.product-type.application') then
         buildable_product_runnable = profile_action.add_element 'BuildableProductRunnable'
-      
+
         buildable_reference = buildable_product_runnable.add_element 'BuildableReference'
         buildable_reference.attributes['BuildableIdentifier'] = 'primary'
         buildable_reference.attributes['BlueprintIdentifier'] = build_target.uuid
@@ -162,16 +149,64 @@ module Xcodeproj
         buildable_reference.attributes['BlueprintName'] = build_target.name
         buildable_reference.attributes['ReferencedContainer'] = "container:#{container}.xcodeproj"
       end
-      
+
       analyze_action = scheme.add_element 'AnalyzeAction'
       analyze_action.attributes['buildConfiguration'] = 'Debug'
-      
+
       archive_action = scheme.add_element 'ArchiveAction'
       archive_action.attributes['buildConfiguration'] = 'Release'
       archive_action.attributes['revealArchiveInOrganizer'] = 'YES'
     end
 
-    # Returns the current value if the build target must be runned during the build step.
+    public
+
+    # @!group Class methods
+
+    #-------------------------------------------------------------------------#
+
+    # Share a User Scheme. Basically this method move the xcscheme file from
+    # the xcuserdata folder to xcshareddata folder.
+    #
+    # @param  [String] project_path
+    #         Path of the .xcodeproj folder.
+    #
+    # @param  [String] scheme_name
+    #         The name of scheme that will be shared.
+    #
+    # @param  [String] user
+    #         The user name that have the scheme.
+    #
+    def self.share_scheme(project_path, scheme_name, user = nil)
+      to_folder = shared_data_dir(project_path)
+      to_folder.mkpath
+      to = to_folder + "#{scheme_name}.xcscheme"
+      from = self.user_data_dir(project_path, user) + "#{scheme_name}.xcscheme"
+      FileUtils.mv(from, to)
+    end
+
+    # @return [Pathname]
+    #
+    def self.shared_data_dir(project_path)
+      project_path = Pathname.new(project_path)
+      project_path + 'xcshareddata/xcschemes'
+    end
+
+    # @return [Pathname]
+    #
+    def self.user_data_dir(project_path, user = nil)
+      project_path = Pathname.new(project_path)
+      user ||= ENV['USER']
+      project_path + "xcuserdata/#{user}.xcuserdatad/xcschemes"
+    end
+
+    public
+
+    # @!group
+
+    #-------------------------------------------------------------------------#
+
+    # Returns the current value if the build target must be runned during the
+    # build step.
     #
     # @return [Boolean]
     #         true  => run during the build step
@@ -190,9 +225,9 @@ module Xcodeproj
 
       build_target_for_running == 'YES'
     end
-    
-    # Set the build target to run or not run during the build step.
-    # Useful for cases where the build target is a unit test bundle.
+
+    # Set the build target to run or not run during the build step. Useful for
+    # cases where the build target is a unit test bundle.
     #
     # @param [Boolean] build_target_for_running
     #        true  => run during the build step
@@ -200,13 +235,13 @@ module Xcodeproj
     #
     def build_target_for_running=(build_target_for_running)
       build_action = @doc.root.elements['BuildAction']
-      
+
       if (build_action.elements['BuildActionEntries'] == nil) then
-        build_action_entries = build_action.add_element 'BuildActionEntries'
+        build_action_entries = build_action.add_element('BuildActionEntries')
       else
         build_action_entries = build_action.elements['BuildActionEntries']
       end
-      
+
       if (build_action_entries.elements['BuildActionEntry'] == nil) then
         build_action_entry = build_action_entries.add_element 'BuildActionEntry'
         build_action_entry.attributes['buildForTesting'] = 'YES'
@@ -216,9 +251,9 @@ module Xcodeproj
       else
         build_action_entry = build_action_entries.elements['BuildActionEntry']
       end
-      
+
       build_action_entry.attributes['buildForRunning'] = build_target_for_running ? 'YES' : 'NO'
-      
+
       if (build_action_entry.elements['BuildableReference'] == nil) then
         buildable_reference = build_action_entry.add_element 'BuildableReference'
         buildable_reference.attributes['BuildableIdentifier'] = 'primary'
@@ -228,10 +263,16 @@ module Xcodeproj
         buildable_reference.attributes['ReferencedContainer'] = "container:#{container}.xcodeproj"
       end
     end
-    
-    # Serializes the current state of the object to a String
+
+    public
+
+    # @!group Serialization
+
+    #-------------------------------------------------------------------------#
+
+    # Serializes the current state of the object to a String.
     #
-    # @return [String] the XML string value of the current state of the object
+    # @return [String] the XML string value of the current state of the object.
     #
     def to_s
       formatter = REXML::Formatters::Pretty.new(2)
@@ -240,7 +281,7 @@ module Xcodeproj
       formatter.write(@doc, out)
       out
     end
-    
+
     # Serializes the current state of the object to a ".xcscheme" file.
     #
     # @param [String, Pathname] project_path
@@ -256,17 +297,19 @@ module Xcodeproj
     #   scheme.save_as('path/to/Project.xcodeproj') #=> true
     #
     def save_as(project_path, shared = true)
-      if shared then
-        scheme_folder_path = File.join(project_path, 'xcshareddata', 'xcschemes')
+      if shared
+        scheme_folder_path = self.class.shared_data_dir(project_path)
       else
-        scheme_folder_path = File.join(project_path, 'xcuserdata', "#{ENV['USER']}.xcuserdatad", 'xcschemes')
+        scheme_folder_path = self.class.user_data_dir(project_path)
       end
-      Pathname(scheme_folder_path).mkpath
-      scheme_path = File.join(scheme_folder_path, "#{build_target.display_name}.xcscheme")
+      scheme_folder_path.mkpath
+      scheme_path = scheme_folder_path + "#{build_target.name}.xcscheme"
       File.open(scheme_path, 'w') do |f|
-        f.write(self)
+        f.write(to_s)
       end
     end
-    
+
+    #-------------------------------------------------------------------------#
+
   end
 end

data/lib/xcodeproj/xcodebuild_helper.rb

@@ -0,0 +1,96 @@
+module Xcodeproj
+
+  # Helper class which returns information from xcodebuild.
+  #
+  class XcodebuildHelper
+
+    def initialize
+      @needs_to_parse_sdks = true
+    end
+
+    # @return [String] The version of the last iOS sdk.
+    #
+    def last_ios_sdk
+      parse_sdks_if_needed
+      verions_by_sdk[:ios].sort.last
+    end
+
+    # @return [String] The version of the last OS X sdk.
+    #
+    def last_osx_sdk
+      parse_sdks_if_needed
+      verions_by_sdk[:osx].sort.last
+    end
+
+    private
+
+    # !@group Private Helpers
+
+    #-------------------------------------------------------------------------#
+
+    # @return [Hash] The versions of the sdks grouped by name (`:ios`, or `:osx`).
+    #
+    attr_accessor :verions_by_sdk
+
+    # @return [void] Parses the SDKs returned by xcodebuild and stores the
+    #         information in the `needs_to_parse_sdks` hash.
+    #
+    def parse_sdks_if_needed
+      if @needs_to_parse_sdks
+        @verions_by_sdk = {}
+        @verions_by_sdk[:osx] = []
+        @verions_by_sdk[:ios] = []
+        if xcodebuild_available?
+          skds = parse_sdks_information(xcodebuild_sdks)
+          skds.each do |(name, version)|
+            case
+            when name == 'macosx' then @verions_by_sdk[:osx] << version
+            when name == 'iphoneos' then @verions_by_sdk[:ios] << version
+            end
+          end
+        end
+      end
+    end
+
+    # @return [Bool] Whether xcodebuild is available.
+    #
+    def xcodebuild_available?
+      if @xcodebuild_available.nil?
+        `which xcodebuild 2>/dev/null`
+        @xcodebuild_available = $?.exitstatus.zero?
+      end
+      @xcodebuild_available
+    end
+
+    # @return [Array<Array<String>>] An array of tuples where the first element
+    #         is the name of the SDK and the second is the version.
+    #
+    def parse_sdks_information(output)
+      output.scan(/-sdk (macosx|iphoneos)(.+\w)/)
+    end
+
+    # @return [String] The sdk information reported by xcodebuild.
+    #
+    def xcodebuild_sdks
+      `xcodebuild -showsdks 2>/dev/null`
+    end
+
+    public
+
+    #-------------------------------------------------------------------------#
+
+    # @!group Singleton
+
+    # @return [XcodebuildHelper] the current xcodebuild instance creating one
+    #         if needed, which caches the information from the xcodebuild
+    #         command line tool.
+    #
+    def self.instance
+      @instance ||= new
+    end
+
+    #-------------------------------------------------------------------------#
+
+  end
+
+end

data/lib/xcodeproj.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
-  VERSION = '0.8.1' unless defined? Xcodeproj::VERSION
+  VERSION = '0.9.0' unless defined? Xcodeproj::VERSION
 
   class PlainInformative < StandardError
   end
@@ -10,13 +10,14 @@ module Xcodeproj
     end
   end
 
-  autoload :Command,        'xcodeproj/command'
-  autoload :Config,         'xcodeproj/config'
-  autoload :Constants,      'xcodeproj/constants'
-  autoload :Differ,         'xcodeproj/differ'
-  autoload :Helper,         'xcodeproj/helper'
-  autoload :Project,        'xcodeproj/project'
-  autoload :UI,             'xcodeproj/user_interface'
-  autoload :Workspace,      'xcodeproj/workspace'
-  autoload :XCScheme,       'xcodeproj/scheme'
+  autoload :Command,          'xcodeproj/command'
+  autoload :Config,           'xcodeproj/config'
+  autoload :Constants,        'xcodeproj/constants'
+  autoload :Differ,           'xcodeproj/differ'
+  autoload :Helper,           'xcodeproj/helper'
+  autoload :Project,          'xcodeproj/project'
+  autoload :UI,               'xcodeproj/user_interface'
+  autoload :Workspace,        'xcodeproj/workspace'
+  autoload :XCScheme,         'xcodeproj/scheme'
+  autoload :XcodebuildHelper, 'xcodeproj/xcodebuild_helper'
 end

metadata

@@ -1,62 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xcodeproj
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 1
-  version: 0.8.1
+version: !ruby/object:Gem::Version
+  version: 0.9.0
 platform: ruby
-authors: 
+authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 2
-        - 13
+      - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !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).
+  prerelease: false
+  version_requirements: !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).
 email: eloy.de.enige@gmail.com
-executables: 
+executables:
 - xcodeproj
-extensions: 
+extensions:
 - ext/xcodeproj/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/xcodeproj/command/project_diff.rb
 - lib/xcodeproj/command/show.rb
 - lib/xcodeproj/command/target_diff.rb
@@ -81,10 +72,12 @@ files:
 - lib/xcodeproj/project/object_attributes.rb
 - lib/xcodeproj/project/object_dictionary.rb
 - lib/xcodeproj/project/object_list.rb
+- lib/xcodeproj/project/project_helper.rb
 - lib/xcodeproj/project.rb
 - lib/xcodeproj/scheme.rb
 - lib/xcodeproj/user_interface.rb
 - lib/xcodeproj/workspace.rb
+- lib/xcodeproj/xcodebuild_helper.rb
 - lib/xcodeproj.rb
 - ext/xcodeproj/extconf.rb
 - ext/xcodeproj/xcodeproj_ext.c
@@ -92,39 +85,29 @@ files:
 - LICENSE
 - bin/xcodeproj
 homepage: https://github.com/cocoapods/xcodeproj
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - ext
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.
 test_files: []
-
 has_rdoc: