cocoapods 0.38.2 → 0.39.0.beta.1

data/lib/cocoapods/resolver.rb

@@ -370,22 +370,30 @@ module Pod
     # @param  [Molinillo::ResolverError] error
     #
     def handle_resolver_error(error)
+      message = error.message
       case error
       when Molinillo::VersionConflict
         error.conflicts.each do |name, conflict|
           lockfile_reqs = conflict.requirements[name_for_locking_dependency_source]
           if lockfile_reqs && lockfile_reqs.last && lockfile_reqs.last.prerelease? && !conflict.existing
-            raise Informative, 'Due to the previous naïve CocoaPods resolver, ' \
+            message = 'Due to the previous naïve CocoaPods resolver, ' \
               "you were using a pre-release version of `#{name}`, " \
               'without explicitly asking for a pre-release version, which now leads to a conflict. ' \
               'Please decide to either use that pre-release version by adding the ' \
               'version requirement to your Podfile ' \
               "(e.g. `pod '#{name}', '#{lockfile_reqs.map(&:requirement).join("', '")}'`) " \
               "or revert to a stable version by running `pod update #{name}`."
+          elsif !conflict.existing
+            conflict.requirements.values.flatten.each do |r|
+              unless search_for(r).empty?
+                message << "\n\nSpecs satisfying the `#{r}` dependency were found, " \
+                  'but they required a higher minimum deployment target.'
+              end
+            end
           end
         end
       end
-      raise Informative, error.message
+      raise Informative, message
     end
 
     # Returns whether the given spec is platform-compatible with the dependency

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -152,6 +152,22 @@ module Pod
         paths_for_attribute(:vendored_frameworks, true)
       end
 
+      # @return [Array<Pathname>] The paths of the dynamic framework bundles
+      #         that come shipped with the Pod.
+      #
+      def vendored_dynamic_frameworks
+        vendored_frameworks.select do |framework|
+          dynamic_binary?(framework + framework.basename('.*'))
+        end
+      end
+
+      # @return [Array<Pathname>] The paths of the static (fake) framework
+      #         bundles that come shipped with the Pod.
+      #
+      def vendored_static_frameworks
+        vendored_frameworks - vendored_dynamic_frameworks
+      end
+
       # @param  [Pathname] framework
       #         The vendored framework to search into.
       # @return [Pathname] The path of the header directory of the
@@ -187,6 +203,36 @@ module Pod
         paths_for_attribute(:vendored_libraries)
       end
 
+      # @return [Array<Pathname>] The paths of the dynamic libraries
+      #         that come shipped with the Pod.
+      #
+      def vendored_dynamic_libraries
+        vendored_libraries.select do |library|
+          dynamic_binary?(library)
+        end
+      end
+
+      # @return [Array<Pathname>] The paths of the static libraries
+      #         that come shipped with the Pod.
+      #
+      def vendored_static_libraries
+        vendored_libraries - vendored_dynamic_libraries
+      end
+
+      # @return [Array<Pathname>] The paths of the dynamic binary artifacts
+      #         that come shipped with the Pod.
+      #
+      def vendored_dynamic_artifacts
+        vendored_dynamic_libraries + vendored_dynamic_frameworks
+      end
+
+      # @return [Array<Pathname>] The paths of the static binary artifacts
+      #         that come shipped with the Pod.
+      #
+      def vendored_static_artifacts
+        vendored_static_libraries + vendored_static_frameworks
+      end
+
       # @return [Hash{String => Array<Pathname>}] A hash that describes the
       #         resource bundles of the Pod. The keys represent the name of
       #         the bundle while the values the path of the resources.
@@ -315,6 +361,17 @@ module Pod
         result.flatten.compact.uniq
       end
 
+      # @param  [Pathname] binary
+      #         The file to be checked for being a dynamic Mach-O binary.
+      #
+      # @return [Boolean] Whether `binary` can be dynamically linked.
+      #
+      def dynamic_binary?(binary)
+        return unless binary.file?
+        output, status = Executable.capture_command('file', [binary], :capture => :out)
+        status.success? && output =~ /dynamically linked/
+      end
+
       #-----------------------------------------------------------------------#
     end
   end

data/lib/cocoapods/sandbox/headers_store.rb

@@ -66,13 +66,13 @@ module Pod
       #         the path of the header file relative to the Pods project
       #         (`PODS_ROOT` variable of the xcconfigs).
       #
-      # @note   This method adds the files to the search paths.
+      # @note   This method does _not_ add the files to the search paths.
       #
       # @return [Array<Pathname>]
       #
-      def add_files(namespace, relative_header_paths, platform)
+      def add_files(namespace, relative_header_paths)
         relative_header_paths.map do |relative_header_path|
-          add_file(namespace, relative_header_path, relative_header_path.basename, platform)
+          add_file(namespace, relative_header_path, relative_header_path.basename)
         end
       end
 
@@ -90,12 +90,11 @@ module Pod
       #         the name under which the file should be available in the
       #         headers directory.
       #
-      # @note   This method adds the file to the search paths.
+      # @note   This method does _not_ add the file to the search paths.
       #
       # @return [Pathname]
       #
-      def add_file(namespace, relative_header_path, final_name, platform)
-        add_search_path(namespace, platform)
+      def add_file(namespace, relative_header_path, final_name)
         namespaced_path = root + namespace
         namespaced_path.mkpath unless File.exist?(namespaced_path)
 

data/lib/cocoapods/target.rb

@@ -75,12 +75,6 @@ module Pod
       requires_frameworks? ? :framework : :static_library
     end
 
-    # @return [String] the XCConfig namespaced prefix.
-    #
-    def xcconfig_prefix
-      label.upcase.gsub(/[^A-Z]/, '_') + '_'
-    end
-
     # @return [String] A string suitable for debugging.
     #
     def inspect
@@ -140,12 +134,6 @@ module Pod
       end
     end
 
-    # @return [Pathname] the absolute path of the private xcconfig file.
-    #
-    def xcconfig_private_path
-      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

data/lib/cocoapods/target/pod_target.rb

@@ -33,6 +33,11 @@ module Pod
     attr_reader :scoped
     alias_method :scoped?, :scoped
 
+    # @return [Array<PodTarget>] the targets that this target has a dependency
+    #         upon.
+    #
+    attr_accessor :dependent_targets
+
     # @param [Array<Specification>] @spec #see spec
     # @param [Array<TargetDefinition>] target_definitions @see target_definitions
     # @param [Sandbox] sandbox @see sandbox
@@ -49,6 +54,7 @@ module Pod
       @build_headers  = Sandbox::HeadersStore.new(sandbox, 'Private')
       @file_accessors = []
       @resource_bundle_targets = []
+      @dependent_targets = []
     end
 
     # @return [Array<PodTarget>] a scoped copy for each target definition.
@@ -60,6 +66,7 @@ module Pod
           target.user_build_configurations = user_build_configurations
           target.native_target = native_target
           target.archs = archs
+          target.dependent_targets = dependent_targets.map(&:scoped)
         end
       end
     end

data/lib/cocoapods/validator.rb

@@ -62,7 +62,7 @@ module Pod
     # @return [Bool] whether the specification passed validation.
     #
     def validate
-      @results  = []
+      @results = []
 
       # Replace default spec with a subspec if asked for
       a_spec = spec
@@ -111,7 +111,7 @@ module Pod
         when :warning then type = 'WARN'
         when :note    then type = 'NOTE'
         else raise "#{result.type}" end
-        UI.puts "    - #{type.ljust(5)} | #{platform_message}#{subspecs_message}#{result.message}"
+        UI.puts "    - #{type.ljust(5)} | #{platform_message}#{subspecs_message}#{result.attribute_name}: #{result.message}"
       end
       UI.puts
     end
@@ -127,9 +127,13 @@ module Pod
       if !allow_warnings && (size = results_by_type[:warning].size) && size > 0
         reason = "#{size} #{'warning'.pluralize(size)}"
         pronoun = size == 1 ? 'it' : 'them'
-        reason <<  " (but you can use `--allow-warnings` to ignore #{pronoun})" if reasons.empty?
+        reason << " (but you can use `--allow-warnings` to ignore #{pronoun})" if reasons.empty?
         reasons << reason
       end
+      if results.all?(&:public_only)
+        reasons << 'All results apply only to public specs, but you can use ' \
+                   '`--private` to ignore them if linting the specification for a private pod.'
+      end
       reasons.to_sentence
     end
 
@@ -177,6 +181,11 @@ module Pod
     #
     attr_accessor :use_frameworks
 
+    # @return [Boolean] Whether attributes that affect only public sources
+    #         Bool be skipped.
+    #
+    attr_accessor :ignore_public_only_results
+
     #-------------------------------------------------------------------------#
 
     # !@group Lint results
@@ -195,7 +204,9 @@ module Pod
     #         One of: `:error`, `:warning`, `:note`.
     #
     def result_type
-      types = results.map(&:type).uniq
+      applicable_results = results
+      applicable_results = applicable_results.reject(&:public_only?) if ignore_public_only_results
+      types              = applicable_results.map(&:type).uniq
       if    types.include?(:error)   then :error
       elsif types.include?(:warning) then :warning
       else  :note
@@ -277,9 +288,9 @@ module Pod
       resp = Pod::HTTP.validate_url(url)
 
       if !resp
-        warning('url', "There was a problem validating the URL #{url}.")
+        warning('url', "There was a problem validating the URL #{url}.", true)
       elsif !resp.success?
-        warning('url', "The URL (#{url}) is not reachable.")
+        warning('url', "The URL (#{url}) is not reachable.", true)
       end
 
       resp
@@ -297,8 +308,8 @@ module Pod
     #
     def validate_screenshots(spec)
       spec.screenshots.compact.each do |screenshot|
-        request = validate_url(screenshot)
-        if request && !(request.headers['content-type'] && request.headers['content-type'].first =~ /image\/.*/i)
+        response = validate_url(screenshot)
+        if response && !(response.headers['content-type'] && response.headers['content-type'].first =~ /image\/.*/i)
           warning('screenshot', "The screenshot #{screenshot} is not a valid image.")
         end
       end
@@ -371,8 +382,8 @@ module Pod
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
 
       unless file_accessor.nil?
-        dynamic_frameworks = file_accessor.vendored_frameworks.select { |fw| `file #{fw + fw.basename('.framework')} 2>&1` =~ /dynamically linked/ }
-        dynamic_libraries = file_accessor.vendored_libraries.select { |lib| `file #{lib} 2>&1` =~ /dynamically linked/ }
+        dynamic_frameworks = file_accessor.vendored_dynamic_frameworks
+        dynamic_libraries = file_accessor.vendored_dynamic_libraries
         if (dynamic_frameworks.count > 0 || dynamic_libraries.count > 0) && consumer.platform_name == :ios &&
             (deployment_target.nil? || Version.new(deployment_target).major < 8)
           error('dynamic', 'Dynamic frameworks and libraries are only supported on iOS 8.0 and onwards.')
@@ -395,7 +406,7 @@ module Pod
         UI.message "\nBuilding with xcodebuild.\n".yellow do
           output = Dir.chdir(config.sandbox_root) { xcodebuild }
           UI.puts output
-          parsed_output  = parse_xcodebuild_output(output)
+          parsed_output = parse_xcodebuild_output(output)
           parsed_output.each do |message|
             # Checking the error for `InputFile` is to work around an Xcode
             # issue where linting would fail even though `xcodebuild` actually
@@ -490,24 +501,24 @@ module Pod
 
     # !@group Result Helpers
 
-    def error(attribute_name, message)
-      add_result(:error, attribute_name, message)
+    def error(*args)
+      add_result(:error, *args)
     end
 
-    def warning(attribute_name, message)
-      add_result(:warning, attribute_name, message)
+    def warning(*args)
+      add_result(:warning, *args)
     end
 
-    def note(attribute_name, message)
-      add_result(:note, attribute_name, message)
+    def note(*args)
+      add_result(:note, *args)
     end
 
-    def add_result(type, attribute_name, message)
+    def add_result(type, attribute_name, message, public_only = false)
       result = results.find do |r|
-        r.type == type && r.attribute_name && r.message == message
+        r.type == type && r.attribute_name && r.message == message && r.public_only? == public_only
       end
       unless result
-        result = Result.new(type, attribute_name, message)
+        result = Result.new(type, attribute_name, message, public_only)
         results << result
       end
       result.platforms << consumer.platform_name if consumer
@@ -517,8 +528,8 @@ module Pod
     # Specialized Result to support subspecs aggregation
     #
     class Result < Specification::Linter::Results::Result
-      def initialize(type, attribute_name, message)
-        super(type, attribute_name, message)
+      def initialize(type, attribute_name, message, public_only = false)
+        super(type, attribute_name, message, public_only)
         @subspecs = []
       end
 
@@ -583,7 +594,7 @@ module Pod
     def parse_xcodebuild_output(output)
       lines = output.split("\n")
       selected_lines = lines.select do |l|
-        l.include?('error: ') && (l !~ /errors? generated\./) && (l !~ /error: \(null\)/)  ||
+        l.include?('error: ') && (l !~ /errors? generated\./) && (l !~ /error: \(null\)/) ||
           l.include?('warning: ') && (l !~ /warnings? generated\./) && (l !~ /frameworks only run on iOS 8/) ||
           l.include?('note: ') && (l !~ /expanded from macro/)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.38.2
+  version: 0.39.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.38.2
+        version: 0.39.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.38.2
+        version: 0.39.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
@@ -89,42 +89,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
@@ -311,8 +311,7 @@ files:
 - lib/cocoapods/generator/umbrella_header.rb
 - lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
-- lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
-- lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb
+- lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
 - lib/cocoapods/hooks_manager.rb
 - lib/cocoapods/installer.rb
@@ -330,6 +329,7 @@ files:
 - lib/cocoapods/installer/podfile_validator.rb
 - lib/cocoapods/installer/post_install_hooks_context.rb
 - lib/cocoapods/installer/pre_install_hooks_context.rb
+- lib/cocoapods/installer/source_provider_hooks_context.rb
 - lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
 - lib/cocoapods/installer/target_installer/pod_target_installer.rb