cocoapods 0.35.0 → 0.36.0.beta.1

data/lib/cocoapods/target.rb

@@ -15,18 +15,65 @@ module Pod
     #
     attr_reader :sandbox
 
+    # @return [Boolean] Whether the target needs to be implemented as a framework.
+    #         Computed by analyzer.
+    #
+    attr_accessor :host_requires_frameworks
+    alias_method :host_requires_frameworks?, :host_requires_frameworks
+
     # @return [String] the name of the library.
     #
     def name
       label
     end
 
-    # @return [String] the name of the library.
+    # @return [String] the name of the product.
     #
     def product_name
+      if requires_frameworks?
+        framework_name
+      else
+        static_library_name
+      end
+    end
+
+    # @return [String] the name of the product excluding the file extension or
+    #         a product type specific prefix, depends on #requires_frameworks?
+    #         and #product_module_name or #label.
+    #
+    def product_basename
+      if requires_frameworks?
+        product_module_name
+      else
+        label
+      end
+    end
+
+    # @return [String] the name of the framework, depends on #label.
+    #
+    # @note This may not depend on #requires_frameworks? indirectly as it is
+    #       used for migration.
+    #
+    def framework_name
+      "#{product_module_name}.framework"
+    end
+
+    # @return [String] the name of the library, depends on #label.
+    #
+    # @note This may not depend on #requires_frameworks? indirectly as it is
+    #       used for migration.
+    #
+    def static_library_name
       "lib#{label}.a"
     end
 
+    # @return [Symbol] either :framework or :static_library, depends on
+    #         #requires_frameworks?.
+    #
+    def product_type
+      requires_frameworks? ? :framework : :static_library
+    end
+
     # @return [String] the XCConfig namespaced prefix.
     #
     def xcconfig_prefix
@@ -41,6 +88,20 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
+    # @return [Boolean] whether the generated target needs to be implemented
+    #         as a framework
+    #
+    # @note This applies either if Swift was used by the host, which was checked
+    #       eagerly by the analyzer before, or in the given target or its
+    #       dependents, which can only be checked after the specs were been
+    #       fetched.
+    #
+    def requires_frameworks?
+      host_requires_frameworks? || uses_swift?
+    end
+
+    #-------------------------------------------------------------------------#
+
     # @!group Information storage
 
     # @return [Hash{String=>Symbol}] A hash representing the user build
@@ -95,6 +156,22 @@ module Pod
       support_files_dir + "#{label}-Private.xcconfig"
     end
 
+    # @return [Pathname] the absolute path of the header file which contains
+    #         the exported foundation constants with framework version
+    #         information and all headers, which should been exported in the
+    #         module map.
+    #
+    def umbrella_header_path
+      support_files_dir + "#{label}-umbrella.h"
+    end
+
+    # @return [Pathname] the absolute path of the LLVM module map file that
+    #         defines the module structure for the compiler.
+    #
+    def module_map_path
+      support_files_dir + "#{label}.modulemap"
+    end
+
     # @return [Pathname] the absolute path of the header file which contains
     #         the information about the installed pods.
     #
@@ -115,12 +192,51 @@ module Pod
       support_files_dir + "#{label}.bridgesupport"
     end
 
+    # @return [Pathname] the absolute path of the Info.plist file.
+    #
+    def info_plist_path
+      support_files_dir + "Info.plist"
+    end
+
     # @return [Pathname] the path of the dummy source generated by CocoaPods
     #
     def dummy_source_path
       support_files_dir + "#{label}-dummy.m"
     end
 
+    # @return [String] The configuration build dir, if the target is integrated
+    #         as framework.
+    #
+    # @note   Namespace the pod target product with its target definition name.
+    #         Pod target products are named after their specs. The namespacing
+    #         cannot directly happen in the product name itself, because this
+    #         must be equal to the module name and this will be used in source
+    #         code, which should stay agnostic over the dependency manager.
+    #         We need namespacing at all because multiple targets can exist for
+    #         the same podspec and their products should not collide. This
+    #         happens when multiple user targets require the same pod, because
+    #         they could require different sets of subspecs.
+    #
+    def configuration_build_dir
+      "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/#{target_definition.label}"
+    end
+
     #-------------------------------------------------------------------------#
