From 43c64bcd4939dd262eb6731c8e1ceb51f7715748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= <francois.benaiteau@gmail.com>
Date: Wed, 29 May 2013 01:19:03 +0200
Subject: [PATCH 1/6] [Gitignore] Add documentation folder

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 569684e9a..f6515aee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ spec/fixtures/vcr
 coverage/
 .coveralls.yml
 .idea/
+documentation/

From 346a4463571dd03f8a5f4ddbb45f6eb2daeb9d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= <francois.benaiteau@gmail.com>
Date: Wed, 29 May 2013 01:18:07 +0200
Subject: [PATCH 2/6] [Podfile] Added sources array

---
 lib/cocoapods-core/podfile.rb     |  7 +++
 lib/cocoapods-core/podfile/dsl.rb | 72 +++++++++++++++++++++++++++++++
 spec/fixtures/Podfile             |  2 +
 spec/fixtures/Podfile.yaml        |  4 ++
 spec/podfile_spec.rb              | 31 +++++++++++++
 5 files changed, 116 insertions(+)

diff --git a/lib/cocoapods-core/podfile.rb b/lib/cocoapods-core/podfile.rb
index 7e6f4989d..4c45302bb 100644
--- a/lib/cocoapods-core/podfile.rb
+++ b/lib/cocoapods-core/podfile.rb
@@ -95,6 +95,12 @@ def dependencies
 
     # @!group Attributes
 
+    # @return [Array<String>] all the specs source names.
+
+    def sources
+      get_hash_value('sources') || []
+    end
+
     # @return [String] the path of the workspace if specified by the user.
     #
     def workspace_path
@@ -173,6 +179,7 @@ def post_install!(installer)
     HASH_KEYS = %w(
       target_definitions
       workspace
+      sources
       generate_bridge_support
       set_arc_compatibility_flag
     ).freeze
diff --git a/lib/cocoapods-core/podfile/dsl.rb b/lib/cocoapods-core/podfile/dsl.rb
index 8758a8adf..2eca49d2e 100644
--- a/lib/cocoapods-core/podfile/dsl.rb
+++ b/lib/cocoapods-core/podfile/dsl.rb
@@ -468,6 +468,78 @@ def set_arc_compatibility_flag!
 
       #-----------------------------------------------------------------------#
 
+      # @!group Sources
+      #
+      #   The Podfile retrieves specs from a given source.
+      #   This group manage these sources
+      #
+      #   Sources are __global__ and not stored per target definition.
+
+      #-----------------------------------------------------------------------#
+
+      # Specifies the location of specs
+      #
+      # -----
+      #
+      # By default, the github Cocoapods/specs repository is used. Use this method
+      # to specify (an) other(s) source(s).
+      # Sources are prioritised by appearance in Podfile
+      #
+      # @param    [String] source
+      #           name of specs repo. Previously specified by user
+      #           via pod repo add command
+      #
+      # @example  Specifying to use first myprivaterepo and then cocoapods master
+      #
+      #           source 'myprivaterepo'
+      #           source 'master'
+      #
+      # @return   [void]
+      #
+      def source(source)
+        hash_sources = get_hash_value('sources') || []
+        hash_sources << source
+        set_hash_value('sources', hash_sources.uniq)
+      end
+
+      #-----------------------------------------------------------------------#
+
+      # @!group Sources
+      #
+      #   The Podfile retrieves specs from a given source.
+      #   This group manage these sources
+      #
+      #   Sources are __global__ and not stored per target definition.
+
+      #-----------------------------------------------------------------------#
+
+      # Specifies the location of specs
+      #
+      # -----
+      #
+      # By default, the github Cocoapods/specs repository is used. Use this method
+      # to specify (an) other(s) source(s).
+      # Sources are prioritised by appearance in Podfile
+      #
+      # @param    [String] source
+      #           name of specs repo. Previously specified by user
+      #           via pod repo add command
+      #
+      # @example  Specifying to use first myprivaterepo and then cocoapods master
+      #
+      #           source 'myprivaterepo'
+      #           source 'master'
+      #
+      # @return   [void]
+      #
+      def source(source)
+        hash_sources = get_hash_value('sources') || []
+        hash_sources << source
+        set_hash_value('sources', hash_sources.uniq)
+      end
+
+      #-----------------------------------------------------------------------#
+
       # @!group Hooks
       #   The Podfile provides hooks that will be called during the
       #   installation process.
diff --git a/spec/fixtures/Podfile b/spec/fixtures/Podfile
index bbd843b59..265ed45b4 100644
--- a/spec/fixtures/Podfile
+++ b/spec/fixtures/Podfile
@@ -1,3 +1,5 @@
+source 'myrepo1'
+source 'myrepo2'
 platform :ios
 pod 'SSZipArchive',      '>= 1'
 pod 'ASIHTTPRequest',    '~> 1.8.0'
diff --git a/spec/fixtures/Podfile.yaml b/spec/fixtures/Podfile.yaml
index bbadedba2..38f8ec492 100644
--- a/spec/fixtures/Podfile.yaml
+++ b/spec/fixtures/Podfile.yaml
@@ -1,8 +1,12 @@
 ---
+sources:
+  - 'myrepo1'
+  - 'myrepo2'
 target_definitions:
   - name: Pods
     link_with_first_target: true
     platform: ios
+
     dependencies:
     - SSZipArchive:
       - '>= 1'
diff --git a/spec/podfile_spec.rb b/spec/podfile_spec.rb
index 982fba4f3..b33f9f49d 100644
--- a/spec/podfile_spec.rb
+++ b/spec/podfile_spec.rb
@@ -117,6 +117,21 @@ module Pod
         Podfile.new { set_arc_compatibility_flag! }.should.set_arc_compatibility_flag
       end
 
+      describe 'source' do
+        it 'can have multiple sources' do
+          Podfile.new do
+            source 'new_repo_1'
+            source 'new_repo_2'
+          end.sources.size.should  == 2
+
+          Podfile.new do
+            source 'new_repo_1'
+            source 'new_repo_2'
+            source 'master'
+          end.sources.size.should  == 3
+        end
+
+      end
     end
 
     #-------------------------------------------------------------------------#
@@ -234,6 +249,22 @@ module Pod
         }
       end
 
+      it 'includes the specified sources in the hash representation' do
+        podfile = Podfile.new do
+          source 'new_ASIHTTPRequest_source'
+          pod 'ASIHTTPRequest'
+        end
+        podfile.to_hash.should == {
+          'sources' => %w(new_ASIHTTPRequest_source),
+          'target_definitions' => [
+            {
+              'name' => 'Pods',
+              'link_with_first_target' => true,
+              'dependencies' => %w(ASIHTTPRequest)
+            }
+          ]
+        }
+      end
     end
 
     #-------------------------------------------------------------------------#

From f9b3a8551a81d94597c590eda78c6b3ba4e3743f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franc=CC=A7ois=20Benaiteau?= <francois.benaiteau@gmail.com>
Date: Tue, 8 Oct 2013 02:03:59 +0200
Subject: [PATCH 3/6] [AggregateTarget] Support for directory list

---
 lib/cocoapods-core/source/aggregate.rb   | 37 +++++++++---------------
 spec/source/aggregate_spec.rb            |  5 ++--
 spec/specification/set/presenter_spec.rb |  2 +-
 spec/specification/set_spec.rb           |  3 +-
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/lib/cocoapods-core/source/aggregate.rb b/lib/cocoapods-core/source/aggregate.rb
index b0e78d442..ed42f9041 100644
--- a/lib/cocoapods-core/source/aggregate.rb
+++ b/lib/cocoapods-core/source/aggregate.rb
@@ -3,20 +3,25 @@ class Source
     # The Aggregate manages a directory of sources repositories.
     #
     class Aggregate
-      # @return [Pathname] the directory were the repositories are stored.
-      #
-      attr_reader :repos_dir
-
-      # @param [Pathname] repos_dir @see repos_dir.
-      #
-      def initialize(repos_dir)
-        @repos_dir = repos_dir
+      # @return [<Array<Pathname] Collection of directories
+      #         where the repositories are stored.
+      attr_reader :dirs
+
+      # @param [<Array<Pathname] repos_dirs @see repos_dirs
+      def initialize(repos_dirs)
+        if repos_dirs.is_a? Array
+          @dirs = repos_dirs
+        else
+          @dirs = []
+        end
       end
 
       # @return [Array<Source>] all the sources.
+      #         The sources specified via source, searching each source in your Podifle
+      #         from first added (top of the file) to last added.
       #
       def all
-        @sources ||= dirs.map { |repo| Source.new(repo) }.sort_by(&:name)
+        @sources ||= dirs.map { |repo| Source.new(repo) }
       end
 
       # @return [Array<String>] the names of all the pods available.
@@ -47,20 +52,6 @@ def all_sets
         end
       end
 
-      # @return [Array<Pathname>] the directories where the sources are stored.
-      #
-      # @note   If the repos dir doesn't exits this will return an empty array.
-      #
-      # @raise  If the repos dir doesn't exits.
-      #
-      def dirs
-        if repos_dir.exist?
-          repos_dir.children.select(&:directory?)
-        else
-          []
-        end
-      end
-
       # Returns a set configured with the source which contains the highest
       # version in the aggregate.
       #
diff --git a/spec/source/aggregate_spec.rb b/spec/source/aggregate_spec.rb
index 7ff6f6968..e98aad50d 100644
--- a/spec/source/aggregate_spec.rb
+++ b/spec/source/aggregate_spec.rb
@@ -7,7 +7,8 @@ module Pod
     # JSONKit is in test repo has version 1.4 (duplicated) and the 999.999.999.
     #
     before do
-      @subject = Source::Aggregate.new(fixture('spec-repos'))
+      repos = [fixture('spec-repos/test_repo'), fixture('spec-repos/master')]
+      @subject = Source::Aggregate.new(repos)
     end
 
     #-------------------------------------------------------------------------#
@@ -15,7 +16,7 @@ module Pod
     describe 'In general' do
 
       it 'returns all the sources' do
-        @subject.all.map(&:name).should == %w(master test_repo)
+        @subject.all.map(&:name).sort.should == %w(master test_repo)
       end
 
       it 'returns the name of all the available pods' do
diff --git a/spec/specification/set/presenter_spec.rb b/spec/specification/set/presenter_spec.rb
index a4de82d98..7e0962699 100644
--- a/spec/specification/set/presenter_spec.rb
+++ b/spec/specification/set/presenter_spec.rb
@@ -5,7 +5,7 @@ module Pod
 
     describe 'Set Information' do
       before do
-        set = Source::Aggregate.new(fixture('spec-repos')).search_by_name('JSONKit').first
+        set = Source::Aggregate.new([fixture('spec-repos/master'), fixture('spec-repos/test_repo')]).search_by_name('JSONKit').first
         @presenter = Spec::Set::Presenter.new(set)
       end
 
diff --git a/spec/specification/set_spec.rb b/spec/specification/set_spec.rb
index 4aecebd30..31dc14394 100644
--- a/spec/specification/set_spec.rb
+++ b/spec/specification/set_spec.rb
@@ -109,7 +109,8 @@ module Pod
 
       before do
         # JSONKit is in test repo has version 1.4 (duplicated) and the 999.999.999.
-        @set = Source::Aggregate.new(fixture('spec-repos')).search_by_name('JSONKit').first
+        repos_dirs = [fixture('spec-repos/master'), fixture('spec-repos/test_repo')]
+        @set = Source::Aggregate.new(repos_dirs).search_by_name('JSONKit').first
       end
 
       it 'returns the sources where a podspec is available' do

From 2a6ec4cdfcf880ea65ce0644e863ec8d18f18967 Mon Sep 17 00:00:00 2001
From: Fabio Pelosin <fabiopelosin@gmail.com>
Date: Thu, 21 Aug 2014 01:07:06 +0200
Subject: [PATCH 4/6] [Podfile] Documentation

---
 lib/cocoapods-core/podfile.rb     |  4 +--
 lib/cocoapods-core/podfile/dsl.rb | 56 ++++++-------------------------
 spec/podfile_spec.rb              |  6 ++--
 3 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/lib/cocoapods-core/podfile.rb b/lib/cocoapods-core/podfile.rb
index 4c45302bb..086ec722d 100644
--- a/lib/cocoapods-core/podfile.rb
+++ b/lib/cocoapods-core/podfile.rb
@@ -95,8 +95,8 @@ def dependencies
 
     # @!group Attributes
 
