From 71fc2bbfd3bbcecdf2e8008ca331f35be071b3bb Mon Sep 17 00:00:00 2001 From: Eloy Duran Date: Sat, 17 Sep 2011 01:27:28 +0200 Subject: [PATCH] Small cleanup --- examples/Podfile | 2 +- lib/cocoa_pods/installer.rb | 24 ++++-------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/examples/Podfile b/examples/Podfile index 52d3583..15bfb1a 100644 --- a/examples/Podfile +++ b/examples/Podfile @@ -1,7 +1,7 @@ dependency 'SSZipArchive', '>= 1' -dependency 'ASIHTTPRequest', '1.8' +#dependency 'ASIHTTPRequest', '1.8' #dependency 'ASIWebPageRequest', '= 1.8' # is part of ASIHTTPRequest 1.8 and 1.8.1 diff --git a/lib/cocoa_pods/installer.rb b/lib/cocoa_pods/installer.rb index efc159f..f000959 100644 --- a/lib/cocoa_pods/installer.rb +++ b/lib/cocoa_pods/installer.rb @@ -44,33 +44,17 @@ module Pod @xcodeproj ||= Xcode::Project.ios_static_library end - def install! - unless config.silent? - puts "Installing dependencies defined in: #{@specification.defined_in_file}" - end - install_dependent_specifications! - generate_project - write_files! - end - - def install_dependent_specifications! - dependent_specification_sets.each do |set| - # In case the set is only part of other pods we don't need to install - # the pod itself. - next if set.only_part_of_other_pod? - set.specification.install! - end - end - def generate_project - puts "==> Creating Pods project files" unless config.silent? source_files.each { |file| xcodeproj.add_source_file(file) } build_specification_sets.each do |set| xcconfig << set.specification.read(:xcconfig) end end - def write_files! + def install! + puts "Installing dependencies of: #{@specification.defined_in_file}" unless config.silent? + generate_project + build_specification_sets.each { |set| set.specification.install! } xcodeproj.create_in(config.project_pods_root) xcconfig.create_in(config.project_pods_root) end