Bump the master submodule to a post-sharding commit

cocoapods-integration-specs @ d7a6d615

-Subproject commit c66e853111de92e569dfdbb82c12ff81b57e9abb
+Subproject commit d7a6d6157f8c6e8cea96904ccc5b744d7ea58536

master @ e486ad4a

-Subproject commit 3000b6eca873d89082fd9fd54c064084b0d7c1b3
+Subproject commit e486ad4a691f9b24c894ac1ab6c9cbdf646765bc

spec/functional/command/spec_spec.rb

@@ -207,7 +207,7 @@ module Pod
       end
 
       it 'lints the current working directory' do
-        Dir.chdir(fixture('spec-repos') + 'master/Specs/JSONKit/1.4/') do
+        Dir.chdir(fixture('spec-repos') + 'master/Specs/1/3/f/JSONKit/1.4/') do
           cmd = command('spec', 'lint', '--quick', '--allow-warnings')
           cmd.run
           UI.output.should.include 'passed validation'
@@ -221,7 +221,7 @@ module Pod
       end
 
       before do
-        text = (fixture('spec-repos') + 'master/Specs/JSONKit/1.4/JSONKit.podspec.json').read
+        text = (fixture('spec-repos') + 'master/Specs/1/3/f/JSONKit/1.4/JSONKit.podspec.json').read
         text.gsub!(/.*license.*/, '"license": { "file": "LICENSE" },')
         file = temporary_directory + 'JSONKit.podspec.json'
         File.open(file, 'w') { |f| f.write(text) }
@@ -327,13 +327,13 @@ module Pod
 
       it 'cats the given podspec' do
         lambda { command('spec', 'cat', 'AFNetworking').run }.should.not.raise
-        UI.output.should.include fixture('spec-repos/master/Specs/AFNetworking/2.4.1/AFNetworking.podspec.json').read
+        UI.output.should.include fixture('spec-repos/master/Specs/a/7/5/AFNetworking/3.1.0/AFNetworking.podspec.json').read
       end
 
       it 'cats the first podspec from all podspecs' do
         UI.next_input = "1\n"
         run_command('spec', 'cat', '--show-all', 'AFNetworking')
-        UI.output.should.include fixture('spec-repos/master/Specs/AFNetworking/2.4.1/AFNetworking.podspec.json').read
+        UI.output.should.include fixture('spec-repos/master/Specs/a/7/5/AFNetworking/3.1.0/AFNetworking.podspec.json').read
       end
 
       describe_regex_support('cat')
@@ -357,7 +357,7 @@ module Pod
         ENV['EDITOR'] = 'podspeceditor'
         lambda { command('spec', 'edit', 'AFNetworking').run }.should.raise SystemExit
         UI.output.should.include '/bin/sh -i -c podspeceditor "$@" --'
-        UI.output.should.include 'fixtures/spec-repos/master/Specs/AFNetworking'
+        UI.output.should.include 'fixtures/spec-repos/master/Specs/a/7/5/AFNetworking'
       end
 
       it 'will raise if no editor is found' do
@@ -371,7 +371,7 @@ module Pod
         UI.next_input = "1\n"
         lambda { command('spec', 'edit', '--show-all', 'AFNetworking').run }.should.raise SystemExit
         UI.output.should.include '/bin/sh -i -c podspeceditor "$@" --'
-        UI.output.should.include 'fixtures/spec-repos/master/Specs/AFNetworking/1.2.0/AFNetworking.podspec'
+        UI.output.should.include 'fixtures/spec-repos/master/Specs/a/7/5/AFNetworking/1.2.0/AFNetworking.podspec'
       end
 
       it "complains if it can't find a spec file for the given spec" do
@@ -394,7 +394,7 @@ module Pod
       describe '#get_path_of_spec' do
         it 'returns the path of the specification with the given name' do
           path = @command.send(:get_path_of_spec, 'AFNetworking')
-          path.should == fixture('spec-repos') + 'master/Specs/AFNetworking/2.4.1/AFNetworking.podspec.json'
+          path.should == fixture('spec-repos') + 'master/Specs/a/7/5/AFNetworking/3.1.0/AFNetworking.podspec.json'
         end
       end
     end

spec/functional/command_spec.rb

