cocoapods 1.7.5 → 1.8.0.beta.1

data/lib/cocoapods/command/repo/add.rb

@@ -34,9 +34,9 @@ module Pod
           unless @name && @url
             help! 'Adding a repo needs a `NAME` and a `URL`.'
           end
-          if @name == 'master' || @url =~ %r{github.com[:/]+cocoapods/specs}i
+          if @name == 'trunk'
             raise Informative,
-                  'To setup the master specs repo, please run `pod setup`.'
+                  "Repo name `trunk` is reserved for CocoaPods' main spec repo accessed via CDN."
           end
         end
 

data/lib/cocoapods/command/repo/list.rb

@@ -19,10 +19,10 @@ module Pod
 
         # @output  Examples:
         #
-        #          master
-        #          - type: git (master)
-        #          - URL:  https://github.com/CocoaPods/Specs.git
-        #          - path: /Users/lascorbe/.cocoapods/repos/master
+        #          trunk
+        #          - type: CDN
+        #          - URL:  https://cdn.cocoapods.org/
+        #          - path: /Users/lascorbe/.cocoapods/repos/trunk
         #
         #          test
         #          - type: local copy
@@ -45,7 +45,9 @@ module Pod
         # @return [void]
         #
         def print_source(source)
-          if source.git?
+          if source.is_a?(Pod::CDNSource)
+            UI.puts '- Type: CDN'
+          elsif source.git?
             branch_name, = Executable.capture_command('git', %w(name-rev --name-only HEAD), :capture => :out, :chdir => source.repo)
             branch_name.strip!
             branch_name = 'unknown' if branch_name.empty?

data/lib/cocoapods/command/repo/push.rb

@@ -25,19 +25,18 @@ module Pod
             ['--allow-warnings', 'Allows pushing even if there are warnings'],
             ['--use-libraries', 'Linter uses static libraries to install the spec'],
             ['--use-modular-headers', 'Lint uses modular headers during installation'],
-            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
-             '(defaults to all available repos). ' \
-             'Multiple sources must be comma-delimited.'],
+            ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to pull dependent pods ' \
+             '(defaults to all available repos). Multiple sources must be comma-delimited'],
             ['--local-only', 'Does not perform the step of pushing REPO to its remote'],
             ['--no-private', 'Lint includes checks that apply only to public repos'],
             ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
             ['--skip-tests', 'Lint skips building and running tests during validation'],
-            ['--commit-message="Fix bug in pod"', 'Add custom commit message. ' \
-            'Opens default editor if no commit message is specified.'],
-            ['--use-json', 'Push JSON spec to repo'],
-            ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used when linting the spec. ' \
-             'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file.'],
-            ['--no-overwrite', 'Disallow pushing that would overwrite an existing spec.'],
+            ['--commit-message="Fix bug in pod"', 'Add custom commit message. Opens default editor if no commit ' \
+              'message is specified'],
+            ['--use-json', 'Convert the podspec to JSON before pushing it to the repo'],
+            ['--swift-version=VERSION', 'The `SWIFT_VERSION` that should be used when linting the spec. ' \
+             'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file'],
+            ['--no-overwrite', 'Disallow pushing that would overwrite an existing spec'],
           ].concat(super)
         end
 
@@ -73,7 +72,7 @@ module Pod
 
         def run
           open_editor if @commit_message && @message.nil?
-          check_if_master_repo
+          check_if_push_allowed
           validate_podspec_files
           check_repo_status
           update_repo
@@ -106,7 +105,11 @@ module Pod
         # Temporary check to ensure that users do not push accidentally private
         # specs to the master repo.
         #
