xcodeproj 0.18.0 → 0.19.0

data/lib/xcodeproj/config/other_linker_flags_parser.rb

@@ -0,0 +1,62 @@
+require 'shellwords'
+
+module Xcodeproj
+  class Config
+    # Parses other linker flags values.
+    #
+    module OtherLinkerFlagsParser
+      # @return [Hash{Symbol, Array[String]}] Splits the given
+      #         other linker flags value by type.
+      #
+      # @param  [String] flags
+      #         The other linker flags value.
+      #
+      def self.parse(flags)
+        result = {
+          :frameworks => [],
+          :weak_frameworks => [],
+          :libraries => [],
+          :simple => [],
+        }
+
+        key = nil
+        split(flags).each do |token|
+          case token
+          when '-framework'
+            key = :frameworks
+          when '-weak_framework'
+            key = :weak_frameworks
+          when '-l'
+            key = :libraries
+          else
+            if key
+              result[key] << token
+              key = nil
+            else
+              result[:simple] << token
+            end
+          end
+        end
+        result
+      end
+
+      # @return [Array<String>] Split the given other linker
+      #         flags value, taking into account quoting and
+      #         the fact that the `-l` flag might omit the
+      #         space.
+      #
+      # @param  [String] flags
+      #         The other linker flags value.
+      #
+      def self.split(flags)
+        flags.strip.shellsplit.map do |string|
+          if string =~ /\A-l.+/
+            ['-l', string[2..-1]]
+          else
+            string
+          end
+        end.flatten
+      end
+    end
+  end
+end

data/lib/xcodeproj/constants.rb

@@ -1,9 +1,7 @@
 module Xcodeproj
-
   # This modules groups all the constants known to Xcodeproj.
   #
   module Constants
-
     # @return [String] The last known iOS SDK (stable).
     #
     LAST_KNOWN_IOS_SDK = '7.1'
@@ -27,7 +25,7 @@ module Xcodeproj
     # @return [Hash] The all the known ISAs grouped by superclass.
     #
     KNOWN_ISAS = {
-      'AbstractObject' => %w[
+      'AbstractObject' => %w(
         PBXBuildFile
         AbstractBuildPhase
         PBXBuildRule
@@ -39,53 +37,56 @@ module Xcodeproj
         PBXProject
         PBXTargetDependency
         PBXReferenceProxy
-      ],
+      ),
 
-      'AbstractBuildPhase' => %w[
+      'AbstractBuildPhase' => %w(
         PBXCopyFilesBuildPhase
         PBXResourcesBuildPhase
         PBXSourcesBuildPhase
         PBXFrameworksBuildPhase
         PBXHeadersBuildPhase
         PBXShellScriptBuildPhase
-      ],
+      ),
 
-      'AbstractTarget' => %w[
+      'AbstractTarget' => %w(
         PBXNativeTarget
         PBXAggregateTarget
         PBXLegacyTarget
-      ],
+      ),
 
-      'PBXGroup' => %w[
+      'PBXGroup' => %w(
         XCVersionGroup
         PBXVariantGroup
-      ]
+      ),
     }.freeze
 
     # @return [Array] The list of the super classes for each ISA.
     #
