xcodeproj 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd5a8807aed9829a9a1e355790100434f4df1fd7
-  data.tar.gz: 15e7c38281fb55f32e2a473e1badf6d806d9063e
+  metadata.gz: 160de31d624d01bb10824d3d9b06f0154828e769
+  data.tar.gz: f692cb98d2e7ad4b34e344c2c8b4f995c5843bf4
 SHA512:
-  metadata.gz: ae80f793ecc1635660a7802304547540c9a1e3eb2e8b54a0572acfa8eb3c3069edd3c0302360393041da28026eb77bbf3a5f3e263f72c040ce0c149fb621c2c4
-  data.tar.gz: 531fa9d52e9be2918b113f6603f7d5382ff00eb707de7cc34b70ed956c65f759420292cb4552611d839ad8bb6031d028c4bc91fc1ac3894ee46e40bf6b3a86fb
+  metadata.gz: c85b6c33b61408e2597410292b3fcc3591b7feb6061c5cd3dcf3b950ca8e54d9ca936e1e633b4bd028dd289c9ec5b64f2a9a4c34a21dce299d9dd1e9fcd7dcd3
+  data.tar.gz: 4bae982841ee95c3a2de0200210c46c9226d54f999e1a21366701fe19176ceca450c269548cd7c386642ef8581473005aff617171c7f86faf02ba8b26f5d252d

data/lib/xcodeproj/gem_version.rb

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

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

@@ -85,15 +85,21 @@ module Xcodeproj
         #
         def resolve_build_setting(key, root_target = nil)
           setting = build_settings[key]
-          setting = resolve_variable_substitution(key, setting, root_target) if setting.is_a?(String)
+          setting = resolve_variable_substitution(key, setting, root_target)
+
           config_setting = base_configuration_reference && config[key]
-          config_setting = resolve_variable_substitution(key, config_setting, root_target) if config_setting.is_a?(String)
+          config_setting = resolve_variable_substitution(key, config_setting, root_target)
 
           project_setting = project.build_configuration_list[name]
-          project_setting = nil if project_setting == self
+          project_setting = nil if equal?(project_setting)
           project_setting &&= project_setting.resolve_build_setting(key, root_target)
 
-          [project_setting, config_setting, setting, ENV[key]].compact.reduce do |inherited, value|
+          defaults = {
+            'CONFIGURATION' => name,
+            'SRCROOT' => project.project_dir.to_s,
+          }
+
+          [defaults[key], project_setting, config_setting, setting, ENV[key]].compact.reduce(nil) do |inherited, value|
             expand_build_setting(value, inherited)
           end
         end
@@ -102,15 +108,25 @@ module Xcodeproj
 
         private
 
+        VARIABLE_NAME_PATTERN =
+          '( # capture block
+            [_a-zA-Z0-9]+? # non-greedy lookup for everything contained in this list
+          )'.freeze
+        private_constant :VARIABLE_NAME_PATTERN
+
         CAPTURE_VARIABLE_IN_BUILD_CONFIG = /
             \$ # matches dollar sign literally
-            [{(] # matches a single caracter on this list
-              ( # capture block
-              [^inherited] # ignore if match characters in this list
-              [$(){}_a-zA-Z0-9]*? # non-greedy lookup for everything that contains this list
-              )
-            [})] # matches a single caracter on this list
+            (?: # non-capturing group
+              [{] # matches a single character on this list
+                #{VARIABLE_NAME_PATTERN}
+              [}] # matches a single character on this list
+              | # or
+              [(] # matches a single character on this list
+                #{VARIABLE_NAME_PATTERN}
+              [)] # matches a single character on this list
+            )
           /x
+        private_constant :CAPTURE_VARIABLE_IN_BUILD_CONFIG
 
         def expand_build_setting(build_setting_value, config_value)
           if build_setting_value.is_a?(Array) && config_value.is_a?(String)
@@ -127,23 +143,37 @@ module Xcodeproj
         end
 
         def resolve_variable_substitution(key, value, root_target)
-          variable = match_variable(value)
-          return nil if key.eql?(variable)
-          if variable.nil?
-            return name if value.eql?('CONFIGURATION')
-            if root_target
-              return root_target.build_configuration_list[name].resolve_build_setting(value, root_target) || value
-            else
-              return resolve_build_setting(value, root_target) || value
-            end
+          case value
+          when Array
+            return value.map { |v| resolve_variable_substitution(key, v, root_target) }
+          when nil
+            return
+          when String
+            # we know how to resolve strings!
+            nil
+          else
+            raise ArgumentError, "Settings values can only be nil, string, or array, got #{value.inspect} for #{key}"
           end