+
+    private
+
+    # Transforms the given string into a valid +identifier+ after C99ext
+    # standard, so that it can be used in source code where escaping of
+    # ambiguous characters is not applicable.
+    #
+    # @param  [String] name
+    #         any name, which may contain leading numbers, spaces or invalid
+    #         characters.
+    #
+    # @return [String]
+    #
+    def c99ext_identifier(name)
+      name.gsub(/^([0-9])/, '_\1').gsub(/[^a-zA-Z0-9_]/, '_')
+    end
   end
 end

data/lib/cocoapods/target/aggregate_target.rb

@@ -20,6 +20,14 @@ module Pod
       target_definition.label.to_s
     end
 
+    # @return [String] the name to use for the source code module constructed
+    #         for this target, and which will be used to import the module in
+    #         implementation source files.
+    #
+    def product_module_name
+      c99ext_identifier(label)
+    end
+
     # @return [Pathname] the folder where the client is stored used for
     #         computing the relative paths. If integrating it should be the
     #         folder where the user project is stored, otherwise it should
@@ -71,21 +79,32 @@ module Pod
     #
     attr_accessor :pod_targets
 
+    # @param  [String] build_configuration The build configuration for which the
+    #         the pod targets should be returned.
+    #
+    # @return [Array<PodTarget>] the pod targets for the given build
+    #         configuration.
+    #
+    def pod_targets_for_build_configuration(build_configuration)
+      pod_targets.select do |pod_target|
+        pod_target.include_in_build_config?(build_configuration)
+      end
+    end
+
     # @return [Array<Specification>] The specifications used by this aggregate target.
     #
     def specs
       pod_targets.map(&:specs).flatten
     end
 
-    # @return [Hash{Symbol => Array<PodTarget>}] The pod targets for each
+    # @return [Hash{Symbol => Array<Specification>}] The pod targets for each
     #         build configuration.
     #
     def specs_by_build_configuration
       result = {}
       user_build_configurations.keys.each do |build_configuration|
-        result[build_configuration] = pod_targets.select do |pod_target|
-          pod_target.include_in_build_config?(build_configuration)
-        end.map(&:specs).flatten
+        result[build_configuration] = pod_targets_for_build_configuration(build_configuration).
+          flat_map(&:specs)
       end
       result
     end
@@ -96,6 +115,16 @@ module Pod
       specs.map { |spec| spec.consumer(platform) }
     end
 
+    # @return [Boolean] Whether the target uses Swift code
+    #
+    def uses_swift?
+      pod_targets.any?(&:uses_swift?)
+    end
+
+    #-------------------------------------------------------------------------#
+
+    # @!group Support files
+
     # @return [Pathname] The absolute path of acknowledgements file.
     #
     # @note   The acknowledgements generators add the extension according to
@@ -111,6 +140,12 @@ module Pod
       support_files_dir + "#{label}-resources.sh"
     end
 
+    # @return [Pathname] The absolute path of the embed frameworks script.
+    #
+    def embed_frameworks_script_path
+      support_files_dir + "#{label}-frameworks.sh"
+    end
+
     # @return [String] The xcconfig path of the root from the `$(SRCROOT)`
     #         variable of the user's project.
     #
@@ -133,6 +168,13 @@ module Pod
       "${SRCROOT}/#{relative_to_srcroot(copy_resources_script_path)}"
     end
 
+    # @return [String] The path of the embed frameworks relative to the
+    #         root of the user project.
+    #
+    def embed_frameworks_script_relative_path
+      "${SRCROOT}/#{relative_to_srcroot(embed_frameworks_script_path)}"
+    end
+
     private
 
     # @!group Private Helpers

data/lib/cocoapods/target/pod_target.rb

@@ -19,8 +19,9 @@ module Pod
       @specs = specs
       @target_definition = target_definition
       @sandbox = sandbox
