cocoapods 1.10.0.rc.1 → 1.11.0.beta.1

data/lib/cocoapods/command/spec/lint.rb

@@ -122,7 +122,7 @@ module Pod
                 output_path = podspecs_tmp_dir + File.basename(path)
                 output_path.dirname.mkpath
                 begin
-                  open(path) do |io|
+                  OpenURI.open_uri(path) do |io|
                     output_path.open('w') { |f| f << io.read }
                   end
                 rescue => e

data/lib/cocoapods/command/spec/which.rb

@@ -16,12 +16,14 @@ module Pod
           [
             ['--regex', 'Interpret the `QUERY` as a regular expression'],
             ['--show-all', 'Print all versions of the given podspec'],
+            ['--version', 'Print a specific version of the given podspec'],
           ].concat(super)
         end
 
         def initialize(argv)
           @use_regex = argv.flag?('regex')
           @show_all = argv.flag?('show-all')
+          @version = argv.option('version')
           @query = argv.shift_argument
           @query = @query.gsub('.podspec', '') unless @query.nil?
           super
@@ -35,7 +37,7 @@ module Pod
 
         def run
           query = @use_regex ? @query : Regexp.escape(@query)
-          UI.puts get_path_of_spec(query, @show_all)
+          UI.puts get_path_of_spec(query, @show_all || @version)
         end
       end
     end

data/lib/cocoapods/config.rb

@@ -163,7 +163,7 @@ module Pod
     #
     def installation_root
       @installation_root ||= begin
-        current_dir = Pathname.new(ActiveSupport::Multibyte::Unicode.normalize(Dir.pwd))
+        current_dir = Pathname.new(Dir.pwd.unicode_normalize(:nfkc))
         current_path = current_dir
         until current_path.root?
           if podfile_path_in_dir(current_path)

data/lib/cocoapods/downloader.rb

@@ -50,8 +50,10 @@ module Pod
 
       if target && result.location && target != result.location
         UI.message "Copying #{request.name} from `#{result.location}` to #{UI.path target}", '> ' do
-          FileUtils.rm_rf target
-          FileUtils.cp_r(result.location, target)
+          Cache.read_lock(result.location) do
+            FileUtils.rm_rf target
+            FileUtils.cp_r(result.location, target)
+          end
         end
       end
       result

data/lib/cocoapods/downloader/cache.rb

@@ -69,6 +69,91 @@ module Pod
         end
       end
 
+      # Convenience method for acquiring a shared lock to safely read from the
+      # cache. See `Cache.lock` for more details.
+      #
+      # @param  [Pathname] location
+      #         the path to require a lock for.
+      #
+      # @param  [block] &block
+      #         the block to execute inside the lock.
+      #
+      # @return [void]
+      #
+      def self.read_lock(location, &block)
+        Cache.lock(location, File::LOCK_SH, &block)
+      end
+
+      # Convenience method for acquiring an exclusive lock to safely write to
+      # the cache. See `Cache.lock` for more details.
+      #
+      # @param  [Pathname] location
+      #         the path to require a lock for.
+      #
+      # @param  [block] &block
+      #         the block to execute inside the lock.
+      #
+      # @return [void]
+      #
+      def self.write_lock(location, &block)
+        Cache.lock(location, File::LOCK_EX, &block)
+      end
+
+      # Creates a .lock file at `location`, aquires a lock of type
+      # `lock_type`, checks that it is valid, and executes passed block while
+      # holding on to that lock. Afterwards, the .lock file is deleted, which is
+      # why validation of the lock is necessary, as you might have a lock on a
+      # file that doesn't exist on the filesystem anymore.
+      #
+      # @param  [Pathname] location
+      #         the path to require a lock for.
+      #
+      # @param  [locking_constant] lock_type
+      #         the type of lock, either exclusive (File::LOCK_EX) or shared
+      #         (File::LOCK_SH).
+      #
+      # @return [void]
+      #
+      def self.lock(location, lock_type)
+        raise ArgumentError, 'no block given' unless block_given?
+        lockfile = "#{location}.lock"
+        f = nil
+        loop do
+          f.close if f
+          f = File.open(lockfile, File::CREAT, 0o644)
+          f.flock(lock_type)
+          break if Cache.valid_lock?(f, lockfile)
+        end
+        begin
+          yield location
+        ensure
+          if lock_type == File::LOCK_SH
+            f.flock(File::LOCK_EX)
+            File.delete(lockfile) if Cache.valid_lock?(f, lockfile)
+          else
+            File.delete(lockfile)
+          end
+          f.close
+        end
+      end
+
+      # Checks that the lock is on a file that still exists on the filesystem.
+      #
+      # @param  [File] file
+      #         the actual file that we have a lock for.
+      #
+      # @param  [String] filename
+      #         the filename of the file that we have a lock for.
+      #
+      # @return [Boolean]
+      #         true if `filename` still exists and is the same file as `file`
+      #
+      def self.valid_lock?(file, filename)
+        file.stat.ino == File.stat(filename).ino
+      rescue Errno::ENOENT
+        false
+      end
+
       private
 
       # Ensures the cache on disk was created with the same CocoaPods version as