-    # @return [Array<String>] all the specs source names.
-
+    # @return [Array<String>] The name of the sources.
+    #
     def sources
       get_hash_value('sources') || []
     end
diff --git a/lib/cocoapods-core/podfile/dsl.rb b/lib/cocoapods-core/podfile/dsl.rb
index 2eca49d2e..090f0c3e1 100644
--- a/lib/cocoapods-core/podfile/dsl.rb
+++ b/lib/cocoapods-core/podfile/dsl.rb
@@ -470,10 +470,9 @@ def set_arc_compatibility_flag!
 
       # @!group Sources
       #
-      #   The Podfile retrieves specs from a given source.
-      #   This group manage these sources
+      #   The Podfile retrieves specs from a given list of sources (repos).
       #
-      #   Sources are __global__ and not stored per target definition.
+      #   Sources are __global__ and they are not stored per target definition.
 
       #-----------------------------------------------------------------------#
 
@@ -481,53 +480,20 @@ def set_arc_compatibility_flag!
       #
       # -----
       #
-      # By default, the github Cocoapods/specs repository is used. Use this method
-      # to specify (an) other(s) source(s).
-      # Sources are prioritised by appearance in Podfile
+      # By default, the github Cocoapods/specs repository is used. Use this
+      # method to specify (an) other(s) source(s). The order of the sources is
+      # relevant. CocoaPods will use the highest version of a Pod of the first
+      # source which includes the Pod (regardless whether other sources have a
+      # higher version).
       #
       # @param    [String] source
-      #           name of specs repo. Previously specified by user
+      #           The name of a specs repo. Previously specified by user
       #           via pod repo add command
       #
-      # @example  Specifying to use first myprivaterepo and then cocoapods master
+      # @example  Specifying to use first `my_private_repo` and then the
+      #           CocoaPods Master Repo
       #
-      #           source 'myprivaterepo'
-      #           source 'master'
-      #
-      # @return   [void]
-      #
-      def source(source)
-        hash_sources = get_hash_value('sources') || []
-        hash_sources << source
-        set_hash_value('sources', hash_sources.uniq)
-      end
-
-      #-----------------------------------------------------------------------#
-
-      # @!group Sources
-      #
-      #   The Podfile retrieves specs from a given source.
-      #   This group manage these sources
-      #
-      #   Sources are __global__ and not stored per target definition.
-
-      #-----------------------------------------------------------------------#
-
-      # Specifies the location of specs
-      #
-      # -----
-      #
-      # By default, the github Cocoapods/specs repository is used. Use this method
-      # to specify (an) other(s) source(s).
-      # Sources are prioritised by appearance in Podfile
-      #
-      # @param    [String] source
-      #           name of specs repo. Previously specified by user
-      #           via pod repo add command
-      #
-      # @example  Specifying to use first myprivaterepo and then cocoapods master
-      #
-      #           source 'myprivaterepo'
+      #           source 'my_private_repo'
       #           source 'master'
       #
       # @return   [void]
diff --git a/spec/podfile_spec.rb b/spec/podfile_spec.rb
index b33f9f49d..5ce977d7f 100644
--- a/spec/podfile_spec.rb
+++ b/spec/podfile_spec.rb
@@ -260,9 +260,9 @@ module Pod
             {
               'name' => 'Pods',
               'link_with_first_target' => true,
-              'dependencies' => %w(ASIHTTPRequest)
-            }
-          ]
+              'dependencies' => %w(ASIHTTPRequest),
+            },
+          ],
         }
       end
     end

From 9d9842612c254900fbf515bab5ec3eec32f34947 Mon Sep 17 00:00:00 2001
From: Fabio Pelosin <fabiopelosin@gmail.com>
Date: Thu, 21 Aug 2014 01:44:35 +0200
Subject: [PATCH 5/6] [Source::Aggregate] Style & Documentation

---
 lib/cocoapods-core/source/aggregate.rb | 41 +++++++++++---------------
 spec/source/aggregate_spec.rb          | 19 ++++--------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/lib/cocoapods-core/source/aggregate.rb b/lib/cocoapods-core/source/aggregate.rb
index ed42f9041..e5ca8d1ed 100644
--- a/lib/cocoapods-core/source/aggregate.rb
+++ b/lib/cocoapods-core/source/aggregate.rb
@@ -3,43 +3,38 @@ class Source
     # The Aggregate manages a directory of sources repositories.
     #
     class Aggregate
