xcodeproj 0.28.2 → 1.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eae456c17889ae1b3dc65acb3e95122776f584f5
-  data.tar.gz: 30e4ee588cfccff194ad57520a64737e2bf7434e
+  metadata.gz: 55e5e01727aa2cef3b7bc6e1682340c8b795adfd
+  data.tar.gz: df9be60720e81d807f9206ef7e1aac6bbf2f47f2
 SHA512:
-  metadata.gz: e149c929d82e0593c8accbbdedd4bb6a23405b976aefcfb551d50381aada69b8b39725240ff4c34f99918c3aaa57c178cc939dae69537eb04516e1cb0ea5d3d9
-  data.tar.gz: 82e272ca562aae5487bd0ef985e411f1576a55b1e6056a3dd6b4434e88f5700632e236e06b98acad5d6af8acc8c292e3bca7d1c5a756a24a06bf79910e1934be
+  metadata.gz: e26720ad177f765056a554e514a9c4465aa94b4619fbd8947e0a221704926f8df605e8cc9a1a46c97e87dd4574023834e169144df4d0f4dce5e01460cfd937af
+  data.tar.gz: 72832c119af852d63ae64df30ebda2f7cb5090c83b57684b07b1cb57f3cd3686850c292dd2d66ece72c8ca3960ac54db87885aff33c0f60ea41df37e65da85fb

data/lib/xcodeproj.rb

@@ -20,7 +20,7 @@ module Xcodeproj
   autoload :Constants,        'xcodeproj/constants'
   autoload :Differ,           'xcodeproj/differ'
   autoload :Helper,           'xcodeproj/helper'
-  autoload :PlistHelper,      'xcodeproj/plist_helper'
+  autoload :Plist,            'xcodeproj/plist'
   autoload :Project,          'xcodeproj/project'
   autoload :Workspace,        'xcodeproj/workspace'
   autoload :XCScheme,         'xcodeproj/scheme'

data/lib/xcodeproj/command/config_dump.rb

@@ -23,7 +23,7 @@ module Xcodeproj
 
       def initialize(argv)
         self.xcodeproj_path = argv.shift_argument
-        @output_path  = Pathname(argv.shift_argument || '.')
+        @output_path = Pathname(argv.shift_argument || '.')
 
         super
       end

data/lib/xcodeproj/config.rb

@@ -82,7 +82,7 @@ module Xcodeproj
     def to_s(prefix = nil)
       include_lines = includes.map { |path| "#include \"#{normalized_xcconfig_path(path)}\"" }
       settings = to_hash(prefix).sort_by(&:first).map { |k, v| "#{k} = #{v}".strip }
-      [include_lines + settings].join("\n")
+      (include_lines + settings).join("\n") << "\n"
     end
 
     # Writes the serialized representation of the internal data to the given
@@ -275,9 +275,17 @@ module Xcodeproj
     #
     def merge_attributes!(attributes)
       @attributes.merge!(attributes) do |_, v1, v2|
-        v1, v2 = v1.strip, v2.strip
-        existing = v1.strip.shellsplit
-        existing.include?(v2) ? v1 : "#{v1} #{v2}"
+        v1 = v1.strip
+        v2 = v2.strip
+        v1_split = v1.shellsplit
+        v2_split = v2.shellsplit
+        if (v2_split - v1_split).empty? || v1_split.first(v2_split.size) == v2_split
+          v1
+        elsif v2_split.first(v1_split.size) == v1_split
+          v2
+        else
+          "#{v1} #{v2}"
+        end
       end
     end
 
@@ -317,7 +325,8 @@ module Xcodeproj
     def extract_key_value(line)
       match = line.match(KEY_VALUE_PATTERN)
       if match
-        key, value = match[1], match[2]
+        key = match[1]
+        value = match[2]
         [key.strip, value.strip]
       else
         []

data/lib/xcodeproj/config/other_linker_flags_parser.rb

@@ -8,7 +8,7 @@ module Xcodeproj
       # @return [Hash{Symbol, Array[String]}] Splits the given
       #         other linker flags value by type.
       #
-      # @param  [String] flags
+      # @param  [String, Array] flags
       #         The other linker flags value.
       #
       def self.parse(flags)
