cocoapods 0.35.0.rc1 → 0.35.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f722fd7a025af675271c7e2e190028e95dfe302
-  data.tar.gz: 147981dc0fd9fd643e8de728c51a046e40e8f3e8
+  metadata.gz: 195891db68a277163d28c78e08b75e0ddfc852bd
+  data.tar.gz: 8c79a991661ebff9f5b1c363e1234becd3ab78f8
 SHA512:
-  metadata.gz: f669a688c5aecf46ffc90979c34ef0d1fbd52be0c0b474d950955b8d3aa47180d930e208ca316e30d2bde568fe68dbf470f54c6de939c4c1deac5c4be00d113c
-  data.tar.gz: eea96ff3d30d6e05006d5fd31e7e705875b6914a541663b201b3094c333dd297f2a157f8ab853cba61b808570041e35c0ec07a3f3fac4b209559c61d0f32cd10
+  metadata.gz: 29c891e01ead5efc883d6521ef5ea6071d8dc5877fe2a8130f56ce7bce50e0f8d87b7cb1562508eec984457e805c36da25e32dc1eb934e35bee6b268cbb4ba02
+  data.tar.gz: cf21e26e241ca8060c16be2ecc74e19c6e134803b0a1b141de382f450e593a5cb60597c41fa15a9b83960734e48a9c0ff023ec2e39d36058aecceceedc5f81e9

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+To install release candidates run `[sudo] gem install cocoapods --pre`
+
+## 0.35.0.rc2
+
+##### Enhancements
+
+* Allow the resolver to fail faster when there are unresolvable conflicts
+  involving the Lockfile.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+##### Bug Fixes
+
+* Allows pre-release spec versions when a requirement has an external source
+  specified.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2768](https://github.com/CocoaPods/CocoaPods/issues/2768)
+
+* We no longer require git version 1.7.5 or greater.  
+  [Kyle Fuller](https://github.com/kylef)
+
+* Fix the usage of `:head` pods.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2789](https://github.com/CocoaPods/CocoaPods/issues/2789)
+
+* Show a more informative message when attempting to lint a spec whose
+  source could not be downloaded.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2667](https://github.com/CocoaPods/CocoaPods/issues/2667)
+  [#2759](https://github.com/CocoaPods/CocoaPods/issues/2759)
+
 ## 0.35.0.rc1
 
 ##### Highlighted Enhancements That Need Testing

data/lib/cocoapods/command/lib.rb

@@ -113,8 +113,9 @@ module Pod
            ['--subspec=NAME', 'Lint validates only the given subspec'],
            ['--no-subspecs', 'Lint skips validation of subspecs'],
            ['--no-clean',    'Lint leaves the build directory intact for inspection'],
-           ['--sources=https://github.com/artsy/Specs', 'The sources to pull dependant pods from ' \
-            '(defaults to https://github.com/CocoaPods/Specs.git)']].concat(super)
+           ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
+            '(defaults to https://github.com/CocoaPods/Specs.git). '\
+            'Multiple sources must be comma-delimited.']].concat(super)
         end
 
         def initialize(argv)

data/lib/cocoapods/command/spec.rb

@@ -68,8 +68,9 @@ module Pod
            ['--subspec=NAME', 'Lint validates only the given subspec'],
            ['--no-subspecs', 'Lint skips validation of subspecs'],
            ['--no-clean',    'Lint leaves the build directory intact for inspection'],
-           ['--sources=https://github.com/artsy/Specs', 'The sources to pull dependant pods from ' \
-            '(defaults to https://github.com/CocoaPods/Specs.git)']].concat(super)
+           ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
+            '(defaults to https://github.com/CocoaPods/Specs.git). '\
+            'Multiple sources must be comma-delimited.']].concat(super)
         end
 
         def initialize(argv)

data/lib/cocoapods/command.rb

@@ -41,7 +41,6 @@ module Pod
 
     def self.run(argv)
       help! 'You cannot run CocoaPods as root.' if Process.uid == 0
-      verify_git_version!
 
       super(argv)
       UI.print_warnings
@@ -122,18 +121,5 @@ module Pod
         raise Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
       end
     end
-
-    def self.verify_git_version!
-      begin
-        git_version = `git version`.strip
-      rescue Errno::ENOENT
-        help! 'CocoaPods requires you to have `git` installed.'
-      end
-
-      git_version = Version.new(git_version.split[2])
-      if git_version < Pod::Version.new('1.7.5')
-        help! 'CocoaPods requires git version 1.7.5 or newer. Please update git.'
-      end
-    end
   end
 end

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.35.0.rc1' unless defined? Pod::VERSION
+  VERSION = '0.35.0.rc2' unless defined? Pod::VERSION
 end

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

@@ -32,7 +32,9 @@ module Pod
               add_to_dependency_graph(pod, [], dependency_graph)
             end
 
-            pods_to_update.each { |u| dependency_graph.detach_vertex_named(u) }
+            pods_to_update.each do |u|
+              dependency_graph.detach_vertex_named(u) if dependency_graph.vertex_named(u)
+            end
           end
 
           dependency_graph

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -60,7 +60,7 @@ module Pod
       # @return [void]
       #
       def clean!
