Fix integration specs.

lib/cocoapods/hooks/installer_data.rb

@@ -5,6 +5,8 @@ module Pod
     #
     class InstallerData
 
+      include Config::Mixin
+
       # @return [Sandbox] sandbox the sandbox where the support files should
       #         be generated.
       #
@@ -23,20 +25,15 @@ module Pod
       #
       # attr_accessor :local_pods_by_target
 
-      # @return [Array<LocalPod>] The list of LocalPod instances for each
+      # @return [Array<PodData>] The list of LocalPod instances for each
       #         dependency sorted by name.
       #
-      # attr_accessor :local_pods
+      attr_accessor :pods
 
       # @return [Pod::Project] the `Pods/Pods.xcodeproj` project.
       #
       attr_accessor :project
 
-      def pods
-      #   UI.warn "InstallerData#pods is deprecated"
-      #   [] # TODO
-      end
-
     end
   end
 end

lib/cocoapods/hooks/pod_data.rb

@@ -5,13 +5,30 @@ module Pod
     #
     class PodData
 
+      # @return [Pathname]
+      #
       attr_accessor :root
 
+      # @return [Version]
+      #
+      attr_accessor :root_spec
+
+      #--------------------------------------------------------------------------------#
+
+      def to_s
+        root_spec.to_s
+      end
+
     end
   end
 end
 
 
 
-
+# TODO
+module Pod
+  class Specification
+    include Config::Mixin
+  end
+end
 

lib/cocoapods/hooks/target_installer_data.rb

@@ -4,31 +4,32 @@ module Pod
 
       # Stores the information of the target installer
 
-      # @todo This has to be removed, but this means the specs have to be
-      #       updated if they need a reference to the prefix header.
-      #
-      # def prefix_header_filename
-      #   UI.warn "The usage of the TargetInstaller#prefix_header_filename is deprecated."
-      #   library.prefix_header_path.relative_path_from(sandbox.root)
-      # end
-      #
-      #
       # @return [Sandbox] sandbox the sandbox where the support files should
       #         be generated.
       #
-      attr_reader :sandbox
+      attr_accessor :sandbox
 
       # @return [Library] The library whose target needs to be generated.
       #
-      attr_reader :library
+      attr_accessor :library
+
+      #--------------------------------------------------------------------------------#
 
+      # @todo This has to be removed, but this means the specs have to be
+      #       updated if they need a reference to the prefix header.
+      #
+      def prefix_header_filename
+        UI.warn "The usage of the TargetInstaller#prefix_header_filename is deprecated."
+        library.prefix_header_path.relative_path_from(sandbox.root)
+      end
 
       # @return [PBXNativeTarget] the target generated by the installation
       #         process.
       #
       # @note   Generated by the {#add_target} step.
       #
-      attr_reader :target
+      def target
+      end
 
       # @return [Project] the Pods project of the sandbox.
       #

spec/integration_spec.rb

 require File.expand_path('../spec_helper', __FILE__)
 require 'yaml'
 
-# TODO Make specs faster by limiting remote network connections
-
 #-----------------------------------------------------------------------------#
 
 # @!group Helpers
@@ -38,7 +36,6 @@ module Pod
   describe "Full integration" do
 
     before do
-      # fixture('spec-repos/master') # ensure the archive is unpacked
       config.integrate_targets = false
     end
 
@@ -46,14 +43,10 @@ module Pod
 
     describe "Single platform" do
 
-      # it "includes automatically inherited subspecs" do
-      # end
-
-      # it "handles different subspecs for the same Pod in different target definitions" do
-      # end
+      # xit "includes automatically inherited subspecs" do; end
+      # xit "handles different subspecs for the same Pod in different target definitions" do; end
 
-      # @todo fix the config of the hook
-      xit "installs a Pod directly from its repo" do
+      it "installs a Pod directly from its repo" do
         url = fixture('integration/sstoolkit').to_s
         commit = '2adcd0f81740d6b0cd4589af98790eee3bd1ae7b'
         podfile = Podfile.new do
@@ -128,7 +121,7 @@ module Pod
 
       # @note ASIHTTPRequest depends on Reachability in iOS.
       #
-      xit "creates targets for different platforms" do
+      it "creates targets for different platforms" do
         podfile = Podfile.new do
           platform :ios
           xcodeproj 'dummy'
@@ -172,7 +165,7 @@ module Pod
         puts "    ! ".red << "Skipping because the `appledoc` executable can't be found."
       else
         # @todo fix the config of the hook
-        xit "generates documentation of all pods by default" do
+        it "generates documentation of all pods by default" do
 
           podfile = Podfile.new do
             platform :ios
@@ -182,7 +175,7 @@ module Pod
           end
 
           config.generate_docs = true
-          config.doc_install   = false
+          config.install_docs  = false
           Generator::Documentation.any_instance.stubs(:already_installed?).returns(false)
           installer = Installer.new(config.sandbox, podfile)
           installer.install!
@@ -239,9 +232,8 @@ module Pod
             end
           end
 
-
           Installer.new(config.sandbox, podfile).install!
-          project = Project.new(config.project_pods_root + 'Pods.xcodeproj')
+          project = Xcodeproj::Project.new(config.sandbox.project_path)
           project.targets.first.build_configurations.map do |config|
             config.build_settings['GCC_ENABLE_OBJC_GC']
           end.should == %w{ supported supported }
@@ -261,7 +253,6 @@ module Pod
             pod 'SSZipArchive',      '< 0.1.2'
           end
 
-
           installer = Installer.new(config.sandbox, podfile)
           installer.install!
 
@@ -293,8 +284,8 @@ module Pod
           (root + 'Pods.xcconfig').read.should == installer.libraries.first.xcconfig.to_s
           project_file = (root + 'Pods.xcodeproj/project.pbxproj').to_s
           saved_project = Xcodeproj.read_plist(project_file)
-          saved_project.to_hash.recursive_diff(installer.project.to_hash).should.be.nil
-          saved_project.should == installer.project.to_hash
+          saved_project.to_hash.recursive_diff(installer.pods_project.to_hash).should.be.nil
+          saved_project.should == installer.pods_project.to_hash
 
           should_xcodebuild(podfile.target_definitions[:default])
         end
@@ -336,15 +327,15 @@ module Pod
           installer = Installer.new(config.sandbox, podfile)
           installer.install!
 
-          project = Project.new(config.project_pods_root + 'Pods.xcodeproj')
+          project = Xcodeproj::Project.new(config.project_pods_root + 'Pods.xcodeproj')
           disk_source_files = project.files.sort.reject { |f| f.build_files.empty? }
-          installer_source_files = installer.project.files.sort.reject { |f| f.build_files.empty? }
+          installer_source_files = installer.pods_project.files.sort.reject { |f| f.build_files.empty? }
           disk_source_files.should == installer_source_files
         end
 
         #--------------------------------------#
 
-        xit "creates a project with multiple targets" do
+        it "creates a project with multiple targets" do
           podfile = Podfile.new do
             platform test_platform
             pod 'ASIHTTPRequest'
@@ -423,7 +414,7 @@ module Pod
           workspace = Xcodeproj::Workspace.new_from_xcworkspace(temporary_directory + 'ASIHTTPRequest.xcworkspace')
           workspace.projpaths.sort.should == ['ASIHTTPRequest.xcodeproj', 'Pods/Pods.xcodeproj']
 
-          project = Project.new(projpath)
+          project = Xcodeproj::Project.new(projpath)
           libPods = project.files.find { |f| f.name == 'libPods.a' }
 
           target = project.targets.first
@@ -436,7 +427,7 @@ module Pod
 
         #--------------------------------------#
 
-        xit "should prevent duplication cleaning headers symlinks with multiple targets" do
+        it "should prevent duplication cleaning headers symlinks with multiple targets" do
           podfile = Podfile.new do
             platform test_platform
             xcodeproj 'dummy'