@@ -21,7 +21,10 @@ module Xcodeproj
         }
 
         key = nil
-        split(flags).each do |token|
+        if flags.is_a? String
+          flags = split(flags)
+        end
+        flags.each do |token|
           case token
           when '-framework'
             key = :frameworks

data/lib/xcodeproj/constants.rb

@@ -4,17 +4,17 @@ module Xcodeproj
   module Constants
     # @return [String] The last known iOS SDK (stable).
     #
-    LAST_KNOWN_IOS_SDK = '9.0'
+    LAST_KNOWN_IOS_SDK = '9.2'
 
     # @return [String] The last known OS X SDK (stable).
     #
-    LAST_KNOWN_OSX_SDK  = '10.11'
+    LAST_KNOWN_OSX_SDK = '10.11'
 
-    # @return [String] The last known tvOS SDK (unstable).
-    LAST_KNOWN_TVOS_SDK = '9.0'
+    # @return [String] The last known tvOS SDK (stable).
+    LAST_KNOWN_TVOS_SDK = '9.1'
 
-    # @return [String] The last known watchOS SDK.
-    LAST_KNOWN_WATCHOS_SDK = '2.0'
+    # @return [String] The last known watchOS SDK (stable).
+    LAST_KNOWN_WATCHOS_SDK = '2.1'
 
     # @return [String] The last known archive version to Xcodeproj.
     #
@@ -25,15 +25,15 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION  = 47
+    LAST_KNOWN_OBJECT_VERSION = 47
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_UPGRADE_CHECK  = '0700'
+    LAST_UPGRADE_CHECK = '0700'
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_SWIFT_UPGRADE_CHECK = '0700'
+    LAST_SWIFT_UPGRADE_CHECK = '0720'
 
     # @return [String] The version of `.xcscheme` files supported by Xcodeproj
     #
@@ -119,6 +119,7 @@ module Xcodeproj
       :watch2_app        => 'com.apple.product-type.application.watchapp2',
       :watch_extension   => 'com.apple.product-type.watchkit-extension',
       :watch2_extension  => 'com.apple.product-type.watchkit2-extension',
+      :tv_extension      => 'com.apple.product-type.tv-app-extension',
     }.freeze
 
     # @return [Hash] The extensions or the various product UTIs.
