Commit d0b598a3 authored by Kyle Fuller's avatar Kyle Fuller

Merge pull request #2998 from CocoaPods/explicit-master

[Podfile] Change the default spec repository to the master
parents 8ba4d543 d61705f8
...@@ -6,6 +6,14 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -6,6 +6,14 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
## Master ## Master
##### Breaking
* Changes the default spec repositories used from all configured spec
repositories, to the master spec repository when no spec repositories
are explicitly configured in a Podfile.
[Kyle Fuller](https://github.com/kylef)
[#2946](https://github.com/CocoaPods/CocoaPods/issues/2946)
##### Enhancements ##### Enhancements
* Xcodebuild warnings will now be reported as `warning` during linting * Xcodebuild warnings will now be reported as `warning` during linting
...@@ -23,6 +31,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -23,6 +31,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[#2981](https://github.com/CocoaPods/CocoaPods/issues/2981) [#2981](https://github.com/CocoaPods/CocoaPods/issues/2981)
[cocoapods-trunk#33](https://github.com/CocoaPods/cocoapods-trunk/issues/33) [cocoapods-trunk#33](https://github.com/CocoaPods/cocoapods-trunk/issues/33)
* Clone the master spec repository when no spec repositories are explicitly
defined in the Podfile. This fixes problems using CocoaPods for the first
time without any explicit spec repositories.
[Kyle Fuller](https://github.com/kylef)
[#2946](https://github.com/CocoaPods/CocoaPods/issues/2946)
* Xcodebuild warnings with the string `error` in them will no longer be * Xcodebuild warnings with the string `error` in them will no longer be
linted as errors if they are in fact warnings. linted as errors if they are in fact warnings.
[Hugo Tunius](https://github.com/K0nserv) [Hugo Tunius](https://github.com/K0nserv)
......
...@@ -465,7 +465,8 @@ module Pod ...@@ -465,7 +465,8 @@ module Pod
# Returns the sources used to query for specifications # Returns the sources used to query for specifications
# #
# When no explicit Podfile sources are defined, this defaults to all # When no explicit Podfile sources are defined, this defaults to the
# master spec repository.
# available sources ({SourcesManager.all}). # available sources ({SourcesManager.all}).
# #
# @return [Array<Source>] the sources to be used in finding # @return [Array<Source>] the sources to be used in finding
...@@ -475,7 +476,8 @@ module Pod ...@@ -475,7 +476,8 @@ module Pod
@sources ||= begin @sources ||= begin
sources = podfile.sources sources = podfile.sources
if sources.empty? if sources.empty?
SourcesManager.all url = 'https://github.com/CocoaPods/Specs.git'
[SourcesManager.find_or_create_source_with_url(url)]
else else
sources.map do |url| sources.map do |url|
SourcesManager.find_or_create_source_with_url(url) SourcesManager.find_or_create_source_with_url(url)
......
Subproject commit 623de2ff1ad1f843fb6552cf62ce0c5a7e6cdd24 Subproject commit 04a00cdac169338476ca6982b84f7ef954480c3e
...@@ -54,7 +54,7 @@ module Pod ...@@ -54,7 +54,7 @@ module Pod
it 'updates the repositories by default' do it 'updates the repositories by default' do
config.skip_repo_update = false config.skip_repo_update = false
SourcesManager.expects(:update).twice SourcesManager.expects(:update).once
@analyzer.analyze @analyzer.analyze
end end
...@@ -552,9 +552,9 @@ module Pod ...@@ -552,9 +552,9 @@ module Pod
describe '#sources' do describe '#sources' do
describe 'when there are no explicit sources' do describe 'when there are no explicit sources' do
it 'defaults to all sources' do it 'defaults to the master spec repository' do
@analyzer.send(:sources).map(&:url).should == @analyzer.send(:sources).map(&:url).should ==
SourcesManager.all.map(&:url) ['https://github.com/CocoaPods/Specs.git']
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment