cocoapods 0.37.2 → 0.38.0.beta.1

data/lib/cocoapods/installer/podfile_validator.rb

@@ -0,0 +1,86 @@
+module Pod
+  class Installer
+    # Validate the podfile before installing to catch errors and
+    # problems
+    #
+    class PodfileValidator
+      # @return [Podfile] The podfile being validated
+      #
+      attr_reader :podfile
+
+      # @return [Array<String>] any errors that have occured during the validation
+      #
+      attr_reader :errors
+
+      # Initialize a new instance
+      # @param [Podfile] podfile
+      #        The podfile to validate
+      #
+      def initialize(podfile)
+        @podfile = podfile
+        @errors = []
+        @validated = false
+      end
+
+      # Validate the podfile
+      # Errors are added to the errors array
+      #
+      def validate
+        validate_pod_directives
+
+        @validated = true
+      end
+
+      # Wether the podfile is valid is not
+      # NOTE: Will execute `validate` if the podfile
+      # has not yet been validated
+      #
+      def valid?
+        validate unless @validated
+
+        @validated && errors.size == 0
+      end
+
+      # A message describing any errors in the
+      # validation
+      #
+      def message
+        errors.join("\n")
+      end
+
+      private
+
+      def add_error(error)
+        errors << error
+      end
+
+      def validate_pod_directives
+        dependencies = podfile.target_definitions.flat_map do |_, target|
+          target.dependencies
+        end.uniq
+
+        dependencies.each do |dependency|
+          validate_conflicting_external_sources!(dependency)
+        end
+      end
+
+      def validate_conflicting_external_sources!(dependency)
+        external_source = dependency.external_source
+        return false if external_source.nil?
+
+        available_downloaders = Downloader.downloader_class_by_key.keys
+        specified_downloaders = external_source.select { |key| available_downloaders.include?(key) }
+        if specified_downloaders.size > 1
+          add_error "The dependency `#{dependency.name}` specifies more than one download strategy(#{specified_downloaders.keys.join(',')})." \
+            'Only one is allowed'
+        end
+
+        pod_spec_or_path = external_source[:podspec].present? || external_source[:path].present?
+        if pod_spec_or_path && specified_downloaders.size > 0
+          add_error "The dependency `#{dependency.name}` specifies `podspec` or `path` in combination with other" \
+            ' download strategies. This is not allowed'
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/{hooks_context.rb → post_install_hooks_context.rb}

@@ -3,7 +3,7 @@ module Pod
     # Context object designed to be used with the HooksManager which describes
     # the context of the installer.
     #
-    class HooksContext
+    class PostInstallHooksContext
       # @return [String] The path to the sandbox root (`Pods` directory).
       #
       attr_accessor :sandbox_root
@@ -13,7 +13,7 @@ module Pod
       #
       attr_accessor :umbrella_targets
 
-      # Generate a {HooksContext}.
+      # @return [PostInstallHooksContext] Convenience class generator method
       #
       # @param  [Sandbox] sandbox
       #         The sandbox
@@ -66,7 +66,7 @@ module Pod
         #
         attr_accessor :specs
 
-        # @return [Symbol] The platform (either `:ios` or `:osx`).
+        # @return [Symbol] The platform (either `:ios`, `:watchos` or `:osx`).
         #
         attr_accessor :platform_name
 

data/lib/cocoapods/installer/pre_install_hooks_context.rb

@@ -0,0 +1,41 @@
+module Pod
+  class Installer
+    # Context object designed to be used with the HooksManager which describes
+    # the context of the installer before analysis has been completed.
+    #
+    class PreInstallHooksContext
+      # @return [String] The path to the sandbox root (`Pods` directory).
+      #
+      attr_accessor :sandbox_root
+
+      # @return [Podfile] The Podfile for the project.
+      #
+      attr_accessor :podfile
+
+      # @return [Sandbox] The Sandbox for the project.
+      #
+      attr_accessor :sandbox
+
+      # @return [Lockfile] The Lockfile for the project.
+      #
+      attr_accessor :lockfile
+
+      # @param  [Sandbox] sandbox see {#sandbox}
+      #
+      # @param  [Podfile] podfile see {#podfile}
+      #
+      # @param  [Lockfile] lockfile see {#lockfile}
+      #
+      # @return [PreInstallHooksContext] Convenience class method to generate the
+      #         static context.
+      #
+      def self.generate(sandbox, podfile, lockfile)
+        result = new
+        result.podfile = podfile
+        result.sandbox = sandbox
+        result.lockfile = lockfile
+        result
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/target_installer.rb