@@ -138,13 +139,16 @@ module Xcodeproj
     #
     COMMON_BUILD_SETTINGS = {
       :all => {
-        'PRODUCT_NAME'                      => '$(TARGET_NAME)',
         'ENABLE_STRICT_OBJC_MSGSEND'        => 'YES',
+        'GCC_NO_COMMON_BLOCKS'              => 'YES',
+        'PRODUCT_NAME'                      => '$(TARGET_NAME)',
       }.freeze,
       [:debug] => {
+        'DEBUG_INFORMATION_FORMAT'          => 'dwarf',
         'MTL_ENABLE_DEBUG_INFO'             => 'YES',
       }.freeze,
       [:release] => {
+        'DEBUG_INFORMATION_FORMAT'          => 'dwarf-with-dsym',
         'MTL_ENABLE_DEBUG_INFO'             => 'NO',
       }.freeze,
       [:ios] => {
@@ -163,23 +167,18 @@ module Xcodeproj
         # Empty?
       }.freeze,
       [:release, :osx] => {
-        'DEBUG_INFORMATION_FORMAT'          => 'dwarf-with-dsym',
+        # Empty?
       }.freeze,
       [:debug, :ios] => {
         # Empty?
       }.freeze,
       [:debug, :application, :swift] => {
         'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
-        'ENABLE_TESTABILITY'                => 'YES',
       }.freeze,
-      [:debug, :dynamic_library, :swift] => {
-        'ENABLE_TESTABILITY'                => 'YES',
-      }.freeze,
-      [:debug, :framework, :swift] => {
-        'ENABLE_TESTABILITY'                => 'YES',
+      [:debug, :swift] => {
+        'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
       }.freeze,
       [:debug, :static_library, :swift] => {
-        'ENABLE_TESTABILITY'                => 'YES',
       }.freeze,
       [:framework] => {
         'VERSION_INFO_PREFIX'               => '',
@@ -200,25 +199,43 @@ module Xcodeproj
       [:osx, :framework] => {
         'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/../Frameworks', '@loader_path/Frameworks'],
         'FRAMEWORK_VERSION'                 => 'A',
+        'CODE_SIGN_IDENTITY'                => '-',
         'COMBINE_HIDPI_IMAGES'              => 'YES',
       }.freeze,
+      [:watchos, :framework] => {
+        'APPLICATION_EXTENSION_API_ONLY'    => 'YES',
+        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
+        'TARGETED_DEVICE_FAMILY'            => '4',
+      }.freeze,
+      [:tvos, :framework] => {
+        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks', '@loader_path/Frameworks'],
+        'TARGETED_DEVICE_FAMILY'            => '3',
+      }.freeze,
       [:framework, :swift] => {
         'DEFINES_MODULE'                    => 'YES',
       }.freeze,
-      [:debug, :framework, :swift] => {
-        'SWIFT_OPTIMIZATION_LEVEL'          => '-Onone',
-      }.freeze,
       [:osx, :static_library] => {
+        'CODE_SIGN_IDENTITY'                => '-',
         'EXECUTABLE_PREFIX'                 => 'lib',
       }.freeze,
       [:ios, :static_library] => {
+        'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
+        'OTHER_LDFLAGS'                     => '-ObjC',
+        'SKIP_INSTALL'                      => 'YES',
+      }.freeze,
+      [:watchos, :static_library] => {
+        'OTHER_LDFLAGS'                     => '-ObjC',
+        'SKIP_INSTALL'                      => 'YES',
+      }.freeze,
+      [:tvos, :static_library] => {
         'OTHER_LDFLAGS'                     => '-ObjC',
         'SKIP_INSTALL'                      => 'YES',
       }.freeze,
       [:osx, :dynamic_library] => {
-        'EXECUTABLE_PREFIX'                 => 'lib',
+        'CODE_SIGN_IDENTITY'                => '-',
         'DYLIB_COMPATIBILITY_VERSION'       => '1',
         'DYLIB_CURRENT_VERSION'             => '1',
+        'EXECUTABLE_PREFIX'                 => 'lib',
       }.freeze,
       [:application] => {
         'ASSETCATALOG_COMPILER_APPICON_NAME' => 'AppIcon',
@@ -226,12 +243,26 @@ module Xcodeproj
       [:ios, :application] => {
         'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
         'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks'],
+        'TARGETED_DEVICE_FAMILY'            => '1,2',
       }.freeze,
       [:osx, :application] => {
         'COMBINE_HIDPI_IMAGES'              => 'YES',
         'CODE_SIGN_IDENTITY'                => '-',
         'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/../Frameworks'],
       }.freeze,
+      [:watchos, :application] => {
+        'SKIP_INSTALL'                      => 'YES',
+        'TARGETED_DEVICE_FAMILY'            => '4',
+      }.freeze,
+      [:watchos, :application, :swift] => {
+        'EMBEDDED_CONTENT_CONTAINS_SWIFT'   => 'YES',
+      }.freeze,
+      [:tvos, :application] => {
+        'ASSETCATALOG_COMPILER_APPICON_NAME' => 'App Icon & Top Shelf Image',
+        'ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME' => 'LaunchImage',
+        'TARGETED_DEVICE_FAMILY'            => '3',
+        'LD_RUNPATH_SEARCH_PATHS'           => ['$(inherited)', '@executable_path/Frameworks'],
+      }.freeze,
       [:bundle] => {
         'PRODUCT_NAME'                      => '$(TARGET_NAME)',
         'WRAPPER_EXTENSION'                 => 'bundle',
@@ -241,9 +272,10 @@ module Xcodeproj
         'SDKROOT'                           => 'iphoneos',
       }.freeze,
       [:osx, :bundle] => {
+        'CODE_SIGN_IDENTITY'                => '-',
         'COMBINE_HIDPI_IMAGES'              => 'YES',
-        'SDKROOT'                           => 'macosx',
         'INSTALL_PATH'                      => '$(LOCAL_LIBRARY_DIR)/Bundles',
+        'SDKROOT'                           => 'macosx',
       }.freeze,
     }.freeze
 
@@ -281,6 +313,7 @@ module Xcodeproj
       :debug => {
         'ONLY_ACTIVE_ARCH'                   => 'YES',
         'COPY_PHASE_STRIP'                   => 'NO',
+        'ENABLE_TESTABILITY'                 => 'YES',
         'GCC_DYNAMIC_NO_PIC'                 => 'NO',
         'GCC_OPTIMIZATION_LEVEL'             => '0',
         'GCC_PREPROCESSOR_DEFINITIONS'       => ['DEBUG=1', '$(inherited)'],
@@ -313,6 +346,6 @@ module Xcodeproj
 
     # @return [Array] The extensions which are associated with header files.
     #
-    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp).freeze
+    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def).freeze
   end
 end

data/lib/xcodeproj/differ.rb

@@ -43,8 +43,8 @@ module Xcodeproj
     # @return [Nil] if the given values are equal.
     #
     def self.diff(value_1, value_2, options = {})
-      options[:key_1]  ||= 'value_1'
-      options[:key_2]  ||= 'value_2'
+      options[:key_1] ||= 'value_1'
+      options[:key_2] ||= 'value_2'
       options[:id_key] ||= nil
 
       if value_1.class == value_2.class

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/plist.rb

@@ -0,0 +1,89 @@
+module Xcodeproj
+  # Provides support for loading and serializing property list files.
+  #
+  module Plist
+    autoload :FFI, 'xcodeproj/plist/ffi'
+    autoload :PlistGem, 'xcodeproj/plist/plist_gem'
+
+    # @return [Hash] Returns the native objects loaded from a property list
+    #         file.
+    #
+    # @param  [#to_s] path
+    #         The path of the file.
+    #
+    def self.read_from_path(path)
+      path = path.to_s
+      unless File.exist?(path)
+        raise Informative, "The plist file at path `#{path}` doesn't exist."
+      end
+      if file_in_conflict?(path)
+        raise Informative, "The file `#{path}` is in a merge conflict."
+      end
+      implementation.read_from_path(path)
+    end
+
+    # Serializes a hash as an XML property list file.
+    #
+    # @param  [#to_hash] hash
+    #         The hash to store.
+    #
+    # @param  [#to_s] path
+    #         The path of the file.
+    #
+    def self.write_to_path(hash, path)
+      if hash.respond_to?(:to_hash)
+        hash = hash.to_hash
+      else
+        raise TypeError, "The given `#{hash.inspect}` must respond " \
+                          "to #to_hash'."
+      end
+
+      unless path.is_a?(String) || path.is_a?(Pathname)
+        raise TypeError, "The given `#{path}` must be a string or 'pathname'."
+      end
+      path = path.to_s
+      raise IOError, 'Empty path.' if path.empty?
+      implementation.write_to_path(hash, path)
+    end
+
+    # The known modules that can serialize plists.
+    #
+    KNOWN_IMPLEMENTATIONS = [:FFI, :PlistGem]
+
+    class << self
+      # @return The module used to implement plist serialization.
+      #
+      attr_accessor :implementation
+      def implementation
+        @implementation ||= autoload_implementation
+      end
+    end
+
+    # Attempts to autoload a known plist implementation.
+    #
+    # @return a successfully loaded plist serialization implementation.
+    #
+    def self.autoload_implementation
+      failures = KNOWN_IMPLEMENTATIONS.map do |impl|
+        begin
+          impl = Plist.const_get(impl)
+          failure = impl.attempt_to_load!
+          return impl if failure.nil?
+          failure
+        rescue NameError, LoadError => e
+          e.message
+        end
+      end.compact
+      raise Informative, "Unable to load a plist implementation:\n\n#{failures.join("\n\n")}"
+    end
+
+    # @return [Bool] Checks whether there are merge conflicts in the file.
+    #
+    # @param  [#to_s] path
+    #         The path of the file.
+    #
+    def self.file_in_conflict?(path)
+      File.read(path).match(/^(<|=|>){7}/)
+    end
+  end
+end

data/lib/xcodeproj/plist/ffi.rb

@@ -0,0 +1,119 @@
+module Xcodeproj
+  module Plist
+    # Provides support for loading and serializing property list files via
+    # Fiddle and CoreFoundation / Xcode.
+    #
+    module FFI
+      autoload :CoreFoundation, 'xcodeproj/plist/ffi/core_foundation'
+      autoload :DevToolsCore,   'xcodeproj/plist/ffi/dev_tools_core'
+
+      class << self
+        # Attempts to load the `fiddle` and Xcode based plist serializer.
+        #
+        # @return [String,Nil] The loading error message, or `nil` if loading
+        #         was successful.
+        #
+        def attempt_to_load!
+          return @attempt_to_load if defined?(@attempt_to_load)
+          @attempt_to_load = begin
+            require 'fiddle'
+            nil
+          rescue LoadError
+            'Xcodeproj relies on a library called `fiddle` to read and write ' \
+            'Xcode project files. Ensure your Ruby installation includes ' \
+            '`fiddle` and try again.'
+          end
+        end
+
+        # Serializes a hash as an XML property list file.
+        #
+        # @param  [#to_hash] hash
+        #         The hash to store.
+        #
+        # @param  [#to_s] path
+        #         The path of the file.
+        #
+        def write_to_path(hash, path)
+          raise ThreadError, 'Can only write plists from the main thread.' unless Thread.current == Thread.main
+
+          if DevToolsCore.load_xcode_frameworks && path.end_with?('pbxproj')
+            ruby_hash_write_xcode(hash, path)
+          else
+            CoreFoundation.RubyHashPropertyListWrite(hash, path)
+            fix_encoding(path)
+          end
+        end
+
+        # @return [Hash] Returns the native objects loaded from a property list
+        #         file.
+        #
+        # @param  [#to_s] path
+        #         The path of the file.
+        #
+        def read_from_path(path)
+          CoreFoundation.RubyHashPropertyListRead(path)
+        end
+
+        private
+
+        # Simple workaround to escape characters which are outside of ASCII
+        # character-encoding. Relies on the fact that there are no XML characters
+        # which would need to be escaped.
+        #
+        # @note   This is necessary because Xcode (4.6 currently) uses the MacRoman
+        #         encoding unless the `// !$*UTF8*$!` magic comment is present. It
+        #         is not possible to serialize a plist using the NeXTSTEP format
+        #         without access to the private classes of Xcode and that comment
+        #         is not compatible with the XML format. For the complete
+        #         discussion see CocoaPods/CocoaPods#926.
+        #
+        #
+        # @note   Sadly this hack is not sufficient for supporting Emoji.
+        #
+        # @param  [String, Pathname] The path of the file which needs to be fixed.
+        #
+        # @return [void]
+        #
+        def fix_encoding(filename)
+          output = ''
+          input = File.open(filename, 'rb', &:read)
+          input.unpack('U*').each do |codepoint|
+            if codepoint > 127 # ASCII is 7-bit, so 0-127 are valid characters
+              output << "&##{codepoint};"
+            else
+              output << codepoint.chr
+            end
+          end
+          File.open(filename, 'wb') { |file| file.write(output) }
+        end
+
+        # Serializes a hash as an ASCII plist, using Xcode.
+        #
+        # @param  [Hash] hash
+        #         The hash to store.
+        #
+        # @param  [String] path
+        #         The path of the file.
+        #
+        def ruby_hash_write_xcode(hash, path)
+          path = File.expand_path(path)
+          success = true
+
+          begin
+            plist = DevToolsCore::CFDictionary.new(CoreFoundation.RubyHashToCFDictionary(hash))
+            data = DevToolsCore::NSData.new(plist.plistDescriptionUTF8Data)
+            success &= data.writeToFileAtomically(path)
+
+            project = DevToolsCore::PBXProject.new(path)
+            success &= project.writeToFileSystemProjectFile
+            project.close
+          rescue Fiddle::DLError
+            success = false
+          end
+
+          CoreFoundation.RubyHashPropertyListWrite(hash, path) unless success
+        end
+      end
+    end
+  end
+end