cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb

@@ -1,117 +1,114 @@
 module Pod
   module Generator
     module XCConfig
-
-    # Generates the private xcconfigs for the pod targets.
-    #
-    # The private xcconfig file for a Pod target merges the configuration
-    # values of the public namespaced xcconfig with the default private
-    # configuration values required by CocoaPods.
-    #
-    class PrivatePodXCConfig
-
-      # @return [Target] the target represented by this xcconfig.
+      # Generates the private xcconfigs for the pod targets.
       #
-      attr_reader :target
-
-      # @return [Xcodeproj::Config] The public xcconfig which this one will
-      #         use.
+      # The private xcconfig file for a Pod target merges the configuration
+      # values of the public namespaced xcconfig with the default private
+      # configuration values required by CocoaPods.
       #
-      attr_reader :public_xcconfig
+      class PrivatePodXCConfig
+        # @return [Target] the target represented by this xcconfig.
+        #
+        attr_reader :target
 
-      # @param  [Target] target @see target
-      # @param  [Xcodeproj::Config] public_xcconfig @see public_xcconfig
-      #
-      def initialize(target, public_xcconfig)
-        @target = target
-        @public_xcconfig = public_xcconfig
-      end
+        # @return [Xcodeproj::Config] The public xcconfig which this one will
+        #         use.
+        #
+        attr_reader :public_xcconfig
 
-      # @return [Xcodeproj::Config] The generated xcconfig.
-      #
-      attr_reader :xcconfig
+        # @param  [Target] target @see target
+        # @param  [Xcodeproj::Config] public_xcconfig @see public_xcconfig
+        #
+        def initialize(target, public_xcconfig)
+          @target = target
+          @public_xcconfig = public_xcconfig
+        end
 
-      # Generates and saves the xcconfig to the given path.
-      #
-      # @param  [Pathname] path
-      #         the path where the prefix header should be stored.
-      #
-      # @return [void]
-      #
-      def save_as(path)
-        generate.save_as(path)
-      end
+        # @return [Xcodeproj::Config] The generated xcconfig.
+        #
+        attr_reader :xcconfig
 
-      # Generates the xcconfig.
-      #
-      # @return [Xcodeproj::Config]
-      #
-      def generate
-        search_paths = target.build_headers.search_paths.concat(target.sandbox.public_headers.search_paths)
-        config = {
-          'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
-          'PODS_ROOT'  => '${SRCROOT}',
-          'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
-          'GCC_PREPROCESSOR_DEFINITIONS' => 'COCOAPODS=1',
-          # 'USE_HEADERMAP' => 'NO'
-        }
+        # Generates and saves the xcconfig to the given path.
+        #
+        # @param  [Pathname] path
+        #         the path where the prefix header should be stored.
+        #
+        # @return [void]
+        #
+        def save_as(path)
+          generate.save_as(path)
+        end
 
-        xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
-        @xcconfig = Xcodeproj::Config.new(xcconfig_hash)
-        @xcconfig.includes = [target.name]
-        @xcconfig
-      end
+        # Generates the xcconfig.
+        #
+        # @return [Xcodeproj::Config]
+        #
+        def generate
+          search_paths = target.build_headers.search_paths.concat(target.sandbox.public_headers.search_paths)
+          config = {
+            'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+            'PODS_ROOT'  => '${SRCROOT}',
+            'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
+            'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+            # 'USE_HEADERMAP' => 'NO'
+          }
 
-      private
+          xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
+          @xcconfig = Xcodeproj::Config.new(xcconfig_hash)
+          @xcconfig.includes = [target.name]
+          @xcconfig
+        end
 
-      #-----------------------------------------------------------------------#
+        private
 
-      # !@group Private Helpers
+        #-----------------------------------------------------------------------#
 
-      # Returns the hash representation of an xcconfig which inherit from the
-      # namespaced keys of a given one.
-      #
-      # @param  [Hash] source_config
-      #         The xcconfig whose keys need to be inherited.
-      #
-      # @param  [Hash] destination_config
-      #         The config which should inherit the source config keys.
-      #
-      # @return [Hash] The inheriting xcconfig.
-      #
-      def add_xcconfig_namespaced_keys(source_config, destination_config, prefix)
-        result = destination_config.dup
-        source_config.each do |key, value|
-          prefixed_key = prefix + conditional_less_key(key)
-          current_value = destination_config[key]
-          if current_value
-            result[key] = "#{current_value} ${#{prefixed_key}}"
-          else
-            result[key] = "${#{prefixed_key}}"
+        # !@group Private Helpers
+
+        # Returns the hash representation of an xcconfig which inherit from the
+        # namespaced keys of a given one.
+        #
+        # @param  [Hash] source_config
+        #         The xcconfig whose keys need to be inherited.
+        #
+        # @param  [Hash] destination_config
+        #         The config which should inherit the source config keys.
+        #
+        # @return [Hash] The inheriting xcconfig.
+        #
+        def add_xcconfig_namespaced_keys(source_config, destination_config, prefix)
+          result = destination_config.dup
+          source_config.each do |key, _value|
+            prefixed_key = prefix + conditional_less_key(key)
+            current_value = destination_config[key]
+            if current_value
+              result[key] = "#{current_value} ${#{prefixed_key}}"
+            else
+              result[key] = "${#{prefixed_key}}"
+            end
           end
+          result
         end
-        result
-      end
 
-      # Strips the [*]-syntax from the given xcconfig key.
-      #
-      # @param  [String] key
-      #         The key to strip.
-      #
-      # @return [String] The stripped key.
-      #
-      def conditional_less_key(key)
-        brackets_index = key.index('[')
-        if brackets_index
-          key[0...brackets_index]
-        else
-          key
+        # Strips the [*]-syntax from the given xcconfig key.
+        #
+        # @param  [String] key
+        #         The key to strip.
+        #
+        # @return [String] The stripped key.
+        #
+        def conditional_less_key(key)
+          brackets_index = key.index('[')
+          if brackets_index
+            key[0...brackets_index]
+          else
+            key
+          end
         end
-      end
-
-      #-----------------------------------------------------------------------#
 
-    end
+        #-----------------------------------------------------------------------#
+      end
   end
 end
 end

data/lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb

@@ -1,62 +1,59 @@
 module Pod
   module Generator
     module XCConfig
+      # Generates the public xcconfigs for the pod targets.
+      #
+      # The public xcconfig file for a Pod is completely namespaced to prevent
+      # configuration value collision with the build settings of other Pods. This
+      # xcconfig includes the standard podspec defined values including
+      # libraries, frameworks, weak frameworks and xcconfig overrides.
+      #
+      class PublicPodXCConfig
+        # @return [Target] the target represented by this xcconfig.
+        #
+        attr_reader :target
+
+        # @param  [Target] target @see target
+        #
+        def initialize(target)
+          @target = target
+        end
 
-    # Generates the public xcconfigs for the pod targets.
-    #
-    # The public xcconfig file for a Pod is completely namespaced to prevent
-    # configuration value collision with the build settings of other Pods. This
-    # xcconfig includes the standard podspec defined values including
-    # libraries, frameworks, weak frameworks and xcconfig overrides.
-    #
-    class PublicPodXCConfig
-
-      # @return [Target] the target represented by this xcconfig.
-      #
-      attr_reader :target
-
-      # @param  [Target] target @see target
-      #
-      def initialize(target)
-        @target = target
-      end
-
-      # @return [Xcodeproj::Config] The generated xcconfig.
-      #
-      attr_reader :xcconfig
-
-      # Generates and saves the xcconfig to the given path.
-      #
-      # @param  [Pathname] path
-      #         the path where the prefix header should be stored.
-      #
-      # @return [void]
-      #
-      def save_as(path)
-        generate.save_as(path, target.xcconfig_prefix)
-      end
+        # @return [Xcodeproj::Config] The generated xcconfig.
+        #
+        attr_reader :xcconfig
+
+        # Generates and saves the xcconfig to the given path.
+        #
+        # @param  [Pathname] path
+        #         the path where the prefix header should be stored.
+        #
+        # @return [void]
+        #
+        def save_as(path)
+          generate.save_as(path, target.xcconfig_prefix)
+        end
 
-      # Generates the xcconfig for the target.
-      #
-      # @return [Xcodeproj::Config]
-      #
-      def generate
-        @xcconfig = Xcodeproj::Config.new
-        target.file_accessors.each do |file_accessor|
-          XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, @xcconfig)
-          file_accessor.vendored_frameworks.each do |vendored_framework|
-            XCConfigHelper.add_framework_build_settings(vendored_framework, @xcconfig, target.sandbox.root)
-          end
-          file_accessor.vendored_libraries.each do |vendored_library|
-            XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
+        # Generates the xcconfig for the target.
+        #
+        # @return [Xcodeproj::Config]
+        #
+        def generate
+          @xcconfig = Xcodeproj::Config.new
+          target.file_accessors.each do |file_accessor|
+            XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, @xcconfig)
+            file_accessor.vendored_frameworks.each do |vendored_framework|
+              XCConfigHelper.add_framework_build_settings(vendored_framework, @xcconfig, target.sandbox.root)
+            end
+            file_accessor.vendored_libraries.each do |vendored_library|
+              XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
+            end
           end
+          @xcconfig
         end
-        @xcconfig
-      end
 
-      #-----------------------------------------------------------------------#
-
-    end
+        #-----------------------------------------------------------------------#
+      end
   end
 end
 end

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -1,11 +1,9 @@
 module Pod
   module Generator
     module XCConfig
-
       # Stores the shared logic of the classes of the XCConfig module.
       #
       module XCConfigHelper
-
         # Converts an array of strings to a single string where the each string
         # is surrounded by double quotes and separated by a space. Used to
         # represent strings in a xcconfig file.
