cocoapods 1.0.0.beta.4 → 1.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a45e8f74520fb565c87e9868bddd55dc0fb6131
-  data.tar.gz: 4f454b54f7246fe6b0b7eb3d4e46f83bf4aa8a88
+  metadata.gz: 351bd282c885de91d29ea0ce21df2f9fbebe22ad
+  data.tar.gz: a2b17616d19c1cc6971232c77fde0e36c1c559e1
 SHA512:
-  metadata.gz: 284712afd5fcad4ab68829aa9976f8c2ef64c54a3554b93c69a637807187aa56c2ce050b62219529b7db976bad9a087e415d14227c337777103bacd63074fce7
-  data.tar.gz: edc7840b2eb983949a1d45fb2688b8eb9175d070ea6f840f944ace9238024823fb75154b64e6272c12af610d74d56d99d30f0ba3c2ebe291ba4e9fb2e0a40e43
+  metadata.gz: b165cefed02d0efd9088f9acfaad7ca9e92a07df8e827b655965a9a42eabbc25796bd716e5fc7fd28feb3975411d5b7b57904bb1b8cd5b67c6d8944057ba79a9
+  data.tar.gz: 172057ccdbbba5eac50a33abb6d611d9f5409db97748e1fd36e348a8fbdea458101f534bfc4d4f0849f05e8a7cb9fc54dd4609dfff100525c8182f7fc9a0ef37

data/CHANGELOG.md

