cocoapods 1.6.0.beta.1 → 1.6.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eea82a7d50fbc9129a369914b81e1a7722de54530e1486cc14735c4984694c6a
-  data.tar.gz: 1c5e1381e2d5f513c380a817ba52401eb1480e5a42bf747c57d9042c651d1b0f
+  metadata.gz: 78fc10cd8ecb6e143b881badf52a7688a75a4027494be697848432c15e4ef2ea
+  data.tar.gz: 1193a91131a6f03a5ac7b7b52eecca0ca82d74167e7b465f08342255ba4b14d8
 SHA512:
-  metadata.gz: e5bb218d53e23686ffae0612f20778d6050e52a135b49a1b35c4a3922d497c5852e442a6e2df71182bb844853b3df5215c8bf9c1acc9ebf24c2078398f0037ca
-  data.tar.gz: 70d05ff41270cec4e2ac020c1f8c0918ae5467694fe0bcb13b230f88170fc74239e0fa89d8067277fb80b49512135b79239556de2f0f20e427cde6feb1b315a9
+  metadata.gz: f24e4f502e4251a6cebfb9020037af737c52094121aea6d0f26f6392f14d993ba95597249266e74c5113b0062dfc8de277a60ce6eba7e9b2213f19f907ca51cc
+  data.tar.gz: 949700b4fd4b5fec511390a75ad55b12d86128650833b3caf72da2c4bb3d15ecd90429d6e70177b3f67134e4cf8d7848b8c3d06504cf9dbe350b9750f7bbd164

data/CHANGELOG.md