-      # @return [<Array<Pathname] Collection of directories
-      #         where the repositories are stored.
-      attr_reader :dirs
+      # @return [Array<Pathname>] The ordered list of source directories.
+      #
+      attr_reader :directories
 
-      # @param [<Array<Pathname] repos_dirs @see repos_dirs
+      # @param  [Array<Pathname>] repos_dirs @see directories
+      #
       def initialize(repos_dirs)
-        if repos_dirs.is_a? Array
-          @dirs = repos_dirs
-        else
-          @dirs = []
-        end
+        @directories = Array(repos_dirs)
       end
 
-      # @return [Array<Source>] all the sources.
-      #         The sources specified via source, searching each source in your Podifle
-      #         from first added (top of the file) to last added.
+      # @return [Array<Source>] The ordered list of the sources.
       #
-      def all
-        @sources ||= dirs.map { |repo| Source.new(repo) }
+      def sources
+        @sources ||= directories.map { |repo| Source.new(repo) }
       end
 
       # @return [Array<String>] the names of all the pods available.
       #
       def all_pods
-        all.map(&:pods).flatten.uniq
+        sources.map(&:pods).flatten.uniq
       end
 
-      # @return [Array<Set>] the sets for all the pods available.
+      # @return [Array<Set>] The sets for all the pods available.
       #
       # @note   Implementation detail: The sources don't cache their values
       #         because they might change in response to an update. Therefore
-      #         this method to prevent slowness caches the values before
+      #         this method to preserve performance caches the values before
       #         processing them.
       #
       def all_sets
         pods_by_source = {}
-        all.each do |source|
+        sources.each do |source|
           pods_by_source[source] = source.pods
         end
         sources = pods_by_source.keys
@@ -64,7 +59,7 @@ def all_sets
       def representative_set(name)
         representative_source = nil
         highest_version = nil
-        all.each do |source|
+        sources.each do |source|
           source_versions = source.versions(name)
           if source_versions
             source_version = source_versions.first
@@ -91,9 +86,9 @@ def representative_set(name)
       # @see    Source#search
       #
       def search(dependency)
-        sources = all.select { |s| s.search(dependency) }
-        unless sources.empty?
-          Specification::Set.new(dependency.root_name, sources)
+        found_sources = sources.select { |s| s.search(dependency) }
+        unless found_sources.empty?
+          Specification::Set.new(dependency.root_name, found_sources)
         end
       end
 
@@ -108,7 +103,7 @@ def search(dependency)
       def search_by_name(query, full_text_search = false)
         pods_by_source = {}
         result = []
-        all.each do |s|
+        sources.each do |s|
           source_pods = s.search_by_name(query, full_text_search)
           pods_by_source[s] = source_pods.map(&:name)
         end
diff --git a/spec/source/aggregate_spec.rb b/spec/source/aggregate_spec.rb
index e98aad50d..619ef953d 100644
--- a/spec/source/aggregate_spec.rb
+++ b/spec/source/aggregate_spec.rb
@@ -15,8 +15,8 @@ module Pod
 
     describe 'In general' do
 
-      it 'returns all the sources' do
-        @subject.all.map(&:name).sort.should == %w(master test_repo)
+      it 'returns the sources' do
+        @subject.sources.map(&:name).sort.should == %w(master test_repo)
       end
 
       it 'returns the name of all the available pods' do
@@ -56,15 +56,6 @@ module Pod
         set.should.nil?
       end
 
-      it 'returns the directories where the repos are defined' do
-        @subject.dirs.map { |d| d.basename.to_s }.sort.should == %w(master test_repo)
-      end
-
-      it "returns an empty list for the directories if the repos dir doesn't exists" do
-        aggregate = Source::Aggregate.new(Pathname.new('missing-dir'))
-        aggregate.dirs.should == []
-      end
-
       it 'returns a set configured to use only the source which contains the highest version' do
         set = @subject.representative_set('JSONKit')
         set.versions.map(&:to_s).should == ['999.999.999', '1.13', '1.4']
@@ -93,14 +84,14 @@ module Pod
       end
 
       it 'performs a full text search' do
-        @subject.stubs(:dirs).returns([fixture('spec-repos/test_repo')])
+        @subject.stubs(:directories).returns([fixture('spec-repos/test_repo')])
         sets = @subject.search_by_name('Banana Corp', true)
         sets.count.should == 1
         sets.first.name.should == 'BananaLib'
       end
 
       it 'raises an informative if unable to find a Pod with the given name' do
-        @subject.stubs(:dirs).returns([fixture('spec-repos/test_repo')])
+        @subject.stubs(:directories).returns([fixture('spec-repos/test_repo')])
         should.raise Informative do
           @subject.search_by_name('Some-funky-name', true)
         end.message.should.match /Unable to find/
@@ -114,7 +105,7 @@ module Pod
 
       before do
         test_source = Source.new(fixture('spec-repos/test_repo'))
-        @subject.stubs(:all).returns([test_source])
+        @subject.stubs(:sources).returns([test_source])
       end
 
       it 'generates the search index from scratch' do

From 85ef1bf5917c853def368d6ca5a5ab955486b4d7 Mon Sep 17 00:00:00 2001
From: Fabio Pelosin <fabiopelosin@gmail.com>
Date: Thu, 21 Aug 2014 17:34:12 +0200
Subject: [PATCH 6/6] [Lockfile] Return multiple dependencies to lock a Pod

See https://github.com/CocoaPods/CocoaPods/pull/2297
---
 lib/cocoapods-core/lockfile.rb | 23 +++++++++++++----------
 spec/lockfile_spec.rb          |  5 +++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/cocoapods-core/lockfile.rb b/lib/cocoapods-core/lockfile.rb
index 1aa843d96..d75ff7342 100644
--- a/lib/cocoapods-core/lockfile.rb
+++ b/lib/cocoapods-core/lockfile.rb
@@ -135,18 +135,21 @@ def dependencies
     #
     # @return [Dependency] the generated dependency.
     #
-    def dependency_to_lock_pod_named(name)
-      dep = dependencies.find { |d| d.name == name || d.root_name == name }
-      version = version(name)
-
-      unless dep && version
+    def dependencies_to_lock_pod_named(name)
+      result = []
+      deps = dependencies.select { |d| d.root_name == name }
+      if deps.empty?
         raise StandardError, "Attempt to lock the `#{name}` Pod without an " \
           'known dependency.'
       end
 
-      locked_dependency = dep.dup
-      locked_dependency.specific_version = version
-      locked_dependency
+      deps.each do |dep|
+        version = version(dep.name)
+        locked_dependency = dep.dup
+        locked_dependency.specific_version = version
+        result << locked_dependency
+      end
+      result
     end
 
     # @return [Version] The version of CocoaPods which generated this lockfile.
@@ -233,8 +236,8 @@ def detect_changes_with_podfile(podfile)
       [:added, :changed, :removed, :unchanged].each { |k| result[k] = [] }
 
       installed_deps = dependencies.map do |dep|
-        dependency_to_lock_pod_named(dep.name)
-      end
+        dependencies_to_lock_pod_named(dep.name)
+      end.flatten
       all_dep_names  = (dependencies + podfile.dependencies).map(&:name).uniq
       all_dep_names.each do |name|
         installed_dep = installed_deps.find { |d| d.name == name }
diff --git a/spec/lockfile_spec.rb b/spec/lockfile_spec.rb
index 863556067..bb5e52694 100644
--- a/spec/lockfile_spec.rb
+++ b/spec/lockfile_spec.rb
@@ -143,12 +143,13 @@ def self.specs
       it 'returns the dependency that locks the pod with the given name to the installed version' do
         json_dep = Dependency.new('JSONKit', '1.4')
         json_dep.external_source = { :podspec => 'path/JSONKit.podspec' }
-        @lockfile.dependency_to_lock_pod_named('JSONKit').should == json_dep
+        result = @lockfile.dependencies_to_lock_pod_named('JSONKit')
+        result.should == [json_dep]
       end
 
       it 'raises if there is a request for a locking dependency for a not stored Pod' do
         should.raise StandardError do
-          @lockfile.dependency_to_lock_pod_named('Missing')
+          @lockfile.dependencies_to_lock_pod_named('Missing')
         end.message.should.match /without an known dependency/
       end