cocoapods-core 1.6.2 → 1.7.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8ead46288e97d3d0f2e40be798c50e17414ee2
-  data.tar.gz: 79bcf66137a524456dfff3f5a707139dec734031
+  metadata.gz: 6d6029877133203026dca0a0536818e5799bb22a
+  data.tar.gz: 14c7457385e244d39a5fabff47257f702c6b5afe
 SHA512:
-  metadata.gz: 0ae496e65d8142956c8e6761d9e7f458e5d1a70de2fe4a865c7058ca6430a6c5bd0cd2be67904dd8f7b51a00d34e33e0a629d1674fb29630d09fb01339c619ba
-  data.tar.gz: c818be4b01bd274eae09542015c4aeb9459039d9535257601ca9c4271f52c8ccef098a7fa660b6b605b6f5b28248b61f2266411a1999a8bc1e2c438868a7de3f
+  metadata.gz: b34c2e92c8d1125c7d30237ca3f8771195860817768873d4ca3c774a82d6d83cf2741e7ca81e21ec738ce6fdd3c14b442c4815dc11aab2260ae9416e9fdad437
+  data.tar.gz: 1e4bc919ec36bd8f87a92dae0ce64755103d4bcd04b510443a6ef87078c22352ac084470d5e95c6f02c883b940cf7f68c9c31d1e71bb05ca21011b983a1e495d

data/lib/cocoapods-core.rb

@@ -27,6 +27,7 @@ module Pod
   autoload :Platform,       'cocoapods-core/platform'
   autoload :Podfile,        'cocoapods-core/podfile'
   autoload :Source,         'cocoapods-core/source'
+  autoload :CDNSource,      'cocoapods-core/cdn_source'
   autoload :MasterSource,   'cocoapods-core/master_source'
   autoload :Specification,  'cocoapods-core/specification'
   autoload :StandardError,  'cocoapods-core/standard_error'

data/lib/cocoapods-core/cdn_source.rb