-    ISAS_SUPER_CLASSES = %w[ AbstractObject AbstractBuildPhase PBXGroup ]
+    ISAS_SUPER_CLASSES = %w(AbstractObject AbstractBuildPhase PBXGroup)
 
     # @return [Hash] The known file types corresponding to each extension.
     #
     FILE_TYPES_BY_EXTENSION = {
       'a'           => 'archive.ar',
       'app'         => 'wrapper.application',
+      'bundle'      => 'wrapper.plug-in',
       'dylib'       => 'compiled.mach-o.dylib',
       'framework'   => 'wrapper.framework',
-      'bundle'      => 'wrapper.plug-in',
       'h'           => 'sourcecode.c.h',
       'm'           => 'sourcecode.c.objc',
+      'markdown'    => 'text',
+      'mdimporter'  => 'wrapper.cfbundle',
+      'octest'      => 'wrapper.cfbundle',
       'pch'         => 'sourcecode.c.h',
-      'xcconfig'    => 'text.xcconfig',
-      'xcdatamodel' => 'wrapper.xcdatamodel',
-      'xib'         => 'file.xib',
+      'plist'       => 'text.plist.xml',
       'sh'          => 'text.script.sh',
       'swift'       => 'sourcecode.swift',
-      'plist'       => 'text.plist.xml',
-      'markdown'    => 'text',
       'xcassets'    => 'folder.assetcatalog',
-      'xctest'      => 'wrapper.cfbundle'
+      'xcconfig'    => 'text.xcconfig',
+      'xcdatamodel' => 'wrapper.xcdatamodel',
+      'xcodeproj'   => 'wrapper.pb-project',
+      'xctest'      => 'wrapper.cfbundle',
+      'xib'         => 'file.xib',
     }.freeze
 
     # @return [Hash] The uniform type identifier of various product types.
@@ -96,6 +97,7 @@ module Xcodeproj
       :dynamic_library  => 'com.apple.product-type.library.dynamic',
       :static_library   => 'com.apple.product-type.library.static',
       :bundle           => 'com.apple.product-type.bundle',
+      :unit_test_bundle => 'com.apple.product-type.bundle.unit-test',
     }.freeze
 
     # @return [Hash] The extensions or the various product UTIs.
@@ -118,24 +120,24 @@ module Xcodeproj
         'SKIP_INSTALL'                      => 'YES',
         'DSTROOT'                           => '/tmp/xcodeproj.dst',
         'ALWAYS_SEARCH_USER_PATHS'          => 'NO',
-        'INSTALL_PATH'                      => "$(BUILT_PRODUCTS_DIR)",
+        'INSTALL_PATH'                      => '$(BUILT_PRODUCTS_DIR)',
         'OTHER_LDFLAGS'                     => '',
         'COPY_PHASE_STRIP'                  => 'YES',
       }.freeze,
       :debug => {
         'GCC_DYNAMIC_NO_PIC'                => 'NO',
-        'GCC_PREPROCESSOR_DEFINITIONS'      => ["DEBUG=1", "$(inherited)"],
+        'GCC_PREPROCESSOR_DEFINITIONS'      => ['DEBUG=1', '$(inherited)'],
         'GCC_SYMBOLS_PRIVATE_EXTERN'        => 'NO',
         'GCC_OPTIMIZATION_LEVEL'            => '0',
         'COPY_PHASE_STRIP'                  => 'NO',
       }.freeze,
       :release => {
-        'OTHER_CFLAGS'                      => ['-DNS_BLOCK_ASSERTIONS=1', "$(inherited)"],
-        'OTHER_CPLUSPLUSFLAGS'              => ['-DNS_BLOCK_ASSERTIONS=1', "$(inherited)"],
+        'OTHER_CFLAGS'                      => ['-DNS_BLOCK_ASSERTIONS=1', '$(inherited)'],
+        'OTHER_CPLUSPLUSFLAGS'              => ['-DNS_BLOCK_ASSERTIONS=1', '$(inherited)'],
       }.freeze,
       :ios => {
         'IPHONEOS_DEPLOYMENT_TARGET'        => '4.3',
-        'PUBLIC_HEADERS_FOLDER_PATH'        => "$(TARGET_NAME)",
+        'PUBLIC_HEADERS_FOLDER_PATH'        => '$(TARGET_NAME)',
         'SDKROOT'                           => 'iphoneos',
       }.freeze,
       :osx => {
@@ -164,8 +166,8 @@ module Xcodeproj
     PROJECT_DEFAULT_BUILD_SETTINGS = {
       :all => {
         'ALWAYS_SEARCH_USER_PATHS'         => 'NO',
-        'CLANG_CXX_LANGUAGE_STANDARD'      => "gnu++0x",
-        'CLANG_CXX_LIBRARY'                => "libc++",
+        'CLANG_CXX_LANGUAGE_STANDARD'      => 'gnu++0x',
+        'CLANG_CXX_LIBRARY'                => 'libc++',
         'CLANG_ENABLE_OBJC_ARC'            => 'YES',
         'CLANG_WARN_BOOL_CONVERSION'       => 'YES',
         'CLANG_WARN_CONSTANT_CONVERSION'   => 'YES',
@@ -193,7 +195,7 @@ module Xcodeproj
         'COPY_PHASE_STRIP'                 => 'YES',
         'GCC_DYNAMIC_NO_PIC'               => 'NO',
         'GCC_OPTIMIZATION_LEVEL'           => '0',
-        'GCC_PREPROCESSOR_DEFINITIONS'     => ["DEBUG=1", "$(inherited)"],
+        'GCC_PREPROCESSOR_DEFINITIONS'     => ['DEBUG=1', '$(inherited)'],
         'GCC_SYMBOLS_PRIVATE_EXTERN'       => 'NO',
       }.freeze,
     }.freeze
@@ -205,18 +207,17 @@ module Xcodeproj
       :absolute_path      =>  '0',
       :products_directory => '16',
       :wrapper            =>  '1',
-      :resources          =>  '7', #default
+      :resources          =>  '7', # default
       :executables        =>  '6',
       :java_resources     => '15',
       :frameworks         => '10',
       :shared_frameworks  => '11',
       :shared_support     => '12',
-      :plug_ins           => '13'
+      :plug_ins           => '13',
     }.freeze
 
     # @return [Hash] The extensions which are associated with header files.
     #
