xcodeproj 0.19.4 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15d4866be3a0c0e6822284381fe063e88569c6d8
-  data.tar.gz: 62bb5c0836656973f9abb42c45b338787c06efa9
+  metadata.gz: 52c251c9a9b1362652e5dc8ea5c23901b8c0327e
+  data.tar.gz: 56c1bfb43c09840aa85c5cff8655be63de176207
 SHA512:
-  metadata.gz: 6957ded10d5c212485c7eba72d951c1be505c3d942f30fe2fbae73404698faeee0b8627da53ba31f5258693b8d34a18cabce13caea6bb96204b83257b3e70ec1
-  data.tar.gz: 73959189a97c54fd761cbb14b8ffd6e9da579fd4371b6f549a4fec136528360003ddb161f7402360c78585426879d492bb8729832105f5111fdb1eb0535de9de
+  metadata.gz: 83d70e140a46ad9f7418ec5ca2587d0878c63ae67a0dcd51eb210fc1f271dd472690af92ffe579892fd405b5ee604500e582cd2950a2c83b5a342f5769a7fc85
+  data.tar.gz: 0b18b6ca17245519fcfa4955596c0163c5390db3f89a9d51a292ec21cad7a4d71c2374d70625fd67d549d77fac39b72cb2222bca637909d437c4e090828c9140

data/lib/xcodeproj.rb

@@ -21,5 +21,3 @@ module Xcodeproj
   autoload :XCScheme,         'xcodeproj/scheme'
   autoload :XcodebuildHelper, 'xcodeproj/xcodebuild_helper'
 end
-
-require 'xcodeproj/ext'

data/lib/xcodeproj/constants.rb

@@ -37,6 +37,7 @@ module Xcodeproj
         PBXProject
         PBXTargetDependency
         PBXReferenceProxy
+        AbstractTarget
       ),
 
       'AbstractBuildPhase' => %w(
@@ -60,10 +61,6 @@ module Xcodeproj
       ),
     }.freeze
 
-    # @return [Array] The list of the super classes for each ISA.
-    #
-    ISAS_SUPER_CLASSES = %w(AbstractObject AbstractBuildPhase PBXGroup)
-
     # @return [Hash] The known file types corresponding to each extension.
     #
     FILE_TYPES_BY_EXTENSION = {
@@ -216,6 +213,13 @@ module Xcodeproj
       :plug_ins           => '13',
     }.freeze
 
+    # @return [Hash] The corresponding numeric value of each proxy type for
+    #         PBXContainerItemProxy.
+    PROXY_TYPES = {
+      :native_target => '1',
+      :reference     => '2',
+    }.freeze
+
     # @return [Hash] The extensions which are associated with header files.
     #
     HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp).freeze

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/plist_helper.rb

@@ -37,6 +37,7 @@ module Xcodeproj
           raise TypeError, "The given `#{path}` must be a string or 'pathname'."
         end
         path = path.to_s
+        raise IOError, 'Empty path.' if path == ''
 
         CoreFoundation.RubyHashPropertyListWrite(hash, path)
       end
@@ -52,45 +53,22 @@ module Xcodeproj
         unless File.exist?(path)
           raise ArgumentError, "The plist file at path `#{path}` doesn't exist."
         end
+        if file_in_conflict?(path)
+          raise ArgumentError, "The file `#{path}` is in a merge conflict"
+        end
         CoreFoundation.RubyHashPropertyListRead(path)
       end
-    end
-  end
-end
 
-# Define compatibility with older Fiddle implementation in Ruby 1.9.3.
-#
-# @todo: Soon we will drop support for any Ruby < 2 and this should be removed.
-#
-# @!visibility private
-#
-module Fiddle
-  unless defined?(NULL)
-    require 'dl'
-    NULL = DL::NULL
-  end
-
-  unless defined?(SIZEOF_INTPTR_T)
-    require 'dl'
-    SIZEOF_INTPTR_T = DL::SIZEOF_VOIDP
-  end
-
-  unless defined?(Handle)
-    require 'dl'
-    Handle = DL::Handle
-  end
-
-  unless respond_to?(:dlopen)
-    require 'dl'
-    def self.dlopen(library)
-      DL.dlopen(library)
-    end
-  end
-
-  class Function
-    unless public_method_defined?(:to_i)
-      def to_i
-        @ptr.to_i
+      # @return [Bool] Checks whether there are merge conflicts in the file.
+      #
+      # @param  [#to_s] path
+      #         The path of the file.
+      #
+      def file_in_conflict?(path)
+        file = File.open(path)
+        file.each_line.any? { |l| l.match(/^(<|=|>){7}/) }
+      ensure
+        file.close
       end
     end
   end

data/lib/xcodeproj/project.rb

@@ -5,6 +5,7 @@ require 'securerandom'
 require 'xcodeproj/project/object'
 require 'xcodeproj/project/project_helper'
 require 'xcodeproj/project/xcproj_helper'
+require 'xcodeproj/plist_helper'
 
 module Xcodeproj
   # This class represents a Xcode project document.

data/lib/xcodeproj/project/object.rb

@@ -471,14 +471,10 @@ require 'xcodeproj/project/object_list'
 
 # Required because some classes have cyclical references to each other.
 #
-# In ruby 1.8.7 the hash are not sorted so it is necessary to use an array to
-# preserve the proper loading order of the various super classes.
-#
 # @todo I'm sure that there is a method to achieve the same result which
 # doesn't present the risk of some rubist laughing at me :-)
 #
-Xcodeproj::Constants::ISAS_SUPER_CLASSES.each do |superclass_name|
-  isas = Xcodeproj::Constants::KNOWN_ISAS[superclass_name]
+Xcodeproj::Constants::KNOWN_ISAS.each do |superclass_name, isas|
   superklass = Xcodeproj::Project::Object.const_get(superclass_name)
   isas.each do |isa|
     c = Class.new(superklass)

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

@@ -195,6 +195,31 @@ module Xcodeproj
         #         copied to.
         #
         attribute :dst_subfolder_spec, String, Constants::COPY_FILES_BUILD_PHASE_DESTINATIONS[:resources]
+
+        # Alias method for #dst_subfolder_spec=, which accepts symbol values
+        # instead of numeric string values.
+        #
+        # @param [Symbol] value
+        #        one of `COPY_FILES_BUILD_PHASE_DESTINATIONS.keys`
+        #
+        # @raise [StandardError] if value is not a valid known key
+        #
+        def symbol_dst_subfolder_spec=(value)
+          numeric_value = Constants::COPY_FILES_BUILD_PHASE_DESTINATIONS[value]
+          raise "[Xcodeproj] Value checking error: got `#{value.inspect}` for" \
+              ' attribute: dst_subfolder_spec' if numeric_value.nil?
+          self.dst_subfolder_spec = numeric_value
+        end
+
+        # Alias method for #dst_subfolder_spec, which returns symbol values
+        # instead of numeric string values.
+        #
+        # @return [Symbol]
+        #
+        def symbol_dst_subfolder_spec
+          key = Constants::COPY_FILES_BUILD_PHASE_DESTINATIONS.find { |_, num| num == dst_subfolder_spec }
+          key ? key.first : nil
+        end
       end
 
       #-----------------------------------------------------------------------#

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

@@ -42,7 +42,7 @@ module Xcodeproj
 
         # @return [String] the type of the proxy.
         #
-        # @note   {PBXNativeTarget} is `1`.
+        # @note   @see {Constants::PROXY_TYPE.values} for valid values.
         #
         attribute :proxy_type, String
 
@@ -65,6 +65,28 @@ module Xcodeproj
         #         the proxy.
         #
         attribute :remote_info, String
+
+        # Checks whether the reference points to a remote project.
+        #
+        # @return [Bool]
+        #
+        def remote?
+          project.root_object.uuid != container_portal
+        end
+
+        # Get the proxied object
+        #
+        # @return [AbstractObject]
+        #
+        def proxied_object
+          if remote?
+            container_portal_file_ref = project.objects_by_uuid[container_portal]
+            container_portal_object = Project.open(container_portal_file_ref.real_path)
+          else
+            container_portal_object = project
+          end
+          container_portal_object.objects_by_uuid[remote_global_id_string]
+        end
       end
     end
   end

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

@@ -184,7 +184,7 @@ module Xcodeproj
             subproj.products_group.files.each do |product_reference|
               container_proxy = group.project.new(PBXContainerItemProxy)
               container_proxy.container_portal = ref.uuid
-              container_proxy.proxy_type = '2'
+              container_proxy.proxy_type = Constants::PROXY_TYPES[:reference]
               container_proxy.remote_global_id_string = product_reference.uuid
               container_proxy.remote_info = 'Subproject'
 

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

@@ -194,7 +194,7 @@ module Xcodeproj
         # @return [void]
         #
         def add_dependency(target)
-          unless dependencies.map(&:target).include?(target)
+          unless dependency_for_target(target)
             container_proxy = project.new(Xcodeproj::Project::PBXContainerItemProxy)
             if target.project == project
               container_proxy.container_portal = project.root_object.uuid
@@ -203,18 +203,36 @@ module Xcodeproj
               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.proxy_type = Constants::PROXY_TYPES[:native_target]
             container_proxy.remote_global_id_string = target.uuid
             container_proxy.remote_info = target.name
 
             dependency = project.new(Xcodeproj::Project::PBXTargetDependency)
-            dependency.target = target
+            dependency.name = target.name
+            dependency.target = target if target.project == project
             dependency.target_proxy = container_proxy
 
             dependencies << dependency
           end
         end
 
+        # Checks whether this target has a dependency on the given target.
+        #
+        # @param  [AbstractTarget] target
+        #         the target to search for.
+        #
+        # @return [PBXTargetDependency]
+        #
+        def dependency_for_target(target)
+          dependencies.find do |dep|
+            if dep.target_proxy.remote?
+              dep.target_proxy.remote_global_id_string == target.uuid
+            else
+              dep.target == target
+            end
+          end
+        end
+
         # Creates a new copy files build phase.
         #
         # @param  [String] name