@@ -0,0 +1,292 @@
+require 'cocoapods-core/source'
+require 'rest'
+require 'concurrent'
+
+module Pod
+  # Subclass of Pod::Source to provide support for CDN-based Specs repositories
+  #
+  class CDNSource < Source
+    # @param [String] repo The name of the repository
+    #
+    def initialize(repo)
+      @check_existing_files_for_update = false
+      # Optimization: we initialize startup_time when the source is first initialized
+      # and then test file modification dates against it. Any file that was touched
+      # after the source was initialized, is considered fresh enough.
+      @startup_time = Time.new
+
+      @executor = Concurrent::ThreadPoolExecutor.new(
+        :min_threads => 1,
+        :max_threads => 200,
+        :max_queue => 0 # unbounded work queue
+      )
+      super(repo)
+    end
+
+    # @return [String] The URL of the source.
+    #
+    def url
+      @url ||= File.read(repo.join('.url'))
+    end
+
+    # @return [String] The type of the source.
+    #
+    def type
+      'CDN'
+    end
+
+    def refresh_metadata
+      if metadata.nil?
+        unless repo.exist?
+          raise Informative, "Unable to find a source named: `#{name}`"
+        end
+
+        specs_dir.mkpath
+        download_file('CocoaPods-version.yml')
+      end
+
+      super
+    end
+
+    def preheat_existing_files
+      all_existing_files = [repo.join('**/*.yml'), repo.join('**/*.txt'), repo.join('**/*.json')].map(&Pathname.method(:glob)).flatten
+      loaders = all_existing_files.map { |f| f.relative_path_from(repo).to_s }.map do |file|
+        Concurrent::Promise.execute(:executor => @executor) do
+          download_file(file)
+        end
+      end
+      Concurrent::Promise.zip(*loaders).wait!
+    end
+
+    # @return [Pathname] The directory where the specs are stored.
+    #
+    def specs_dir
+      @specs_dir ||= repo + 'Specs'
+    end
+
+    # @!group Querying the source
+    #-------------------------------------------------------------------------#
+
+    # @return [Array<String>] the list of the name of all the Pods.
+    #
+    def pods
+      download_file('all_pods.txt')
+      local_file('all_pods.txt', &:to_a).map(&:chomp)
+    end
+
+    # @return [Array<Version>] all the available versions for the Pod, sorted
+    #         from highest to lowest.
+    #
+    # @param  [String] name
+    #         the name of the Pod.
+    #
+    def versions(name)
+      return nil unless specs_dir
+      raise ArgumentError, 'No name' unless name
+
+      return @versions_by_name[name] unless @versions_by_name[name].nil?
+
+      pod_path_actual = pod_path(name)
+      pod_path_relative = relative_pod_path(name)
+      versions_file_path_relative = pod_path_relative.join(INDEX_FILE_NAME).to_s
+      download_file(versions_file_path_relative)
+
+      return nil unless pod_path_actual.join(INDEX_FILE_NAME).exist?
+
+      loaders = []
+      @versions_by_name[name] ||= local_file(versions_file_path_relative) do |file|
+        file.map do |v|
+          version = v.chomp
+
+          # Optimization: ensure all the podspec files at least exist. The correct one will get refreshed
+          # in #specification_path regardless.
+          podspec_version_path_relative = Pathname.new(version).join("#{name}.podspec.json")
+          unless pod_path_actual.join(podspec_version_path_relative).exist?
+            loaders << Concurrent::Promise.execute(:executor => @executor) do
+              download_file(pod_path_relative.join(podspec_version_path_relative).to_s)
+            end
+          end
+          begin
+            Version.new(version) if version[0, 1] != '.'
+          rescue ArgumentError
+            raise Informative, 'An unexpected version directory ' \
+            "`#{version}` was encountered for the " \
+            "`#{pod_dir}` Pod in the `#{name}` repository."
+          end
+        end
+      end.compact.sort.reverse
+      Concurrent::Promise.zip(*loaders).wait!
+      @versions_by_name[name]
+    end
+
+    # Returns the path of the specification with the given name and version.
+    #
+    # @param  [String] name
+    #         the name of the Pod.
+    #
+    # @param  [Version,String] version
+    #         the version for the specification.
+    #
+    # @return [Pathname] The path of the specification.
+    #
+    def specification_path(name, version)
+      raise ArgumentError, 'No name' unless name
+      raise ArgumentError, 'No version' unless version
+
+      podspec_version_path_relative = Pathname.new(version.to_s).join("#{name}.podspec.json")
+      relative_podspec = relative_pod_path(name).join(podspec_version_path_relative).to_s
+      download_file(relative_podspec)
+      pod_path(name).join(podspec_version_path_relative)
+    end
+
+    # @return [Array<Specification>] all the specifications contained by the
+    #         source.
+    #
+    def all_specs
+      raise Informative, "Can't retrieve all the specs for a CDN-backed source, it will take forever"
+    end
+
+    # @!group Searching the source
+    #-------------------------------------------------------------------------#
+
+    # @return [Set] a set for a given dependency. The set is identified by the
+    #               name of the dependency and takes into account subspecs.
+    #
+    # @note   This method is optimized for fast lookups by name, i.e. it does
+    #         *not* require iterating through {#pod_sets}
+    #
+    # @todo   Rename to #load_set
+    #
+    def search(query)
+      unless specs_dir
+        raise Informative, "Unable to find a source named: `#{name}`"
+      end
+      if query.is_a?(Dependency)
+        query = query.root_name
+      end
+
+      found = download_file(relative_pod_path(query).join(INDEX_FILE_NAME).to_s)
+
+      if found
+        set = set(query)
+        set if set.specification_name == query
+      end
+    end
+
+    # @return [Array<Set>] The list of the sets that contain the search term.
+    #
+    # @param  [String] query
+    #         the search term. Can be a regular expression.
+    #
+    # @param  [Bool] full_text_search
+    #         not supported due to performance reasons
+    #
+    # @note   full text search requires to load the specification for each pod,
+    #         and therefore not supported.
+    #
+    def search_by_name(query, full_text_search = false)
+      if full_text_search
+        raise Informative, "Can't perform full text search, it will take forever"
+      else
+        super(query)
+      end
+    end
+
+    # Check update dates for all existing files.
+    # Does not download non-existing specs, since CDN-backed repo is updated live.
+    #
+    # @param  [Bool] show_output
+    #
+    # @return  [Array<String>] Always returns empty array, as it cannot know
+    #          everything that actually changed.
+    #
+    def update(_show_output)
+      @check_existing_files_for_update = true
+      begin
+        preheat_existing_files
+      ensure
+        @check_existing_files_for_update = false
+      end
+      []
+    end
+
+    def git?
+      # Long story here. This property is actually used solely by Source::Manager to determine
+      # which sources are updatable. Ideally, this would require a name change but @segiddins
+      # has pointed out that it is public and could break plugins.
+      # In any case, CDN-backed repos can be updated and therefore the value ought to be true.
+      true
+    end
+
+    private
+
+    # Index files contain all the sub directories in the directory, separated by
+    # a newline. We use those because you can't get a directory listing from a CDN.
+    INDEX_FILE_NAME = 'index.txt'.freeze
+
+    def local_file(partial_url)
+      File.open(repo.join(partial_url)) do |file|
+        yield file if block_given?
+      end
+    end
+
+    def relative_pod_path(pod_name)
+      pod_path(pod_name).relative_path_from(repo)
+    end
+
+    def download_file(partial_url)
+      file_remote_url = url + partial_url.to_s
+      path = repo + partial_url
+
+      if File.exist?(path)
+        if @startup_time < File.mtime(path)
+          debug "CDN: #{name} Relative path: #{partial_url} modified during this run! Returning local"
+          return partial_url
+        end
+
+        unless @check_existing_files_for_update
+          debug "CDN: #{name} Relative path: #{partial_url} exists! Returning local because checking is only perfomed in repo update"
+          return partial_url
+        end
+      end
+
+      path.dirname.mkpath
+
+      etag_path = path.sub_ext(path.extname + '.etag')
+
+      etag = File.read(etag_path) if File.exist?(etag_path)
+      debug "CDN: #{name} Relative path: #{partial_url}, has ETag? #{etag}" unless etag.nil?
+
+      response = etag.nil? ? REST.get(file_remote_url) : REST.get(file_remote_url, 'If-None-Match' => etag)
+
+      case response.status_code
+      when 304
+        debug "CDN: #{name} Relative path not modified: #{partial_url}"
+        # We need to update the file modification date, as it is later used for freshness
+        # optimization. See #initialize for more information.
+        FileUtils.touch path
+        partial_url
+      when 200
+        File.open(path, 'w') { |f| f.write(response.body) }
+
+        etag_new = response.headers['etag'].first if response.headers.include?('etag')
+        debug "CDN: #{name} Relative path downloaded: #{partial_url}, save ETag: #{etag_new}"
+        File.open(etag_path, 'w') { |f| f.write(etag_new) } unless etag_new.nil?
+        partial_url
+      when 404
+        debug "CDN: #{name} Relative path couldn't be downloaded: #{partial_url} Response: #{response.status_code}"
+        nil
+      else
+        raise Informative, "CDN: #{name} Relative path couldn't be downloaded: #{partial_url} Response: #{response.status_code}"
+      end
+    end
+
+    def debug(message)
+      if defined?(Pod::UI)
+        Pod::UI.message(message)
+      else
+        CoreUI.puts(message)
+      end
+    end
+  end
+end

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.6.2'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.7.0.beta.1'.freeze unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/lockfile.rb

