Commit cee1e8c2 authored by Samuel E. Giddins's avatar Samuel E. Giddins

wip

parent 34156c09
...@@ -15,7 +15,7 @@ gem 'json', '1.7.7' ...@@ -15,7 +15,7 @@ gem 'json', '1.7.7'
group :development do group :development do
cp_gem 'claide', 'CLAide' cp_gem 'claide', 'CLAide'
cp_gem 'cocoapods-core', 'Core' gem 'cocoapods-core', path: '../Core'
cp_gem 'cocoapods-downloader', 'cocoapods-downloader' cp_gem 'cocoapods-downloader', 'cocoapods-downloader'
cp_gem 'cocoapods-plugins', 'cocoapods-plugins' cp_gem 'cocoapods-plugins', 'cocoapods-plugins'
cp_gem 'cocoapods-search', 'cocoapods-search' cp_gem 'cocoapods-search', 'cocoapods-search'
......
...@@ -5,16 +5,6 @@ GIT ...@@ -5,16 +5,6 @@ GIT
specs: specs:
claide (0.9.1) claide (0.9.1)
GIT
remote: https://github.com/CocoaPods/Core.git
revision: 9b06e3d9a6212cabf7ab6e3a77c849df3a983a4f
branch: master
specs:
cocoapods-core (0.39.0.beta.4)
activesupport (>= 3.2.15)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
GIT GIT
remote: https://github.com/CocoaPods/Molinillo.git remote: https://github.com/CocoaPods/Molinillo.git
revision: 604847cee4a460590bb6c67ffac4279ea3c02b8f revision: 604847cee4a460590bb6c67ffac4279ea3c02b8f
...@@ -96,6 +86,14 @@ PATH ...@@ -96,6 +86,14 @@ PATH
nap (~> 1.0) nap (~> 1.0)
xcodeproj (~> 0.27.2) xcodeproj (~> 0.27.2)
PATH
remote: ../Core
specs:
cocoapods-core (0.39.0.beta.4)
activesupport (>= 3.2.15)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
......
...@@ -540,7 +540,10 @@ module Pod ...@@ -540,7 +540,10 @@ module Pod
UI.section "Resolving dependencies of #{UI.path(podfile.defined_in_file) || 'Podfile'}" do UI.section "Resolving dependencies of #{UI.path(podfile.defined_in_file) || 'Podfile'}" do
resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources) resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources)
specs_by_target = resolver.resolve specs_by_target = resolver.resolve
specs_by_target.values.flatten(1).each(&:validate_cocoapods_version) specs_by_target.each do |target, specs|
specs.each(&:validate_cocoapods_version)
specs -= target.dependencies_to_skip_installing
end
end end
specs_by_target specs_by_target
end end
......
...@@ -498,6 +498,18 @@ module Pod ...@@ -498,6 +498,18 @@ module Pod
e.message.should.match %r{RestKit \(from `https://github.com/RestKit/RestKit.git`\)} e.message.should.match %r{RestKit \(from `https://github.com/RestKit/RestKit.git`\)}
e.message.should.match /RestKit \(~> 0.23.0\)/ e.message.should.match /RestKit \(~> 0.23.0\)/
end end
it 'handles `podspec` dependencies' do
podfile = Podfile.new do
source 'https://github.com/CocoaPods/Specs.git'
xcodeproj 'SampleProject/SampleProject'
platform :ios, '8.0'
podspec :path => SourcesManager.master.first.specification_path('RestKit', '0.23.0')
pod 'AFNetworking', :git => 'https://github.com/Alamofire/AFNetworking.git', :tag => '1.3.4'
end
analyzer = Pod::Installer::Analyzer.new(config.sandbox, podfile, nil)
@analyzer.analyze.specifications.map(&:to_s).should == []
end
end end
describe 'using lockfile checkout options' do describe 'using lockfile checkout options' do
......
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