cocoapods 1.3.0.beta.1 → 1.3.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85b8c7d56dc05bce8e651e54f7b9d2af2ffefaea
-  data.tar.gz: fa049011f0e3c0f28a40d444d74450445be75ed1
+  metadata.gz: b333fa1137f2e1a7944d505a3980c5e70fbead9c
+  data.tar.gz: debc12d5f99d1c374220dfb216e144accac4242d
 SHA512:
-  metadata.gz: e03f894668359510702db376e92692ad0bac0fa0334c25cbdeab29420d4e9cea080a135695b5d614208b9545ab4c2797e90566c4fa47055c751990a7272d51fa
-  data.tar.gz: e6f6cc8935c87cc50084cc2224cb47a70ab9b9c8a0906ffe55dacff18aab74cc5c16cef6eaac718cd3ca66db1e6f190f622b000b928da92ac3b6027660e73a54
+  metadata.gz: 86fa795c0a553e257907a02a2b377ad19938f1eb279f75c57105bb7984d72ab823e97481f05c4cf44c0353c392be8ba383422872b254f57b63ae03f53058d537
+  data.tar.gz: d1d3136f5bec874fa203d453008a8b358e53caf14be96b93c7f66f7ff9cb4a0ed497ba1ccef4fc790870768251ed9cd2c880dc51b04e5e452b1761c5be805406

data/CHANGELOG.md