@@ -454,22 +454,17 @@ module Pod
       #
       #
       def generate_pods_data(specs)
-        pod_and_deps = specs.map do |spec|
-          [spec.to_s, spec.all_dependencies.map(&:to_s).sort]
-        end.uniq
-
-        tmp = {}
-        pod_and_deps.each do |name, deps|
-          if tmp[name]
-            tmp[name].concat(deps).uniq!
-          else
-            tmp[name] = deps
-          end
+        pods_and_deps_merged = specs.reduce({}) do |result, spec|
+          name = spec.to_s
+          result[name] ||= []
+          result[name].concat(spec.all_dependencies.map(&:to_s))
+          result
         end
-        pod_and_deps = tmp.sort_by(&:first).map do |name, deps|
-          deps.empty? ? name : { name => deps }
+
+        pod_and_deps = pods_and_deps_merged.map do |name, deps|
+          deps.empty? ? name : { name => YAMLHelper.sorted_array(deps.uniq) }
         end
-        pod_and_deps
+        YAMLHelper.sorted_array(pod_and_deps)
       end
 
       # Generates the list of the dependencies of the Podfile.
@@ -481,7 +476,7 @@ module Pod
       # @return   [Array] the generated data.
       #
       def generate_dependencies_data(podfile)
-        podfile.dependencies.map(&:to_s).sort
+        YAMLHelper.sorted_array(podfile.dependencies.map(&:to_s))
       end
 
       # Generates the hash of spec repo sources used in the Podfile.
@@ -496,7 +491,7 @@ module Pod
           key = source.url || source.name
           key = key.downcase if source.name == Pod::MasterSource::MASTER_REPO_NAME
           value = specs.map { |s| s.root.name }.uniq
-          [key, value]
+          [key, YAMLHelper.sorted_array(value)]
         end.compact]
       end
 

data/lib/cocoapods-core/podfile.rb

@@ -255,7 +255,7 @@ module Pod
       end
 
       case path.extname
-      when '', '.podfile'
+      when '', '.podfile', '.rb'
         Podfile.from_ruby(path)
       when '.yaml'
         Podfile.from_yaml(path)

data/lib/cocoapods-core/podfile/dsl.rb

@@ -20,7 +20,7 @@ module Pod
     #     target 'MyApp' do
     #       pod 'ObjectiveSugar', '~> 0.5'
     #
-    #       target "MyAppTests" do
+    #       target 'MyAppTests' do
     #         inherit! :search_paths
     #         pod 'OCMock', '~> 2.0.1'
     #       end
@@ -112,6 +112,9 @@ module Pod
       #              specify in your version requirement. The example is equal to
       #              `>= 0.1.2` combined with `< 0.2.0` and will always match the
       #              latest known version matching your requirements.
+      # * `~> 0.1.3-beta.0` Beta and release versions for 0.1.3, release versions
+      #              up to 0.2 excluding 0.2. Components separated by a dash (-)
+      #              will not be considered for the version requirement.
       #
       # A list of version requirements can be specified for even more fine
       # grained control.
@@ -182,6 +185,18 @@ module Pod
       #
       #     pod 'QueryKit', :subspecs => ['Attribute', 'QuerySet']
       #
+      # ### Test Specs
+      #
+      # Test specs can be optionally included via the `:testspecs` option. By default,
+      # none of a Pod's test specs are included.
+      #
+      # You may specify a list of test spec names to install using the following:
+      #
+      #     pod 'AFNetworking', :testspecs => ['UnitTests', 'SomeOtherTests']
+      #
+      # The values provided to `:testspecs` correspond to the name provided to the
+      # `test_spec` DSL attribute in a Podspec.
+      #
       # ------
       #
       # Dependencies can be obtained also from external sources.
@@ -753,8 +768,7 @@ module Pod
       # @param    [String] source
       #           The URL of a specs repository.
       #
-      # @example  Specifying to first use the Artsy repository and then the
-      #           CocoaPods Master Repository
+      # @example  Specifying to first use the Artsy repository and then the CocoaPods Master Repository
       #
       #           source 'https://github.com/artsy/Specs.git'
       #           source 'https://github.com/CocoaPods/Specs.git'
@@ -847,6 +861,39 @@ module Pod
         raise Informative, 'Specifying multiple `post_install` hooks is unsupported.' if @post_install_callback
         @post_install_callback = block
       end
+
+      # Specifies the Swift version requirements this target definition supports.
+      #
+      # **Note** These requirements are inherited from the parent, if specified and if none
+      # are specified at the root level then all versions are considered to be supported.
+      #
+      # @param   [String, Version, Array<String>, Array<Version>] requirements
+      #          The set of requirements this target supports.
+      #
+      # @example
+      #
+      #   target 'MyApp' do
+      #     supports_swift_versions '>= 3.0', '< 4.0'
+      #     pod 'AFNetworking', '~> 1.0'
+      #   end
+      #
+      # @example
+      #
+      #   supports_swift_versions '>= 3.0', '< 4.0'
+      #
+      #   target 'MyApp' do
+      #     pod 'AFNetworking', '~> 1.0'
+      #   end
+      #
+      #   target 'ZipApp' do
+      #     pod 'SSZipArchive'
+      #   end
+      #
+      # @return   [void]
+      #
+      def supports_swift_versions(*requirements)
+        current_target_definition.store_swift_version_requirements(*requirements)
+      end
     end
   end
 end