-      @build_headers  = Sandbox::HeadersStore.new(sandbox, 'Build')
+      @build_headers  = Sandbox::HeadersStore.new(sandbox, 'Private')
       @file_accessors = []
+      @resource_bundle_targets = []
     end
 
     # @return [String] the label for the target.
@@ -29,11 +30,31 @@ module Pod
       "#{target_definition.label}-#{root_spec.name}"
     end
 
+    # @return [String] The name to use for the source code module constructed
+    #         for this target, and which will be used to import the module in
+    #         implementation source files.
+    #
+    def product_module_name
+      root_spec.module_name
+    end
+
     # @return [Array<Sandbox::FileAccessor>] the file accessors for the
     #         specifications of this target.
     #
     attr_accessor :file_accessors
 
+    # @return [Array<PBXTarget>] the resource bundle targets belonging
+    #         to this target.
+    attr_reader :resource_bundle_targets
+
+    # @return [Bool] Whether or not this target should be build.
+    #
+    # A target should not be build if it has no source files.
+    #
+    def should_build?
+      !file_accessors.flat_map(&:source_files).empty?
+    end
+
     # @return [Array<Specification::Consumer>] the specification consumers for
     #         the target.
     #
@@ -41,6 +62,14 @@ module Pod
       specs.map { |spec| spec.consumer(platform) }
     end
 
+    # @return [Boolean] Whether the target uses Swift code
+    #
+    def uses_swift?
+      file_accessors.any? do |file_accessor|
+        file_accessor.source_files.any? { |sf| sf.extname == ".swift" }
+      end
+    end
+
     # @return [Specification] The root specification for the target.
     #
     def root_spec
@@ -53,6 +82,15 @@ module Pod
       root_spec.name
     end
 
+    # @param  [String] bundle_name
+    #         The name of the bundle product, which is given by the +spec+.
+    #
+    # @return [String] The derived name of the resource bundle target.
+    #
+    def resources_bundle_target_label(bundle_name)
+      "#{label}-#{bundle_name}"
+    end
+
     # @return [Array<String>] The names of the Pods on which this target
     #         depends.
     #

data/lib/cocoapods/user_interface.rb

@@ -156,11 +156,11 @@ module Pod
 
       # Prints the textual representation of a given set.
       #
-      def pod(set, mode = :normal, statistics_provider = nil)
+      def pod(set, mode = :normal)
         if mode == :name_and_version
           puts_indented "#{set.name} #{set.versions.first.version}"
         else
-          pod = Specification::Set::Presenter.new(set, statistics_provider)
+          pod = Specification::Set::Presenter.new(set)
           title = "\n-> #{pod.name} (#{pod.version})"
           if pod.spec.deprecated?
             title += " #{pod.deprecation_description}"
@@ -174,17 +174,16 @@ module Pod
             puts_indented "pod '#{pod.name}', '~> #{pod.version}'"
             labeled('Homepage', pod.homepage)
             labeled('Source',   pod.source_url)
-            labeled('Versions', pod.verions_by_source)
+            labeled('Versions', pod.versions_by_source)
             if mode == :stats
-              labeled('Pushed',   pod.github_last_activity)
               labeled('Authors',  pod.authors) if pod.authors =~ /,/
               labeled('Author',   pod.authors) if pod.authors !~ /,/
               labeled('License',  pod.license)
               labeled('Platform', pod.platform)
-              labeled('Watchers', pod.github_watchers)
+              labeled('Stars',    pod.github_stargazers)
               labeled('Forks',    pod.github_forks)
             end
-            labeled('Sub specs', pod.subspecs)
+            labeled('Subspecs', pod.subspecs)
           end
         end
       end
@@ -193,20 +192,16 @@ module Pod
       #
       def labeled(label, value, justification = 12)
         if value
