cocoapods 0.35.0 → 0.36.0.beta.1

data/lib/cocoapods/generator/module_map.rb

@@ -0,0 +1,49 @@
+module Pod
+  module Generator
+    # Generates LLVM module map files. A module map file is generated for each
+    # Pod and for each Pod target definition that is built as a framework. It
+    # specifies a different umbrella header than usual to avoid name conflicts
+    # with existing headers of the podspec.
+    #
+    class ModuleMap
+      # @return [Target] the target represented by this Info.plist.
+      #
+      attr_reader :target
+
+      # @param  [Target] target @see target
+      #
+      def initialize(target)
+        @target = target
+      end
+
+      # Generates and saves the Info.plist to the given path.
+      #
+      # @param  [Pathname] path
+      #         the path where the prefix header should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        contents = generate
+        path.open('w') do |f|
+          f.write(contents)
+        end
+      end
+
+      # Generates the contents of the module.modulemap file.
+      #
+      # @return [String]
+      #
+      def generate
+        <<-eos.strip_heredoc
+          framework module #{target.product_module_name} {
+            umbrella header "#{target.umbrella_header_path.basename}"
+
+            export *
+            module * { export * }
+          }
+        eos
+      end
+    end
+  end
+end

data/lib/cocoapods/generator/umbrella_header.rb

@@ -0,0 +1,44 @@
+module Pod
+  module Generator
+    # Generates an umbrella header file for clang modules, which are used by
+    # dynamic frameworks on iOS 8 and OSX 10.10 under the hood.
+    #
+    # If the target is a +PodTarget+, then the umbrella header is required
+    # to make all public headers in a convenient manner available without the
+    # need to write out header declarations for every library header.
+    #
+    class UmbrellaHeader < Header
+      # @return [Target]
+      #         the target, which provides the product name
+      attr_reader :target
+
+      # @param  [Target] target
+      #         @see target
+      #
+      def initialize(target)
+        super(target.target_definition.platform)
+        @target = target
+      end
+
+      # Generates the contents of the umbrella header according to the included
+      # pods.
+      #
+      # @return [String]
+      #
+      def generate
+        result = super
+
+        result << "\n"
+
+        result << <<-eos.strip_heredoc
+        FOUNDATION_EXPORT double #{target.product_module_name}VersionNumber;
+        FOUNDATION_EXPORT const unsigned char #{target.product_module_name}VersionString[];
+        eos
+
+        result << "\n"
+
+        result
+      end
+    end
+  end
+end

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

@@ -47,33 +47,58 @@ module Pod
         # @return [Xcodeproj::Config]
         #
         def generate
-          header_search_path_flags = target.sandbox.public_headers.search_paths(target.platform)
-          @xcconfig = Xcodeproj::Config.new(
-                                              'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
-                                              'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
-                                              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_path_flags),
-                                              'PODS_ROOT' => target.relative_pods_root,
-                                              'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
-                                              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_path_flags, '-isystem')
-                                            )
+          pod_targets = target.pod_targets_for_build_configuration(@configuration_name)
+          config = {
+            'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
+            'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
+            'PODS_ROOT' => target.relative_pods_root,
+            'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
+          }
 
-          target.pod_targets.each do |pod_target|
-            next unless pod_target.include_in_build_config?(@configuration_name)
+          if target.requires_frameworks?
+            # Framework headers are automatically discoverable by `#import <…>`.
+            header_search_paths = pod_targets.map { |target| "$PODS_FRAMEWORK_BUILD_PATH/#{target.product_name}/Headers" }
+            build_settings = {
+              'PODS_FRAMEWORK_BUILD_PATH' => target.configuration_build_dir,
+              'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
+              # Make headers discoverable by `import "…"`
+              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote')
+            }
+            config.merge!(build_settings)
+          else
+            # Make headers discoverable from $PODS_ROOT/Headers directory
+            header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
+            build_settings = {
+              # by `#import "…"`
+              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
+              # by `#import <…>`
+              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem')
+            }
+            config.merge!(build_settings)
+          end
 
-            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
+          @xcconfig = Xcodeproj::Config.new(config)
 
-            # Add pod static lib to list of libraries that are to be linked with
-            # the user’s project.
+          XCConfigHelper.add_target_specific_settings(target, @xcconfig)
 
-            @xcconfig.merge!('OTHER_LDFLAGS' => %(-l "#{pod_target.name}"))
+          pod_targets.each do |pod_target|
+            unless pod_target.should_build? && pod_target.requires_frameworks?
+              # In case of generated pod targets, which require frameworks, the
+              # vendored frameworks and libraries are already linked statically
+              # into the framework binary and must not be linked again to the
+              # user target.
+              XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, @xcconfig)
+            end
+
+            # Add pod target to list of frameworks / libraries that are
+            # linked with the user’s project.
+            if pod_target.should_build?
+              if pod_target.requires_frameworks?
+                @xcconfig.merge!('OTHER_LDFLAGS' => %(-framework "#{pod_target.product_basename}"))
+              else
+                @xcconfig.merge!('OTHER_LDFLAGS' => %(-l "#{pod_target.product_basename}"))
+              end
+            end
           end
 
           # TODO Need to decide how we are going to ensure settings like these
@@ -82,9 +107,30 @@ module Pod
           # See https://github.com/CocoaPods/CocoaPods/issues/1216
           @xcconfig.attributes.delete('USE_HEADERMAP')
 
+          generate_ld_runpath_search_paths if target.requires_frameworks?
+
           @xcconfig
         end
 
+        def generate_ld_runpath_search_paths
+          ld_runpath_search_paths = ['$(inherited)']
+          if target.platform.symbolic_name == :osx
+            ld_runpath_search_paths << "'@executable_path/../Frameworks'"
+            ld_runpath_search_paths << \
+              if target.native_target.symbol_type == :unit_test_bundle
+                "'@loader_path/../Frameworks'"
+              else
+                "'@loader_path/Frameworks'"
+              end
+          else
+            ld_runpath_search_paths << [
+              "'@executable_path/Frameworks'",
+              "'@loader_path/Frameworks'"
+            ]
+          end
+          @xcconfig.merge!('LD_RUNPATH_SEARCH_PATHS' => ld_runpath_search_paths.join(' '))
+        end
+
         #---------------------------------------------------------------------#
       end
   end

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

@@ -57,8 +57,20 @@ module Pod
             # 'USE_HEADERMAP' => 'NO'
           }
 
+          if target.requires_frameworks?
+            # Only quote the FRAMEWORK_SEARCH_PATHS entry, because it’s a setting that takes multiple values.
+            # In addition, quoting CONFIGURATION_BUILD_DIR would make it be interpreted as a relative path.
+            build_settings = {
+              'PODS_FRAMEWORK_BUILD_PATH' => target.configuration_build_dir,
+              'CONFIGURATION_BUILD_DIR' => '$PODS_FRAMEWORK_BUILD_PATH',
+              'FRAMEWORK_SEARCH_PATHS' => '"$PODS_FRAMEWORK_BUILD_PATH"',
+            }
+            config.merge!(build_settings)
+          end
+
           xcconfig_hash = add_xcconfig_namespaced_keys(public_xcconfig.to_hash, config, target.xcconfig_prefix)
           @xcconfig = Xcodeproj::Config.new(xcconfig_hash)
+          XCConfigHelper.add_target_specific_settings(target, @xcconfig)
           @xcconfig.includes = [target.name]
           @xcconfig
         end

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

@@ -40,15 +40,7 @@ module Pod
         #
         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
+          XCConfigHelper.add_settings_for_file_accessors_of_target(target, @xcconfig)
           @xcconfig
         end
 

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

@@ -33,6 +33,26 @@ module Pod
           ld_flags
         end
 
+        # Configures the given Xcconfig
+        #
+        # @param  [PodTarget] pod_target
+        #         The pod target, which holds the list of +Spec::FileAccessor+.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_settings_for_file_accessors_of_target(target, xcconfig)
+          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
+
         # Configures the given Xcconfig according to the build settings of the
         # given Specification.
         #
@@ -59,6 +79,9 @@ module Pod
         # @param  [Xcodeproj::Config] xcconfig
         #         The xcconfig to edit.
         #
+        # @param  [Pathname] sandbox_root
+        #         The path retrieved from Sandbox#root.
+        #
         def self.add_framework_build_settings(framework_path, xcconfig, sandbox_root)
           name = File.basename(framework_path, '.framework')
           dirname = '$(PODS_ROOT)/' + framework_path.dirname.relative_path_from(sandbox_root).to_s
@@ -70,7 +93,7 @@ module Pod
         end
 
         # Configures the given Xcconfig with the the build settings for the given
-        # framework path.
+        # library path.
         #
         # @param  [Pathanme] framework_path
         #         The path of the framework.
@@ -78,6 +101,9 @@ module Pod
         # @param  [Xcodeproj::Config] xcconfig
         #         The xcconfig to edit.
         #
+        # @param  [Pathname] sandbox_root
+        #         The path retrieved from Sandbox#root.
+        #
         def self.add_library_build_settings(library_path, xcconfig, sandbox_root)
           name = File.basename(library_path, '.a').sub(/\Alib/, '')
           dirname = '$(PODS_ROOT)/' + library_path.dirname.relative_path_from(sandbox_root).to_s
@@ -88,6 +114,58 @@ module Pod
           xcconfig.merge!(build_settings)
         end
 
+        # Add the code signing settings for generated targets to ensure that
+        # frameworks are correctly signed to be integrated and re-signed when
+        # building the application and embedding the framework
+        #
+        # @param  [Target] target
+        #         The target.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_code_signing_settings(target, xcconfig)
+          build_settings = {}
+          if target.platform.to_sym == :osx
+            build_settings['CODE_SIGN_IDENTITY'] = ''
+          end
+          xcconfig.merge!(build_settings)
+        end
+
+        # Checks if the given target requires specific settings and configures
+        # the given Xcconfig.
+        #
+        # @param  [Target] target
+        #         The target.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_target_specific_settings(target, xcconfig)
+          if target.requires_frameworks?
+            add_code_signing_settings(target, xcconfig)
+          end
+          add_language_specific_settings(target, xcconfig)
+        end
+
+        # Checks if the given target requires language specific settings and
+        # configures the given Xcconfig.
+        #
+        # @param  [Target] target
+        #         The target.
+        #
+        # @param  [Xcodeproj::Config] xcconfig
+        #         The xcconfig to edit.
+        #
+        def self.add_language_specific_settings(target, xcconfig)
+          if target.uses_swift?
+            build_settings = {
+              'OTHER_SWIFT_FLAGS' => quote(['-D COCOAPODS']),
+            }
+            xcconfig.merge!(build_settings)
+          end
+        end
+
         # Adds the search paths of the developer frameworks to the specification
         # if needed. This is done because the `SenTestingKit` requires them and
         # adding them to each specification which requires it is repetitive and

data/lib/cocoapods/hooks_manager.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+
 module Pod
   # Provides support for the hook system of CocoaPods. The system is designed
   # especially for plugins. Interested clients can register to notifications by
@@ -14,27 +16,70 @@ module Pod
   # from CocoaPods 1.0).
   #
   module HooksManager
+    # Represents a single registered hook.
+    #
+    class Hook
+      # @return [String]
+      #         The name of the hook's notification.
+      #
+      attr_reader :plugin_name
+
+      # @return [String]
+      #         The name of the plugin the hook came from.
+      #
+      attr_reader :name
+
+      # @return [Proc]
+      #         The block.
+      #
+      attr_reader :block
+
+      # @param  [String] name        @see {#name}.
+      #
+      # @param  [String] plugin_name @see {#plugin_name}.
+      #
+      # @param  [Proc]   block       @see {#block}.
+      #
+      def initialize(name, plugin_name, block)
+        raise ArgumentError, 'Missing name' unless name
+        raise ArgumentError, 'Missing block' unless block
+
+        UI.warn '[Hooks] The use of hooks without specifying a `plugin_name` ' \
+                'has been deprecated.' unless plugin_name
+
+        @name = name
+        @plugin_name = plugin_name
+        @block = block
+      end
+    end
+
     class << self
-      # @return [Hash{Symbol => Proc}] The list of the blocks that are
+      # @return [Hash{Symbol => Array<Proc>}] The list of the blocks that are
       #         registered for each notification name.
       #
       attr_reader :registrations
 
       # Registers a block for the hook with the given name.
       #
-      # @param  [Symbol] name
+      # @param  [String] plugin_name
+      #         The name of the plugin the hook comes from.
+      #
+      # @param  [Symbol] hook_name
       #         The name of the notification.
       #
       # @param  [Proc] block
       #         The block.
       #
-      def register(name, &block)
-        raise ArgumentError, 'Missing name' unless name
-        raise ArgumentError, 'Missing block' unless block
+      def register(plugin_name, hook_name = nil, &block)
+        # TODO: Backwards compatibility with nameless plugins from CP 0.34
+        if hook_name.nil?
+          hook_name = plugin_name
+          plugin_name = nil
+        end
 
         @registrations ||= {}
-        @registrations[name] ||= []
-        @registrations[name] << block
+        @registrations[hook_name] ||= []
+        @registrations[hook_name] << Hook.new(hook_name, plugin_name, block)
       end
 
       # Runs all the registered blocks for the hook with the given name.
@@ -45,15 +90,32 @@ module Pod
       # @param  [Object] context
       #         The context object which should be passed to the blocks.
       #
-      def run(name, context)
+      # @param  [Hash<String, Hash>] whitelisted_plugins
+      #         The plugins that should be run, in the form of a hash keyed by
+      #         plugin name, where the values are the custom options that should
+      #         be passed to the hook's block if it supports taking a second
+      #         argument.
+      #
+      def run(name, context, whitelisted_plugins = nil)
         raise ArgumentError, 'Missing name' unless name
         raise ArgumentError, 'Missing options' unless context
 
-        if @registrations
-          blocks = @registrations[name]
-          if blocks
-            blocks.each do |block|
-              block.call(context)
+        if registrations
+          hooks = registrations[name]
+          if hooks
+            UI.message "- Running #{name.to_s.gsub('_', ' ')} hooks" do
+              hooks.each do |hook|
+                next if whitelisted_plugins && !whitelisted_plugins.key?(hook.plugin_name)
+                UI.message "- #{hook.plugin_name || 'unknown plugin'} from " \
+                           "`#{hook.block.source_location.first}`" do
+                  block = hook.block
+                  if block.arity > 1
+                    block.call(context, whitelisted_plugins[hook.plugin_name])
+                  else
+                    block.call(context)
+                  end
+                end
+              end
             end
           end
         end