-          resolve_variable_substitution(key, value.sub(CAPTURE_VARIABLE_IN_BUILD_CONFIG, resolve_variable_substitution(key, variable, root_target)), root_target)
-        end
 
-        def match_variable(config_setting)
-          match_data = config_setting.match(CAPTURE_VARIABLE_IN_BUILD_CONFIG)
-          return match_data.captures.first unless match_data.nil?
-          match_data
+          unless variable_match_data = value.match(CAPTURE_VARIABLE_IN_BUILD_CONFIG)
+            # no variables left, return the value unchanged
+            return value
+          end
+          variable_reference, variable = *variable_match_data.values_at(0, 1, 2).compact
+
+          case variable
+          when 'inherited'
+            # this is handled separately, after resolving all other variable references
+            value
+          when key
+            # to prevent infinite recursion
+            nil
+          else
+            configuration_to_resolve_against = root_target ? root_target.build_configuration_list[name] : self
+            resolved_value_for_variable = configuration_to_resolve_against.resolve_build_setting(variable, root_target) || ''
+            value = value.gsub(variable_reference, resolved_value_for_variable)
+            resolve_variable_substitution(key, value, root_target)
+          end
         end
 
         def sorted_build_settings

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

@@ -98,7 +98,7 @@ module Xcodeproj
           #
           def real_path(object)
             source_tree = source_tree_real_path(object)
-            path = object.path || ''
+            path = object.path || ''.freeze
             if source_tree
               source_tree + path
             else
@@ -115,11 +115,16 @@ module Xcodeproj
           def full_path(object)
             folder =  case object.source_tree
                       when '<group>'
-                        parent(object).isa != 'PBXProject' ? full_path(parent(object)) : nil
+                        object_parent = parent(object)
+                        if object_parent.isa == 'PBXProject'.freeze
+                          nil
+                        else
+                          full_path(object_parent)
+                        end
                       when 'SOURCE_ROOT'
                         nil
                       when '<absolute>'
-                        Pathname.new('/')
+                        Pathname.new('/'.freeze)
                       else
                         Pathname.new("${#{object.source_tree}}")
                       end
@@ -140,10 +145,11 @@ module Xcodeproj
           def source_tree_real_path(object)
             case object.source_tree
             when '<group>'
-              if parent(object).isa == 'PBXProject'
+              object_parent = parent(object)
+              if object_parent.isa == 'PBXProject'.freeze
                 object.project.project_dir
               else
-                real_path(parent(object))
+                real_path(object_parent)
               end
             when 'SOURCE_ROOT'
               object.project.project_dir

data/lib/xcodeproj/scheme.rb

@@ -31,7 +31,9 @@ module Xcodeproj
     def initialize(file_path = nil)
       if file_path
         @file_path = file_path
-        @doc = REXML::Document.new(File.new(file_path))
+        @doc = File.open(file_path, 'r') do |f|
+          REXML::Document.new(f)
+        end
         @doc.context[:attribute_quote] = :quote
 
         @scheme = @doc.elements['Scheme']

data/lib/xcodeproj/scheme/buildable_reference.rb

@@ -59,10 +59,12 @@ module Xcodeproj
       #        If true, buildable_name will also be updated by computing a name from the target
       #
       def set_reference_target(target, override_buildable_name = false, root_project = nil)
+        # note, the order of assignment here is important, it determines the order of serialization in the xml
+        # this matches the order that Xcode generates
         @xml_element.attributes['BlueprintIdentifier'] = target.uuid
+        self.buildable_name = construct_buildable_name(target) if override_buildable_name
         @xml_element.attributes['BlueprintName'] = target.name
         @xml_element.attributes['ReferencedContainer'] = construct_referenced_container_uri(target, root_project)
-        self.buildable_name = construct_buildable_name(target) if override_buildable_name
       end
 
       # @return [String]

data/lib/xcodeproj/workspace.rb

@@ -64,7 +64,7 @@ module Xcodeproj
     #
     def self.new_from_xcworkspace(path)
       from_s(File.read(File.join(path, 'contents.xcworkspacedata')),
-             File.expand_path(File.dirname(path)))
+             File.expand_path(path))
     rescue Errno::ENOENT
       new(nil)
     end
@@ -191,8 +191,14 @@ module Xcodeproj
     # @return [void]
     #
     def load_schemes(workspace_dir_path)