@@ -4,18 +4,109 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.6.0.beta.2 (2018-10-17)
+
+##### Enhancements
+
+* Remove contraction from docs to fix rendering on the website.  
+  [stevemoser](https://github.com/stevemoser)
+  [#8131](https://github.com/CocoaPods/CocoaPods/pull/8131)
+
+* Provide an installation option to preserve folder structure  
+  [dacaiguoguogmail](https://github.com/dacaiguoguogmail)
+  [#8097](https://github.com/CocoaPods/CocoaPods/pull/8097)
+
+* Nests test specs host apps inside that Pod's directory for cleaner project 
+  navigators.  
+  [Derek Ostrander](https://github.com/dostrander)
+   
+* mark_ruby_file_ref add indent width and tab width config  
+  [dacaiguoguogmail](https://github.com/dacaiguoguogmail)
+
+* Print an error that will show up in Xcode's issue navigator upon unexpected
+  failures in the copy resources and embed frameworks script phases.  
+  [Samuel Giddins](https://github.com/segiddins)
+  
+* Validate that all generated `PBXNativeTarget`s contain source files to build,
+  so specs (including test specs) with no source files won't fail at runtime
+  due to the lack of a generated executable.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Print better promote message when unable to find a specification.  
+  [Xinyu Zhao](https://github.com/X140Yu)
+  [#8064](https://github.com/CocoaPods/CocoaPods/issues/8064)
+
+* Silence warnings in headers for Pods with `inhibit_warnings => true`  
+  [Guillaume Algis](https://github.com/guillaumealgis)
+  [#6401](https://github.com/CocoaPods/CocoaPods/pull/6401)
+
+* When resolving a locked dependency, source the spec from the locked
+  specs repository.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Slightly improve resolution speed for Podfiles that contain multiple targets
+  with the same dependencies.  
+  [Samuel Giddins]
+
+##### Bug Fixes
+
+* Don't generate unencrypted source warnings for localhost.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8156](https://github.com/CocoaPods/CocoaPods/issues/8156)
+
+* Fix linting when armv7 is included but i386 isn't.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#8129](https://github.com/CocoaPods/CocoaPods/issues/8129)
+
+* Provide an installation option to disable usage of input/output paths.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8073](https://github.com/CocoaPods/CocoaPods/issues/8073)
+
+* Scope prefix header setting to each test spec.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8046](https://github.com/CocoaPods/CocoaPods/pull/8046)
+
+* Don't add incomplete subspec subset targets for extensions.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7850](https://github.com/CocoaPods/CocoaPods/issues/7850)
+
+* Clear out `MACH_O_TYPE` for unit test bundles that use static frameworks.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8031](https://github.com/CocoaPods/CocoaPods/issues/8031)
+
+* Fix `weak_frameworks` missing regression.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7872](https://github.com/CocoaPods/CocoaPods/issues/7872)
+
+* Fix line spacing for Swift error message.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8024](https://github.com/CocoaPods/CocoaPods/pull/8024)
+
+* Improve validation for test_specs on specific platforms  
+  [icecrystal23](https://github.com/icecrystal23)
+  [#7009](https://github.com/CocoaPods/CocoaPods/issues/7009)
+
+* Fix running `pod outdated` with externally-sourced pods.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#8025](https://github.com/CocoaPods/CocoaPods/issues/8025)
+
+* Remove codesign suppression  
+  [Jaehong Kang](https://github.com/sinoru)
+  [#7606](https://github.com/CocoaPods/CocoaPods/issues/7606)
+
+
 ## 1.6.0.beta.1 (2018-08-16)
 
 ##### Enhancements
 
 * Every test spec will have its own xctest bundle.  
-  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [Jenn Kaplan](https://github.com/jkap)
   [#7908](https://github.com/CocoaPods/CocoaPods/pull/7908)
 
 * Generate a separate app host per pod.  
   [Samuel Giddins](https://github.com/segiddins)
-  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#8005](https://github.com/CocoaPods/CocoaPods/pull/8005)
 
 * Add default launch screen storyboard to test app hosts.  
@@ -29,7 +120,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 * Warn instead of error when linting if `public_header_files` or
   `private_header_files` do not match any files.  
   [Eric Amorde](https://github.com/amorde)
-  [#7427](https://github.com/CocoaPods/CocoaPods/issues/7427) 
+  [#7427](https://github.com/CocoaPods/CocoaPods/issues/7427)
 
 * Add `--platforms` parameter to `pod spec lint` and `pod lib lint` to specify
   which platforms to lint.  
@@ -279,7 +370,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Maxime Le Moine](https://github.com/MaximeLM)
   [#7590](https://github.com/CocoaPods/CocoaPods/issues/7590)
 
-
 ## 1.5.0 (2018-04-04)
 
 ##### Enhancements

data/lib/cocoapods/command/cache/clean.rb

@@ -10,7 +10,7 @@ module Pod
           If there is multiple cache for various versions of the requested pod,
           you will be asked which one to clean. Use `--all` to clean them all.
 
-          If you don't give a pod `NAME`, you need to specify the `--all`
+          If you do not give a pod `NAME`, you need to specify the `--all`
           flag (this is to avoid cleaning all the cache by mistake).
         DESC
 

data/lib/cocoapods/command/init.rb

@@ -84,7 +84,9 @@ module Pod
       def target_module(app, tests)
         target_module = "\ntarget '#{app.name.gsub(/'/, "\\\\\'")}' do\n"
 
-        target_module << if app.resolved_build_setting('SWIFT_OPTIMIZATION_LEVEL').values.any?
+        app_uses_swift = app.source_build_phase.files_references.any? { |fr| File.extname(fr.path) == '.swift' }
+
+        target_module << if app_uses_swift
                            <<-RUBY
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
   use_frameworks!

data/lib/cocoapods/command/outdated.rb

@@ -22,7 +22,7 @@ module Pod
             UI.puts "#{'<blue>'.blue}\t - Will be updated, but not to the newest version because of specified version in Podfile"
             UI.puts "#{'<red>'.red}\t - Will not be updated because of specified version in Podfile"
             UI.puts ''
-          end
+          end if ansi_output?
           UI.section 'The following pod updates are available:' do
             updates.each do |(name, from_version, matching_version, to_version)|
               color = :blue
@@ -85,7 +85,7 @@ module Pod
           pods = []
           UI.titled_section('Analyzing dependencies') do
             pods = Installer::Analyzer.new(config.sandbox, config.podfile).
-              analyze(false).
+              analyze(:outdated).
               specs_by_target.values.flatten.uniq
           end
           pods

data/lib/cocoapods/executable.rb

@@ -177,7 +177,7 @@ module Pod
               output << (string << separator)
             end
           end
-        rescue EOFError
+        rescue EOFError, IOError
           output << (buf << $/) unless buf.empty?
         end
       end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements/plist.rb

@@ -8,19 +8,19 @@ module Pod
       end
 
       def save_as(path)
-        Xcodeproj::Plist.write_to_path(plist, path)
+        Xcodeproj::Plist.write_to_path(plist_hash, path)
       end
 
       # @return [String] The contents of the plist
       #
       def generate
-        plist = Nanaimo::Plist.new(plist, :xml)
+        plist = Nanaimo::Plist.new(plist_hash, :xml)
         contents = StringIO.new
         Nanaimo::Writer::XMLWriter.new(plist, :pretty => true, :output => contents, :strict => false).write
         contents.string
       end
 
-      def plist
+      def plist_hash
         {
           :Title => plist_title,
           :StringsTable => plist_title,

data/lib/cocoapods/generator/app_target_helper.rb

@@ -88,9 +88,8 @@ module Pod
       #
       # @return [Array<PBXBuildFile>] the created build file references.
       #
-      def self.add_app_host_main_file(project, target, platform, name = 'App')
+      def self.add_app_host_main_file(project, target, platform, group, name = 'App')
         source_file = AppTargetHelper.create_app_host_main_file(project, platform, name)
-        group = project[name] || project.new_group(name, name)
         source_file_ref = group.new_file(source_file)
         target.add_file_references([source_file_ref])
       end
@@ -111,9 +110,8 @@ module Pod
       #
       # @return [PBXFileReference] the created file reference of the launchscreen storyboard.
       #
-      def self.add_launchscreen_storyboard(project, target, name = 'App')
+      def self.add_launchscreen_storyboard(project, target, group, name = 'App')
         launch_storyboard_file = AppTargetHelper.create_launchscreen_storyboard_file(project, name)
-        group = project[name] || project.new_group(name, name)
         launch_storyboard_ref = group.new_file(launch_storyboard_file)
         target.resources_build_phase.add_file_reference(launch_storyboard_ref)
       end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -105,10 +105,15 @@ set -e
 set -u
 set -o pipefail
 
+function on_error {
+  echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
+}
+trap 'on_error $LINENO' ERR
+
 if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # resources to, so exit 0 (signalling the script phase was successful).
-    exit 0
+  # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+  # resources to, so exit 0 (signalling the script phase was successful).
+  exit 0
 fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -1,12 +1,14 @@
+require 'cocoapods/target/framework_paths'
+
 module Pod
   module Generator
     class EmbedFrameworksScript
-      # @return [Hash{String => Array<String>}] Multiple lists of frameworks per
+      # @return [Hash{String => Array<FrameworkPaths>}] Multiple lists of frameworks per
       #         configuration.
       #
       attr_reader :frameworks_by_config
 
-      # @param  [Hash{String => Array<String>] frameworks_by_config
+      # @param  [Hash{String => Array<FrameworkPaths>] frameworks_by_config
       #         @see #frameworks_by_config
       #
       def initialize(frameworks_by_config)
@@ -46,10 +48,15 @@ module Pod
           set -u
           set -o pipefail
 
+          function on_error {
+            echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
+          }
+          trap 'on_error $LINENO' ERR
+
           if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-              # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
-              # frameworks to, so exit 0 (signalling the script phase was successful).
-              exit 0
+            # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+            # frameworks to, so exit 0 (signalling the script phase was successful).
+            exit 0
           fi
 
           echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
@@ -79,8 +86,8 @@ module Pod
             local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
             if [ -L "${source}" ]; then
-                echo "Symlinked..."
-                source="$(readlink "${source}")"
+              echo "Symlinked..."
+              source="$(readlink "${source}")"
             fi
 
             # Use filter instead of exclude so missing patterns don't throw errors.
@@ -110,7 +117,7 @@ module Pod
             # Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
             if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
               local swift_runtime_libs
-              swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u  && exit ${PIPESTATUS[0]})
+              swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\\\/\\(.+dylib\\).*/\\\\1/g | uniq -u)
               for lib in $swift_runtime_libs; do
                 echo "rsync -auv \\"${SWIFT_STDLIB_PATH}/${lib}\\" \\"${destination}\\""
                 rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
@@ -179,7 +186,7 @@ module Pod
             for arch in $binary_archs; do
               if ! [[ "${ARCHS}" == *"$arch"* ]]; then
                 # Strip non-valid architectures in-place
-                lipo -remove "$arch" -output "$binary" "$binary" || exit 1
+                lipo -remove "$arch" -output "$binary" "$binary"
                 stripped="$stripped $arch"
               fi
             done
@@ -192,16 +199,15 @@ module Pod
         SH
         script << "\n" unless frameworks_by_config.values.all?(&:empty?)
         frameworks_by_config.each do |config, frameworks_with_dsyms|
-          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[: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_input_path]}"\n) unless framework_with_dsym[:dsym_input_path].nil?
-            end
-            script << "fi\n"
+          next if frameworks_with_dsyms.empty?
+          script << %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)
+          frameworks_with_dsyms.each do |framework_with_dsym|
+            script << %(  install_framework "#{framework_with_dsym.source_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_path}"\n) unless framework_with_dsym.dsym_path.nil?
           end
+          script << "fi\n"
         end
         script << <<-SH.strip_heredoc
         if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then

data/lib/cocoapods/installer.rb

@@ -72,6 +72,7 @@ module Pod
 
       @use_default_plugins = true
       @has_dependencies = true
+      @pod_installers = []
     end
 
     # @return [Hash, Boolean, nil] Pods that have been requested to be
@@ -103,6 +104,19 @@ module Pod
     attr_accessor :deployment
     alias_method :deployment?, :deployment
 
+    #-------------------------------------------------------------------------#
+
+    private
+
+    # @return [Array<PodSourceInstaller>] the pod installers created
+    #         while installing pod targets
+    #
+    attr_reader :pod_installers
+
+    #-------------------------------------------------------------------------#
+
+    public
+
     # Installs the Pods.
     #
     # The installation process is mostly linear with a few minor complications
@@ -244,6 +258,8 @@ module Pod
 
     # Performs the analysis.
     #
+    # @param  [Analyzer] analyzer the analyzer to use for analysis
+    #
     # @return [void]
     #
     def analyze(analyzer = create_analyzer)
@@ -369,13 +385,7 @@ module Pod
     end
 
     def create_pod_installer(pod_name)
-      specs_by_platform = {}
-      pod_targets.each do |pod_target|
-        if pod_target.root_spec.name == pod_name
-          specs_by_platform[pod_target.platform] ||= []
-          specs_by_platform[pod_target.platform].concat(pod_target.specs)
-        end
-      end
+      specs_by_platform = specs_for_pod(pod_name)
 
       if specs_by_platform.empty?
         requiring_targets = pod_targets.select { |pt| pt.recursive_dependent_targets.any? { |dt| dt.pod_name == pod_name } }
@@ -385,12 +395,26 @@ module Pod
         raise StandardError, message
       end
 
-      @pod_installers ||= []
       pod_installer = PodSourceInstaller.new(sandbox, specs_by_platform, :can_cache => installation_options.clean?)
-      @pod_installers << pod_installer
+      pod_installers << pod_installer
       pod_installer
     end
 
+    # The specifications matching the specified pod name
+    #
+    # @param  [String] pod_name the name of the pod
+    #
+    # @return [Hash{Platform => Array<Specification>}] the specifications grouped by platform
+    #
+    def specs_for_pod(pod_name)
+      pod_targets.each_with_object({}) do |pod_target, hash|
+        if pod_target.root_spec.name == pod_name
+          hash[pod_target.platform] ||= []
+          hash[pod_target.platform].concat(pod_target.specs)
+        end
+      end
+    end
+
     # Install the Pods. If the resolver indicated that a Pod should be
     # installed and it exits, it is removed and then reinstalled. In any case if
     # the Pod doesn't exits it is installed.
@@ -405,21 +429,16 @@ module Pod
 
     # Cleans the sources of the Pods if the config instructs to do so.
     #
-    # @todo Why the @pod_installers might be empty?
     #
     def clean_pod_sources
       return unless installation_options.clean?
-      return unless @pod_installers
-      @pod_installers.each(&:clean!)
+      pod_installers.each(&:clean!)
     end
 
     # Unlocks the sources of the Pods.
     #
-    # @todo Why the @pod_installers might be empty?
-    #
     def unlock_pod_sources
-      return unless @pod_installers
-      @pod_installers.each do |installer|
+      pod_installers.each do |installer|
         pod_target = pod_targets.find { |target| target.pod_name == installer.name }
         installer.unlock_files!(pod_target.file_accessors)
       end
@@ -427,12 +446,9 @@ module Pod
 
     # Locks the sources of the Pods if the config instructs to do so.
     #
-    # @todo Why the @pod_installers might be empty?
-    #
     def lock_pod_sources
       return unless installation_options.lock_pod_sources?
-      return unless @pod_installers
-      @pod_installers.each do |installer|
+      pod_installers.each do |installer|
         pod_target = pod_targets.find { |target| target.pod_name == installer.name }
         installer.lock_files!(pod_target.file_accessors)
       end
@@ -496,7 +512,7 @@ module Pod
 
     # Runs the registered callbacks for the source provider plugin hooks.
     #
-    # @return [void]
+    # @return [Array<Pod::Source>] the plugin sources
     #
     def run_source_provider_hooks
       context = SourceProviderHooksContext.generate