data/lib/cocoapods-core/podfile/target_definition.rb

@@ -140,7 +140,7 @@ module Pod
       # Sets the path of the user project this target definition should link
       # with.
       #
-      # @param  [String] path
+      # @param  [String] name
       #         The path of the project.
       #
       # @return [void]
@@ -393,6 +393,27 @@ module Pod
         get_hash_value('swift_version')
       end
 
+      # @return [Array<String>] the Swift version requirements this target definition enforces.
+      #
+      def swift_version_requirements
+        get_hash_value('swift_version_requirements')
+      end
+
+      # Queries the target if a version of Swift is supported or not.
+      #
+      # @param  [Version] swift_version
+      #         The Swift version to query against.
+      #
+      # @return [Boolean] Whether the target accepts the specified Swift version.
+      #
+      def supports_swift_version?(swift_version)
+        if swift_version_requirements.nil?
+          root? || parent.supports_swift_version?(swift_version)
+        else
+          Requirement.create(swift_version_requirements).satisfied_by?(swift_version)
+        end
+      end
+
       #--------------------------------------#
 
       # Whether a specific pod should be linked to the target when building for
@@ -610,6 +631,17 @@ module Pod
         set_platform(name, target)
       end
 
+      # Stores the Swift version requirements to be used for this target.
+      #
+      # @param   [String, Version, Array<String>, Array<Version>] requirements
+      #          The set of requirements this target supports.
+      #
+      # @return [void]
+      #
+      def store_swift_version_requirements(*requirements)
+        set_hash_value('swift_version_requirements', requirements.flatten.map(&:to_s))
+      end
+
       #--------------------------------------#
 
       # Stores the dependency for a Pod with the given name.
@@ -742,6 +774,7 @@ module Pod
         children
         configuration_pod_whitelist
         uses_frameworks
+        swift_version_requirements
         inheritance
         abstract
         swift_version
@@ -860,6 +893,7 @@ module Pod
           if inhibit_hash['all']
             # Clean pods that are set to not inhibit inside parent if inhibit_all_warnings! was set.
             parent_hash['not_for_pods'] = nil
+            inhibit_hash.delete('all') if parent_hash['all']
           end
           parent_hash.merge(inhibit_hash) do |_, l, r|
             Array(l).concat(r).uniq
@@ -966,7 +1000,7 @@ module Pod
       # Removes :inhibit_warnings from the requirements list, and adds
       # the pod's name into internal hash for disabling warnings.
       #
-      # @param [String] pod name
+      # @param [String] name The name of the pod
       #
       # @param [Array] requirements
       #        If :inhibit_warnings is the only key in the hash, the hash
@@ -988,7 +1022,7 @@ module Pod
       # Removes :modular_headers from the requirements list, and adds
       # the pods name into internal hash for modular headers.
       #
-      # @param [String] pod name
+      # @param [String] name The name of the pod
       #
       # @param [Array] requirements
       #        If :modular_headers is the only key in the hash, the hash
@@ -1011,7 +1045,7 @@ module Pod
       # and adds the pod's name into the internal hash for which pods should be
       # linked in which configuration only.
       #
-      # @param [String] pod name
+      # @param [String] name The name of the pod
       #
       # @param [Array] requirements
       #        If :configurations is the only key in the hash, the hash
@@ -1048,6 +1082,7 @@ module Pod
 
         subspecs = options.delete(:subspecs)
         test_specs = options.delete(:testspecs)
+        app_specs = options.delete(:appspecs)
 
         subspecs.each do |ss|
           store_pod("#{name}/#{ss}", *requirements.dup)
@@ -1058,6 +1093,11 @@ module Pod
           store_pod("#{name}/#{ss}", *requirements_copy)
         end if test_specs
 
+        app_specs.each do |as|
+          requirements_copy = requirements.map(&:dup)
+          store_pod("#{name}/#{as}", *requirements_copy)
+        end if app_specs
+
         requirements.pop if options.empty?
         !subspecs.nil?
       end

data/lib/cocoapods-core/source/manager.rb

@@ -33,15 +33,12 @@ module Pod
       #         will be used.
       #
       def aggregate_for_dependency(dependency)
-        if dependency.podspec_repo
-          source = source_with_url(dependency.podspec_repo)
-          raise StandardError, '[Bug] Failed to find known source with the URL ' \
-            "#{dependency.podspec_repo.inspect}" if source.nil?
+        return aggregate if dependency.podspec_repo.nil?
 
-          aggregate_with_repos([source.repo])
-        else
-          aggregate
-        end
+        source = source_with_url(dependency.podspec_repo)
+        return aggregate if source.nil?
+
+        aggregate_with_repos([source.repo])
       end
 
       # @return [Array<Source>] The list of the sources with the given names.
@@ -234,6 +231,10 @@ module Pod
       #                  A hash containing changed specification paths for each source.
       #
       def update_search_index_if_needed_in_background(changed_spec_paths)
+        if Gem.win_platform?
+          update_search_index_if_needed(changed_spec_paths)
+          return
+        end
         Process.fork do
           Process.daemon
           update_search_index_if_needed(changed_spec_paths)
@@ -283,7 +284,10 @@ module Pod
       #
       def source_from_path(path)
         @sources_by_path ||= Hash.new do |hash, key|
-          hash[key] = if key.basename.to_s == Pod::MasterSource::MASTER_REPO_NAME
+          hash[key] = case
+                      when (key + '.url').exist?
+                        CDNSource.new(key)
+                      when key.basename.to_s == Pod::MasterSource::MASTER_REPO_NAME
                         MasterSource.new(key)
                       else
                         Source.new(key)

data/lib/cocoapods-core/specification.rb

@@ -37,13 +37,18 @@ module Pod
     # @param [Bool] test_specification
     #        Whether the specification is a test specification
     #
-    def initialize(parent = nil, name = nil, test_specification = false)
+    # @param [Bool] app_specification
+    #        Whether the specification is an app specification
+    #
+    def initialize(parent = nil, name = nil, test_specification = false, app_specification: false)
+      raise StandardError, "#{self} can not be both an app and test specification." if test_specification && app_specification
       @attributes_hash = {}
       @subspecs = []
       @consumers = {}
       @parent = parent
       @hash_value = nil
       @test_specification = test_specification
+      @app_specification = app_specification
       attributes_hash['name'] = name
       attributes_hash['test_type'] = :unit if test_specification
 
@@ -74,6 +79,11 @@ module Pod
     attr_accessor :test_specification
     alias_method :test_specification?, :test_specification
 
+    # @return [Bool] If this specification is an app specification.
+    #
+    attr_accessor :app_specification
+    alias_method :app_specification?, :app_specification
+
     # Checks if a specification is equal to the given one according its name
     # and to its version.
     #
@@ -221,8 +231,35 @@ module Pod
 
     public
 
+    # @return [Symbol] Spec type of the current spec.
+    #
+    # @note see Attribute#SUPPORTED_SPEC_TYPES for the list of available spec_types.
+    #
+    def spec_type
+      return :app if app_specification?
+      return :test if test_specification?
+
+      :library
+    end
+
     # @!group Dependencies & Subspecs
 
+    # @return [Bool] If this specification is a library specification.
+    #
+    # @note a library specification is a specification that is not of type app or test.
+    #
+    def library_specification?
+      !app_specification? && !test_specification?
+    end
+
+    # @return [Bool] If this specification is not a library specification.
+    #
+    # @note see #library_specification?
+    #
+    def non_library_specification?
+      !library_specification?
+    end
+
     # @return [Symbol] the test type supported if this is a test specification.
     #
     def test_type
@@ -236,6 +273,20 @@ module Pod
       subspecs.select(&:test_specification?)
     end
 
+    # @return [Array<Specification>] the list of all the app subspecs of
+    #         a specification.
+    #
+    def app_specs
+      subspecs.select(&:app_specification?)
+    end
+
+    # @return [Array<Specification>] the list of all the non libary (app or test) subspecs of
+    #         a specification.
+    #
+    def non_library_specs
+      subspecs.select(&:non_library_specification?)
+    end
+
     # @return [Array<Specification>] the recursive list of all the subspecs of
     #         a specification.
     #
@@ -265,7 +316,7 @@ module Pod
     #
     # @return   [Specification] the subspec with the given name or self.
     #
-    def subspec_by_name(relative_name, raise_if_missing = true, include_test_specifications = false)
+    def subspec_by_name(relative_name, raise_if_missing = true, include_non_library_specifications = false)
       if relative_name.nil? || relative_name == base_name
         self
       elsif relative_name.downcase == base_name.downcase
@@ -274,7 +325,7 @@ module Pod
       else
         remainder = relative_name[base_name.size + 1..-1]
         subspec_name = remainder.split('/').shift
-        subspec = subspecs.find { |s| s.base_name == subspec_name && (include_test_specifications || !s.test_specification?) }
+        subspec = subspecs.find { |s| s.base_name == subspec_name && (include_non_library_specifications || !s.non_library_specification?) }
         unless subspec
           if raise_if_missing
             raise Informative, 'Unable to find a specification named ' \
@@ -283,7 +334,7 @@ module Pod
             return nil
           end
         end
-        subspec.subspec_by_name(remainder, raise_if_missing, include_test_specifications)
+        subspec.subspec_by_name(remainder, raise_if_missing, include_non_library_specifications)
       end
     end
 
@@ -307,7 +358,7 @@ module Pod
     #
     def subspec_dependencies(platform = nil)
       specs = if default_subspecs.empty?
-                subspecs.compact.reject(&:test_specification?)
+                subspecs.compact.reject(&:non_library_specification?)
               else
                 default_subspecs.map do |subspec_name|
                   root.subspec_by_name("#{name}/#{subspec_name}")
@@ -377,6 +428,13 @@ module Pod
       end
     end
 
+    # @return [Hash] The scheme value.
+    #
+    def scheme
+      value = attributes_hash['scheme'] || {}
+      Specification.convert_keys_to_symbol(value, :recursive => false)
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -520,30 +578,36 @@ module Pod
     # @param  [Object] value
     #         the value that needs to be stripped from the Symbols.
     #
-    # @return [Hash] the hash with the strings instead of the keys.
+    # @param  [Boolean] recursive
+    #         whether to convert keys of nested hashes.
+    #
+    # @return [Hash] the hash with the keys as strings instead of symbols.
     #
-    def self.convert_keys_to_string(value)
+    def self.convert_keys_to_string(value, recursive: true)
       return unless value
       result = {}
       value.each do |key, subvalue|
-        subvalue = Specification.convert_keys_to_string(subvalue) if subvalue.is_a?(Hash)
+        subvalue = Specification.convert_keys_to_string(subvalue) if recursive && subvalue.is_a?(Hash)
         result[key.to_s] = subvalue
       end
       result
     end
 