@@ -10,7 +10,7 @@ module Pod
 
     it 'reports the location of the AFNetworking spec' do
       lambda { Pod::Command.run(%w(spec which AFNetworking)) }.should.not.raise
-      UI.output.should.include 'spec/fixtures/spec-repos/master/Specs/AFNetworking'
+      UI.output.should.include 'spec/fixtures/spec-repos/master/Specs/a/7/5/AFNetworking'
     end
 
     it "doesn't let you run as root" do

spec/unit/external_sources/abstract_external_source_spec.rb

@@ -50,7 +50,7 @@ module Pod
 
       describe 'podspec validation' do
         before do
-          @podspec = Pod::Specification.from_file(fixture('spec-repos') + 'master/Specs/JSONKit/1.4/JSONKit.podspec.json')
+          @podspec = Pod::Specification.from_file(fixture('spec-repos') + 'master/Specs/1/3/f/JSONKit/1.4/JSONKit.podspec.json')
         end
 
         it 'returns a validator for the given podspec' do

spec/unit/installer/analyzer_spec.rb

@@ -491,7 +491,7 @@ module Pod
         analyzer.update = { :pods => %w(AFNetworking) }
         analyzer.analyze.specifications.
           find { |s| s.name == 'AFNetworking' }.
-          version.to_s.should == '2.4.1'
+          version.to_s.should == '2.6.3'
       end
 
       it 'unlocks only local pod when specification checksum changes' do

spec/unit/resolver_spec.rb

@@ -143,20 +143,20 @@ module Pod
         resolver = Resolver.new(config.sandbox, @podfile, empty_graph, config.sources_manager.all)
         specs = resolver.resolve.values.flatten.map(&:to_s).sort
         specs.should == ['AFAmazonS3Client (1.0.1)', 'AFNetworking (1.3.4)',
-                         'AFOAuth2Client (0.1.2)', 'CargoBay (1.0.0)']
+                         'AFOAuth2Client (1.0.0)', 'CargoBay (1.0.0)']
       end
 
       it 'uses a Podfile requirement even when a previously declared ' \
         'dependency has a different requirement' do
           @podfile = Podfile.new do
             platform :ios, '7.0'
-            pod 'InstagramKit' # latest version (3.5.0) requires 'AFNetworking', '~> 2.0'
+            pod 'InstagramKit' # latest version (3.7) requires 'AFNetworking', '~> 2.0'
             pod 'AFNetworking', '2.0.1'
           end
 
           resolver = Resolver.new(config.sandbox, @podfile, empty_graph, config.sources_manager.all)
           specs = resolver.resolve.values.flatten.map(&:root).map(&:to_s).uniq.sort
-          specs.should == ['AFNetworking (2.0.1)', 'InstagramKit (3.5.0)']
+          specs.should == ['AFNetworking (2.0.1)', 'InstagramKit (3.7)']
         end
 
       it 'holds the context state, such as cached specification sets' do
@@ -370,13 +370,13 @@ module Pod
       it 'raises if no such version of a dependency exists' do
         podfile = Podfile.new do
           platform :ios
-          pod 'AFNetworking', '3.0.1'
+          pod 'AFNetworking', '999.999.999'
         end
         resolver = Resolver.new(config.sandbox, podfile, empty_graph, config.sources_manager.all)
         e = lambda { resolver.resolve }.should.raise Informative
         e.message.should.match(/Unable to satisfy the following requirements/)
-        e.message.should.match(/`AFNetworking \(= 3.0.1\)` required by `Podfile`/)
-        e.message.should.match(/None of your spec sources contain a spec satisfying the dependency: `AFNetworking \(= 3.0.1\)`./)
+        e.message.should.match(/`AFNetworking \(= 999\.999\.999\)` required by `Podfile`/)
+        e.message.should.match(/None of your spec sources contain a spec satisfying the dependency: `AFNetworking \(= 999\.999\.999\)`./)
         e.message.should.match(/You have either:/)
         e.message.should.match(/ * out-of-date source repos which you can update with `pod repo update`/)
         e.message.should.match(/ * not added the source repo that hosts the Podspec to your Podfile./)
@@ -479,16 +479,16 @@ module Pod
         end
 
         it 'includes dependencies in the target for the requested platform only' do
-          osx_dependency = 'ARAnalytics/CoreMac (2.8.0)'
-          ios_dependency = 'ARAnalytics/CoreIOS (2.8.0)'
+          osx_dependency = 'ARAnalytics/CoreMac (4.0.1)'
+          ios_dependency = 'ARAnalytics/CoreIOS (4.0.1)'
           @podfile = Podfile.new do
             target 'iOS' do
               platform :ios, '8'
-              pod 'ARAnalytics', '2.8.0'
+              pod 'ARAnalytics', '4.0.1'
             end
             target 'OSX' do
               platform :osx, '10.10'
-              pod 'ARAnalytics', '2.8.0'
+              pod 'ARAnalytics', '4.0.1'
             end
           end
           resolved = resolve
@@ -534,7 +534,7 @@ module Pod
         resolver = Resolver.new(config.sandbox, podfile, empty_graph, sources)
         spec = resolver.resolve.values.flatten.first
         spec.version.to_s.should == '1.4'
-        spec.defined_in_file.should == fixture('spec-repos/master/Specs/JSONKit/1.4/JSONKit.podspec.json')
+        spec.defined_in_file.should == fixture('spec-repos/master/Specs/1/3/f/JSONKit/1.4/JSONKit.podspec.json')
 
         sources = config.sources_manager.sources(%w(test_repo master))
         resolver = Resolver.new(config.sandbox, podfile, empty_graph, sources)
@@ -589,7 +589,7 @@ module Pod
         resolver = Resolver.new(config.sandbox, podfile, empty_graph, sources)
         spec = resolver.resolve.values.flatten.first
         spec.version.to_s.should == '1.5pre'
-        spec.defined_in_file.should == fixture('spec-repos/master/Specs/JSONKit/1.5pre/JSONKit.podspec.json')
+        spec.defined_in_file.should == fixture('spec-repos/master/Specs/1/3/f/JSONKit/1.5pre/JSONKit.podspec.json')
       end
 
       it 'uses explicit source repos for a dependency even when it\'s transitive' do
@@ -636,7 +636,7 @@ module Pod
 
         afnetworking_spec = specs.find { |s| s.name == 'AFNetworking' }
         afnetworking_spec.should.not.be.nil
-        afnetworking_spec.defined_in_file.should == fixture('spec-repos/master/Specs/AFNetworking/2.4.0/AFNetworking.podspec.json')
+        afnetworking_spec.defined_in_file.should == fixture('spec-repos/master/Specs/a/7/5/AFNetworking/2.4.0/AFNetworking.podspec.json')
 
         # Check that if the master source is not available the dependency cannot be resolved.
         sources = config.sources_manager.sources(%w(test_repo))

spec/unit/validator_spec.rb

@@ -31,7 +31,7 @@ module Pod
     # @return [String]
     #
     def stub_podspec(pattern = nil, replacement = nil)
-      spec = (fixture('spec-repos') + 'master/Specs/JSONKit/1.4/JSONKit.podspec.json').read
+      spec = podspec_path.read
       spec.gsub!(/.*license.*$/, '"license": "Public Domain",')
       spec.gsub!(%r{https://github\.com/johnezang/JSONKit\.git}, fixture('integration/JSONKit').to_s)
       spec.gsub!(pattern, replacement) if pattern && replacement
@@ -40,8 +40,8 @@ module Pod
 
     # @return [Pathname]
     #
-    def podspec_path
-      fixture('spec-repos') + 'master/Specs/JSONKit/1.4/JSONKit.podspec.json'
+    def podspec_path(name = 'JSONKit', version = '1.4')
+      Config.instance.sources_manager.master.first.pod_path(name).join("#{version}/#{name}.podspec.json")
     end
 
     #-------------------------------------------------------------------------#
@@ -95,7 +95,7 @@ module Pod
 
       describe '#only_subspec' do
         before do
-          podspec = fixture('spec-repos') + 'master/Specs/RestKit/0.22.0/RestKit.podspec.json'
+          podspec = podspec_path('RestKit', '0.22.0')
           @validator = Validator.new(podspec, config.sources_manager.master.map(&:url))
           @validator.quick = true
         end