@@ -67,7 +67,7 @@ module Pod
       def custom_build_settings
         settings = {}
 
-        if target.archs
+        unless target.archs.empty?
           settings['ARCHS'] = target.archs
         end
 
@@ -184,12 +184,6 @@ module Pod
         sandbox.project
       end
 
-      # @return [TargetDefinition] the target definition of the library.
-      #
-      def target_definition
-        target.target_definition
-      end
-
       # @return [PBXGroup] the group where the file references to the support
       #         files should be stored.
       #

data/lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -20,7 +20,6 @@ module Pod
             create_umbrella_header
             create_embed_frameworks_script
           end
-          create_target_environment_header
           create_bridge_support_file
           create_copy_resources_script
           create_acknowledgements
@@ -32,6 +31,12 @@ module Pod
 
       private
 
+      # @return [TargetDefinition] the target definition of the library.
+      #
+      def target_definition
+        target.target_definition
+      end
+
       # Ensure that vendored static frameworks and libraries are not linked
       # twice to the aggregate target, which shares the xcconfig of the user
       # target.
@@ -73,16 +78,6 @@ module Pod
         end
       end
 
-      # Generates a header which allows to inspect at compile time the installed
-      # pods and the installed specifications of a pod.
-      #
-      def create_target_environment_header
-        path = target.target_environment_header_path
-        generator = Generator::TargetEnvironmentHeader.new(target.specs_by_build_configuration)
-        generator.save_as(path)
-        add_file_to_support_group(path)
-      end
-
       # Generates the bridge support metadata if requested by the {Podfile}.
       #
       # @note   The bridge support metadata is added to the resources of the
@@ -92,7 +87,7 @@ module Pod
       # @return [void]
       #
       def create_bridge_support_file
-        if target_definition.podfile.generate_bridge_support?
+        if target.podfile.generate_bridge_support?
           path = target.bridge_support_path
           headers = native_target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
           generator = Generator::BridgeSupport.new(headers)
@@ -112,7 +107,7 @@ module Pod
         end
         resources_by_config = {}
         target.user_build_configurations.keys.each do |config|
-          file_accessors = library_targets.select { |t| t.include_in_build_config?(config) }.flat_map(&:file_accessors)
+          file_accessors = library_targets.select { |t| t.include_in_build_config?(target_definition, config) }.flat_map(&:file_accessors)
           resource_paths = file_accessors.flat_map { |accessor| accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) } }
           resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name.shellescape}.bundle" } }
           resources_by_config[config] = (resource_paths + resource_bundles).uniq
@@ -149,11 +144,14 @@ module Pod
         path = target.embed_frameworks_script_path
         frameworks_by_config = {}
         target.user_build_configurations.keys.each do |config|
-          frameworks_by_config[config] = target.pod_targets.select do |pod_target|
-            pod_target.include_in_build_config?(config) && pod_target.should_build?
-          end.map(&:product_name)
+          relevant_pod_targets = target.pod_targets.select do |pod_target|
+            pod_target.include_in_build_config?(target_definition, config) && pod_target.should_build?
+          end
+          frameworks_by_config[config] = relevant_pod_targets.map do |pod_target|
+            "#{target_definition.label}/#{pod_target.product_name}"
+          end
         end
-        generator = Generator::EmbedFrameworksScript.new(target_definition, frameworks_by_config)
+        generator = Generator::EmbedFrameworksScript.new(frameworks_by_config)
         generator.save_as(path)
         add_file_to_support_group(path)
       end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -130,7 +130,7 @@ module Pod
 
             bundle_target.build_configurations.each do |c|
               c.build_settings['PRODUCT_NAME'] = bundle_name
-              if target.requires_frameworks?
+              if target.requires_frameworks? && target.scoped?
                 c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
               end
             end
@@ -174,7 +174,6 @@ module Pod
       def create_prefix_header
         path = target.prefix_header_path
         generator = Generator::PrefixHeader.new(target.file_accessors, target.platform)
-        generator.imports << target.target_environment_header_path.basename
         generator.save_as(path)
         add_file_to_support_group(path)
 
@@ -187,6 +186,7 @@ module Pod
       ENABLE_OBJECT_USE_OBJC_FROM = {
         :ios => Version.new('6'),
         :osx => Version.new('10.8'),
+        :watchos => Version.new('2.0'),
       }
 
       # Returns the compiler flags for the source files of the given specification.
@@ -235,8 +235,8 @@ module Pod
             flags << '-DOS_OBJECT_USE_OBJC=0'
           end
         end
-        if target_definition.inhibits_warnings_for_pod?(consumer.spec.root.name)
-          flags << '-w -Xanalyzer -analyzer-disable-checker -Xanalyzer deadcode'
+        if target.inhibit_warnings?
+          flags << '-w -Xanalyzer -analyzer-disable-all-checks'
         end
         flags * ' '
       end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -142,19 +142,13 @@ module Pod
         # @return [void]
         #
         def add_embed_frameworks_script_phase
-          phase_name = 'Embed Pods Frameworks'
           targets_to_embed_in = native_targets_to_integrate.select do |target|
             EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
           end
           targets_to_embed_in.each do |native_target|
-            embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == phase_name }
-            unless embed_build_phase.present?
-              UI.message("Adding Build Phase '#{phase_name}' to project.")
-              embed_build_phase = native_target.new_shell_script_build_phase(phase_name)
-            end
+            phase = create_or_update_build_phase(native_target, 'Embed Pods Frameworks')
             script_path = target.embed_frameworks_script_relative_path
-            embed_build_phase.shell_script = %("#{script_path}"\n)
-            embed_build_phase.show_env_vars_in_log = '0'
+            phase.shell_script = %("#{script_path}"\n)
           end
         end
 
@@ -189,11 +183,9 @@ module Pod
         def add_copy_resources_script_phase
           phase_name = 'Copy Pods Resources'
           native_targets_to_integrate.each do |native_target|
-            phase = native_target.shell_script_build_phases.find { |bp| bp.name == phase_name }
-            phase ||= native_target.new_shell_script_build_phase(phase_name)
+            phase = create_or_update_build_phase(native_target, phase_name)
             script_path = target.copy_resources_script_relative_path
             phase.shell_script = %("#{script_path}"\n)
-            phase.show_env_vars_in_log = '0'
           end
         end
 
@@ -209,10 +201,8 @@ module Pod
         def add_check_manifest_lock_script_phase
           phase_name = 'Check Pods Manifest.lock'
           native_targets_to_integrate.each do |native_target|
-            next if native_target.shell_script_build_phases.any? { |phase| phase.name == phase_name }
-            phase = native_target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
-            native_target.build_phases.unshift(phase)
-            phase.name = phase_name
+            phase = create_or_update_build_phase(native_target, phase_name)
+            native_target.build_phases.unshift(phase).uniq!
             phase.shell_script = <<-EOS.strip_heredoc
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
               if [[ $? != 0 ]] ; then
@@ -222,7 +212,6 @@ module Pod
                   exit 1
               fi
             EOS
-            phase.show_env_vars_in_log = '0'
           end
         end
 
@@ -278,6 +267,17 @@ module Pod
           "Integrating target `#{target.name}` " \
             "(#{UI.path target.user_project_path} project)"
         end
+
+        def create_or_update_build_phase(target, phase_name, phase_class = Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+          target.build_phases.grep(phase_class).find { |phase| phase.name == phase_name } ||
+            target.project.new(phase_class).tap do |phase|
+              UI.message("Adding Build Phase '#{phase_name}' to project.") do
+                phase.name = phase_name
+                phase.show_env_vars_in_log = '0'
+                target.build_phases << phase
+              end
+            end
+        end
       end
     end
   end

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -152,13 +152,31 @@ module Pod
         paths_for_attribute(:vendored_frameworks, true)
       end
 
+      # @param  [Pathname] framework
+      #         The vendored framework to search into.
+      # @return [Pathname] The path of the header directory of the
+      #         vendored framework.
+      #
+      def self.vendored_frameworks_headers_dir(framework)
+        (framework + 'Headers').realpath
+      end
+
+      # @param  [Pathname] framework
+      #         The vendored framework to search into.
+      # @return [Array<Pathname>] The paths of the headers included in the
+      #         vendored framework.
+      #
+      def self.vendored_frameworks_headers(framework)
+        headers_dir = vendored_frameworks_headers_dir(framework)
+        Pathname.glob(headers_dir + '**/' + GLOB_PATTERNS[:public_header_files])
+      end
+
       # @return [Array<Pathname>] The paths of the framework headers that come
       #         shipped with the Pod.
       #
       def vendored_frameworks_headers
         vendored_frameworks.map do |framework|
-          headers_dir = (framework + 'Headers').realpath
-          Pathname.glob(headers_dir + GLOB_PATTERNS[:public_header_files])
+          self.class.vendored_frameworks_headers(framework)
         end.flatten.uniq
       end
 

data/lib/cocoapods/sandbox/path_list.rb

@@ -21,6 +21,7 @@ module Pod
       #
       def initialize(root)
         @root = root
+        @glob_cache = {}
       end
 
       # @return [Array<String>] The list of absolute the path of all the files
@@ -55,6 +56,7 @@ module Pod
         relative_paths = absolute_paths.map { |p| p[root_length..-1] }
         @files = relative_paths - relative_dirs
         @dirs  = relative_dirs.map { |d| d.gsub(/\/\.\.?$/, '') }.reject { |d| d == '.' || d == '..' } .uniq
+        @glob_cache = {}
       end
 
       #-----------------------------------------------------------------------#
@@ -101,6 +103,10 @@ module Pod
       def relative_glob(patterns, options = {})
         return [] if patterns.empty?
 
+        cache_key = options.merge(:patterns => patterns)
+        cached_value = @glob_cache[cache_key]
+        return cached_value if cached_value
+
         dir_pattern = options[:dir_pattern]
         exclude_patterns = options[:exclude_patterns]
         include_dirs = options[:include_dirs]
@@ -112,19 +118,15 @@ module Pod
         end
 
         list = Array(patterns).map do |pattern|
-          if pattern.is_a?(String)
-            if directory?(pattern) && dir_pattern
-              pattern += '/' unless pattern.end_with?('/')
-              pattern +=  dir_pattern
-            end
-            expanded_patterns = dir_glob_equivalent_patterns(pattern)
-            full_list.select do |path|
-              expanded_patterns.any? do |p|
-                File.fnmatch(p, path, File::FNM_CASEFOLD | File::FNM_PATHNAME)
-              end
+          if directory?(pattern) && dir_pattern
+            pattern += '/' unless pattern.end_with?('/')
+            pattern += dir_pattern
+          end
+          expanded_patterns = dir_glob_equivalent_patterns(pattern)
+          full_list.select do |path|
+            expanded_patterns.any? do |p|
+              File.fnmatch(p, path, File::FNM_CASEFOLD | File::FNM_PATHNAME)
             end
-          else
-            full_list.select { |path| path.match(pattern) }
           end
         end.flatten
 
@@ -133,7 +135,7 @@ module Pod
           exclude_options = { :dir_pattern => '**/*', :include_dirs => include_dirs }
           list -= relative_glob(exclude_patterns, exclude_options)
         end
-        list
+        @glob_cache[cache_key] = list
       end
 
       #-----------------------------------------------------------------------#