Revert #3878

CHANGELOG.md

@@ -22,10 +22,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   frameworks.  
   [Marius Rackwitz](https://github.com/mrackwitz)
 
-* Pods integrated as static libraries can now be imported as modules.  
-  [Tomas Linhart](https://github.com/TomasLinhart)
-  [#3874](https://github.com/CocoaPods/CocoaPods/issues/3874)
-
 ##### Bug Fixes
 
 * Ensure the aggregate `.xcconfig` file only has the settings for the

lib/cocoapods/generator/module_map.rb

@@ -42,9 +42,8 @@ module Pod
       # @return [String]
       #
       def generate
-        module_declaration_qualifier = target.requires_frameworks? ? 'framework ' : ''
         result = <<-eos.strip_heredoc
-          #{module_declaration_qualifier}module #{target.product_module_name} {
+          framework module #{target.product_module_name} {
             umbrella header "#{target.umbrella_header_path.basename}"
 
             export *

lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -22,15 +22,13 @@ module Pod
           create_xcconfig_file
           if target.requires_frameworks?
             create_info_plist_file
+            create_module_map do |generator|
+              generator.private_headers += target.file_accessors.flat_map(&:private_headers).map(&:basename)
+            end
+            create_umbrella_header do |generator|
+              generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
+            end
           end
-          create_module_map do |generator|
-            generator.private_headers += target.file_accessors.flat_map(&:private_headers).map(&:basename)
-          end
-          create_umbrella_header do |generator|
-            generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
-          end
-          link_module_map
-          link_umbrella_header
           create_prefix_header
           create_dummy_source
         end
@@ -185,27 +183,6 @@ module Pod
         end
       end
 
-      # Links a module map to Public headers.
-      #
-      # @return [void]
-      #
-      def link_module_map
-        return if target.requires_frameworks? && target.should_build?
-
-        sandbox.public_headers.add_file(target.name, target.module_map_path, 'module.modulemap', target.platform)
-      end
-
-      # Links a an umbrella header to Public headers.
-      #
-      # @return [void]
-      #
-      def link_umbrella_header
-        return if custom_module_map
-        return if target.requires_frameworks? && target.should_build?
-
-        sandbox.public_headers.add_files(target.name, [target.umbrella_header_path], target.platform)
-      end
-
       # Creates a prefix header file which imports `UIKit` or `Cocoa` according
       # to the platform of the target. This file also include any prefix header
       # content reported by the specification of the pods.
@@ -303,12 +280,6 @@ module Pod
           FileUtils.cp(custom_module_map, path)
           add_file_to_support_group(path)
 
-          unless target.requires_frameworks?
-            contents = path.read
-            contents.gsub!(/^\s*framework\s+module/, 'module')
-            path.open('w') { |f| f.write(contents) }
-          end
-
           native_target.build_configurations.each do |c|
             relative_path = path.relative_path_from(sandbox.root)
             c.build_settings['MODULEMAP_FILE'] = relative_path.to_s

lib/cocoapods/sandbox/headers_store.rb

@@ -71,40 +71,18 @@ module Pod
       # @return [Array<Pathname>]
       #
       def add_files(namespace, relative_header_paths, platform)
-        relative_header_paths.map do |relative_header_path|
-          add_file(namespace, relative_header_path, relative_header_path.basename, platform)
-        end
-      end
-
-      # Adds a header to the directory under different name.
-      #
-      # @param  [Pathname] namespace
-      #         the path where the header file should be stored relative to the
-      #         headers directory.
-      #
-      # @param  [Pathname] relative_header_path
-      #         the path of the header file relative to the Pods project
-      #         (`PODS_ROOT` variable of the xcconfigs).
-      #
-      # @param  [String] final_name
-      #         the name under which the file should be available in the
-      #         headers directory.
-      #
-      # @note   This method adds the file to the search paths.
-      #
-      # @return [Pathname]
-      #
-      def add_file(namespace, relative_header_path, final_name, platform)
         add_search_path(namespace, platform)
         namespaced_path = root + namespace
         namespaced_path.mkpath unless File.exist?(namespaced_path)
 
-        absolute_source = (sandbox.root + relative_header_path)
-        source = absolute_source.relative_path_from(namespaced_path)
-        Dir.chdir(namespaced_path) do
-          FileUtils.ln_sf(source, final_name)
+        relative_header_paths.map do |relative_header_path|
+          absolute_source = (sandbox.root + relative_header_path)
+          source = absolute_source.relative_path_from(namespaced_path)
+          Dir.chdir(namespaced_path) do
+            FileUtils.ln_sf(source, relative_header_path.basename)
+          end
+          namespaced_path + relative_header_path.basename
         end
-        namespaced_path + relative_header_path.basename
       end
 
       # Adds an header search path to the sandbox.

lib/cocoapods/validator.rb

@@ -244,19 +244,15 @@ module Pod
         UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
         @consumer = spec.consumer(platform)
         setup_validation_environment
-        download_pod
-        check_file_patterns
         install_pod
         validate_vendored_dynamic_frameworks
         build_pod
+        check_file_patterns
         tear_down_validation_environment
         validated?
       end
       return false if fail_fast && !valid
       perform_extensive_subspec_analysis(spec) unless @no_subspecs
-    rescue => e
-      error('unknown', "Encountered an unknown error (#{e}) during validation.")
-      false
     end
 
     # Recursively perform the extensive analysis on all subspecs
@@ -338,33 +334,29 @@ module Pod
       Config.instance = @original_config
     end
 
-    def download_pod
-      deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
-      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks)
-      sandbox = Sandbox.new(config.sandbox_root)
-      @installer = Installer.new(sandbox, podfile)
-      @installer.use_default_plugins = false
-      %i(prepare resolve_dependencies download_dependencies).each { |m| @installer.send(m) }
-      @file_accessor = @installer.pod_targets.flat_map(&:file_accessors).find { |fa| fa.spec.name == consumer.spec.name }
-    end
-
     # It creates a podfile in memory and builds a library containing the pod
     # for all available platforms with xcodebuild.
     #
     def install_pod
-      %i(determine_dependency_product_types verify_no_duplicate_framework_names
-         verify_no_static_framework_transitive_dependencies
-         verify_framework_usage generate_pods_project
-         perform_post_install_actions).each { |m| @installer.send(m) }
-
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
-      @installer.aggregate_targets.each do |target|
+      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks)
+      sandbox = Sandbox.new(config.sandbox_root)
+      installer = Installer.new(sandbox, podfile)
+      installer.use_default_plugins = false
+      installer.install!
+
+      file_accessors = installer.aggregate_targets.map do |target|
         if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
             (deployment_target.nil? || Version.new(deployment_target).major < 8)
           uses_xctest = target.spec_consumers.any? { |c| (c.frameworks + c.weak_frameworks).include? 'XCTest' }
           error('swift', 'Swift support uses dynamic frameworks and is therefore only supported on iOS > 8.') unless uses_xctest
         end
-      end
+
+        target.pod_targets.map(&:file_accessors)
+      end.flatten
+
+      @file_accessor = file_accessors.find { |accessor| accessor.spec.root.name == spec.root.name }
+      config.silent
     end
 
     def validate_vendored_dynamic_frameworks
@@ -554,11 +546,11 @@ module Pod
     #         in local mode.
     #
     def podfile_from_spec(platform_name, deployment_target, use_frameworks = true)
-      name     = subspec_name || spec.name
+      name     = subspec_name ? subspec_name : spec.name
       podspec  = file.realpath
       local    = local?
       urls     = source_urls
-      Pod::Podfile.new do
+      podfile  = Pod::Podfile.new do
         urls.each { |u| source(u) }
         use_frameworks!(use_frameworks)
         platform(platform_name, deployment_target)
@@ -568,6 +560,7 @@ module Pod
           pod name, :podspec => podspec.to_s
         end
       end
+      podfile
     end
 
     # Parse the xcode build output to identify the lines which are relevant

spec/functional/command/repo/push_spec.rb

@@ -114,12 +114,9 @@ module Pod
     end
 
     before do
-      %i(prepare resolve_dependencies download_dependencies).each do |m|
-        Installer.any_instance.stubs(m)
-      end
       Installer.any_instance.stubs(:aggregate_targets).returns([])
-      Installer.any_instance.stubs(:pod_targets).returns([])
-      Validator.any_instance.stubs(:install_pod)
+      Installer.any_instance.stubs(:install!)
+
       Validator.any_instance.stubs(:check_file_patterns)
       Validator.any_instance.stubs(:validated?).returns(true)
       Validator.any_instance.stubs(:validate_url)

spec/unit/generator/module_map_spec.rb

@@ -9,9 +9,8 @@ module Pod
       @gen = Generator::ModuleMap.new(@pod_target)
     end
 
-    it 'writes the framework module map to the disk' do
+    it 'writes the module map to the disk' do
       path = temporary_directory + 'BananaLib.modulemap'
-      @pod_target.stubs(:requires_frameworks? => true)
       @gen.save_as(path)
       path.read.should == <<-EOS.strip_heredoc
         framework module BananaLib {
@@ -23,23 +22,8 @@ module Pod
       EOS
     end
 
-    it 'writes the library module map to the disk' do
-      path = temporary_directory + 'BananaLib.modulemap'
-      @pod_target.stubs(:requires_frameworks? => false)
-      @gen.save_as(path)
-      path.read.should == <<-EOS.strip_heredoc
-        module BananaLib {
-          umbrella header "BananaLib-umbrella.h"
-
-          export *
-          module * { export * }
-        }
-      EOS
-    end
-
     it 'correctly adds private headers' do
       @gen.stubs(:private_headers).returns(['Private.h'])
-      @pod_target.stubs(:requires_frameworks? => true)
       @gen.generate.should == <<-EOS.strip_heredoc
         framework module BananaLib {
           umbrella header "BananaLib-umbrella.h"

spec/unit/installer/target_installer/pod_target_installer_spec.rb

@@ -103,7 +103,6 @@ module Pod
             'Pods-BananaLib-Private.xcconfig',
             'Pods-BananaLib-dummy.m',
             'Pods-BananaLib-prefix.pch',
-            'Pods-BananaLib.modulemap',
             'Pods-BananaLib.xcconfig',
           ]
         end
@@ -146,7 +145,6 @@ module Pod
             'BananaLib-Private.xcconfig',
             'BananaLib-dummy.m',
             'BananaLib-prefix.pch',
-            'BananaLib.modulemap',
             'BananaLib.xcconfig',
           ]
         end

spec/unit/validator_spec.rb

@@ -99,10 +99,9 @@ module Pod
       describe 'URL validation' do
         before do
           @validator = Validator.new(podspec_path, SourcesManager.master.map(&:url))
-          @validator.stubs(:download_pod)
-          @validator.stubs(:check_file_patterns)
           @validator.stubs(:install_pod)
           @validator.stubs(:build_pod)
+          @validator.stubs(:check_file_patterns)
           @validator.stubs(:tear_down_validation_environment)
           WebMock::API.stub_request(:head, /not-found/).to_return(:status => 404)
           WebMock::API.stub_request(:get, /not-found/).to_return(:status => 404)
@@ -301,12 +300,8 @@ module Pod
         validator.stubs(:validate_screenshots)
         validator.stubs(:check_file_patterns)
         validator.stubs(:check_file_patterns)
-        validator.stubs(:install_pod)
-        %i(prepare resolve_dependencies download_dependencies).each do |m|
-          Installer.any_instance.stubs(m)
-        end
+        Installer.any_instance.stubs(:install!)
         Installer.any_instance.stubs(:aggregate_targets).returns([])
-        Installer.any_instance.stubs(:pod_targets).returns([])
         subspec = Specification.new(validator.spec, 'subspec') do |s|
           s.ios.deployment_target = '7.0'
         end
@@ -513,12 +508,8 @@ module Pod
         @validator.stubs(:validate_url)
         @validator.stubs(:validate_screenshots)
         @validator.stubs(:check_file_patterns)
-        @validator.stubs(:install_pod)
-        %i(prepare resolve_dependencies download_dependencies).each do |m|
-          Installer.any_instance.stubs(m)
-        end
+        Installer.any_instance.stubs(:install!)
         Installer.any_instance.stubs(:aggregate_targets).returns([])
-        Installer.any_instance.stubs(:pod_targets).returns([])
       end
 
       it 'lints as a framework if specified' do