-        def check_if_master_repo
+        def check_if_push_allowed
+          if @source.is_a?(CDNSource)
+            raise Informative, 'Cannot push to a CDN source, as it is read-only.'
+          end
+
           remotes, = Executable.capture_command('git', %w(remote --verbose), :capture => :merge, :chdir => repo_dir)
           master_repo_urls = [
             'git@github.com:CocoaPods/Specs.git',
@@ -227,7 +230,7 @@ module Pod
         #
         def push_repo
           UI.puts "\nPushing the `#{@repo}' repo\n".yellow
-          repo_git('push', 'origin', 'master')
+          repo_git('push', 'origin', 'HEAD')
         end
 
         #---------------------------------------------------------------------#

data/lib/cocoapods/command/setup.rb

@@ -6,97 +6,11 @@ module Pod
       self.summary = 'Setup the CocoaPods environment'
 
       self.description = <<-DESC
-        Creates a directory at `#{Config.instance.repos_dir}` which will hold your spec-repos.
-        This is where it will create a clone of the public `master` spec-repo from:
-
-            https://github.com/CocoaPods/Specs
-
-        If the clone already exists, it will ensure that it is up-to-date.
+        Setup the CocoaPods environment
       DESC
 
-      extend Executable
-      executable :git
-
       def run
-        UI.section 'Setting up CocoaPods master repo' do
-          if master_repo_dir.exist?
-            set_master_repo_url
-            set_master_repo_branch
-            update_master_repo
-          else
-            add_master_repo
-          end
-        end
-
-        UI.puts 'Setup completed'.green
-      end
-
-      #--------------------------------------#
-
-      # @!group Setup steps
-
-      # Sets the url of the master repo according to whether it is push.
-      #
-      # @return [void]
-      #
-      def set_master_repo_url
-        Dir.chdir(master_repo_dir) do
-          git('remote', 'set-url', 'origin', url)
-        end
-      end
-
-      # Adds the master repo from the remote.
-      #
-      # @return [void]
-      #
-      def add_master_repo
-        cmd = ['master', url, 'master', '--progress']
-        Repo::Add.parse(cmd).run
-      end
-
-      # Updates the master repo against the remote.
-      #
-      # @return [void]
-      #
-      def update_master_repo
-        show_output = !config.silent?
-        config.sources_manager.update('master', show_output)
-      end
-
-      # Sets the repo to the master branch.
-      #
-      # @note   This is not needed anymore as it was used for CocoaPods 0.6
-      #         release candidates.
-      #
-      # @return [void]
-      #
-      def set_master_repo_branch
-        Dir.chdir(master_repo_dir) do
-          git %w(checkout master)
-        end
-      end
-
-      #--------------------------------------#
-
-      # @!group Private helpers
-
-      # @return [String] the url to use according to whether push mode should
-      #         be enabled.
-      #
-      def url
-        self.class.read_only_url
-      end
-
-      # @return [String] the read only url of the master repo.
-      #
-      def self.read_only_url
-        'https://github.com/CocoaPods/Specs.git'
-      end
-
-      # @return [Pathname] the directory of the master repo.
-      #
-      def master_repo_dir
-        config.sources_manager.master_repo_dir
+        # Right now, no setup is needed
       end
     end
   end

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

@@ -24,17 +24,16 @@ module Pod
             ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
             ['--use-libraries', 'Lint uses static libraries to install the spec'],
             ['--use-modular-headers', 'Lint uses modular headers during installation'],
-            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
-             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
-             'Multiple sources must be comma-delimited.'],
-            ['--platforms=ios,macos', 'Lint against specific platforms' \
-              '(defaults to all platforms supported by the podspec).' \
-              'Multiple platforms must be comma-delimited'],
+            ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to pull dependent pods ' \
+             "(defaults to #{Pod::TrunkSource::TRUNK_REPO_URL}). Multiple sources must be comma-delimited"],
+            ['--platforms=ios,macos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
+              'podspec). Multiple platforms must be comma-delimited'],
             ['--private', 'Lint skips checks that apply only to public specs'],
-            ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
-             'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file.'],
+            ['--swift-version=VERSION', 'The `SWIFT_VERSION` that should be used to lint the spec. ' \
+             'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file'],
             ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
             ['--skip-tests', 'Lint skips building and running tests during validation'],
+            ['--analyze', 'Validate with the Xcode Static Analysis tool'],
           ].concat(super)
         end
 
@@ -47,12 +46,13 @@ module Pod
           @only_subspec    = argv.option('subspec')
           @use_frameworks  = !argv.flag?('use-libraries')
           @use_modular_headers = argv.flag?('use-modular-headers')
-          @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @source_urls     = argv.option('sources', Pod::TrunkSource::TRUNK_REPO_URL).split(',')
           @platforms       = argv.option('platforms', '').split(',')
           @private         = argv.flag?('private', false)
           @swift_version   = argv.option('swift-version', nil)
           @skip_import_validation = argv.flag?('skip-import-validation', false)
           @skip_tests = argv.flag?('skip-tests', false)
+          @analyze = argv.flag?('analyze', false)
           @podspecs_paths = argv.arguments!
           super
         end