-          title = "- #{label}:".ljust(justification)
-          output = begin
-            if value.is_a?(Array)
-              lines = [wrap_string(title, self.indentation_level)]
-              value.each do |v|
-                lines << wrap_string("- #{v}", self.indentation_level + 2)
-              end
-              lines.join("\n")
-            else
-              wrap_string(title + "#{value}", self.indentation_level)
-            end + "\n"
+          title = "- #{label}:"
+          if value.is_a?(Array)
+            lines = [wrap_string(title, self.indentation_level)]
+            value.each do |v|
+              lines << wrap_string("- #{v}", self.indentation_level + 2)
+            end
+            puts lines.join("\n")
+          else
+            puts wrap_string(title.ljust(justification) + "#{value}", self.indentation_level)
           end
-          puts output
-          output
         end
       end
 
@@ -291,10 +286,10 @@ module Pod
       #
       def wrap_string(string, indent = 0)
         if disable_wrap
-          string
+          (' ' * indent) + string
         else
           first_space = ' ' * indent
-          indented = CLAide::Helper.wrap_with_indent(string, indent, 9999)
+          indented = CLAide::Command::Banner::TextWrapper.wrap_with_indent(string, indent, 9999)
           first_space + indented
         end
       end

data/lib/cocoapods/user_interface/error_report.rb

@@ -51,7 +51,7 @@ Repositories : #{repo_information.join("\n               ")}
 
 #{'[!] Oh no, an error occurred.'.red}
 #{error_from_podfile(exception)}
-#{'Search for existing github issues similar to yours:'.yellow}
+#{'Search for existing GitHub issues similar to yours:'.yellow}
 #{issues_url(exception)}
 
 #{'If none exists, create a ticket, with the template displayed above, on:'.yellow}
@@ -114,7 +114,7 @@ EOS
         end
 
         def installed_plugins
-          CLAide::Command::PluginsHelper.specifications.
+          CLAide::Command::PluginManager.specifications.
             reduce({}) { |hash, s| hash.tap { |h| h[s.name] = s.version.to_s } }
         end
 

data/lib/cocoapods/validator.rb

@@ -143,6 +143,10 @@ module Pod
     #
     attr_accessor :no_subspecs
 
+    # @return [Bool] Whether frameworks should be used for the installation.
+    #
+    attr_accessor :use_frameworks
+
     #-------------------------------------------------------------------------#
 
     # !@group Lint results
@@ -233,9 +237,9 @@ module Pod
       resp = Pod::HTTP.validate_url(url)
 
       if !resp
-        warning "There was a problem validating the URL #{url}."
+        warning('url', "There was a problem validating the URL #{url}.")
       elsif !resp.success?
-        warning "The URL (#{url}) is not reachable."
+        warning('url', "The URL (#{url}) is not reachable.")
       end
 
       resp
@@ -255,7 +259,7 @@ module Pod
       spec.screenshots.compact.each do |screenshot|
         request = validate_url(screenshot)
         if request && !(request.headers['content-type'] && request.headers['content-type'].first =~ /image\/.*/i)
-          warning "The screenshot #{screenshot} is not a valid image."
+          warning('screenshot', "The screenshot #{screenshot} is not a valid image.")
         end
       end
     end
@@ -298,7 +302,8 @@ module Pod
     # for all available platforms with xcodebuild.
     #
     def install_pod
-      podfile = podfile_from_spec(consumer.platform_name, spec.deployment_target(consumer.platform_name))
+      deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
+      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks)
       sandbox = Sandbox.new(config.sandbox_root)
       installer = Installer.new(sandbox, podfile)
       installer.install!
@@ -340,15 +345,19 @@ module Pod
             end
 
             if message.include?('error: ')
-              error "[xcodebuild] #{message}"
+              error('xcodebuild', message)
             else
-              note "[xcodebuild] #{message}"
+              note('xcodebuild', message)
             end
           end
         end
       end
     end
 
+    FILE_PATTERNS = %i(source_files resources preserve_paths vendored_libraries
+                       vendored_frameworks public_header_files preserve_paths
+                       private_header_files resource_bundles).freeze
+
     # It checks that every file pattern specified in a spec yields
     # at least one file. It requires the pods to be already present
     # in the current working directory under Pods/spec.name.
@@ -356,42 +365,66 @@ module Pod
     # @return [void]
     #
     def check_file_patterns
-      [:source_files, :resources, :preserve_paths, :vendored_libraries, :vendored_frameworks].each do |attr_name|
-        # file_attr = Specification::DSL.attributes.values.find{|attr| attr.name == attr_name }
+      FILE_PATTERNS.each do |attr_name|
+        if respond_to?("_validate_#{attr_name}", true)
+          send("_validate_#{attr_name}")
+        end
+
         if !file_accessor.spec_consumer.send(attr_name).empty? && file_accessor.send(attr_name).empty?
-          error "The `#{attr_name}` pattern did not match any file."
+          error('file patterns', "The `#{attr_name}` pattern did not match any file.")
         end
       end
 
       if consumer.spec.root?
         unless file_accessor.license || spec.license && (spec.license[:type] == 'Public Domain' || spec.license[:text])
-          warning 'Unable to find a license file'
+          warning('license', 'Unable to find a license file')
         end
       end
     end
 
+    def _validate_private_header_files
+      _validate_header_files(:private_header_files)
+    end
+
+    def _validate_public_header_files
+      _validate_header_files(:public_header_files)
+    end
+
+    # Ensures that a list of header files only contains header files.
+    #
+    def _validate_header_files(attr_name)
+      non_header_files = file_accessor.send(attr_name).
+        select { |f| !Sandbox::FileAccessor::HEADER_EXTENSIONS.include?(f.extname) }.
+        map { |f| f.relative_path_from file_accessor.root }
+      unless non_header_files.empty?
+        error(attr_name, "The pattern matches non-header files (#{non_header_files.join(', ')}).")
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     private
 
     # !@group Result Helpers
 
-    def error(message)
-      add_result(:error, message)
+    def error(attribute_name, message)
+      add_result(:error, attribute_name, message)
     end
 
-    def warning(message)
-      add_result(:warning, message)
+    def warning(attribute_name, message)
+      add_result(:warning, attribute_name, message)
     end
 
-    def note(message)
-      add_result(:note, message)
+    def note(attribute_name, message)
+      add_result(:note, attribute_name, message)
     end
 
-    def add_result(type, message)
-      result = results.find { |r| r.type == type && r.message == message }
+    def add_result(type, attribute_name, message)
+      result = results.find do |r|
+        r.type == type && r.attribute_name && r.message == message
+      end
       unless result
-        result = Result.new(type, message)
+        result = Result.new(type, attribute_name, message)
         results << result
       end
       result.platforms << consumer.platform_name if consumer
@@ -401,8 +434,8 @@ module Pod
     # Specialized Result to support subspecs aggregation
     #
     class Result < Specification::Linter::Results::Result
-      def initialize(type, message)
-        super(type, message)
+      def initialize(type, attribute_name, message)
+        super(type, attribute_name, message)
         @subspecs = []
       end
 
@@ -420,19 +453,31 @@ module Pod
     #
     attr_reader :source_urls
 
+    # @param  [String] platform_name
+    #         the name of the platform, which should be declared
+    #         in the Podfile.
+    #
+    # @param  [String] deployment_target
+    #         the deployment target, which should be declared in
+    #         the Podfile.
+    #
+    # @param  [Bool] use_frameworks
+    #         whether frameworks should be used for the installation
+    #
     # @return [Podfile] a podfile that requires the specification on the
-    # current platform.
+    #         current platform.
     #
     # @note   The generated podfile takes into account whether the linter is
     #         in local mode.
     #
-    def podfile_from_spec(platform_name, deployment_target)
+    def podfile_from_spec(platform_name, deployment_target, use_frameworks = nil)
       name     = subspec_name ? subspec_name : spec.name
       podspec  = file.realpath
       local    = local?
       urls     = source_urls
       podfile  = Pod::Podfile.new do
         urls.each { |u| source(u) }
+        use_frameworks!(use_frameworks) unless use_frameworks.nil?
         platform(platform_name, deployment_target)
         if local
           pod name, :path => podspec.dirname.to_s