Commit 697f8bd1 authored by Fabio Pelosin's avatar Fabio Pelosin

WIP

parent 6ca21338
...@@ -6,9 +6,6 @@ process do |files| ...@@ -6,9 +6,6 @@ process do |files|
specs = files.take_and_map do |file| specs = files.take_and_map do |file|
if file =~ %r{lib/cocoapods/(.+?)\.rb$} if file =~ %r{lib/cocoapods/(.+?)\.rb$}
s = Dir.glob("spec/**/#{File.basename(file, '.rb')}_spec.rb") s = Dir.glob("spec/**/#{File.basename(file, '.rb')}_spec.rb")
if file =~ %r{lib/cocoapods/installer.*\.rb$}
s.concat(['spec/unit/installer_spec.rb', 'spec/unit/installer/target_installer_spec.rb'])
end
s.uniq unless s.empty? s.uniq unless s.empty?
end end
end end
......
...@@ -113,10 +113,9 @@ module Pod ...@@ -113,10 +113,9 @@ module Pod
config.verbose config.verbose
config.skip_repo_update = true config.skip_repo_update = true
sandbox = Sandbox.new(config.project_pods_root) sandbox = Sandbox.new(config.project_pods_root)
resolver = Resolver.new(podfile, nil, sandbox) installer = Installer.new(sandbox, podfile)
installer = Installer.new(resolver)
installer.install! installer.install!
@pod = installer.pods.find { |pod| pod.top_specification == spec } @pod = installer.local_pods.find { |pod| pod.top_specification == spec }
config.silent config.silent
end end
......
This diff is collapsed.
...@@ -70,8 +70,7 @@ else ...@@ -70,8 +70,7 @@ else
end end
# Note that we are *not* using the stubbed SpecHelper::Installer subclass. # Note that we are *not* using the stubbed SpecHelper::Installer subclass.
resolver = Pod::Resolver.new(podfile, nil, Pod::Sandbox.new(config.project_pods_root)) installer = Pod::Installer.new(Pod::Sandbox.new(config.project_pods_root), podfile)
installer = Pod::Installer.new(resolver)
installer.install! installer.install!
result = installer.lockfile.to_hash result = installer.lockfile.to_hash
result['PODS'].should == ['SSToolkit (0.1.3)'] result['PODS'].should == ['SSToolkit (0.1.3)']
...@@ -88,8 +87,7 @@ else ...@@ -88,8 +87,7 @@ else
pod 'Reachability', :podspec => url pod 'Reachability', :podspec => url
end end
resolver = Pod::Resolver.new(podfile, nil, Pod::Sandbox.new(config.project_pods_root)) installer = SpecHelper::Installer.new(Pod::Sandbox.new(config.project_pods_root), podfile)
installer = SpecHelper::Installer.new(resolver)
installer.install! installer.install!
result = installer.lockfile.to_hash result = installer.lockfile.to_hash
result['PODS'].should == ['Reachability (1.2.3)'] result['PODS'].should == ['Reachability (1.2.3)']
......
This diff is collapsed.
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