@@ -74,6 +74,7 @@ module Pod
             validator.swift_version = @swift_version
             validator.skip_import_validation = @skip_import_validation
             validator.skip_tests = @skip_tests
+            validator.analyze = @analyze
             validator.validate
             failure_reasons << validator.failure_reason
 

data/lib/cocoapods/command/update.rb

@@ -21,10 +21,11 @@ module Pod
 
       def self.options
         [
-          ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to update dependent pods. ' \
-           'Multiple sources must be comma-delimited. The master repo will not be included by default with this option.'],
-          ['--exclude-pods=podName', 'Pods to exclude during update. Multiple pods must be comma-delimited.'],
-          ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only applies to projects that have enabled incremental installation.'],
+          ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to update dependent pods. ' \
+           'Multiple sources must be comma-delimited'],
+          ['--exclude-pods=podName', 'Pods to exclude during update. Multiple pods must be comma-delimited'],
+          ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only ' \
+           'applies to projects that have enabled incremental installation'],
         ].concat(super)
       end
 

data/lib/cocoapods/config.rb

@@ -140,6 +140,8 @@ module Pod
 
     attr_writer :repos_dir
 
+    # @return [Source::Manager] the source manager for the spec repos in `repos_dir`
+    #
     def sources_manager
       return @sources_manager if @sources_manager && @sources_manager.repos_dir == repos_dir
       @sources_manager = Source::Manager.new(repos_dir)
@@ -155,13 +157,13 @@ module Pod
     #         Podfile is located.
     #
     def installation_root
-      current_dir = ActiveSupport::Multibyte::Unicode.normalize(Dir.pwd)
-      current_path = Pathname.new(current_dir)
-      unless @installation_root
+      @installation_root ||= begin
+        current_dir = Pathname.new(ActiveSupport::Multibyte::Unicode.normalize(Dir.pwd))
+        current_path = current_dir
         until current_path.root?
           if podfile_path_in_dir(current_path)
-            @installation_root = current_path
-            unless current_path == Pathname.pwd
+            installation_root = current_path
+            unless current_path == current_dir
               UI.puts("[in #{current_path}]")
             end
             break
@@ -169,9 +171,8 @@ module Pod
             current_path = current_path.parent
           end
         end
-        @installation_root ||= Pathname.pwd
+        installation_root || current_dir
       end
-      @installation_root
     end
 
     attr_writer :installation_root
@@ -276,7 +277,7 @@ module Pod
     def configure_with(values_by_key)
       return unless values_by_key
       values_by_key.each do |key, value|
-        if key == :cache_root
+        if key.to_sym == :cache_root
           value = Pathname.new(value).expand_path
         end
         instance_variable_set("@#{key}", value)

data/lib/cocoapods/external_sources/path_source.rb

@@ -8,7 +8,7 @@ module Pod
       #
       def fetch(sandbox)
         title = "Fetching podspec for `#{name}` #{description}"
-        UI.titled_section(title,  :verbose_prefix => '-> ') do
+        UI.section(title, '-> ') do
           podspec = podspec_path
           unless podspec.exist?
             raise Informative, "No podspec found for `#{name}` in " \

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -205,7 +205,7 @@ module Pod
           }
 
         SH
-        script << "\n" unless frameworks_by_config.values.all?(&:empty?)
+        script << "\n" unless frameworks_by_config.each_value.all?(&:empty?)
         frameworks_by_config.each do |config, frameworks_with_dsyms|
           next if frameworks_with_dsyms.empty?
           script << %(if [[ "$CONFIGURATION" == "#{config}" ]]; then\n)

data/lib/cocoapods/generator/info_plist_file.rb

@@ -5,7 +5,7 @@ module Pod
     # framework. It states public attributes.
     #
     class InfoPlistFile
-      # @return [Version] version The version to use for when generating this Info.plist file.
+      # @return [String] version The version to use for when generating this Info.plist file.
       #
       attr_reader :version
 
@@ -24,7 +24,7 @@ module Pod
 
       # Initialize a new instance
       #
-      # @param  [Version] version @see #version
+      # @param  [String] version @see #version
       # @param  [Platform] platform @see #platform
       # @param  [Symbol] bundle_package_type @see #bundle_package_type
       # @param  [Hash] additional_entries @see #additional_entries

data/lib/cocoapods/installer.rb

@@ -156,17 +156,30 @@ module Pod
       resolve_dependencies
       download_dependencies
       validate_targets