-    # Converts the keys of the given hash to a string.
+    # Converts the keys of the given hash to a symbol.
     #
     # @param  [Object] value
-    #         the value that needs to be stripped from the Symbols.
+    #         the value that needs to be stripped from the Strings.
+    #
+    # @param  [Boolean] recursive
+    #         whether to convert keys of nested hashes.
     #
-    # @return [Hash] the hash with the strings instead of the keys.
+    # @return [Hash] the hash with the keys as symbols instead of strings.
     #
-    def self.convert_keys_to_symbol(value)
+    def self.convert_keys_to_symbol(value, recursive: true)
       return unless value
       result = {}
       value.each do |key, subvalue|
-        subvalue = Specification.convert_keys_to_symbol(subvalue) if subvalue.is_a?(Hash)
+        subvalue = Specification.convert_keys_to_symbol(subvalue) if recursive && subvalue.is_a?(Hash)
         result[key.to_sym] = subvalue
       end
       result

data/lib/cocoapods-core/specification/consumer.rb

@@ -9,6 +9,7 @@ module Pod
     # - standardizing the attributes
     # - handling multi-platform values
     # - handle default values
+    # - handle automatic container wrapping of values
     # - handle inherited values
     #
     # This class allows to store the values of the attributes in the
@@ -184,6 +185,10 @@ module Pod
       #
       spec_attr_accessor :script_phases
 
+      # @return [Hash] A hash that contains the scheme configuration.
+      #
+      spec_attr_accessor :scheme
+
       # @return [Array<String>] A hash where the key represents the
       #         paths of the resources to copy and the values the paths of
       #         the resources that should be copied.
@@ -407,6 +412,17 @@ module Pod
         end
       end
 
+      # Converts the a scheme where keys are strings into symbols.
+      #
+      # @param  [Hash] value.
+      #         The value of the attribute as specified by the user.
+      #
+      # @return [Hash] the scheme with symbols as keys instead of strings or `nil` if the value is not a hash.
+      #
+      def _prepare_scheme(value)
+        Specification.convert_keys_to_symbol(value, :recursive => false) if value && value.is_a?(Hash)
+      end
+
       # Ensures that the file patterns of the resource bundles are contained in
       # an array.
       #

data/lib/cocoapods-core/specification/dsl.rb

@@ -129,18 +129,35 @@ module Pod
 
       #------------------#
 
-      # @!method swift_version=(version)
+      # @!method swift_versions=(version)
       #
-      #   The version of Swift that the specification supports.
+      #   The versions of Swift that the specification supports. A version of '4' will be treated as
+      #   '4.0' by CocoaPods and not '4.1' or '4.2'.
+      #
+      #   **Note** The Swift compiler mostly accepts major versions and sometimes will honor minor versions.
+      #   While CocoaPods allows specifying a minor or patch version it might not be honored fully by the Swift compiler.
+      #
+      #   @example
+      #
+      #     spec.swift_versions = ['3.0']
       #
       #   @example
       #
-      #     spec.swift_version = '3.2'
+      #     spec.swift_versions = ['3.0', '4.0', '4.2']
+      #
+      #   @example
       #
-      #   @param  [String] swift_version
+      #     spec.swift_version = '3.0'
       #
-      root_attribute :swift_version,
-                     :multi_platform => false
+      #   @example
+      #
+      #     spec.swift_version = '3.0', '4.0'
+      #
+      #   @param  [String, Array<String>] swift_versions
+      #
+      root_attribute :swift_versions,
+                     :container => Array,
+                     :singularize => true
 
       #-----------------------------------------------------------------------#
 
@@ -660,8 +677,21 @@ module Pod
           end
         end
         unless version_requirements.all? { |req| req.is_a?(String) }
-          raise Informative, 'Unsupported version requirements'
+          version_requirements.each do |requirement|
+            if requirement.is_a?(Hash)
+              if !requirement[:path].nil?
+                raise Informative, 'Podspecs cannot specify the source of dependencies. The `:path` option is not supported.'\
+                                   ' `:path` can be used in the Podfile instead to override global dependencies.'
+              elsif !requirement[:git].nil?
+                raise Informative, 'Podspecs cannot specify the source of dependencies. The `:git` option is not supported.'\
+                                   ' `:git` can be used in the Podfile instead to override global dependencies.'
+              end
+            end
+          end
+
+          raise Informative, "Unsupported version requirements. #{version_requirements.inspect} is not valid."
         end
+
         attributes_hash['dependencies'] ||= {}
         attributes_hash['dependencies'][name] = version_requirements
       end
@@ -1230,10 +1260,10 @@ module Pod
       #
       #     spec.resource_bundles = {
       #         'MapBox' => ['MapView/Map/Resources/*.png'],
-      #         'OtherResources' => ['MapView/Map/OtherResources/*.png']
+      #         'MapBoxOtherResources' => ['MapView/Map/OtherResources/*.png']
       #       }
       #
-      #   @param  [Hash{String=>String}] resource_bundles
+      #   @param  [Hash{String=>String}, Hash{String=>Array<String>}] resource_bundles
       #           A hash where the keys are the names of the resource bundles
       #           and the values are their relative file patterns.
       #
@@ -1443,10 +1473,11 @@ module Pod
       #
       # @param  [Symbol, String] type
       #         The test type to use.
+      #
       attribute :test_type,
                 :types => [Symbol, String],
                 :multi_platform => false,
-                :test_only => true
+                :spec_types => [:test]
 
       # @!method requires_app_host=(flag)
       #
@@ -1462,7 +1493,31 @@ module Pod
       attribute :requires_app_host,
                 :types => [TrueClass, FalseClass],
                 :default_value => false,
-                :test_only => true
+                :spec_types => [:test]
+
+      SCHEME_KEYS = [:launch_arguments, :environment_variables].freeze
+
+      # @!method scheme=(flag)
+      #
+      #   Specifies the scheme configuration to be used for this specification.
+      #
+      #   ---
+      #
+      #   @example
+      #
+      #     spec.scheme = { :launch_arguments => ['Arg1'] }
+      #
+      #   @example
+      #
+      #     spec.scheme = { :launch_arguments => ['Arg1', 'Arg2'], :environment_variables => { 'Key1' => 'Val1'} }
+      #
+      #   @param  [Hash] scheme
+      #           the scheme configuration to be used for this specification.
+      #
+      attribute :scheme,
+                :types => [Hash],
+                :container => Hash,
+                :keys => SCHEME_KEYS
 
       # Represents a test specification for the library. Here you can place all
       # your tests for your podspec along with the test dependencies.
@@ -1486,6 +1541,28 @@ module Pod
         subspec
       end
 
+      # Represents an app specification for the library. Here you can place all
+      # your app source files for your podspec along with the app dependencies.
+      #
+      # ---
+      #
+      # @example
+      #
+      #   Pod::Spec.new do |spec|
+      #     spec.name = 'NSAttributedString+CCLFormat'
+      #
+      #     spec.app_spec do |app_spec|
+      #       app_spec.source_files = 'NSAttributedString+CCLFormat.m'
+      #       app_spec.dependency 'AFNetworking'
+      #     end
+      #   end
+      #
+      def app_spec(name = 'App', &block)
+        appspec = Specification.new(self, name, :app_specification => true, &block)
+        @subspecs << appspec
+        appspec
+      end
+
       #------------------#
 
       # @!method default_subspecs=(subspec_array)

data/lib/cocoapods-core/specification/dsl/attribute.rb

@@ -7,6 +7,10 @@ module Pod
       class Attribute
         require 'active_support/inflector/inflections'
 
+        # Spec types currently supported.
+        #
+        SUPPORTED_SPEC_TYPES = [:library, :app, :test].freeze
+
         # @return [Symbol] the name of the attribute.
         #
         attr_reader :name
@@ -31,7 +35,7 @@ module Pod
 
           @multi_platform = options.delete(:multi_platform) { true       }
           @root_only      = options.delete(:root_only)      { false      }
-          @test_only      = options.delete(:test_only)      { false      }
+          @spec_types     = options.delete(:spec_types)     { SUPPORTED_SPEC_TYPES }
           @inherited      = options.delete(:inherited)      { @root_only }
           @required       = options.delete(:required)       { false      }
           @singularize    = options.delete(:singularize)    { false      }
@@ -46,6 +50,9 @@ module Pod
           unless options.empty?
             raise StandardError, "Unrecognized options: #{options} for #{self}"
           end
+          unless (@spec_types - SUPPORTED_SPEC_TYPES).empty?
+            raise StandardError, "Unrecognized spec type option: #{@spec_types} for #{self}"
+          end
         end
 
         # @return [String] A string representation suitable for UI.
@@ -126,7 +133,7 @@ module Pod
         #         test specifications.
         #
         def test_only?
-          @test_only
+          @spec_types == [:test]
         end
 
         # @return [Bool] whether the attribute is multi-platform and should

data/lib/cocoapods-core/specification/json.rb

@@ -26,13 +26,15 @@ module Pod
           platforms = Hash[available_platforms.map { |p| [p.name.to_s, p.deployment_target && p.deployment_target.to_s] }]
           hash['platforms'] = platforms
         end
-        all_testspecs, all_subspecs = subspecs.partition(&:test_specification?)
-        unless all_testspecs.empty?
-          hash['testspecs'] = all_testspecs.map(&:to_hash)
-        end
-        unless all_subspecs.empty?
-          hash['subspecs'] = all_subspecs.map(&:to_hash)
-        end
+        specs_by_type = subspecs.group_by(&:spec_type)
+        all_appspecs = specs_by_type[:app] || []
+        all_testspecs = specs_by_type[:test] || []
+        all_subspecs = specs_by_type[:library] || []
+
+        hash['testspecs'] = all_testspecs.map(&:to_hash) unless all_testspecs.empty?
+        hash['appspecs'] = all_appspecs.map(&:to_hash) unless all_appspecs.empty?
+        hash['subspecs'] = all_subspecs.map(&:to_hash) unless all_subspecs.empty?
+
         hash
       end
     end
@@ -61,22 +63,33 @@ module Pod
     #
     # @return [Specification] the specification
     #
-    def self.from_hash(hash, parent = nil)
-      spec = Spec.new(parent)
+    def self.from_hash(hash, parent = nil, test_specification: false, app_specification: false)
       attributes_hash = hash.dup
+      spec = Spec.new(parent, nil, test_specification, :app_specification => app_specification)
       subspecs = attributes_hash.delete('subspecs')
       testspecs = attributes_hash.delete('testspecs')
-      spec.attributes_hash = attributes_hash
+      appspecs = attributes_hash.delete('appspecs')
+
+      ## backwards compatibility with 1.3.0
       spec.test_specification = !attributes_hash['test_type'].nil?
