Merge pull request #4672 from CocoaPods/seg-podfile-fixes

Fix issues found during Podfile testing

lib/cocoapods/external_sources/abstract_external_source.rb

@@ -141,14 +141,19 @@ module Pod
       # @return [void]
       #
       def store_podspec(sandbox, spec, json = false)
-        case spec
-        when Pathname
-          spec = Specification.from_file(spec)
-        when String
-          path = "#{name}.podspec"
-          path << '.json' if json
-          spec = Specification.from_string(spec, path)
+        spec = case spec
+               when Pathname
+                 Specification.from_file(spec)
+               when String
+                 path = "#{name}.podspec"
+                 path << '.json' if json
+                 Specification.from_string(spec, path)
+               when Specification
+                 spec.dup
+               else
+                 raise "Unknown spec type: #{spec}"
         end
+        spec.defined_in_file = nil
         validate_podspec(spec)
         sandbox.store_podspec(name, spec.to_pretty_json, true, true)
       end

lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -144,7 +144,6 @@ module Pod
 
             label = target.resources_bundle_target_label(bundle_name)
             bundle_target = project.new_resources_bundle(label, file_accessor.spec_consumer.platform_name)
-            bundle_target.deployment_target = deployment_target
             bundle_target.product_reference.tap do |bundle_product|
               bundle_file_name = "#{bundle_name}.bundle"
               bundle_product.name = bundle_file_name
@@ -155,6 +154,7 @@ module Pod
             target.user_build_configurations.each do |bc_name, type|
               bundle_target.add_build_configuration(bc_name, type)
             end
+            bundle_target.deployment_target = deployment_target
 
             target.resource_bundle_targets << bundle_target
 

spec/unit/external_sources/abstract_external_source_spec.rb

@@ -32,7 +32,10 @@ module Pod
 
     describe 'Subclasses helpers' do
       it 'pre-downloads the Pod and stores the relevant information in the sandbox' do
-        @subject.expects(:validate_podspec).with { |spec| spec.name.should == 'Reachability' }
+        @subject.expects(:validate_podspec).with do |spec|
+          spec.defined_in_file.should.be.nil
+          spec.name.should == 'Reachability'
+        end
         @subject.send(:pre_download, config.sandbox)
         path = config.sandbox.specifications_root + 'Reachability.podspec.json'
         path.should.exist?