cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/generator/dummy_source.rb

@@ -10,11 +10,11 @@ module Pod
 
       def save_as(pathname)
         pathname.open('w') do |source|
-          source.puts "#import <Foundation/Foundation.h>"
+          source.puts '#import <Foundation/Foundation.h>'
           source.puts "@interface #{class_name} : NSObject"
-          source.puts "@end"
+          source.puts '@end'
           source.puts "@implementation #{class_name}"
-          source.puts "@end"
+          source.puts '@end'
         end
       end
     end

data/lib/cocoapods/generator/prefix_header.rb

@@ -1,6 +1,5 @@
 module Pod
   module Generator
-
     # Generates a prefix header file for a Pods library. The prefix header is
     # generated according to the platform of the target and the pods.
     #
@@ -8,19 +7,18 @@ module Pod
     # `Cocoa/Cocoa.h`.
     #
     class PrefixHeader
+      # @return [Array<FileAccessor>] The file accessors for which to generate
+      #         the prefix header.
+      #
+      attr_reader :file_accessors
 
       # @return [Platform] the platform for which the prefix header will be
       #         generated.
       #
-      attr_reader :file_accessors
       attr_reader :platform
 
-      # @return [Array<LocalPod>] the LocalPod for the target for which the
-      #         prefix header needs to be generated.
-      #
-      # attr_reader :consumers
-
-      # @return [Array<String>] any header to import (with quotes).
+      # @return [Array<String>] The list of the headers to import (with
+      #         quotes).
       #
       attr_reader :imports
 
@@ -40,12 +38,14 @@ module Pod
       #         added to the top of the prefix header. For OS X `Cocoa/Cocoa.h`
       #         is imported.
       #
-      # @note   Only unique prefix_header_contents are added to the prefix header.
+      # @note   Only unique prefix_header_contents are added to the prefix
+      #         header.
       #
       # @return [String]
       #
       # @todo   Subspecs can specify prefix header information too.
-      # @todo   Check to see if we have a similar duplication issue with file_accessor.prefix_header.
+      # @todo   Check to see if we have a similar duplication issue with
+      #         file_accessor.prefix_header.
       #
       def generate
         result =  "#ifdef __OBJC__\n"
@@ -53,20 +53,20 @@ module Pod
         result << "#endif\n"
 
         imports.each do |import|
