cocoapods 0.37.2 → 0.38.0.beta.1

data/lib/cocoapods/sandbox/podspec_finder.rb

@@ -14,6 +14,7 @@ module Pod
         spec_files.sort_by { |p| -p.to_path.split(File::SEPARATOR).size }.each do |file|
           begin
             spec = Specification.from_file(file)
+            spec.validate_cocoapods_version
             @specs_by_name[spec.name] = spec
           rescue => e
             UI.warn "Unable to load a podspec from `#{file.basename}`, skipping:\n\n#{e}"

data/lib/cocoapods/sources_manager.rb

@@ -271,6 +271,8 @@ module Pod
             "CocoaPods #{versions['last']} is available.".green,
             "To update use: `#{install_message}`".green,
             ("[!] This is a test version we'd love you to try.".yellow if rc),
+            ("Until we reach version 1.0 the features of CocoaPods can and will change.\n" \
+             'We strongly recommend that you use the latest version at all times.'.yellow unless rc),
             '',
             'For more information see http://blog.cocoapods.org'.green,
             'and the CHANGELOG for this version http://git.io/BaH8pQ.'.green,

data/lib/cocoapods/target.rb

@@ -6,11 +6,6 @@ module Pod
   # This class is used to represent both the targets and their libraries.
   #
   class Target
-    # @return [TargetDefinition] the target definition of the Podfile that
-    #         generated this target.
-    #
-    attr_reader :target_definition
-
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
     attr_reader :sandbox
@@ -21,6 +16,12 @@ module Pod
     attr_accessor :host_requires_frameworks
     alias_method :host_requires_frameworks?, :host_requires_frameworks
 
+    # Initialize a new target
+    #
+    def initialize
+      @archs = []
+    end
+
     # @return [String] the name of the library.
     #
     def name
@@ -110,13 +111,7 @@ module Pod
     #
     attr_accessor :native_target
 
-    # @return [Platform] the platform for this library.
-    #
-    def platform
-      @platform ||= target_definition.platform
-    end
-
-    # @return [String] The value for the ARCHS build setting.
+    # @return [Array<String>] The value for the ARCHS build setting.
     #
     attr_accessor :archs
 
@@ -167,14 +162,6 @@ module Pod
       support_files_dir + "#{label}.modulemap"
     end
 
-    # @return [Pathname] the absolute path of the header file which contains
-    #         the information about the installed pods.
-    #
-    def target_environment_header_path
-      name = target_definition.label
-      sandbox.target_support_files_dir(name) + "#{name}-environment.h"
-    end
-
     # @return [Pathname] the absolute path of the prefix header file.
     #
     def prefix_header_path
@@ -199,23 +186,6 @@ module Pod
       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

data/lib/cocoapods/target/aggregate_target.rb

@@ -3,12 +3,17 @@ module Pod
   # of the single Pods. The client targets will then depend on this one.
   #
   class AggregateTarget < Target
+    # @return [TargetDefinition] the target definition of the Podfile that
+    #         generated this target.
+    attr_reader :target_definition
+
     # Initialize a new instance
     #
     # @param [TargetDefinition] target_definition @see target_definition
     # @param [Sandbox] sandbox @see sandbox
     #
     def initialize(target_definition, sandbox)
+      super()
       @target_definition = target_definition
       @sandbox = sandbox
       @pod_targets = []
@@ -30,6 +35,18 @@ module Pod
       c99ext_identifier(label)
     end
 
+    # @return [Platform] the platform for this target.
+    #
+    def platform
+      @platform ||= target_definition.platform
+    end
+
+    # @return [Podfile] The podfile which declares the dependency
+    #
+    def podfile
+      target_definition.podfile
+    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
@@ -94,7 +111,7 @@ module Pod
     #
     def pod_targets_for_build_configuration(build_configuration)
       pod_targets.select do |pod_target|
-        pod_target.include_in_build_config?(build_configuration)
+        pod_target.include_in_build_config?(target_definition, build_configuration)
       end
     end
 
@@ -182,6 +199,13 @@ module Pod
       "${SRCROOT}/#{relative_to_srcroot(embed_frameworks_script_path)}"
     end
 
+    # @return [String] The scoped configuration build dir, relevant if the
+    #         target is integrated as framework.
+    #
+    def scoped_configuration_build_dir
+      "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/#{target_definition.label}"
+    end
+
     private
 
     # @!group Private Helpers

data/lib/cocoapods/target/pod_target.rb

@@ -3,31 +3,87 @@ module Pod
   # A pod can have one or more activated spec/subspecs.
   #
   class PodTarget < Target
-    # @return [Specification] the spec for the target.
+    # @return [Array<Specification>] the spec and subspecs for the target.
     #
     attr_reader :specs
 
+    # @return [Array<PBXNativeTarget>] the target definitions of the Podfile
+    #         that generated this target.
+    #
+    attr_reader :target_definitions
+
     # @return [HeadersStore] the header directory for the target.
     #
     attr_reader :build_headers
 
-    # @param [Specification] spec @see spec
-    # @param [TargetDefinition] target_definition @see target_definition
+    # @return [Bool] whether the target needs to be scoped by target definition,
+    #         because the spec is used with different subspec sets across them.
+    #
+    # @note   For frameworks the target products of {PodTarget}s 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 because multiple targets can exist for the
+    #         same podspec and their products should not collide. This
+    #         duplication is needed when multiple user targets have the same
+    #         dependency, but they require different sets of subspecs or they
+    #         are on different platforms.
+    #
+    attr_reader :scoped
+    alias_method :scoped?, :scoped
+
+    # @param [Array<Specification>] @spec #see spec
+    # @param [Array<TargetDefinition>] target_definitions @see target_definitions
     # @param [Sandbox] sandbox @see sandbox
+    # @param [Bool] scoped @see scoped
     #
-    def initialize(specs, target_definition, sandbox)
+    def initialize(specs, target_definitions, sandbox, scoped = false)
+      raise "Can't initialize a PodTarget without specs!" if specs.nil? || specs.empty?
+      raise "Can't initialize a PodTarget without TargetDefinition!" if target_definitions.nil? || target_definitions.empty?
+      super()
       @specs = specs
-      @target_definition = target_definition
+      @target_definitions = target_definitions
       @sandbox = sandbox
+      @scoped = scoped
       @build_headers  = Sandbox::HeadersStore.new(sandbox, 'Private')
       @file_accessors = []
       @resource_bundle_targets = []
     end
 
+    # @return [Array<PodTarget>] a scoped copy for each target definition.
+    #
+    def scoped
+      target_definitions.map do |target_definition|
+        PodTarget.new(specs, [target_definition], sandbox, true).tap do |target|
+          target.file_accessors = file_accessors
+          target.user_build_configurations = user_build_configurations
+          target.native_target = native_target
+          target.archs = archs
+        end
+      end
+    end
+
     # @return [String] the label for the target.
     #
     def label
-      "#{target_definition.label}-#{root_spec.name}"
+      if scoped?
+        "#{target_definitions.first.label}-#{root_spec.name}"
+      else
+        root_spec.name
+      end
+    end
+
+    # @return [Platform] the platform for this target.
+    #
+    def platform
+      @platform ||= target_definitions.first.platform
+    end
+
+    # @return [Podfile] The podfile which declares the dependency.
+    #
+    def podfile
+      target_definitions.first.podfile
     end
 
     # @return [String] The name to use for the source code module constructed
@@ -103,13 +159,16 @@ module Pod
     end
 
     # Checks if the target should be included in the build configuration with
-    # the given name.
+    # the given name of a given target definition.
+    #
+    # @param  [TargetDefinition] target_definition
+    #         The target definition to check.
     #
     # @param  [String] configuration_name
     #         The name of the build configuration.
     #
-    def include_in_build_config?(configuration_name)
-      whitelists = target_definition_dependencies.map do |dependency|
+    def include_in_build_config?(target_definition, configuration_name)
+      whitelists = target_definition_dependencies(target_definition).map do |dependency|
         target_definition.pod_whitelisted_for_configuration?(dependency.name, configuration_name)
       end.uniq
 
@@ -125,14 +184,51 @@ module Pod
       end
     end
 
+    # Checks if warnings should be inhibited for this pod.
+    #
+    # @return [Bool]
+    #
+    def inhibit_warnings?
+      whitelists = target_definitions.map do |target_definition|
+        target_definition.inhibits_warnings_for_pod?(root_spec.name)
+      end.uniq
+
+      if whitelists.empty?
+        return false
+      elsif whitelists.count == 1
+        whitelists.first
+      else
+        UI.warn "The pod `#{pod_name}` is linked to different targets " \
+          "(#{target_definitions.map(&:label)}), which contain different " \
+          'settings to inhibit warnings. CocoaPods does not currently ' \
+          'support different settings and will fall back to your preference ' \
+          'set in the root target definition.'
+        return podfile.root_target_definitions.first.inhibits_warnings_for_pod?(root_spec.name)
+      end
+    end
+
+    # @return [String] The configuration build dir, relevant if the target is
+    #         integrated as framework.
+    #
+    def configuration_build_dir
+      if scoped?
+        "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/#{target_definitions.first.label}"
+      else
+        '$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)'
+      end
+    end
+
     private
 
+    # @param  [TargetDefinition] target_definition
+    #         The target definition to check.
+    #
     # @return [Array<Dependency>] The dependency of the target definition for
     #         this Pod. Return an empty array if the Pod is not a direct
     #         dependency of the target definition but the dependency of one or
     #         more Pods.
     #
-    def target_definition_dependencies
+    def target_definition_dependencies(target_definition)
       target_definition.dependencies.select do |dependency|
         Specification.root_name(dependency.name) == pod_name
       end

data/lib/cocoapods/user_interface.rb

@@ -285,6 +285,32 @@ module Pod
         end
       end
 
+      # Presents a choice among the elements of an array to the user.
+      #
+      # @param  [Array<#to_s>] array
+      #         The list of the elements among which the user should make his
+      #         choice.
+      #
+      # @param  [String] message
+      #         The message to display to the user.
+      #
+      # @return [Fixnum] The index of the chosen array item.
+      #
+      def choose_from_array(array, message)
+        array.each_with_index do |item, index|
+          UI.puts "#{ index + 1 }: #{ item }"
+        end
+
+        UI.puts message
+
+        index = UI.gets.chomp.to_i - 1
+        if index < 0 || index > array.count - 1
+          raise Informative, "#{ index + 1 } is invalid [1-#{ array.count }]"
+        else
+          index
+        end
+      end
+
       public
 
       # @!group Basic methods

data/lib/cocoapods/user_interface/error_report.rb

@@ -73,6 +73,12 @@ EOS
 
         private
 
+        def `(other)
+          super
+        rescue Errno::ENOENT => e
+          "Unable to find an executable (#{e})"
+        end
+
         def pathless_exception_message(message)
           message.gsub(/- \(.*\):/, '-')
         end

data/lib/cocoapods/validator.rb

@@ -1,3 +1,6 @@
+require 'active_support/core_ext/array'
+require 'active_support/core_ext/string/inflections'
+
 module Pod
   # Validates a Specification.
   #
@@ -89,6 +92,8 @@ module Pod
           platform_message = '[iOS] '
         elsif result.platforms == [:osx]
           platform_message = '[OSX] '
+        elsif result.platforms == [:watchos]
+          platform_message = '[watchOS] '
         end
 
         subspecs_message = ''
@@ -111,6 +116,23 @@ module Pod
       UI.puts
     end
 
+    def failure_reason
+      results_by_type = results.group_by(&:type)
+      results_by_type.default = []
+      return nil if validated?
+      reasons = []
+      if (size = results_by_type[:error].size) && size > 0
+        reasons << "#{size} #{'error'.pluralize(size)}"
+      end
+      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?
+        reasons << reason
+      end
+      reasons.to_sentence
+    end
+
     #-------------------------------------------------------------------------#
 
     #  @!group Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: 0.38.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,56 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.38.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.38.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,9 @@ files:
 - bin/sandbox-pod
 - lib/cocoapods.rb
 - lib/cocoapods/command.rb
+- lib/cocoapods/command/cache.rb
+- lib/cocoapods/command/cache/clean.rb
+- lib/cocoapods/command/cache/list.rb
 - lib/cocoapods/command/init.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
@@ -291,26 +294,28 @@ files:
 - lib/cocoapods/generator/info_plist_file.rb
 - lib/cocoapods/generator/module_map.rb
 - lib/cocoapods/generator/prefix_header.rb
-- lib/cocoapods/generator/target_environment_header.rb
 - 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/xcconfig_helper.rb
-- lib/cocoapods/hooks/installer_representation.rb
-- lib/cocoapods/hooks/library_representation.rb
-- lib/cocoapods/hooks/pod_representation.rb
 - lib/cocoapods/hooks_manager.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/installer/analyzer.rb
+- lib/cocoapods/installer/analyzer/analysis_result.rb
 - lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
+- lib/cocoapods/installer/analyzer/specs_state.rb
+- lib/cocoapods/installer/analyzer/target_inspection_result.rb
+- lib/cocoapods/installer/analyzer/target_inspector.rb
 - lib/cocoapods/installer/file_references_installer.rb
-- lib/cocoapods/installer/hooks_context.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
 - lib/cocoapods/installer/pod_source_preparer.rb
+- 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/target_installer.rb
 - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
 - lib/cocoapods/installer/target_installer/pod_target_installer.rb
@@ -354,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.