-      spec.subspecs.concat(subspecs_from_hash(spec, subspecs))
-      spec.subspecs.concat(subspecs_from_hash(spec, testspecs))
+
+      testspecs.each { |ts| ts['test_specification'] = true; } unless testspecs.nil?
+      appspecs.each { |ts| ts['app_specification'] = true; } unless appspecs.nil?
+
+      spec.attributes_hash = attributes_hash
+      spec.subspecs.concat(subspecs_from_hash(spec, subspecs, false, false))
+      spec.subspecs.concat(subspecs_from_hash(spec, testspecs, true, false))
+      spec.subspecs.concat(subspecs_from_hash(spec, appspecs, false, true))
+
       spec
     end
 
-    def self.subspecs_from_hash(spec, subspecs)
+    def self.subspecs_from_hash(spec, subspecs, test_specification, app_specification)
       return [] if subspecs.nil?
       subspecs.map do |s_hash|
-        Specification.from_hash(s_hash, spec)
+        Specification.from_hash(s_hash, spec,
+                                :test_specification => test_specification,
+                                :app_specification => app_specification)
       end
     end
 

data/lib/cocoapods-core/specification/linter.rb

@@ -401,8 +401,8 @@ module Pod
           keys = script_phase.keys
           unrecognized_keys = keys - Specification::ALL_SCRIPT_PHASE_KEYS
           unless unrecognized_keys.empty?
-            results.add_error('script_phases', "Unrecognized options `#{unrecognized_keys}` in script phase `#{script_phase[:name]}`. " \
-              "Available options are `#{Specification::ALL_SCRIPT_PHASE_KEYS}`.")
+            results.add_error('script_phases', "Unrecognized option(s) `#{unrecognized_keys.join(', ')}` in script phase `#{script_phase[:name]}`. " \
+              "Available options are `#{Specification::ALL_SCRIPT_PHASE_KEYS.join(', ')}`.")
           end
           missing_required_keys = Specification::SCRIPT_PHASE_REQUIRED_KEYS - keys
           unless missing_required_keys.empty?
@@ -410,7 +410,24 @@ module Pod
           end
           unless Specification::EXECUTION_POSITION_KEYS.include?(script_phase[:execution_position])
             results.add_error('script_phases', "Invalid execution position value `#{script_phase[:execution_position]}` in shell script `#{script_phase[:name]}`. " \
-            "Available options are `#{Specification::EXECUTION_POSITION_KEYS}`.")
+            "Available options are `#{Specification::EXECUTION_POSITION_KEYS.join(', ')}`.")
+          end
+        end
+      end
+
+      # Performs validation related to the `scheme` attribute.
+      #
+      def _validate_scheme(s)
+        unless s.empty?
+          if consumer.spec.subspec? && consumer.spec.library_specification?
+            results.add_error('scheme', 'Scheme configuration is not currently supported for subspecs.')
+            return
+          end
+          if s.key?(:launch_arguments) && !s[:launch_arguments].is_a?(Array)
+            results.add_error('scheme', 'Expected an array for key `launch_arguments`.')
+          end
+          if s.key?(:environment_variables) && !s[:environment_variables].is_a?(Hash)
+            results.add_error('scheme', 'Expected a hash for key `environment_variables`.')
           end
         end
       end

data/lib/cocoapods-core/specification/root_attribute_accessors.rb

@@ -40,12 +40,25 @@ module Pod
           end
         end
 
-        # @return [Version] The swift_versions required to use the specification.
+        # @deprecated in favor of #swift_versions
+        #
+        # @return [Version] The Swift version specified by the specification.
         #
         def swift_version
-          @swift_version ||= if version = attributes_hash['swift_version']
-                               Version.new(version)
-                             end
+          swift_versions.last
+        end
+
+        # @return [Array<Version>] The Swift versions supported by the specification.
+        #
+        def swift_versions
+          @swift_versions ||= begin
+            swift_versions = Array(attributes_hash['swift_versions'])
+            # Pre 1.7.0, the DSL was singularized as it supported only a single version of Swift. In 1.7.0 the DSL
+            # is now pluralized always and a specification can support multiple versions of Swift. This ensures
+            # we parse the old JSON serialized format and include it as part of the Swift versions supported.
+            swift_versions << attributes_hash['swift_version'] unless attributes_hash['swift_version'].nil?
+            swift_versions.map { |swift_version| Version.new(swift_version) }.uniq.sort
+          end
         end
 
         # @return [Requirement] The CocoaPods version required to use the specification.

data/lib/cocoapods-core/version.rb

@@ -221,7 +221,9 @@ module Pod
             return  1 if rhs.nil?
           end
 
-          return lhs <=> rhs if lhs <=> rhs
+          if comparison = lhs <=> rhs
+            return comparison
+          end
           return 1 if lhs.is_a?(String) && rhs.is_a?(Numeric)
           return -1 if lhs.is_a?(Numeric) && rhs.is_a?(String)
         end

data/lib/cocoapods-core/yaml_helper.rb

@@ -239,6 +239,8 @@ module Pod
         end
       end
 
+      public
+
       # Sorts an array according to the string representation of it values.
       # This method allows to sort arrays which contains strings or hashes.
       #
@@ -259,6 +261,8 @@ module Pod
         end.map(&:first)
       end
 
+      private
+
       # Returns the string representation of a value useful for sorting.
       #
       # @param  [String, Symbol, Array, Hash] value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,6 +87,7 @@ files:
 - LICENSE
 - README.md
 - lib/cocoapods-core.rb
+- lib/cocoapods-core/cdn_source.rb
 - lib/cocoapods-core/core_ui.rb
 - lib/cocoapods-core/dependency.rb
 - lib/cocoapods-core/gem_version.rb