-    HEADER_FILES_EXTENSIONS = %w| .h .hh .hpp .ipp |.freeze
-
+    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp).freeze
   end
 end

data/lib/xcodeproj/differ.rb

@@ -1,5 +1,4 @@
 module Xcodeproj
-
   # Computes the recursive diff of Hashes, Array and other objects.
   #
   # Useful to compare two projects. Inspired from
@@ -23,7 +22,6 @@ module Xcodeproj
   #
   #
   module Differ
-
     # Computes the recursive difference of two given values.
     #
     # @param  [Object] value_1
@@ -58,7 +56,7 @@ module Xcodeproj
       else
         method = :generic_diff
       end
-      self.send(method, value_1, value_2, options)
+      send(method, value_1, value_2, options)
     end
 
     # Optimized for reducing the noise from the tree hash of projects
@@ -138,8 +136,8 @@ module Xcodeproj
           end
         end
 
-        new_objects_value_1 = new_objects_value_1 - matched_value_1
-        new_objects_value_2 = new_objects_value_2 - matched_value_2
+        new_objects_value_1 -= matched_value_1
+        new_objects_value_2 -= matched_value_2
       end
 
       if new_objects_value_1.empty? && new_objects_value_2.empty?
@@ -166,7 +164,7 @@ module Xcodeproj
 
       {
         options[:key_1] => value_1,
-        options[:key_2] => value_2
+        options[:key_2] => value_2,
       }
     end
 
@@ -209,7 +207,7 @@ module Xcodeproj
         when Hash
           clean_hash!(value, key)
         when Array
-          value.each { |entry| clean_hash!(entry, key) if entry.is_a?(Hash)}
+          value.each { |entry| clean_hash!(entry, key) if entry.is_a?(Hash) }
         end
       end
     end
@@ -237,7 +235,5 @@ module Xcodeproj
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end
-

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/helper.rb

@@ -14,15 +14,16 @@ module Xcodeproj
       end
 
       # @return [Array<PBXBuildFile>] A list of source files (that will be
-      #   compiled) which are in ‘target 2’ but not in ‘target 1’. The list is
-      #   sorted by file path.
+      #         compiled) which are in ‘target 2’ but not in ‘target 1’. The
+      #         list is sorted by file path.
       #
       def new_source_build_files
-        @target2.source_build_phase.files.reject do |target2_build_file|
+        new = @target2.source_build_phase.files.reject do |target2_build_file|
           @target1.source_build_phase.files.any? do |target1_build_file|
             target1_build_file.file_ref.path == target2_build_file.file_ref.path
           end
-        end.sort_by { |build_file| build_file.file_ref.path }
+        end
+        new.sort_by { |build_file| build_file.file_ref.path }
       end
     end
   end

data/lib/xcodeproj/plist_helper.rb

@@ -1,15 +1,12 @@
-begin
-  require 'libxml'
-rescue LoadError
-  Xcodeproj::UI.warn "Xcodeproj is using a fall back solution for parsing " \
-    "XML. To use a faster alternative install libxml:\n" \
-    "`$ gem install libxml-ruby`"
-end
 require 'cfpropertylist'
+require 'open3'
 
 module Xcodeproj
   # Provides support for loading and serializing property list files.
   #
+  # @note CFPropertyList will automatically pick up the `libxml` strategy or
+  #       other faster strategies, if their dependencies are available.
+  #
   module PlistHelper
     class << self
       # Serializes a hash as an XML property list file.
@@ -26,13 +23,24 @@ module Xcodeproj
             hash = hash.to_hash
           else
             raise TypeError, "The given `#{hash}`, must be a hash or " \
-              "respond to to_hash"
+              'respond to to_hash'
           end
         end
+
+        unless path.is_a?(String) || path.is_a?(Pathname)
+          raise TypeError, "The given `#{path}`, must be a string or " \
+            'pathname'
+        end
         plist = CFPropertyList::List.new
         options = { :convert_unknown_to_string => true }
         plist.value = CFPropertyList.guess(hash, options)
-        plist.save(path, CFPropertyList::List::FORMAT_XML)
+
+        if plutil_available?
+          contents = plist.to_str(CFPropertyList::List::FORMAT_XML)
+          plutil_save(contents, path)
+        else
+          plist.save(path, CFPropertyList::List::FORMAT_XML)
+        end
       end
 
       # @return [String] Returns the native objects loaded from a property list
@@ -83,13 +91,40 @@ module Xcodeproj
       # @note   This method was extracted to simplify testing.
       #
       def plutil_contents(path)
-        `plutil -convert xml1 "#{path}" -o -`
+        `#{plutil_bin} -convert xml1 "#{path}" -o -`
+      end
+
+      # Saves a property to an XML file via the plutil tool.
+      #
+      # @param  [#to_s] contents.
+      #         The contents of the property list.
+      #
+      # @param  [#to_s] path
+      #         The path of the file.
+      #
+      def plutil_save(contents, path)
+        Open3.popen3("#{plutil_bin} -convert xml1 -o '#{path}' -") do |stdin, stdout, _stderr|
+          stdin.puts(contents)
+          stdin.close
+          stdout.read # Make Ruby 1.8.7 wait
+        end
       end
 
       # @return [Bool] Whether the `plutil` tool is available.
       #
       def plutil_available?
-        system('which plutil > /dev/null 2>&1')
+        !plutil_bin.nil?
+      end
+
+      # @return [String] The path of the `plutil` tool.
+      # @return [Nil] In case the plutil is not found.
+      #
+      def plutil_bin
+        unless @bin
+          bin = `which plutil`.strip
+          @bin = bin if $?.success?
+        end
+        @bin
       end
     end
   end

data/lib/xcodeproj/project.rb

@@ -7,7 +7,6 @@ require 'xcodeproj/project/project_helper'
 require 'xcodeproj/project/xcproj_helper'
 
 module Xcodeproj
-
   # This class represents a Xcode project document.
   #
   # It can be used to manipulate existing documents or even create new ones
@@ -40,7 +39,6 @@ module Xcodeproj
   # consistent state.
   #
   class Project
-
     include Object
 
     # @return [Pathname] the path of the project.
@@ -64,7 +62,7 @@ module Xcodeproj
         initialize_from_scratch
       end
       unless skip_initialization.is_a?(TrueClass) || skip_initialization.is_a?(FalseClass)
-        raise ArgumentError, "[Xcodeproj] Initialization parameter expected to " \
+        raise ArgumentError, '[Xcodeproj] Initialization parameter expected to ' \
           "be a boolean #{skip_initialization}"
       end
     end
@@ -130,12 +128,16 @@ module Xcodeproj
       "#<#{self.class}> path:`#{path}` UUID:`#{root_object.uuid}`"
     end
 
-    alias :inspect :to_s
+    alias_method :inspect, :to_s
 
-    # @return [Bool] Whether the xcproj conversion should be disabled.
+    # @return [Bool] Whether the xcproj conversion should be disabled. The
+    #         conversion can be disable also via the
+    #         `XCODEPROJ_DISABLE_XCPROJ` environment variable.
     #
     attr_accessor :disable_xcproj
-
+    def disable_xcproj?
+      @disable_xcproj || ENV['XCODEPROJ_DISABLE_XCPROJ']
+    end
 
     public
 
@@ -182,16 +184,15 @@ module Xcodeproj
         raise "[Xcodeproj] Unable to find a root object in #{pbxproj_path}."
       end
 
-      if (archive_version.to_i > Constants::LAST_KNOWN_ARCHIVE_VERSION)
+      if archive_version.to_i > Constants::LAST_KNOWN_ARCHIVE_VERSION
         raise '[Xcodeproj] Unknown archive version.'
       end
 
-      if (object_version.to_i > Constants::LAST_KNOWN_OBJECT_VERSION)
+      if object_version.to_i > Constants::LAST_KNOWN_OBJECT_VERSION
         raise '[Xcodeproj] Unknown object version.'
       end
     end
 
-
     public
 
     # @!group Plist serialization
@@ -278,7 +279,7 @@ module Xcodeproj
       {
         'File References' => root_object.main_group.pretty_print.values.first,
         'Targets' => root_object.targets.map(&:pretty_print),
-        'Build Configurations' => build_configurations.sort_by(&:name).map(&:pretty_print)
+        'Build Configurations' => build_configurations.sort_by(&:name).map(&:pretty_print),
       }
     end
 
@@ -303,7 +304,7 @@ module Xcodeproj
       file = File.join(save_path, 'project.pbxproj')
       Xcodeproj::PlistHelper.write(to_hash, file)
       fix_encoding(file)
-      XCProjHelper.touch(save_path) unless disable_xcproj
+      XCProjHelper.touch(save_path) unless disable_xcproj?
     end
 
     # Simple workaround to escape characters which are outside of ASCII
@@ -337,7 +338,6 @@ module Xcodeproj
       File.open(filename, 'wb') { |file| file.write(output) }
     end
 
-
     public
 
     # @!group Creating objects
@@ -377,9 +377,7 @@ module Xcodeproj
     # @return [String] A UUID unique to the project.
     #
     def generate_uuid
-      while @available_uuids.empty?
-        generate_available_uuid_list
-      end
+      generate_available_uuid_list while @available_uuids.empty?
       @available_uuids.shift
     end
 
@@ -411,7 +409,6 @@ module Xcodeproj
       @available_uuids += uniques
     end
 
-
     public
 
     # @!group Convenience accessors
@@ -543,7 +540,6 @@ module Xcodeproj
       root_object.build_configuration_list.build_settings(name)
     end
 
-
     public
 
     # @!group Helpers
@@ -632,7 +628,9 @@ module Xcodeproj
     #
     def add_build_configuration(name, type)
       build_configuration_list = root_object.build_configuration_list
-      unless build_configuration_list[name]
+      if build_configuration = build_configuration_list[name]
+        build_configuration
+      else
         build_configuration = new(XCBuildConfiguration)
         build_configuration.name = name
         common_settings = Constants::PROJECT_DEFAULT_BUILD_SETTINGS
@@ -657,7 +655,6 @@ module Xcodeproj
       root_object.sort_recursively(options)
     end
 
-
     public
 
     # @!group Schemes
@@ -707,6 +704,5 @@ module Xcodeproj
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end