@@ -19,7 +17,7 @@ module Pod
         #
         def self.quote(strings, prefix = nil)
           prefix = "#{prefix} " if prefix
-          strings.sort.map { |s| %W|#{prefix}"#{s}"| }.join(" ")
+          strings.sort.map { |s| %W(          #{prefix}"#{s}"          ) }.join(' ')
         end
 
         # @return [String] the default linker flags. `-ObjC` is always included
@@ -28,8 +26,8 @@ module Pod
         #
         def self.default_ld_flags(target)
           ld_flags = '-ObjC'
-          if target.target_definition.podfile.set_arc_compatibility_flag? and
-            target.spec_consumers.any? { |consumer| consumer.requires_arc? }
+          if target.target_definition.podfile.set_arc_compatibility_flag? &&
+            target.spec_consumers.any?(&:requires_arc?)
             ld_flags << ' -fobjc-arc'
           end
           ld_flags
@@ -62,11 +60,11 @@ module Pod
         #         The xcconfig to edit.
         #
         def self.add_framework_build_settings(framework_path, xcconfig, sandbox_root)
-          name = File.basename(framework_path, ".framework")
+          name = File.basename(framework_path, '.framework')
           dirname = '$(PODS_ROOT)/' + framework_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'OTHER_LDFLAGS' => "-framework #{name}",
-            'FRAMEWORK_SEARCH_PATHS' => quote([dirname])
+            'FRAMEWORK_SEARCH_PATHS' => quote([dirname]),
           }
           xcconfig.merge!(build_settings)
         end
@@ -81,11 +79,11 @@ module Pod
         #         The xcconfig to edit.
         #
         def self.add_library_build_settings(library_path, xcconfig, sandbox_root)
-          name = File.basename(library_path, ".a").sub(/\Alib/, '')
+          name = File.basename(library_path, '.a').sub(/\Alib/, '')
           dirname = '$(PODS_ROOT)/' + library_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'OTHER_LDFLAGS' => "-l#{name}",
-            'LIBRARY_SEARCH_PATHS' => quote([dirname])
+            'LIBRARY_SEARCH_PATHS' => quote([dirname]),
           }
           xcconfig.merge!(build_settings)
         end
@@ -101,7 +99,7 @@ module Pod
         # @return [void]
         #
         def self.add_developers_frameworks_if_needed(xcconfig, platform)
-          matched_frameworks = xcconfig.frameworks & ['XCTest', 'SenTestingKit']
+          matched_frameworks = xcconfig.frameworks & %w(XCTest SenTestingKit)
           unless matched_frameworks.empty?
             search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
             search_paths_to_add = []
@@ -111,6 +109,8 @@ module Pod
             else
               search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
             end
+            frameworks_path = '"$(PLATFORM_DIR)/Developer/Library/Frameworks"'
+            search_paths_to_add << frameworks_path
             search_paths_to_add.each do |search_path|
               unless search_paths.include?(search_path)
                 search_paths << ' ' unless search_paths.empty?

data/lib/cocoapods/hooks/installer_representation.rb

@@ -1,28 +1,27 @@
 module Pod
-
+  # @todo: Remove by CocoaPods 1.0
+  #
   class Podfile
     def config
-      UI.warn "Podfile#config is deprecated. The config is accessible from " \
-        "the parameter passed to the hooks"
+      UI.warn 'Podfile#config is deprecated. The config is accessible from ' \
+        'the parameter passed to the hooks'
       Config.instance
     end
-  end
 
-  class Podfile::TargetDefinition
-    def copy_resources_script_name
-      UI.warn "TargetDefinition#copy_resources_script_name is deprecated. " \
-        "The value is accessible directly from the representation of the " \
-        "library using the #copy_resources_script_path method."
-      Config.instance.sandbox.root + "#{label}-resources.sh"
+    class TargetDefinition
+      def copy_resources_script_name
+        UI.warn 'TargetDefinition#copy_resources_script_name is deprecated. ' \
+          'The value is accessible directly from the representation of the ' \
+          'library using the #copy_resources_script_path method.'
+        Config.instance.sandbox.root + "#{label}-resources.sh"
+      end
     end
   end
 
   module Hooks
-
     # The installer representation to pass to the hooks.
     #
     class InstallerRepresentation
-
       public
 
       # @!group Public Hooks API
@@ -79,15 +78,16 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
+
       public
 
       # @!group Compatibility
       #
       # The following aliases provides compatibility with CP < 0.17
 
-      alias :target_installers :libraries
-      alias :specs_by_target :specs_by_lib
-      alias :local_pods_by_target :pods_by_lib
+      alias_method :target_installers, :libraries
+      alias_method :specs_by_target, :specs_by_lib
+      alias_method :local_pods_by_target, :pods_by_lib
 
       #-----------------------------------------------------------------------#
 
@@ -126,9 +126,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end
-
-