@@ -382,10 +400,12 @@ module Xcodeproj
         # @param  [Hash{String=>String}] compiler_flags
         #         the compiler flags for the source files.
         #
-        # @return [void]
+        # @yield_param [PBXBuildFile] each created build file.
+        #
+        # @return [Array<PBXBuildFile>] the created build files.
         #
         def add_file_references(file_references, compiler_flags = {})
-          file_references.each do |file|
+          file_references.map do |file|
             build_file = project.new(PBXBuildFile)
             build_file.file_ref = file
 
@@ -399,6 +419,10 @@ module Xcodeproj
               end
               source_build_phase.files << build_file
             end
+
+            yield build_file if block_given?
+
+            build_file
           end
         end
 
@@ -424,19 +448,7 @@ module Xcodeproj
         # @return [PBXHeadersBuildPhase] the headers build phase.
         #
         def headers_build_phase
-          unless @headers_build_phase
-            headers_build_phase = build_phases.find { |bp| bp.class == PBXHeadersBuildPhase }
-            unless headers_build_phase
-              # Working around a bug in Xcode 4.2 betas, remove this once the
-              # Xcode bug is fixed:
-              # https://github.com/alloy/cocoapods/issues/13
-              # phase = copy_header_phase || headers_build_phases.first
-              headers_build_phase = project.new(PBXHeadersBuildPhase)
-              build_phases << headers_build_phase
-            end
-            @headers_build_phase = headers_build_phase
-          end
-          @headers_build_phase
+          find_or_create_build_phase_by_class(PBXHeadersBuildPhase)
         end
 
         # Finds or creates the source build phase of the target.
@@ -446,15 +458,7 @@ module Xcodeproj
         # @return [PBXSourcesBuildPhase] the source build phase.
         #
         def source_build_phase
-          unless @source_build_phase
-            source_build_phase = build_phases.find { |bp| bp.class == PBXSourcesBuildPhase }
-            unless source_build_phase
-              source_build_phase = project.new(PBXSourcesBuildPhase)
-              build_phases << source_build_phase
-            end
-            @source_build_phase = source_build_phase
-          end
-          @source_build_phase
+          find_or_create_build_phase_by_class(PBXSourcesBuildPhase)
         end
 
         # Finds or creates the frameworks build phase of the target.
@@ -464,12 +468,7 @@ module Xcodeproj
         # @return [PBXFrameworksBuildPhase] the frameworks build phase.
         #
         def frameworks_build_phase
-          phase = build_phases.find { |bp| bp.class == PBXFrameworksBuildPhase }
-          unless phase
-            phase = project.new(PBXFrameworksBuildPhase)
-            build_phases << phase
-          end
-          phase
+          find_or_create_build_phase_by_class(PBXFrameworksBuildPhase)
         end
 
         # Finds or creates the resources build phase of the target.
@@ -479,12 +478,27 @@ module Xcodeproj
         # @return [PBXResourcesBuildPhase] the resources build phase.
         #
         def resources_build_phase
-          phase = build_phases.find { |bp| bp.class == PBXResourcesBuildPhase }
-          unless phase
-            phase = project.new(PBXResourcesBuildPhase)
-            build_phases << phase
+          find_or_create_build_phase_by_class(PBXResourcesBuildPhase)
+        end
+
+        private
+
+        # @!group Internal Helpers
+        #--------------------------------------#
+
+        # Find or create a build phase by a given class
+        #
+        # @param [Class] phase_class the class of the build phase to find or create.
+        #
+        # @return [AbstractBuildPhase] the build phase whose class match the given phase_class.
+        #
+        def find_or_create_build_phase_by_class(phase_class)
+          @phases ||= {}
+          unless phase_class < AbstractBuildPhase
+            raise ArgumentError, "#{phase_class} must be a subclass of #{AbstractBuildPhase.class}"
           end
-          phase
+          @phases[phase_class] ||= build_phases.find { |bp| bp.class == phase_class } \
+            || project.new(phase_class).tap { |bp| build_phases << bp }
         end
 
         public

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

@@ -9,6 +9,10 @@ module Xcodeproj
       class PBXReferenceProxy < AbstractObject
         # @!group Attributes
 
+        # @return [String] the name of the reference.
+        #
+        attribute :name, String
+
         # @return [String] the path of the referenced filed.
         #
         attribute :path, String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.20.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -49,7 +49,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
-- ext/xcodeproj/xcodeproj_ext.bundle
 - lib/xcodeproj/command/project_diff.rb
 - lib/xcodeproj/command/show.rb
 - lib/xcodeproj/command/sort.rb
@@ -59,7 +58,6 @@ 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/plist_helper.rb
@@ -104,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='

data/lib/xcodeproj/ext.rb

@@ -1,12 +0,0 @@
-begin
-  require 'xcodeproj/plist_helper'
-rescue LoadError
-  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'
-  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