@@ -4,6 +4,32 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.3.0.beta.2 (2017-06-22)
+
+##### Enhancements
+
+* Add inputs and outputs for resources script phase  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6806](https://github.com/CocoaPods/CocoaPods/pull/6806)
+
+* Simplify logic around framework input and output paths  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6803](https://github.com/CocoaPods/CocoaPods/pull/6803)
+
+* Add inputs and outputs to check manifest lock and embed framework script phases  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6797](https://github.com/CocoaPods/CocoaPods/issues/6797)
+
+##### Bug Fixes
+
+* Remove 0.34 migration for a small boost in `pod install` time  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6783](hhttps://github.com/CocoaPods/CocoaPods/pull/6783)
+
+* Use a cache when figuring out if a pod target is test only  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6787](https://github.com/CocoaPods/CocoaPods/pull/6787)
+
 ## 1.3.0.beta.1 (2017-06-06)
 
 ##### Enhancements
@@ -32,16 +58,20 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Austin Emmons](https://github.com/atreat)
   [#6742](https://github.com/CocoaPods/CocoaPods/issues/6742) 
 
-##### Bug Fixes
+* Add a ipc command `podfile_json` converts a Podfile to JSON  
+  [Dacaiguoguo](https://github.com/dacaiguoguogmail)
+  [#6779](https://github.com/CocoaPods/CocoaPods/pull/6779)
 
-* Do not double add search paths to test xcconfig from parent  
-  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
-  [#6767](https://github.com/CocoaPods/CocoaPods/pull/6767)
+##### Bug Fixes
 
 * Link `swiftSwiftOnoneSupport` for test xcconfigs  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#6769](https://github.com/CocoaPods/CocoaPods/pull/6769)
 
+* Do not double add search paths to test xcconfig from parent  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6768](https://github.com/CocoaPods/CocoaPods/pull/6768)
+
 * Ensure product name for tests is not overridden by custom build settings  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#6766](https://github.com/CocoaPods/CocoaPods/pull/6766)

data/lib/cocoapods/command/ipc.rb

@@ -1,5 +1,6 @@
 require 'cocoapods/command/ipc/list'
 require 'cocoapods/command/ipc/podfile'
+require 'cocoapods/command/ipc/podfile_json'
 require 'cocoapods/command/ipc/repl'
 require 'cocoapods/command/ipc/spec'
 require 'cocoapods/command/ipc/update_search_index'

data/lib/cocoapods/command/ipc/podfile_json.rb

@@ -0,0 +1,30 @@
+module Pod
+  class Command
+    class IPC < Command
+      class PodfileJSON < IPC
+        include ProjectDirectory
+
+        self.summary = 'Converts a Podfile to JSON'
+        self.description = 'Converts a Podfile to JSON and prints it to STDOUT.'
+        self.arguments = [
+          CLAide::Argument.new('PATH', true),
+        ]
+
+        def initialize(argv)
+          @path = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! 'A Podfile path is required.' unless @path
+        end
+
+        def run
+          podfile = Pod::Podfile.from_file(@path)
+          output_pipe.puts podfile.to_hash.to_json
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.3.0.beta.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.3.0.beta.2'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -122,7 +122,7 @@ module Pod
             archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
             stripped=""
             for arch in $archs; do
-              if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then
+              if ! [[ "${ARCHS}" == *"$arch"* ]]; then
                 # Strip non-valid architectures in-place
                 lipo -remove "$arch" -output "$binary" "$binary" || exit 1
                 stripped="$stripped $arch"
@@ -139,10 +139,10 @@ module Pod
           unless frameworks_with_dsyms.empty?
             script << %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
             frameworks_with_dsyms.each do |framework_with_dsym|
-              script << %(  install_framework "#{framework_with_dsym[:framework]}"\n)
+              script << %(  install_framework "#{framework_with_dsym[:input_path]}"\n)
               # Vendored frameworks might have a dSYM file next to them so ensure its copied. Frameworks built from
               # sources will have their dSYM generated and copied by Xcode.
-              script << %(  install_dsym "#{framework_with_dsym[:dSYM]}"\n) unless framework_with_dsym[:dSYM].nil?
+              script << %(  install_dsym "#{framework_with_dsym[:dsym_input_path]}"\n) unless framework_with_dsym[:dsym_input_path].nil?
             end
             script << "fi\n"
           end

data/lib/cocoapods/installer/analyzer.rb

@@ -46,6 +46,8 @@ module Pod
         @update = false
         @allow_pre_downloads = true
         @has_dependencies = true
+        @test_pod_target_analyzer_cache = {}
+        @test_pod_target_key = Struct.new(:name, :pod_targets)
       end
 
       # Performs the analysis.
@@ -430,8 +432,9 @@ module Pod
         target.pod_targets = pod_targets.select do |pod_target|
           target_definition_included = pod_target.target_definitions.include?(target_definition)
           explicitly_defined_in_target_definition = target_definition.non_inherited_dependencies.map(&:name).include?(pod_target.name)
-          test_pod_target_only = pod_target_test_only?(pod_target, pod_targets)
-          target_definition_included && (explicitly_defined_in_target_definition || !test_pod_target_only)
+          next false unless target_definition_included
+          next true if explicitly_defined_in_target_definition
+          !pod_target_test_only?(pod_target, pod_targets)
         end
 
         target
@@ -449,9 +452,14 @@ module Pod
       # @return [Boolean] if the pod target is only referenced from test dependencies.
       #
       def pod_target_test_only?(pod_target, pod_targets)
-        source = pod_targets.any? { |pt| pt.dependent_targets.map(&:name).include?(pod_target.name) }
-        test = pod_targets.any? { |pt| pt.test_dependent_targets.map(&:name).include?(pod_target.name) }
-        !source && test
+        name = pod_target.name
+        key = @test_pod_target_key.new(name, pod_targets)
+        if @test_pod_target_analyzer_cache.key?(key)
+          return @test_pod_target_analyzer_cache[key]
+        end
+        source = pod_targets.any? { |pt| pt.dependent_targets.map(&:name).include?(name) }
+        test = pod_targets.any? { |pt| pt.test_dependent_targets.map(&:name).include?(name) }
+        @test_pod_target_analyzer_cache[key] = !source && test
       end
 
       # Setup the pod targets for an aggregate target. Deduplicates resulting

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -135,6 +135,11 @@ module Pod
           phase = create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
           script_path = target.embed_frameworks_script_relative_path
           phase.shell_script = %("#{script_path}"\n)
+          framework_paths_by_config = target.framework_paths_by_config.values.flatten.uniq
+          unless framework_paths_by_config.all?(&:empty?)
+            phase.input_paths = [target.embed_frameworks_script_relative_path, *framework_paths_by_config.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
+            phase.output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
+          end
         end
 
         # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
@@ -159,6 +164,11 @@ module Pod
             phase = create_or_update_build_phase(native_target, phase_name)
             script_path = target.copy_resources_script_relative_path
             phase.shell_script = %("#{script_path}"\n)
+            resource_paths_by_config = target.resource_paths_by_config
+            unless resource_paths_by_config.values.all?(&:empty?)
+              phase.input_paths = [target.copy_resources_script_relative_path, *resource_paths_by_config.values.flatten.uniq]
+              phase.output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+            end
           end
         end
 
@@ -183,7 +193,11 @@ module Pod
                   echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
                   exit 1
               fi
+              # This output is used by Xcode 'outputs' to avoid re-running this script phase.
+              echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
             SH
+            phase.input_paths = %w(${PODS_PODFILE_DIR_PATH}/Podfile.lock ${PODS_ROOT}/Manifest.lock)
+            phase.output_paths = [target.check_manifest_lock_script_output_file_path]
           end
         end
 

data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb

@@ -18,7 +18,6 @@ module Pod
           def self.integrate(pod_bundle, targets)
             targets.each do |target|
               target.build_configurations.each do |config|
-                update_to_cocoapods_0_34(pod_bundle, targets)
                 set_target_xcconfig(pod_bundle, target, config)
               end
             end
@@ -29,37 +28,6 @@ module Pod
           # @!group Integration steps
           #-------------------------------------------------------------------#
 
-          # Removes the xcconfig used up to CocoaPods 0.33 from the project and
-          # deletes the file if it exists.
-          #
-          # @param  [Target::AggregateTarget] pod_bundle
-          #         The Pods bundle.
-          #
-          # @param  [Array<XcodeProj::PBXNativeTarget>] targets
-          #         The native targets.
-          #
-          # @todo   This can be removed for CocoaPods 1.0
-          #
-          def self.update_to_cocoapods_0_34(pod_bundle, targets)
-            sandbox = pod_bundle.sandbox
-            targets.map(&:project).uniq.each do |project|
-              file_refs = project.files.select do |file_ref|
-                path = file_ref.path.to_s
-                if File.extname(path) == '.xcconfig'
-                  absolute_path = file_ref.real_path.to_s
-                  absolute_path.start_with?(sandbox.root.to_s) &&
-                    !absolute_path.start_with?(sandbox.target_support_files_root.to_s)
-                end
-              end
-
-              file_refs.uniq.each do |file_ref|
-                UI.message "- Removing (#{file_ref.path})" do
-                  file_ref.remove_from_project
-                end
-              end
-            end
-          end
-
           # Creates a file reference to the xcconfig generated by
           # CocoaPods (if needed) and sets it as the base configuration of
           # build configuration of the user target.

data/lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb

@@ -106,29 +106,6 @@ module Pod
               generator = Generator::BridgeSupport.new(headers)
               generator.save_as(path)
               add_file_to_support_group(path)
-              @bridge_support_file = path.relative_path_from(sandbox.root)
-            end
-          end
-
-          # Uniqued Resources grouped by config
-          #
-          # @return [Hash{ Symbol => Array<Pathname> }]
-          #
-          def resources_by_config
-            library_targets = target.pod_targets.reject do |pod_target|
-              pod_target.should_build? && pod_target.requires_frameworks?
-            end
-            target.user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
-              resources_by_config[config] = library_targets.flat_map do |library_target|
-                next [] unless library_target.include_in_build_config?(target_definition, config)
-                resource_paths = library_target.file_accessors.flat_map do |accessor|
-                  accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) }
-                end
-                resource_bundles = library_target.file_accessors.flat_map do |accessor|
-                  accessor.resource_bundles.keys.map { |name| "#{library_target.configuration_build_dir}/#{name.shellescape}.bundle" }
-                end
-                (resource_paths + resource_bundles + [bridge_support_file].compact).uniq
-              end
             end
           end
 
@@ -142,7 +119,7 @@ module Pod
           #
           def create_copy_resources_script
             path = target.copy_resources_script_path
-            generator = Generator::CopyResourcesScript.new(resources_by_config, target.platform)
+            generator = Generator::CopyResourcesScript.new(target.resource_paths_by_config, target.platform)
             generator.save_as(path)
             add_file_to_support_group(path)
           end
@@ -158,24 +135,7 @@ module Pod
           #
           def create_embed_frameworks_script
             path = target.embed_frameworks_script_path
-            frameworks_and_dsyms_by_config = {}
-            target.user_build_configurations.keys.each do |config|
-              relevant_pod_targets = target.pod_targets.select do |pod_target|
-                pod_target.include_in_build_config?(target_definition, config)
-              end
-              frameworks_and_dsyms_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
-                frameworks = pod_target.file_accessors.flat_map(&:vendored_dynamic_artifacts).map do |fw|
-                  path_to_framework = "${PODS_ROOT}/#{fw.relative_path_from(sandbox.root)}"
-                  # Until this can be configured, assume the dSYM file uses the file name as the framework.
-                  # See https://github.com/CocoaPods/CocoaPods/issues/1698
-                  { :framework => path_to_framework, :dSYM => "#{path_to_framework}.dSYM" }
-                end
-                # For non vendored frameworks Xcode will generate the dSYM and copy it instead.
-                frameworks << { :framework => pod_target.build_product_path('$BUILT_PRODUCTS_DIR'), :dSYM => nil } if pod_target.should_build? && pod_target.requires_frameworks?
-                frameworks
-              end
-            end
-            generator = Generator::EmbedFrameworksScript.new(frameworks_and_dsyms_by_config)
+            generator = Generator::EmbedFrameworksScript.new(target.framework_paths_by_config)
             generator.save_as(path)
             add_file_to_support_group(path)
           end
@@ -195,13 +155,6 @@ module Pod
             end
           end
 
-          # @return [Pathname] the path of the bridge support file relative to the
-          #         sandbox.
-          #
-          # @return [Nil] if no bridge support file was generated.
-          #
-          attr_reader :bridge_support_file
-
           #-----------------------------------------------------------------------#
         end
       end

data/lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb

@@ -7,17 +7,20 @@ module Pod
         # by the target.
         #
         class TargetInstaller
-          # @return [Sandbox] sandbox the sandbox where the support files should
-          #         be generated.
+          # @return [Sandbox] sandbox
+          #         The sandbox where the support files should be generated.
           #
           attr_reader :sandbox
 
-          # @return [Target] The library whose target needs to be generated.
+          # @return [Target] target
+          #         The library whose target needs to be generated.
           #
           attr_reader :target
 
-          # @param  [Project] project @see project
-          # @param  [Target]  target  @see target
+          # Initialize a new instance
+          #
+          # @param [Sandbox] sandbox @see sandbox
+          # @param [Target] target  @see target
           #
           def initialize(sandbox, target)
             @sandbox = sandbox

data/lib/cocoapods/installer/xcode/target_validator.rb

@@ -74,9 +74,9 @@ module Pod
               pod_targets = aggregate_target.pod_targets_for_build_configuration(config)
 
               dependencies = pod_targets.select(&:should_build?).flat_map(&:dependencies)
-              dependended_upon_targets = pod_targets.select { |t| dependencies.include?(t.pod_name) && !t.should_build? }
+              depended_upon_targets = pod_targets.select { |t| dependencies.include?(t.pod_name) && !t.should_build? }
 
-              static_libs = dependended_upon_targets.flat_map(&:file_accessors).flat_map(&:vendored_static_artifacts)
+              static_libs = depended_upon_targets.flat_map(&:file_accessors).flat_map(&:vendored_static_artifacts)
               unless static_libs.empty?
                 raise Informative, "The '#{aggregate_target.label}' target has " \
                   "transitive dependencies that include static binaries: (#{static_libs.to_sentence})"

data/lib/cocoapods/target.rb

@@ -2,7 +2,7 @@ module Pod
   # Model class which describes a Pods target.
   #
   # The Target class stores and provides the information necessary for
-  # working with a target in the Podfile and it's dependent libraries.
+  # working with a target in the Podfile and its dependent libraries.
   # This class is used to represent both the targets and their libraries.
   #
   class Target

data/lib/cocoapods/target/aggregate_target.rb

@@ -184,6 +184,71 @@ module Pod
       pod_targets.any?(&:uses_swift?)
     end
 
+    # @return [Hash{String => Array<Hash{Symbol => [String]}>] The vendored dynamic artifacts and framework target
+    #         input and output paths grouped by config
+    #
+    def framework_paths_by_config
+      framework_paths_by_config = {}
+      user_build_configurations.keys.each do |config|
+        relevant_pod_targets = pod_targets.select do |pod_target|
+          pod_target.include_in_build_config?(target_definition, config)
+        end
+        framework_paths_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
+          frameworks = []
+          pod_target.file_accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
+            relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
+            framework = { :name => framework_path.basename.to_s,
+                          :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
+                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
+            # Until this can be configured, assume the dSYM file uses the file name as the framework.
+            # See https://github.com/CocoaPods/CocoaPods/issues/1698
+            dsym_name = "#{framework_path.basename}.dSYM"
+            dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
+            if dsym_path.exist?
+              framework[:dsym_name] = dsym_name
+              framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
+              framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
+            end
+            frameworks << framework
+          end
+          if pod_target.should_build? && pod_target.requires_frameworks?
+            frameworks << { :name => pod_target.product_name,
+                            :input_path => pod_target.build_product_path('${BUILT_PRODUCTS_DIR}'),
+                            :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{pod_target.product_name}" }
+          end
+          frameworks
+        end
+      end
+      framework_paths_by_config
+    end
+
+    # @return [Hash{ String => Array<String> }] Uniqued Resources grouped by config
+    #
+    def resource_paths_by_config
+      library_targets = pod_targets.reject do |pod_target|
+        pod_target.should_build? && pod_target.requires_frameworks?
+      end
+      user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
+        resources_by_config[config] = library_targets.flat_map do |library_target|
+          next [] unless library_target.include_in_build_config?(target_definition, config)
+          resource_paths = library_target.file_accessors.flat_map do |accessor|
+            accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
+          end
+          resource_bundles = library_target.file_accessors.flat_map do |accessor|
+            accessor.resource_bundles.keys.map { |name| "#{library_target.configuration_build_dir}/#{name.shellescape}.bundle" }
+          end
+          (resource_paths + resource_bundles + [bridge_support_file].compact).uniq
+        end
+      end
+    end
+
+    # @return [Pathname] the path of the bridge support file relative to the
+    #         sandbox or `nil` if bridge support is disabled.
+    #
+    def bridge_support_file
+      bridge_support_path.relative_path_from(sandbox.root) if podfile.generate_bridge_support?
+    end
+
     #-------------------------------------------------------------------------#
 
     # @!group Support files
@@ -209,6 +274,12 @@ module Pod
       support_files_dir + "#{label}-frameworks.sh"
     end
 
+    # @return [String] The output file path fo the check manifest lock script.
+    #
+    def check_manifest_lock_script_output_file_path
+      "$(DERIVED_FILE_DIR)/#{label}-checkManifestLockResult.txt"
+    end
+
     # @return [String] The xcconfig path of the root from the `$(SRCROOT)`
     #         variable of the user's project.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta.1
+  version: 1.3.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta.1
+        version: 1.3.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta.1
+        version: 1.3.0.beta.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +400,7 @@ files:
 - lib/cocoapods/command/ipc.rb
 - lib/cocoapods/command/ipc/list.rb
 - lib/cocoapods/command/ipc/podfile.rb
+- lib/cocoapods/command/ipc/podfile_json.rb
 - lib/cocoapods/command/ipc/repl.rb
 - lib/cocoapods/command/ipc/spec.rb
 - lib/cocoapods/command/ipc/update_search_index.rb