-          result << %|\n#import "#{import}"|
+          result << %(\n#import "#{import}")
         end
 
-        unique_prefix_header_contents = file_accessors.collect do |file_accessor|
+        unique_prefix_header_contents = file_accessors.map do |file_accessor|
           file_accessor.spec_consumer.prefix_header_contents
         end.compact.uniq
-        
+
         result << "\n"
-        
+
         unique_prefix_header_contents.each do |prefix_header_contents|
           result << prefix_header_contents
           result << "\n"
         end
-        
+
         file_accessors.each do |file_accessor|
           if prefix_header = file_accessor.prefix_header
             result << Pathname(prefix_header).read
@@ -85,7 +85,6 @@ module Pod
       def save_as(path)
         path.open('w') { |header| header.write(generate) }
       end
-
     end
   end
 end

data/lib/cocoapods/generator/target_environment_header.rb

@@ -1,6 +1,7 @@
+require 'active_support/core_ext/string/strip'
+
 module Pod
   module Generator
-
     # Generates a header which allows to inspect at compile time the installed
     # pods and the installed specifications of a pod.
     #
@@ -22,15 +23,15 @@ module Pod
     #     #endif
     #
     class TargetEnvironmentHeader
-
-      # @return [Array<LocalPod>] the specifications installed for the target.
+      # @return [Hash{String => LocalPod}] the specifications installed for
+      #         the target by build configuration name.
       #
-      attr_reader :specs
+      attr_reader :specs_by_configuration
 
-      # @param  [Array<LocalPod>] pods @see pods
+      # @param  [Array<Specification>] pods @see pods
       #
-      def initialize(specs)
-        @specs = specs
+      def initialize(specs_by_configuration)
+        @specs_by_configuration = specs_by_configuration
       end
 
       # Generates and saves the file.
@@ -40,47 +41,132 @@ module Pod
       #
       # @return [void]
       #
-      def save_as(pathname)
-        pathname.open('w') do |source|
-          source.puts
-          source.puts "// To check if a library is compiled with CocoaPods you"
-          source.puts "// can use the `COCOAPODS` macro definition which is"
-          source.puts "// defined in the xcconfigs so it is available in"
-          source.puts "// headers also when they are imported in the client"
-          source.puts "// project."
-          source.puts
-          source.puts
-          specs.each do |spec|
-            spec_name = safe_spec_name(spec.name)
-            source.puts "// #{spec.name}"
-            source.puts "#define COCOAPODS_POD_AVAILABLE_#{spec_name}"
-            if spec.version.semantic?
-              source.puts "#define COCOAPODS_VERSION_MAJOR_#{spec_name} #{spec.version.major}"
-              source.puts "#define COCOAPODS_VERSION_MINOR_#{spec_name} #{spec.version.minor}"
-              source.puts "#define COCOAPODS_VERSION_PATCH_#{spec_name} #{spec.version.patch}"
-            else
-              source.puts "// This library does not follow semantic-versioning,"
-              source.puts "// so we were not able to define version macros."
-              source.puts "// Please contact the author."
-              source.puts "// Version: #{spec.version}."
-            end
-            source.puts
-          end
+      def generate
+        result = "\n#{notice}\n\n"
+        common_specs = common_specs(specs_by_configuration)
+        common_specs.each { |spec| result << spec_defines(spec) }
+
+        specs_by_config = specs_scoped_by_configuration(common_specs, specs_by_configuration)
+        specs_by_config.each do |config, specs|
+          result << "// #{config} build configuration\n"
+          result << "#ifdef #{config.gsub(' ', '_').upcase}\n\n"
+          specs.each { |spec| result << spec_defines(spec, 1) }
+          result << "#endif\n"
         end
+        result
       end
 
-      #-----------------------------------------------------------------------#
+      def save_as(path)
+        path.open('w') { |header| header.write(generate) }
+      end
 
       private
 
       # !@group Private Helpers
+      #-----------------------------------------------------------------------#
 
+      # @return [Array<Specification>] The list of the specifications present
+      #         in all build configurations sorted by name.
+      #
+      # @param  [Hash{String => Array<Specification>}] specs_by_configuration
+      #         The specs grouped by build configuration.
+      #
+      def common_specs(specs_by_configuration)
+        result = specs_by_configuration.values.flatten.uniq
+        specs_by_configuration.values.each do |configuration_specs|
+          result = result & configuration_specs
+        end
+        result.sort_by(&:name)
+      end
+
+      # @return [Hash{String => Array<Specification>}] The list of the
+      #         specifications not present in all build configurations sorted
+      #         by name and grouped by build configuration name.
+      #
+      # @param  [Hash{String => Array<Specification>}] specs_by_configuration
+      #         The specs grouped by build configuration.
+      #
+      def specs_scoped_by_configuration(common_specs, specs_by_configuration)
+        result = {}
+        specs_by_configuration.each do |configuration, all_specs|
+          specs = all_specs.sort_by(&:name) - common_specs
+          result[configuration] = specs unless specs.empty?
+        end
+        result
+      end
+
+      # @return The sanitized name of a specification to make it suitable to be
+      #         used as part of an identifier of a define statement.
+      #
+      # @param  [String] spec_name
+      #         The name of the spec.
+      #
       def safe_spec_name(spec_name)
-        spec_name.gsub(/[^\w]/,'_')
+        spec_name.gsub(/[^\w]/, '_')
       end
 
-      #-----------------------------------------------------------------------#
+      # @return [String]
+      #
+      def notice
+        <<-DOC.strip_heredoc
+          // To check if a library is compiled with CocoaPods you
+          // can use the `COCOAPODS` macro definition which is
+          // defined in the xcconfigs so it is available in
+          // headers also when they are imported in the client
+          // project.
+        DOC
+      end
+
+      # @return [String]
+      #
+      def spec_defines(spec, indent_count = 0)
+        spec_name = safe_spec_name(spec.name)
+        result = "// #{spec.name}\n"
+        result << "#define COCOAPODS_POD_AVAILABLE_#{spec_name}\n"
+        if spec.version.semantic?
+          result << semantic_version_defines(spec)
+        else
+          result << non_semantic_version_notice(spec)
+        end
+        result << "\n"
+        indent(result, indent_count)
+      end
 
+      def indent(string, indent_count)
+        indent = ' ' * (indent_count * 2)
+        lines = string.lines.map do |line|
+          if line == "\n"
+            line
+          else
+            "#{indent}#{line}"
+          end
+        end
+        lines.join
+      end
+
+      # @return [String]
+      #
+      def semantic_version_defines(spec)
+        spec_name = safe_spec_name(spec.name)
+        <<-DOC.strip_heredoc
+          #define COCOAPODS_VERSION_MAJOR_#{spec_name} #{spec.version.major}
+          #define COCOAPODS_VERSION_MINOR_#{spec_name} #{spec.version.minor}
+          #define COCOAPODS_VERSION_PATCH_#{spec_name} #{spec.version.patch}
+        DOC
+      end
+
+      # @return [String]
+      #
+      def non_semantic_version_notice(spec)
+        <<-DOC.strip_heredoc
+          // This library does not follow semantic-versioning,
+          // so we were not able to define version macros.
+          // Please contact the author.
+          // Version: #{spec.version}.
+        DOC
+      end
+
+      #-----------------------------------------------------------------------#
     end
   end
 end

data/lib/cocoapods/generator/xcconfig.rb

@@ -1,18 +1,14 @@
 module Pod
   module Generator
-
     # Generates Xcode configuration files. A configuration file is generated
     # for each Pod and for each Pod target definition. The aggregates the
     # configurations of the Pods and define target specific settings.
     #
     module XCConfig
-
       autoload :AggregateXCConfig,  'cocoapods/generator/xcconfig/aggregate_xcconfig'
       autoload :PublicPodXCConfig,  'cocoapods/generator/xcconfig/public_pod_xcconfig'
       autoload :PrivatePodXCConfig, 'cocoapods/generator/xcconfig/private_pod_xcconfig'
       autoload :XCConfigHelper,     'cocoapods/generator/xcconfig/xcconfig_helper'
-
     end
   end
 end
-

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

@@ -1,82 +1,91 @@
 module Pod
   module Generator
     module XCConfig
-
-    # Generates the xcconfigs for the aggregate targets.
-    #
-    class AggregateXCConfig
-
-      # @return [Target] the target represented by this xcconfig.
+      # Generates the xcconfigs for the aggregate targets.
       #
-      attr_reader :target
+      class AggregateXCConfig
+        # @return [Target] the target represented by this xcconfig.
+        #
+        attr_reader :target
 
-      # @param  [Target] target @see target
-      #
-      def initialize(target)
-        @target = target
-      end
+        # @param  [Target] target @see target
+        #
+        # @param  [String] configuration_name
+        #         The name of the build configuration to generate this xcconfig
+        #         for.
+        #
+        def initialize(target, configuration_name)
+          @target = target
+          @configuration_name = configuration_name
+        end
 
-      # @return [Xcodeproj::Config] The generated xcconfig.
-      #
-      attr_reader :xcconfig
+        # @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)
-      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
 
-      # Generates the xcconfig.
-      #
-      # @note   The xcconfig file for a Pods integration target includes the
-      #         namespaced xcconfig files for each spec target dependency.
-      #         Each namespaced configuration value is merged into the Pod
-      #         xcconfig file.
-      #
-      # @todo   This doesn't include the specs xcconfigs anymore and now the
-      #         logic is duplicated.
-      #
-      # @return [Xcodeproj::Config]
-      #
-      def generate
-        header_search_path_flags = target.sandbox.public_headers.search_paths
-        @xcconfig = Xcodeproj::Config.new({
-          'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
-          'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(target.sandbox.public_headers.search_paths),
-          'PODS_ROOT' => target.relative_pods_root,
-          'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
-          'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_path_flags, '-isystem')
-        })
+        # Generates the xcconfig.
+        #
+        # @note   The xcconfig file for a Pods integration target includes the
+        #         namespaced xcconfig files for each spec target dependency.
+        #         Each namespaced configuration value is merged into the Pod
+        #         xcconfig file.
+        #
+        # @todo   This doesn't include the specs xcconfigs anymore and now the
+        #         logic is duplicated.
+        #
+        # @return [Xcodeproj::Config]
+        #
+        def generate
+          header_search_path_flags = target.sandbox.public_headers.search_paths
+          @xcconfig = Xcodeproj::Config.new(
+                                              'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+                                              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(target.sandbox.public_headers.search_paths),
+                                              'PODS_ROOT' => target.relative_pods_root,
+                                              'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+                                              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_path_flags, '-isystem')
+                                            )
 
-        target.pod_targets.each do |pod_target|
-          pod_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)
+          target.pod_targets.each do |pod_target|
+            next unless pod_target.include_in_build_config?(@configuration_name)
+
+            pod_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
-          end
-        end
 
-        # TODO Need to decide how we are going to ensure settings like these
-        # are always excluded from the user's project.
-        #
-        # See https://github.com/CocoaPods/CocoaPods/issues/1216
-        @xcconfig.attributes.delete('USE_HEADERMAP')
+            # Add pod static lib to list of libraries that are to be linked with
+            # the user’s project.
 
-        @xcconfig
-      end
+            @xcconfig.merge!('OTHER_LDFLAGS' => %(-l "#{pod_target.name}"))
+          end
+
+          # TODO Need to decide how we are going to ensure settings like these
+          # are always excluded from the user's project.
+          #
+          # See https://github.com/CocoaPods/CocoaPods/issues/1216
+          @xcconfig.attributes.delete('USE_HEADERMAP')
 
-      #-----------------------------------------------------------------------#
+          @xcconfig
+        end
 
-    end
+        #---------------------------------------------------------------------#
+      end
   end
 end
 end