+      if installation_options.skip_pods_project_generation?
+        show_skip_pods_project_generation_message
+      else
+        integrate
+      end
+      perform_post_install_actions
+    end
+
+    def show_skip_pods_project_generation_message
+      UI.section 'Skipping Pods Project Creation'
+      UI.section 'Skipping User Project Integration'
+    end
+
+    def integrate
       generate_pods_project
       if installation_options.integrate_targets?
         integrate_user_project
       else
         UI.section 'Skipping User Project Integration'
       end
-      perform_post_install_actions
     end
 
     def analyze_project_cache
-      user_projects = aggregate_targets.map(&:user_project).compact
+      user_projects = aggregate_targets.map(&:user_project).compact.uniq
       object_version = user_projects.min_by { |p| p.object_version.to_i }.object_version.to_i unless user_projects.empty?
 
       if !installation_options.incremental_installation
@@ -175,8 +188,8 @@ module Pod
                                                      analysis_result.all_user_build_configurations, object_version)
       else
         UI.message 'Analyzing Project Cache' do
-          @installation_cache = ProjectCache::ProjectInstallationCache.from_file(sandbox.project_installation_cache_path)
-          @metadata_cache = ProjectCache::ProjectMetadataCache.from_file(sandbox.project_metadata_cache_path)
+          @installation_cache = ProjectCache::ProjectInstallationCache.from_file(sandbox, sandbox.project_installation_cache_path)
+          @metadata_cache = ProjectCache::ProjectMetadataCache.from_file(sandbox, sandbox.project_metadata_cache_path)
           @project_cache_version = ProjectCache::ProjectCacheVersion.from_file(sandbox.project_version_cache_path)
 
           force_clean_install = clean_install || project_cache_version.version != Version.create(VersionMetadata.project_cache_version)
@@ -337,8 +350,7 @@ module Pod
 
     # @!group Installation results
 
-    # @return [Analyzer] the analyzer which provides the information about what
-    #         needs to be installed.
+    # @return [Analyzer::AnalysisResult] the result of the analysis performed during installation
     #
     attr_reader :analysis_result
 
@@ -496,7 +508,7 @@ module Pod
             install_source_of_pod(spec.name)
           end
         else
-          UI.titled_section("Using #{spec}", title_options) do
+          UI.section("Using #{spec}", title_options[:verbose_prefix]) do
             create_pod_installer(spec.name)
           end
         end
@@ -514,7 +526,7 @@ module Pod
         raise StandardError, message
       end
 
-      pod_installer = PodSourceInstaller.new(sandbox, specs_by_platform, :can_cache => installation_options.clean?)
+      pod_installer = PodSourceInstaller.new(sandbox, podfile, specs_by_platform, :can_cache => installation_options.clean?)
       pod_installers << pod_installer
       pod_installer
     end
@@ -574,7 +586,7 @@ module Pod
     end
 
     def validate_targets
-      validator = Xcode::TargetValidator.new(aggregate_targets, pod_targets)
+      validator = Xcode::TargetValidator.new(aggregate_targets, pod_targets, installation_options)
       validator.validate!
     end
 
@@ -740,16 +752,24 @@ module Pod
       @lockfile = generate_lockfile
 
       UI.message "- Writing Lockfile in #{UI.path config.lockfile_path}" do
+        # No need to invoke Sandbox#update_changed_file here since this logic already handles checking if the
+        # contents of the file are the same.
         @lockfile.write_to_disk(config.lockfile_path)
       end
 
       UI.message "- Writing Manifest in #{UI.path sandbox.manifest_path}" do
-        sandbox.manifest_path.open('w') do |f|
-          f.write config.lockfile_path.read
-        end
+        # No need to invoke Sandbox#update_changed_file here since this logic already handles checking if the
+        # contents of the file are the same.
+        @lockfile.write_to_disk(sandbox.manifest_path)
       end
     end
 
+    # @param [ProjectCacheAnalysisResult] cache_analysis_result
+    #        The cache analysis result for the current installation.
+    #
+    # @param [Hash{String => TargetInstallationResult}] target_installation_results
+    #        The installation results for pod targets installed.
+    #
     def update_project_cache(cache_analysis_result, target_installation_results)
       return unless installation_cache || metadata_cache
       installation_cache.update_cache_key_by_target_label!(cache_analysis_result.cache_key_by_target_label)