@@ -112,7 +197,7 @@ module Pod
       #
       def path_for_spec(request, slug_opts = {})
         path = root + 'Specs' + request.slug(**slug_opts)
-        path.sub_ext('.podspec.json')
+        Pathname.new(path.to_path + '.podspec.json')
       end
 
       # @param  [Request] request
@@ -197,10 +282,12 @@ module Pod
       def copy_and_clean(source, destination, spec)
         specs_by_platform = group_subspecs_by_platform(spec)
         destination.parent.mkpath
-        FileUtils.rm_rf(destination)
-        FileUtils.cp_r(source, destination)
-        Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
-        Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
+        Cache.write_lock(destination) do
+          FileUtils.rm_rf(destination)
+          FileUtils.cp_r(source, destination)
+          Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
+          Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
+        end
       end
 
       def group_subspecs_by_platform(spec)
@@ -226,7 +313,9 @@ module Pod
       #
       def write_spec(spec, path)
         path.dirname.mkpath
-        path.open('w') { |f| f.write spec.to_pretty_json }
+        Cache.write_lock(path) do
+          path.open('w') { |f| f.write spec.to_pretty_json }
+        end
       end
     end
   end

data/lib/cocoapods/external_sources/podspec_source.rb

@@ -16,7 +16,7 @@ module Pod
           else
             require 'cocoapods/open-uri'
             begin
-              open(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }
+              OpenURI.open_uri(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }
             rescue OpenURI::HTTPError => e
               status = e.io.status.join(' ')
               raise Informative, "Failed to fetch podspec for `#{name}` at `#{podspec_uri}`.\n Error: #{status}"

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements.rb

@@ -67,7 +67,7 @@ module Pod
       #         the specification for which license is needed.
       #
       # @return [String] The text of the license.
-      # @return [Nil] If not license text could be found.
+      # @return [Nil] If no license text could be found.
       #
       def license_text(spec)
         return nil unless spec.license

data/lib/cocoapods/generator/app_target_helper.rb

@@ -9,7 +9,7 @@ module Pod
       # @param  [Project] project
       #         the Xcodeproj to generate the target into.
       #
-      # @param  [Symbol] platform
+      # @param  [Symbol] platform_name
       #         the platform of the target. Can be `:ios` or `:osx`, etc.
       #
       # @param  [String] deployment_target
@@ -18,10 +18,14 @@ module Pod
       # @param  [String] name
       #         The name to use for the target, defaults to 'App'.
       #
+      # @param  [String] product_basename
+      #         The product basename to use for the target, defaults to `name`.
+      #
       # @return [PBXNativeTarget] the new target that was created.
       #
-      def self.add_app_target(project, platform, deployment_target, name = 'App')
-        project.new_target(:application, name, platform, deployment_target)
+      def self.add_app_target(project, platform_name, deployment_target, name = 'App', product_basename = nil)
+        project.new_target(:application, name, platform_name, deployment_target, nil,
+                           nil, product_basename)
       end
 
       # Creates and links an import file for the given pod target and into the given native target.

data/lib/cocoapods/generator/copy_dsyms_script.rb

@@ -1,18 +1,18 @@
 module Pod
   module Generator
     class CopydSYMsScript
-      # @return [Array<Pathname>] dsym_paths the dSYM paths to include in the script contents.
+      # @return [Array<Pathname, String>] dsym_paths the dSYM paths to include in the script contents.
       #
       attr_reader :dsym_paths
 
-      # @return [Array<Pathname>] bcsymbolmap_paths the bcsymbolmap paths to include in the script contents.
+      # @return [Array<Pathname, String>] bcsymbolmap_paths the bcsymbolmap paths to include in the script contents.
       #
       attr_reader :bcsymbolmap_paths
 
       # Initialize a new instance
       #