+      # Normalizes path to directory of workspace needed for file_reference.absolute_path
+      workspaces_dir = workspace_dir_path
+      if File.extname(workspace_dir_path) == '.xcworkspace'
+        workspaces_dir = File.expand_path('..', workspaces_dir)
+      end
+
       file_references.each do |file_reference|
-        project_full_path = file_reference.absolute_path(workspace_dir_path)
+        project_full_path = file_reference.absolute_path(workspaces_dir)
         load_schemes_from_project(project_full_path)
       end
 

data/lib/xcodeproj/workspace/file_reference.rb

@@ -1,22 +1,14 @@
+require 'xcodeproj/workspace/reference'
+
 module Xcodeproj
   class Workspace
     # Describes a file reference of a Workspace.
     #
-    class FileReference
+    class FileReference < Reference
       # @return [String] the path to the project
       #
       attr_reader :path
 
-      # @return [String] the type of reference to the project
-      #
-      # This can be of the following values:
-      # - absolute
-      # - group
-      # - container
-      # - developer (unsupported)
-      #
-      attr_reader :type
-
       # @param [#to_s] path @see path
       # @param [#to_s] type @see type
       #
@@ -47,20 +39,10 @@ module Xcodeproj
       #
       def self.from_node(xml_node)
         type, path = xml_node.attribute('location').value.split(':', 2)
-        path = prepend_parent_path(xml_node, path)
-        new(path, type)
-      end
-
-      def self.prepend_parent_path(xml_node, path)
-        if !xml_node.parent.nil? && (xml_node.parent.name == 'Group')
-          group = GroupReference.from_node(xml_node.parent)
-          if !group.location.nil? && !group.location.empty?
-            path = '' if path.nil?
-            path = File.join(group.location, path)
-          end
+        if type == 'group'
+          path = prepend_parent_path(xml_node, path)
         end
-
-        path
+        new(path, type)
       end
 
       # @return [REXML::Element] the XML representation of the file reference.

data/lib/xcodeproj/workspace/group_reference.rb

@@ -1,22 +1,14 @@
+require 'xcodeproj/workspace/reference'
+
 module Xcodeproj
   class Workspace
     # Describes a group reference of a Workspace.
     #
-    class GroupReference
+    class GroupReference < Reference
       # @return [String] the name of the group
       #
       attr_reader :name
 
-      # @return [String] the type of reference to the project
-      #
-      # This can be of the following values:
-      # - absolute
-      # - group
-      # - container (only supported value)
-      # - developer
-      #
-      attr_reader :type
-
       # @return [String] the location of the group on disk
       #
       attr_reader :location
@@ -55,6 +47,9 @@ module Xcodeproj
         location_array = xml_node.attribute('location').value.split(':', 2)
         type = location_array.first
         location = location_array[1] || ''
+        if type == 'group'
+          location = prepend_parent_path(xml_node, location)
+        end
         name = xml_node.attribute('name').value
         new(name, type, location)
       end

data/lib/xcodeproj/workspace/reference.rb

@@ -0,0 +1,40 @@
+module Xcodeproj
+  class Workspace
+    # Describes a file/group reference of a Workspace.
+    #
+    class Reference
+      # @return [String] the type of reference to the project
+      #
+      # This can be of the following values:
+      # - absolute
+      # - group
+      # - container
+      # - developer (unsupported)
+      #
+      attr_reader :type
+
+      # Returns the relative path to the parent group reference (if one exists)
+      # prepended to the passed in path.
+      #
+      # @param  [REXML::Element] xml_node
+      #         the XML representation.
+      #
+      # @param  [String] path
+      #         the path that will be prepended to.
+      #
+      # @return [String] the extended path including the parent node's path.
+      #
+      def self.prepend_parent_path(xml_node, path)
+        if !xml_node.parent.nil? && (xml_node.parent.name == 'Group')
+          group = GroupReference.from_node(xml_node.parent)
+          if !group.location.nil? && !group.location.empty?
+            path = '' if path.nil?
+            path = File.join(group.location, path)
+          end
+        end
+
+        path
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -160,6 +160,7 @@ files:
 - lib/xcodeproj/workspace.rb
 - lib/xcodeproj/workspace/file_reference.rb
 - lib/xcodeproj/workspace/group_reference.rb
+- lib/xcodeproj/workspace/reference.rb
 - lib/xcodeproj/xcodebuild_helper.rb
 homepage: https://github.com/cocoapods/xcodeproj
 licenses: