xcodeproj 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192dc46594552b9f7ef13f59410e344bbcdf526f
-  data.tar.gz: 8ce16e389789992902014ed549b9859236ec1d20
+  metadata.gz: f8046e57ba42d21845af2c95f063f5c51fd87625
+  data.tar.gz: 261b049b8d6d5dbc3884901e1bd6a6d184a6b0ed
 SHA512:
-  metadata.gz: 1e5d6e72e955a40a422695d554e1cb9fe8e7cec0021c19047149f3c0d4ec44408d57ff7a9f6bef5f32ddc5fde2ddb1281b53446cac943a136f61a05ad97dd7e9
-  data.tar.gz: 23d02d150fabb995dba2d27b38db0f3e859fe98a0d7994cf1409b9cf11901bad987daaa5b49dd9ad9d4283321bbd45bd229d6645c25e41e5e824fd30cd981e10
+  metadata.gz: 4c6bdef5a2db8877086391a9ba5382ec220a58fa4cd212c432ddb2dd7659a964baf30f96566ec83c54a9de6ff427f7e4a27f161997670298ea898205390899b7
+  data.tar.gz: 31e7ec5eb73b9c36733b21d53997fc06e6ca986d8eb11438f611aeda9fbb7fad607e65438d9f11a452f590c538d5bc3e418b0f3f141d5a823dc99c5bae326b90

data/lib/xcodeproj/constants.rb

@@ -383,5 +383,12 @@ module Xcodeproj
     # @return [Array] The extensions which are associated with header files.
     #
     HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def).freeze
+
+    # @return [Array] The keywords Xcode use to identify a build setting can
+    #                 inherit values from a previous precedence level
+    INHERITED_KEYWORDS = %w(
+      $(inherited)
+      ${inherited}
+    ).freeze
   end
 end

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/project.rb

@@ -809,6 +809,8 @@ module Xcodeproj
       targets.each do |target|
         scheme = XCScheme.new
         scheme.add_build_target(target)
+        scheme.add_test_target(target) if target.test_target_type?
+        yield scheme, target if block_given?
         scheme.save_as(path, target.name, false)
         xcschememanagement['SchemeUserState']["#{target.name}.xcscheme"] = {}
         xcschememanagement['SchemeUserState']["#{target.name}.xcscheme"]['isShown'] = visible

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

@@ -57,7 +57,7 @@ module Xcodeproj
         #         debugging.
         #
         def debug?
-          gcc_preprocessor_definitions = build_settings['GCC_PREPROCESSOR_DEFINITIONS']
+          gcc_preprocessor_definitions = resolve_build_setting('GCC_PREPROCESSOR_DEFINITIONS')
           gcc_preprocessor_definitions && gcc_preprocessor_definitions.include?('DEBUG=1')
         end
 
@@ -68,10 +68,41 @@ module Xcodeproj
           debug? ? :debug : :release
         end
 
+        # @!group Helpers
+        #---------------------------------------------------------------------#
+
+        # Gets the value for the given build setting considering any configuration
+        # file present and resolving inheritance between them
+        #
+        # @param [String] key
+        #        the key of the build setting.
+        #
+        # @return [String] The value of the build setting
+        #
+        def resolve_build_setting(key)
+          setting = build_settings[key]
+          config_setting = base_configuration_reference && config[key]
+
+          project_setting = project.build_configuration_list[name]
+          project_setting = nil if project_setting == self
+          project_setting &&= project_setting.resolve_build_setting(key)
+
+          [project_setting, config_setting, setting].compact.reduce do |inherited, value|
+            expand_build_setting(value, inherited)
+          end
+        end
+
         #---------------------------------------------------------------------#
 
         private
 
+        def expand_build_setting(build_setting_value, config_value)
+          default = build_setting_value.is_a?(String) ? '' : []
+          inherited = config_value || default
+          return build_setting_value.gsub(Regexp.union(Constants::INHERITED_KEYWORDS), inherited) if build_setting_value.is_a? String
+          build_setting_value.map { |value| Constants::INHERITED_KEYWORDS.include?(value) ? inherited : value }.flatten
+        end
+
         def sorted_build_settings
           sorted = {}
           build_settings.keys.sort.each do |key|
@@ -126,6 +157,12 @@ module Xcodeproj
           string.scan(regexp).map(&:first)
         end
 
+        def config
+          @config ||= Xcodeproj::Config.new(base_configuration_reference.real_path).to_hash.tap do |hash|
+            normalize_array_settings(hash)
+          end
+        end
+
         #---------------------------------------------------------------------#
       end
     end

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

@@ -62,13 +62,17 @@ module Xcodeproj
         # @param [String] key
         #        the key of the build setting.
         #
+        # @param [Bool] resolve_against_xcconfig
+        #        wether the retrieved setting should take in consideration any
+        #        configuration file present.
+        #
         # @return [Hash{String => String}] The value of the build setting
         #         grouped by the name of the build configuration.
         #
-        def get_setting(key)
+        def get_setting(key, resolve_against_xcconfig = false)
           result = {}
           build_configurations.each do |bc|
-            result[bc.name] = bc.build_settings[key]
+            result[bc.name] = resolve_against_xcconfig ? bc.resolve_build_setting(key) : bc.build_settings[key]
           end
           result
         end

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

@@ -41,18 +41,30 @@ module Xcodeproj
         # @param [String] key
         #        the key of the build setting.
         #
+        # @param [Bool] resolve_against_xcconfig
+        #        wether the resolved setting should take in consideration any
+        #        configuration file present.
+        #
         # @return [Hash{String => String}] The value of the build setting
         #         grouped by the name of the build configuration.
         #
         # TODO:   Full support for this would require to take into account
-        #         any associated xcconfig and the default values for the
-        #         platform.
+        #         the default values for the platform.
         #
-        def resolved_build_setting(key)
-          target_settings = build_configuration_list.get_setting(key)
-          project_settings = project.build_configuration_list.get_setting(key)
+        def resolved_build_setting(key, resolve_against_xcconfig = false)
+          target_settings = build_configuration_list.get_setting(key, resolve_against_xcconfig)
+          project_settings = project.build_configuration_list.get_setting(key, resolve_against_xcconfig)
           target_settings.merge(project_settings) do |_key, target_val, proj_val|
-            target_val || proj_val
+            target_includes_inherited = Constants::INHERITED_KEYWORDS.any? { |keyword| target_val.include?(keyword) } if target_val
+            if target_includes_inherited && proj_val
+              if target_val.is_a? String
+                target_val.gsub(Regexp.union(Constants::INHERITED_KEYWORDS), proj_val)
+              else
+                target_val.map { |value| Constants::INHERITED_KEYWORDS.include?(value) ? proj_val : value }.flatten
+              end
+            else
+              target_val || proj_val
+            end
           end
         end
 

data/lib/xcodeproj/project/project_helper.rb

@@ -143,6 +143,43 @@ module Xcodeproj
         target
       end
 
+      # Creates a new legacy target and adds it to the project.
+      #
+      # The target is configured for the given platform.
+      #
+      # @param  [Project] project
+      #         the project to which the target should be added.
+      #
+      # @param  [String] name
+      #         the name of the aggregate target.
+      #
+      # @param  [String] build_tool_path
+      #         the build tool path to use for this target.
+      #
+      # @param  [String] build_arguments_string
+      #         the build arguments string to use for this target.
+      #
+      # @param  [String] build_working_directory
+      #         the build working directory to use for this target.
+      #
+      # @param  [String] pass_build_settings_in_environment
+      #         whether to pass build settings in the environment during execution of this target.
+      #
+      # @return [PBXLegacyTarget] the target.
+      #
+      def self.new_legacy_target(project, name, build_tool_path = '/usr/bin/make', build_arguments_string = '$(ACTION)',
+                                 build_working_directory = nil, pass_build_settings_in_environment = '1')
+        target = project.new(PBXLegacyTarget)
+        project.targets << target
+        target.name = name
+        target.build_configuration_list = configuration_list(project)
+        target.build_tool_path = build_tool_path
+        target.build_arguments_string = build_arguments_string
+        target.build_working_directory = build_working_directory
+        target.pass_build_settings_in_environment = pass_build_settings_in_environment
+        target
+      end
+
       # @!group Private Helpers
 
       #-----------------------------------------------------------------------#

data/lib/xcodeproj/scheme/build_action.rb

@@ -52,7 +52,9 @@ module Xcodeproj
       #         Each entry represent a target to build and tells for which action it's needed to be built.
       #
       def entries
-        @xml_element.elements['BuildActionEntries'].get_elements('BuildActionEntry').map do |entry_node|
+        entries = @xml_element.elements['BuildActionEntries']
+        return nil unless entries
+        entries.get_elements('BuildActionEntry').map do |entry_node|
           BuildAction::Entry.new(entry_node)
         end
       end

data/lib/xcodeproj/scheme/test_action.rb

@@ -101,6 +101,24 @@ module Xcodeproj
         env_vars
       end
 
+      # @todo handle 'AdditionalOptions' tag
+
+      # @return [CommandLineArguments]
+      #         Returns the CommandLineArguments that will be passed at app launch
+      #
+      def command_line_arguments
+        CommandLineArguments.new(@xml_element.elements[XCScheme::COMMAND_LINE_ARGS_NODE])
+      end
+
+      # @return [CommandLineArguments] arguments
+      #         Sets the CommandLineArguments that will be passed at app launch
+      #
+      def command_line_arguments=(arguments)
+        @xml_element.delete_element(XCScheme::COMMAND_LINE_ARGS_NODE)
+        @xml_element.add_element(arguments.xml_element) if arguments
+        arguments
+      end
+
       #-------------------------------------------------------------------------#
 
       class TestableReference < XMLElementWrapper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.