-      # @param  [Array<Pathname>] dsym_paths @see dsym_paths
-      # @param  [Array<Pathname>] bcsymbolmap_paths @see bcsymbolmap_paths
+      # @param  [Array<Pathname, String>] dsym_paths @see dsym_paths
+      # @param  [Array<Pathname, String>] bcsymbolmap_paths @see bcsymbolmap_paths
       #
       def initialize(dsym_paths, bcsymbolmap_paths)
         @dsym_paths = Array(dsym_paths)

data/lib/cocoapods/generator/copy_xcframework_script.rb

@@ -157,22 +157,6 @@ install_framework()
   echo "Copied $source to $destination"
 }
 
-install_xcframework_library() {
-  local basepath="$1"
-  local name="$2"
-  local paths=("$@")
-
-  # Locate the correct slice of the .xcframework for the current architectures
-  select_slice "${paths[@]}"
-  local target_path="$SELECT_SLICE_RETVAL"
-  if [[ -z "$target_path" ]]; then
-    echo "warning: [CP] Unable to find matching .xcframework slice in '${paths[@]}' for the current build architectures ($ARCHS)."
-    return
-  fi
-
-  install_framework "$basepath/$target_path" "$name"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
@@ -194,12 +178,8 @@ install_xcframework() {
     mkdir -p "$destination"
   fi
 
-  if [[ "$package_type" == "library" ]]; then
-    # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-    copy_dir "$source/" "$destination"
-  elif [[ "$package_type" == "framework" ]]; then
-    copy_dir "$source" "$destination"
-  fi
+  copy_dir "$source/" "$destination"
+
   echo "Copied $source to $destination"
 }
 
@@ -222,16 +202,11 @@ install_xcframework() {
       def install_xcframework_args(xcframework, slices)
         root = xcframework.path
         args = [shell_escape("${PODS_ROOT}/#{root.relative_path_from(sandbox_root)}")]
-        args << shell_escape(xcframework.name)
+        args << shell_escape(xcframework.target_name)
         is_framework = xcframework.build_type.framework?
         args << shell_escape(is_framework ? 'framework' : 'library')
         slices.each do |slice|
-          args << if is_framework
-                    shell_escape(slice.path.relative_path_from(root))
-                  else
-                    # We don't want the path to the library binary, we want the dir that contains it
-                    shell_escape(slice.path.dirname.relative_path_from(root))
-                  end
+          args << shell_escape(slice.path.dirname.relative_path_from(root))
         end
         args.join(' ')
       end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -159,8 +159,9 @@ code_sign_if_enabled() {
         end
         xcframeworks_by_config.each do |config, xcframeworks|
           xcframeworks.select { |xcf| xcf.build_type.dynamic_framework? }.each do |xcframework|
+            target_name = xcframework.target_name
             name = xcframework.name
-            contents_by_config[config] << %(  install_framework "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{name}/#{name}.framework"\n)
+            contents_by_config[config] << %(  install_framework "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{target_name}/#{name}.framework"\n)
           end
         end
         script << "\n" unless contents_by_config.empty?

data/lib/cocoapods/generator/script_phase_constants.rb

@@ -79,6 +79,7 @@ install_dsym() {
       rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
     else
       # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      mkdir -p "${DWARF_DSYM_FOLDER_PATH}"
       touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.dSYM"
     fi
   fi

data/lib/cocoapods/installer.rb

@@ -36,6 +36,7 @@ module Pod
     autoload :PreInstallHooksContext,       'cocoapods/installer/pre_install_hooks_context'
     autoload :BaseInstallHooksContext,      'cocoapods/installer/base_install_hooks_context'
     autoload :PostIntegrateHooksContext,    'cocoapods/installer/post_integrate_hooks_context'
+    autoload :PreIntegrateHooksContext,     'cocoapods/installer/pre_integrate_hooks_context'
     autoload :SourceProviderHooksContext,   'cocoapods/installer/source_provider_hooks_context'
     autoload :PodfileValidator,             'cocoapods/installer/podfile_validator'
     autoload :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
@@ -175,6 +176,7 @@ module Pod
     end
 
     def integrate
+      run_podfile_pre_integrate_hooks
       generate_pods_project
       if installation_options.integrate_targets?
         integrate_user_project
@@ -199,7 +201,7 @@ module Pod
 
           force_clean_install = clean_install || project_cache_version.version != Version.create(VersionMetadata.project_cache_version)
           cache_result = ProjectCache::ProjectCacheAnalyzer.new(sandbox, installation_cache, analysis_result.all_user_build_configurations,
-                                                                object_version, plugins, pod_targets, aggregate_targets, :clean_install => force_clean_install).analyze
+                                                                object_version, plugins, pod_targets, aggregate_targets, installation_options.to_h, :clean_install => force_clean_install).analyze
           aggregate_targets_to_generate = cache_result.aggregate_targets_to_generate || []
           pod_targets_to_generate = cache_result.pod_targets_to_generate
           (aggregate_targets_to_generate + pod_targets_to_generate).each do |target|
@@ -627,6 +629,15 @@ module Pod
                         title_options)
     end
 
+    # Runs the registered callbacks for the plugins pre integrate hooks.
+    #
+    def run_plugins_pre_integrate_hooks
+      if any_plugin_pre_integrate_hooks?
+        context = PreIntegrateHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        HooksManager.run(:pre_integrate, context, plugins)
+      end
+    end
+
     # Runs the registered callbacks for the plugins post install hooks.
     #
     def run_plugins_post_install_hooks
@@ -650,6 +661,12 @@ module Pod
       end
     end
 
+    # @return [Boolean] whether there are any plugin pre-integrate hooks to run
+    #
+    def any_plugin_pre_integrate_hooks?
+      HooksManager.hooks_to_run(:pre_integrate, plugins).any?
+    end
+
     # @return [Boolean] whether there are any plugin post-install hooks to run
     #
     def any_plugin_post_install_hooks?
@@ -747,7 +764,7 @@ module Pod
     def warn_for_installed_script_phases
       pods_to_install = sandbox_state.added | sandbox_state.changed
       pod_targets.group_by(&:pod_name).each do |name, pod_targets|
-        if pods_to_install.include?(name)
+        if pods_to_install.include?(name) && !sandbox.local?(name)
           script_phase_count = pod_targets.inject(0) { |sum, target| sum + target.script_phases.count }
           unless script_phase_count.zero?
             UI.warn "#{name} has added #{script_phase_count} #{'script phase'.pluralize(script_phase_count)}. " \
@@ -766,9 +783,11 @@ module Pod
     #
     def warn_for_removing_git_master_specs_repo
       return unless installation_options.warn_for_unused_master_specs_repo?
-      podfile_master_source = podfile.sources.find { |source| source == MASTER_SPECS_REPO_GIT_URL }
+      plugin_sources = run_source_provider_hooks
+      all_sources = podfile.sources + plugin_sources.map(&:url)
+      master_source = all_sources.find { |source| source == MASTER_SPECS_REPO_GIT_URL }
       master_repo = config.sources_manager.all.find { |s| s.url == MASTER_SPECS_REPO_GIT_URL }
-      if podfile_master_source.nil? && !master_repo.nil?
+      if master_source.nil? && !master_repo.nil?
         UI.warn 'Your project does not explicitly specify the CocoaPods master specs repo. Since CDN is now used as the' \
         ' default, you may safely remove it from your repos directory via `pod repo remove master`. To suppress this warning' \
         ' please add `warn_for_unused_master_specs_repo => false` to your Podfile.'
@@ -815,6 +834,7 @@ module Pod
       installation_cache.update_project_object_version!(cache_analysis_result.project_object_version)
       installation_cache.update_build_configurations!(cache_analysis_result.build_configurations)
       installation_cache.update_podfile_plugins!(plugins)
+      installation_cache.update_installation_options!(installation_options.to_h)
       installation_cache.save_as(sandbox.project_installation_cache_path)
 
       metadata_cache.update_metadata!(target_installation_results.pod_target_installation_results || {},
@@ -873,6 +893,34 @@ module Pod
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
+    # Runs the post integrate hooks of the installed specs and of the Podfile.
+    #
+    # @note   Post integrate hooks run _after_ saving of project, so that they
+    #         can alter it after it is written to the disk.
+    #
+    # @return [void]
+    #
+    def run_podfile_pre_integrate_hooks
+      UI.message '- Running pre integrate hooks' do
+        executed = run_podfile_pre_integrate_hook
+        UI.message '- Podfile' if executed
+      end
+    end
+
+    # Runs the pre integrate hook of the Podfile.
+    #
+    # @raise  Raises an informative if the hooks raises.
+    #
+    # @return [Boolean] Whether the hook was run.
+    #
+    def run_podfile_pre_integrate_hook
+      podfile.pre_integrate!(self)
+    rescue => e
+      raise Informative, 'An error occurred while processing the pre-integrate ' \
+        'hook of the Podfile.' \
+        "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+    end
+
     # Runs the post install hooks of the installed specs and of the Podfile.
     #
     # @note   Post install hooks run _before_ saving of project, so that they