-        clean_installation  unless local?
+        clean_installation unless local?
       end
 
       # @return [Hash]
@@ -135,7 +135,7 @@ module Pod
       # @return [void]
       #
       def clean_installation
-        clean_paths.each { |path| FileUtils.rm_rf(path) }
+        clean_paths.each { |path| FileUtils.rm_rf(path) } if root.exist?
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/resolver/lazy_specification.rb

@@ -23,7 +23,7 @@ module Pod
         end
 
         def specification
-          @specification ||= source.specification(name, version)
+          @specification ||= source.specification(name, version.version)
         end
       end
 
@@ -50,9 +50,9 @@ module Pod
                 map { |v| "- #{v}" }.join("\n")
           end
 
-          versions_by_source.map do |source, versions|
+          versions_by_source.flat_map do |source, versions|
             versions.map { |version| LazySpecification.new(name, version, source) }
-          end.flatten
+          end
         end
       end
     end

data/lib/cocoapods/resolver.rb

@@ -79,7 +79,7 @@ module Pod
             sort_by(&:name).
             each do |spec|
               validate_platform(spec, target)
-              sandbox.store_head_pod(spec.name) if spec.version.head
+              sandbox.store_head_pod(spec.name) if spec.version.head?
             end
         end
         specs_by_target
@@ -104,15 +104,13 @@ module Pod
     def search_for(dependency)
       @search ||= {}
       @search[dependency] ||= begin
-        specs = find_cached_set(dependency).
+        requirement = Requirement.new(dependency.requirement.as_list << requirement_for_locked_pod_named(dependency.name))
+        find_cached_set(dependency).
           all_specifications.
-          select { |s| dependency.requirement.satisfied_by? s.version }.
+          select { |s| requirement.satisfied_by? s.version }.
           map { |s| s.subspec_by_name(dependency.name, false) }.
-          compact
-
-        specs.
-          reverse.
-          each { |s| s.version.head = dependency.head? }
+          compact.
+          reverse
       end
       @search[dependency].dup
     end
@@ -181,7 +179,10 @@ module Pod
         else
           requirement.requirement.satisfied_by? spec.version
         end
-      requirement_satisfied && !(spec.version.prerelease? && existing_vertices.flat_map(&:requirements).none?(&:prerelease?))
+      requirement_satisfied && !(
+        spec.version.prerelease? &&
+        existing_vertices.flat_map(&:requirements).none? { |r| r.prerelease? || r.external_source }
+      )
     end
 
     # Sort dependencies so that the ones that are easiest to resolve are first.
@@ -302,6 +303,9 @@ module Pod
         else
           set = create_set_from_sources(dependency)
         end
+        if dependency.head?
+          set = Specification::Set::Head.new(set.specification)
+        end
         cached_sets[name] = set
         unless set
           raise Molinillo::NoSuchDependencyError.new(dependency) # rubocop:disable Style/RaiseArgs
@@ -310,6 +314,18 @@ module Pod
       cached_sets[name]
     end
 
+    # @return [Requirement, Nil]
+    #         The {Requirement} that locks the dependency with name `name` in
+    #         {#locked_dependencies}.
+    #
+    def requirement_for_locked_pod_named(name)
+      if vertex = locked_dependencies.vertex_named(name)
+        if dependency = vertex.payload
+          dependency.requirement
+        end
+      end
+    end
+
     # @return [Set] Creates a set for the Pod of the given dependency from the
     #         sources. The set will contain all versions from all sources that
     #         include the Pod.
@@ -345,8 +361,8 @@ module Pod
     end
 
     # Returns the target-appropriate nodes that are `successors` of `node`,
-    # rejecting those that are {Dependency#from_subspec_dependency?} and have
-    # and incompatible platform.
+    # rejecting those that are scoped by target platform and have incompatible
+    # targets.
     #
     # @return [Array<Molinillo::DependencyGraph::Vertex>]
     #         An array of target-appropriate nodes whose `payload`s are
@@ -363,17 +379,13 @@ module Pod
     # Whether the given `edge` should be followed to find dependencies for the
     # given `target`.
     #
-    # @note At the moment, this method only checks whether the edge's
-    #       requirements are normal dependencies _or_ whether they are
-    #       dependencies that come from {Specification#subspec_dependencies}
-    #       and, if so, that their platforms are compatible with the target's.
-    #
     # @return [Bool]
     #
     def edge_is_valid_for_target?(edge, target)
+      dependencies_for_target_platform =
+        edge.origin.payload.all_dependencies(target.platform).map(&:name)
       edge.requirements.any? do |dependency|
-        !dependency.from_subspec_dependency? ||
-          edge.destination.payload.available_platforms.any? { |p| target.platform.supports?(p) }
+        dependencies_for_target_platform.include?(dependency.name)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.35.0.rc1
+  version: 0.35.0.rc2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.0.rc1
+        version: 0.35.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.0.rc1
+        version: 0.35.0.rc2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement