Merge pull request #4957 from CocoaPods/seg-no-master-repo

[SourcesManager] Dont return non-functioning master sources

CHANGELOG.md

@@ -16,6 +16,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [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)
+
 
 ## 1.0.0.beta.4 (2016-02-24)
 

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.

spec/unit/sources_manager_spec.rb

@@ -431,6 +431,11 @@ module Pod
         SourcesManager.master_repo_dir.to_s.should.match %r{fixtures/spec-repos/master}
       end
 
+      it 'returns an empty array for master sources when the master repo has not been set up' do
+        Pathname.any_instance.stubs(:directory?).returns(false)
+        SourcesManager.master.should == []
+      end
+
       it 'returns whether the master repo is functional' do
         SourcesManager.master_repo_functional?.should.be.true
         config.repos_dir = SpecHelper.temporary_directory