@@ -4,6 +4,57 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.0.0.beta.5 (2016-03-08)
+
+##### Breaking
+
+* Development pods will no longer be implicitly unlocked. This makes CocoaPods
+  to respect constraints related to dependencies of development pods in the
+  lockfile.
+
+  If you change constraints of a dependency of your development pod, and want to
+  override the locked version, you will have to use
+  `pod update ${DEPENDENCY_NAME}` manually.  
+  [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
+  [#4211](https://github.com/CocoaPods/CocoaPods/issues/4211)
+  [#4577](https://github.com/CocoaPods/CocoaPods/issues/4577)
+  [#4580](https://github.com/CocoaPods/CocoaPods/issues/4580)
+
+##### Enhancements
+
+* Add the :package: emoji in front of CocoaPods Script Build Phases
+  to quickly and visually differentiate them from other phases.  
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [#4985](https://github.com/CocoaPods/CocoaPods/issues/4985)
+
+* Enable syntax highlighting on the Podfile in the generated
+  `Pods.xcodeproj`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4962](https://github.com/CocoaPods/CocoaPods/issues/4962)
+
+##### Bug Fixes
+
+* Fixes paths passed for resources bundles in the copy resources script.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#4954](https://github.com/CocoaPods/CocoaPods/pull/4954)
+
+* Fix saying the `master` specs repo exists when it has not been set up.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4955](https://github.com/CocoaPods/CocoaPods/issues/4955)
+
+* Move `${TARGET_DEVICE_ARGS}` out of the quotations for `--sdk` in the
+  `Copy Pods Resources` build phase.  
+  [seaders](https://github.com/seaders) [#4940](https://github.com/CocoaPods/CocoaPods/issues/4940)
+
+* Handle when `$PATH` isn't set.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Module maps that are set per-platform will be installed for the correct
+  platform.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4968](https://github.com/CocoaPods/CocoaPods/issues/4968)
+
+
 ## 1.0.0.beta.4 (2016-02-24)
 
 ##### Enhancements

data/lib/cocoapods/command/lib.rb

@@ -37,7 +37,7 @@ module Pod
         def validate!
           super
           help! 'A name for the Pod is required.' unless @name
-          help! 'The Pod name cannot contain spaces.' if @name.match(/\s/)
+          help! 'The Pod name cannot contain spaces.' if @name =~ /\s/
           help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
         end
 

data/lib/cocoapods/command/project.rb

@@ -135,13 +135,13 @@ module Pod
             !lockfile_roots.include?(pod)
           end
 
-          if missing_pods.length > 0
-            if missing_pods.length > 1
-              message = "Pods `#{missing_pods.join('`, `')}` are not " \
-                'installed and cannot be updated'
-            else
-              message = "The `#{missing_pods.first}` Pod is not installed " \
-                'and cannot be updated'
+          unless missing_pods.empty?
+            message = if missing_pods.length > 1
+                        "Pods `#{missing_pods.join('`, `')}` are not " \
+                          'installed and cannot be updated'
+                      else
+                        "The `#{missing_pods.first}` Pod is not installed " \
+                          'and cannot be updated'
             end
             raise Informative, message
           end

data/lib/cocoapods/executable.rb

@@ -46,8 +46,7 @@ module Pod
     # @return [String] the output of the command (STDOUT and STDERR).
     #
     def self.execute_command(executable, command, raise_on_failure = true)
-      bin = which(executable)
-      raise Informative, "Unable to locate the executable `#{executable}`" unless bin
+      bin = which!(executable)
 
       command = command.map(&:to_s)
       full_command = "#{bin} #{command.join(' ')}"
@@ -87,7 +86,10 @@ module Pod
     #
     def self.which(program)
       program = program.to_s
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      paths = ENV.fetch('PATH') { '' }.split(File::PATH_SEPARATOR)
+      paths.unshift('./')
+      paths.uniq!
+      paths.each do |path|
         bin = File.expand_path(program, path)
         if File.file?(bin) && File.executable?(bin)
           return bin
@@ -96,6 +98,20 @@ module Pod
       nil
     end
 
+    # Returns the absolute path to the binary with the given name on the current
+    # `PATH`, or raises if none is found.
+    #
+    # @param  [String] program
+    #         The name of the program being searched for.
+    #
+    # @return [String] The absolute path to the given program.
+    #
+    def self.which!(program)
+      which(program).tap do |bin|
+        raise Informative, "Unable to locate the executable `#{executable}`" unless bin
+      end
+    end
+
     # Runs the given command, capturing the desired output.
     #
     # @param  [String] bin
@@ -114,8 +130,7 @@ module Pod
     #         running the command.
     #
     def self.capture_command(executable, command, capture: :merge)
-      bin = which(executable)
-      raise Informative, "Unable to locate the executable `#{executable}`" unless bin
+      bin = which!(executable)
 
       require 'open3'
       command = command.map(&:to_s)

data/lib/cocoapods/external_sources/podspec_source.rb

@@ -43,7 +43,7 @@ module Pod
       #
       def podspec_uri
         declared_path = params[:podspec].to_s
-        if declared_path.match(%r{^.+://})
+        if declared_path =~ %r{^.+://}
           declared_path
         else
           normalized_podspec_path(declared_path)

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.0.0.beta.4'.freeze unless defined? Pod::VERSION
+  VERSION = '1.0.0.beta.5'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -1,5 +1,3 @@
-# rubocop:disable LineLength
-
 module Pod
   module Generator
     class CopyResourcesScript
@@ -143,7 +141,7 @@ EOM
   case $RESOURCE_PATH in
     *\.storyboard)
       echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT} ${TARGET_DEVICE_ARGS}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
       ;;
     *\.xib)
       echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"

data/lib/cocoapods/installer.rb

@@ -552,12 +552,10 @@ module Pod
     #
     def prepare_pods_project
       UI.message '- Creating Pods project' do
-        object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
-
-        if object_version
-          @pods_project = Pod::Project.new(sandbox.project_path, false, object_version)
-        else
-          @pods_project = Pod::Project.new(sandbox.project_path)
+        @pods_project = if object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
+                          Pod::Project.new(sandbox.project_path, false, object_version)
+                        else
+                          Pod::Project.new(sandbox.project_path)
         end
 
         analysis_result.all_user_build_configurations.each do |name, type|

data/lib/cocoapods/installer/analyzer.rb

@@ -68,10 +68,11 @@ module Pod
           verify_platforms_specified!
         end
         @result.podfile_state = generate_podfile_state
-        @locked_dependencies  = generate_version_locking_dependencies
 
         store_existing_checkout_options
         fetch_external_sources if allow_fetches
+
+        @locked_dependencies    = generate_version_locking_dependencies
         @result.specs_by_target = validate_platforms(resolve_dependencies)
         @result.specifications  = generate_specifications
         @result.targets         = generate_targets
@@ -417,8 +418,11 @@ module Pod
         else
           pods_to_update = result.podfile_state.changed + result.podfile_state.deleted
           pods_to_update += update[:pods] if update_mode == :selected
-          pods_to_update += podfile.dependencies.select(&:local?).map(&:name)
-          LockingDependencyAnalyzer.generate_version_locking_dependencies(lockfile, pods_to_update)
+          local_pod_names = podfile.dependencies.select(&:local?).map(&:root_name)
+          pods_to_unlock = local_pod_names.reject do |pod_name|
+            sandbox.specification(pod_name).checksum == lockfile.checksum(pod_name)
+          end
+          LockingDependencyAnalyzer.generate_version_locking_dependencies(lockfile, pods_to_update, pods_to_unlock)
         end
       end
 
@@ -466,10 +470,10 @@ module Pod
 
       def fetch_external_source(dependency, use_lockfile_options)
         checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name) if lockfile
-        if checkout_options && use_lockfile_options
-          source = ExternalSources.from_params(checkout_options, dependency, podfile.defined_in_file)
-        else
-          source = ExternalSources.from_dependency(dependency, podfile.defined_in_file)
+        source = if checkout_options && use_lockfile_options
+                   ExternalSources.from_params(checkout_options, dependency, podfile.defined_in_file)
+                 else
+                   ExternalSources.from_dependency(dependency, podfile.defined_in_file)
         end
         source.can_cache = installation_options.clean?
         source.fetch(sandbox)

data/lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb

@@ -13,11 +13,23 @@ module Pod
         # is in update mode, to prevent it from upgrading the Pods that weren't
         # changed in the {Podfile}.
         #
+        # @param [Lockfile] lockfile the lockfile containing dependency constraints
+        #
+        # @param [Array<String>] pods_to_update
+        #        List of pod names which needs to be updated because installer is
+        #        in update mode for these pods. Pods in this list and all their recursive dependencies
+        #        will not be included in generated dependency graph
+        #
+        # @param [Array<String>] pods_to_unlock
+        #        List of pod names whose version constraints will be removed from  the generated dependency graph.
+        #        Recursive dependencies of the pods won't be affected. This is currently used to force local pods
+        #        to be evaluated again whenever checksum of the specification of the local pods changes.
+        #
         # @return [Molinillo::DependencyGraph<Dependency>] the dependencies
         #         generated by the lockfile that prevent the resolver to update
         #         a Pod.
         #
-        def self.generate_version_locking_dependencies(lockfile, pods_to_update)
+        def self.generate_version_locking_dependencies(lockfile, pods_to_update, pods_to_unlock = [])
           dependency_graph = Molinillo::DependencyGraph.new
 
           if lockfile
@@ -29,7 +41,7 @@ module Pod
 
             pods = lockfile.to_hash['PODS'] || []
             pods.each do |pod|
-              add_to_dependency_graph(pod, [], dependency_graph)
+              add_to_dependency_graph(pod, [], dependency_graph, pods_to_unlock)
             end
 
             pods_to_update = pods_to_update.flat_map do |u|
@@ -56,20 +68,23 @@ module Pod
 
         private
 
-        def self.add_child_vertex_to_graph(dependency_string, parents, dependency_graph)
+        def self.add_child_vertex_to_graph(dependency_string, parents, dependency_graph, pods_to_unlock)
           dependency = Dependency.from_string(dependency_string)
+          if pods_to_unlock.include?(dependency.root_name)
+            dependency = Dependency.new(dependency.name)
+          end
           dependency_graph.add_child_vertex(dependency.name, parents.empty? ? dependency : nil, parents, nil)
           dependency
         end
 
-        def self.add_to_dependency_graph(object, parents, dependency_graph)
+        def self.add_to_dependency_graph(object, parents, dependency_graph, pods_to_unlock)
           case object
           when String
-            add_child_vertex_to_graph(object, parents, dependency_graph)
+            add_child_vertex_to_graph(object, parents, dependency_graph, pods_to_unlock)
           when Hash
             object.each do |key, value|
-              dependency = add_child_vertex_to_graph(key, parents, dependency_graph)
-              value.each { |v| add_to_dependency_graph(v, [dependency.name], dependency_graph) }
+              dependency = add_child_vertex_to_graph(key, parents, dependency_graph, pods_to_unlock)
+              value.each { |v| add_to_dependency_graph(v, [dependency.name], dependency_graph, pods_to_unlock) }
             end
           end
         end

data/lib/cocoapods/installer/analyzer/pod_variant_set.rb

@@ -94,12 +94,12 @@ module Pod
         def scope_by_specs
           root_spec = variants.first.root_spec
           specs = [root_spec]
-          if root_spec.default_subspecs.empty?
-            specs += root_spec.subspecs.compact
-          else
-            specs += root_spec.default_subspecs.map do |subspec_name|
-              root_spec.subspec_by_name("#{root_spec.name}/#{subspec_name}")
-            end
+          specs += if root_spec.default_subspecs.empty?
+                     root_spec.subspecs.compact
+                   else
+                     root_spec.default_subspecs.map do |subspec_name|
+                       root_spec.subspec_by_name("#{root_spec.name}/#{subspec_name}")
+                     end
           end
           default_specs = Set.new(specs)
           grouped_variants = group_by(&:specs)

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

@@ -107,15 +107,18 @@ module Pod
         library_targets = target.pod_targets.reject do |pod_target|
           pod_target.should_build? && pod_target.requires_frameworks?
         end
-        resources_by_config = {}
-        target.user_build_configurations.keys.each do |config|
-          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
-          resources_by_config[config] << bridge_support_file if bridge_support_file
+        target.user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
+          resources_by_config[config] = library_targets.flat_map do |library_target|
+            next [] unless library_target.include_in_build_config?(target_definition, config)
+            resource_paths = library_target.file_accessors.flat_map do |accessor|
+              accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) }
+            end
+            resource_bundles = library_target.file_accessors.flat_map do |accessor|
+              accessor.resource_bundles.keys.map { |name| "#{library_target.configuration_build_dir}/#{name.shellescape}.bundle" }
+            end
+            (resource_paths + resource_bundles + [bridge_support_file].compact).uniq
+          end
         end
-        resources_by_config
       end
 
       # Creates a script that copies the resources to the bundle of the client

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

@@ -24,12 +24,12 @@ module Pod
             create_info_plist_file
             create_module_map
             create_umbrella_header do |generator|
-              if header_mappings_dir
-                generator.imports += target.file_accessors.flat_map(&:public_headers).map do |pathname|
-                  pathname.relative_path_from(header_mappings_dir)
-                end
-              else
-                generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
+              generator.imports += if header_mappings_dir
+                                     target.file_accessors.flat_map(&:public_headers).map do |pathname|
+                                       pathname.relative_path_from(header_mappings_dir)
+                                     end
+                                   else
+                                     target.file_accessors.flat_map(&:public_headers).map(&:basename)
               end
             end
           end

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

@@ -9,6 +9,14 @@ module Pod
       class TargetIntegrator
         autoload :XCConfigIntegrator, 'cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator'
 
+        # @return [String] the PACKAGE emoji to use as prefix for every build phase aded to the user project
+        #
+        BUILD_PHASE_PREFIX = "\u{1F4E6} ".freeze
+
+        # @return [String] the name of the check manifest phase
+        #
+        CHECK_MANIFEST_PHASE_NAME = 'Check Pods Manifest.lock'.freeze
+
         # @return [Array<Symbol>] the symbol types, which require that the pod
         # frameworks are embedded in the output directory / product bundle.
         #
@@ -18,6 +26,10 @@ module Pod
         #
         EMBED_FRAMEWORK_PHASE_NAME = 'Embed Pods Frameworks'.freeze
 
+        # @return [String] the name of the copy resources phase
+        #
+        COPY_PODS_RESOURCES_PHASE_NAME = 'Copy Pods Resources'.freeze
+
         # @return [AggregateTarget] the target that should be integrated.
         #
         attr_reader :target
@@ -121,7 +133,7 @@ module Pod
         # @return [void]
         #
         def add_copy_resources_script_phase
-          phase_name = 'Copy Pods Resources'
+          phase_name = COPY_PODS_RESOURCES_PHASE_NAME
           native_targets.each do |native_target|
             phase = create_or_update_build_phase(native_target, phase_name)
             script_path = target.copy_resources_script_relative_path
@@ -139,7 +151,7 @@ module Pod
         # @return [void]
         #
         def add_check_manifest_lock_script_phase
-          phase_name = 'Check Pods Manifest.lock'
+          phase_name = CHECK_MANIFEST_PHASE_NAME
           native_targets.each do |native_target|
             phase = create_or_update_build_phase(native_target, phase_name)
             native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
@@ -201,10 +213,13 @@ module Pod
         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 } ||
+          prefixed_phase_name = BUILD_PHASE_PREFIX + phase_name
+          build_phases = target.build_phases.grep(phase_class)
+          build_phases.find { |phase| phase.name == prefixed_phase_name } ||
+            build_phases.find { |phase| phase.name == phase_name }.tap { |p| p.name = prefixed_phase_name if p } ||
             target.project.new(phase_class).tap do |phase|
-              UI.message("Adding Build Phase '#{phase_name}' to project.") do
-                phase.name = phase_name
+              UI.message("Adding Build Phase '#{prefixed_phase_name}' to project.") do
+                phase.name = prefixed_phase_name
                 phase.show_env_vars_in_log = '0'
                 target.build_phases << phase
               end

data/lib/cocoapods/project.rb

@@ -215,10 +215,11 @@ module Pod
     # @return [PBXFileReference] The new file reference.
     #
     def add_podfile(podfile_path)
-      podfile_ref = new_file(podfile_path, :project)
-      podfile_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
-      podfile_ref.last_known_file_type = 'text'
-      podfile_ref
+      new_file(podfile_path, :project).tap do |podfile_ref|
+        podfile_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
+        podfile_ref.explicit_file_type = 'text.script.ruby'
+        podfile_ref.last_known_file_type = 'text'
+      end
     end
 
     # Adds a new build configuration to the project and populates it with

data/lib/cocoapods/resolver.rb

@@ -104,13 +104,7 @@ module Pod
     def search_for(dependency)
       @search ||= {}
       @search[dependency] ||= begin
-        requirement = Requirement.new(dependency.requirement.as_list << requirement_for_locked_pod_named(dependency.name))
-        find_cached_set(dependency).
-          all_specifications.
-          select { |s| requirement.satisfied_by? s.version }.
-          map { |s| s.subspec_by_name(dependency.name, false) }.
-          compact.
-          reverse
+        specifications_for_dependency(dependency, [requirement_for_locked_pod_named(dependency.name)])
       end
       @search[dependency].dup
     end
@@ -279,6 +273,27 @@ module Pod
 
     # @!group Private helpers
 
+    # Returns available specifications which satisfy requirements of given dependency
+    # and additional requirements.
+    #
+    # @param [Dependency] dependency
+    #        The dependency whose requirements will be satisfied.
+    #
+    # @param [Array<Requirement>] additional_requirements
+    #        List of additional requirements which should also be satisfied.
+    #
+    # @return [Array<Specification>] List of specifications satisfying given requirements.
+    #
+    def specifications_for_dependency(dependency, additional_requirements = [])
+      requirement = Requirement.new(dependency.requirement.as_list + additional_requirements)
+      find_cached_set(dependency).
+        all_specifications.
+        select { |s| requirement.satisfied_by? s.version }.
+        map { |s| s.subspec_by_name(dependency.name, false) }.
+        compact.
+        reverse
+    end
+
     # @return [Set] Loads or returns a previously initialized set for the Pod
     #               of the given dependency.
     #
@@ -367,11 +382,13 @@ module Pod
     # @param  [Molinillo::ResolverError] error
     #
     def handle_resolver_error(error)
-      message = error.message
+      message = error.message.dup
       case error
       when Molinillo::VersionConflict
         error.conflicts.each do |name, conflict|
+          local_pod_parent = conflict.requirement_trees.flatten.reverse.find(&:local?)
           lockfile_reqs = conflict.requirements[name_for_locking_dependency_source]
+
           if lockfile_reqs && lockfile_reqs.last && lockfile_reqs.last.prerelease? && !conflict.existing
             message = 'Due to the previous naïve CocoaPods resolver, ' \
               "you were using a pre-release version of `#{name}`, " \
@@ -380,6 +397,12 @@ module Pod
               '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 local_pod_parent && !specifications_for_dependency(conflict.requirement).empty?
+            # Conflict was caused by a requirement from a local dependency.
+            # Tell user to use `pod update`.
+            message << "\n\nIt seems like you've changed the constraints of dependency `#{name}` " \
+            "inside your development pod `#{local_pod_parent.name}`.\nYou should run `pod update #{name}` to apply " \
+            "changes you've made."
           elsif (conflict.possibility && conflict.possibility.version.prerelease?) &&
               (conflict.requirement && !(
               conflict.requirement.prerelease? ||

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -259,8 +259,8 @@ module Pod
       # @return [Pathname] The of the prefix header file of the specification.
       #
       def prefix_header
-        if spec_consumer.prefix_header_file
-          path_list.root + spec_consumer.prefix_header_file
+        if file = spec_consumer.prefix_header_file
+          path_list.root + file
         end
       end
 
@@ -274,8 +274,8 @@ module Pod
       #         specification or auto-detected.
       #
       def license
-        if spec_consumer.spec.root.license[:file]
-          path_list.root + spec_consumer.spec.root.license[:file]
+        if file = spec_consumer.license[:file]
+          path_list.root + file
         else
           path_list.glob([GLOB_PATTERNS[:license]]).first
         end
@@ -284,7 +284,7 @@ module Pod
       # @return [Pathname, Nil] The path of the custom module map file of the
       #         specification, if specified.
       def module_map
-        if module_map = spec_consumer.spec.root.module_map
+        if module_map = spec_consumer.module_map
           path_list.root + module_map
         end
       end

data/lib/cocoapods/sources_manager.rb

@@ -103,7 +103,7 @@ module Pod
       # @return [Array<Source>] The CocoaPods Master Repo source.
       #
       def master
-        sources(['master'])
+        sources(['master']).select { |s| s.repo.directory? }
       end
 
       # Search the appropriate sources to match the set for the given dependency.
@@ -340,8 +340,9 @@ module Pod
       # @return [Bool] Whether the given source is a GIT repo.
       #
       def git_repo?(dir)
-        Dir.chdir(dir) { `git rev-parse >/dev/null 2>&1` }
-        $?.success?
+        Dir.chdir(dir) do
+          Executable.capture_command('git', %w(rev-parse), :capture => :none).success?
+        end
       end
 
       # Checks the version information of the source with the given directory.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.4
+  version: 1.0.0.beta.5
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,21 +19,21 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.beta.5
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
+        version: 1.0.0.beta.2
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -193,14 +193,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -473,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.