cocoapods-core 1.2.1 → 1.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1de14c247ae7bcd804ad2a80098c0f7619c6063
-  data.tar.gz: f9a9501dd9e17b952442b11cddee85bcee0d1d75
+  metadata.gz: dd5bbd87ab68623c39c934248891b30a148f27ad
+  data.tar.gz: 4cd668a92915fc51452e08a69e5fe5d4f32a3341
 SHA512:
-  metadata.gz: 5f685cc69b6259f8bf6a73f8e79fa00763d14782596c642e5ac62306f60f32a5cb6f85bf3e7b085bd86f3e1cb58cc3ac23272f89cfbe959e4317fa983d70965d
-  data.tar.gz: cce835c31af2dd9064822d99dc9f74dfdb065451ccfb4bcd389b7ff1c588aa3b12a3908ac5a6f11f2e4d966ba8b93b1158bae2132695d465a519ee9d5da82ddb
+  metadata.gz: 94c167d862dc5230ad19caf7ac4a2c7c5b50eec997c6d0ce77190abff8866aca95d9a4dc5c045a74c94f35ff25df771a2f23d09b08cf7074d524674c9276d883
+  data.tar.gz: 299de42c3b2ed71dd7ce9e8b442fe788b6281c1ea8ac90ed9428d49509bc15163a67095ddd37108f288c9668c7402867a395774c0ae63fce3637108b9bbc2c9b

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/github.rb

@@ -131,7 +131,7 @@ module Pod
     # @return [Nil] if the given url is not a valid github repo url.
     #
     def self.repo_id_from_url(url)
-      url[%r{github.com/([^/]*/[^/]*)\.*}, 1]
+      url[%r{github.com[/:]([^/]*/(?:(?!\.git)[^/])*)\.*}, 1]
     end
 
     # Performs a get request with the given URL.

data/lib/cocoapods-core/master_source.rb

@@ -1,35 +1,7 @@
 module Pod
   class MasterSource < Source
-    # @!group Updating the source
-    #-------------------------------------------------------------------------#
-
-    # Updates the local clone of the source repo.
-    #
-    # @param  [Bool] show_output
-    #
-    # @return  [Array<String>] changed_spec_paths
-    #          Returns the list of changed spec paths.
-    #
-    def update(show_output)
-      if requires_update?
-        super
-      else
-        []
-      end
-    end
-
-    private
-
-    # Returns whether a source requires updating.
-    #
-    # @param [Source] source
-    #        The source to check.
-    #
-    # @return [Bool] Whether the given source should be updated.
-    #
-    def requires_update?
-      commit_hash = git_commit_hash
-      GitHub.modified_since_commit('CocoaPods/Specs', commit_hash)
-    end
+    # For now, the MasterSource behaves exactly the same as any other Source.
+    # In the future we may apply separate logic to the MasterSource that doesn't
+    # depend on the file system.
   end
 end

data/lib/cocoapods-core/platform.rb

@@ -67,6 +67,14 @@ module Pod
       new :osx
     end
 
+    # Convenience method to initialize a macOS platform.
+    #
+    # @return [Platform] a macOS platform.
+    #
+    def self.macos
+      osx
+    end
+
     # Convenience method to initialize a tvOS platform.
     #
     # @return [Platform] a tvOS platform.
@@ -224,7 +232,7 @@ module Pod
     def self.string_name(symbolic_name)
       case symbolic_name
       when :ios then 'iOS'
-      when :osx then 'OS X'
+      when :osx then 'macOS'
       when :watchos then 'watchOS'
       when :tvos then 'tvOS'
       else symbolic_name.to_s

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

@@ -483,6 +483,7 @@ module Pod
       # @return [void]
       #
       def set_platform(name, target = nil)
+        name = :osx if name == :macos
         unless [:ios, :osx, :tvos, :watchos].include?(name)
           raise StandardError, "Unsupported platform `#{name}`. Platform " \
             'must be `:ios`, `:osx`, `:tvos`, or `:watchos`.'

data/lib/cocoapods-core/source.rb

@@ -330,6 +330,7 @@ module Pod
     #          Returns the list of changed spec paths.
     #
     def update(show_output)
+      return [] if unchanged_github_repo?
       prev_commit_hash = git_commit_hash
       update_git_repo(show_output)
       refresh_metadata
@@ -437,6 +438,12 @@ module Pod
       (`#{command}` || '').strip
     end
 
+    def unchanged_github_repo?
+      url = repo_git(%w(config --get remote.origin.url))
+      return unless url =~ /github.com/
+      !GitHub.modified_since_commit(url, git_commit_hash)
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods-core/specification.rb

@@ -34,13 +34,18 @@ module Pod
     # @param  [String] name
     #         the name of the specification.
     #
-    def initialize(parent = nil, name = nil)
+    # @param [Bool] test_specification
+    #        Whether the specification is a test specification
+    #
+    def initialize(parent = nil, name = nil, test_specification = false)
       @attributes_hash = {}
       @subspecs = []
       @consumers = {}
       @parent = parent
       @hash_value = nil
+      @test_specification = test_specification
       attributes_hash['name'] = name
+      attributes_hash['test_type'] = :unit if test_specification
 
       yield self if block_given?
     end
@@ -54,6 +59,11 @@ module Pod
     #
     attr_accessor :subspecs
 
+    # @return [Bool] If this specification is a test specification.
+    #
+    attr_accessor :test_specification
+    alias_method :test_specification?, :test_specification
+
     # Checks if a specification is equal to the given one according its name
     # and to its version.
     #
@@ -203,7 +213,20 @@ module Pod
 
     # @!group Dependencies & Subspecs
 
-    # @return [Array<Specifications>] the recursive list of all the subspecs of
+    # @return [Symbol] the test type supported if this is a test specification.
+    #
+    def test_type
+      attributes_hash['test_type'].to_sym
+    end
+
+    # @return [Array<Specification>] the list of all the test subspecs of
+    #         a specification.
+    #
+    def test_specs
+      subspecs.select(&:test_specification?)
+    end
+
+    # @return [Array<Specification>] the recursive list of all the subspecs of
     #         a specification.
     #
     def recursive_subspecs
@@ -232,7 +255,7 @@ module Pod
     #
     # @return   [Specification] the subspec with the given name or self.
     #
-    def subspec_by_name(relative_name, raise_if_missing = true)
+    def subspec_by_name(relative_name, raise_if_missing = true, include_test_specifications = false)
       if relative_name.nil? || relative_name == base_name
         self
       elsif relative_name.downcase == base_name.downcase
@@ -241,7 +264,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 }
+        subspec = subspecs.find { |s| s.base_name == subspec_name && (include_test_specifications || !s.test_specification?) }
         unless subspec
           if raise_if_missing
             raise Informative, 'Unable to find a specification named ' \
@@ -250,7 +273,7 @@ module Pod
             return nil
           end
         end
-        subspec.subspec_by_name(remainder, raise_if_missing)
+        subspec.subspec_by_name(remainder, raise_if_missing, include_test_specifications)
       end
     end
 
@@ -274,7 +297,7 @@ module Pod
     #
     def subspec_dependencies(platform = nil)
       specs = if default_subspecs.empty?
-                subspecs.compact
+                subspecs.compact.reject(&:test_specification?)
               else
                 default_subspecs.map do |subspec_name|
                   root.subspec_by_name("#{name}/#{subspec_name}")
@@ -288,9 +311,8 @@ module Pod
 
     # Returns the dependencies on other Pods or subspecs of other Pods.
     #
-    # @param  [Bool] all_platforms
-    #         whether the dependencies should be returned for all platforms
-    #         instead of the active one.
+    # @param  [Platform] platform
+    #         return only dependencies supported on the given platform.
     #
     # @note   External dependencies are inherited by subspecs
     #
@@ -571,7 +593,7 @@ module Pod
       end
 
       spec.defined_in_file = path
-      spec.subspec_by_name(subspec_name)
+      spec.subspec_by_name(subspec_name, true)
     end
 
     # Sets the path of the `podspec` file used to load the specification.

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

@@ -136,6 +136,14 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      # @!group Test Support
+
+      # @return [Symbol] the test type supported by this specification.
+      #
+      spec_attr_accessor :test_type
+
+      #-----------------------------------------------------------------------#
+
       # @!group File patterns
 
       # @return [Array<String>] the source files of the Pod.

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

@@ -539,6 +539,7 @@ module Pod
       #
       def platform=(args)
         name, deployment_target = args
+        name = :osx if name.to_s == 'macos'
         attributes_hash['platforms'] = if name
                                          { name.to_s => deployment_target }
                                        else
@@ -1012,8 +1013,10 @@ module Pod
       #   ---
       #
       #   These are the headers that will be exposed to the user’s project and
-      #   from which documentation will be generated. If no public headers are
-      #   specified then **all** the headers in source_files are considered public.
+      #   from which documentation will be generated. When the library is built,
+      #   these headers will appear in the build directory. If no public headers
+      #   are specified then **all** the headers in source_files are considered
+      #   public.
       #
       #   @example
       #
@@ -1037,7 +1040,13 @@ module Pod
       #   These patterns are matched against the public headers (or all the
       #   headers if no public headers have been specified) to exclude those
       #   headers which should not be exposed to the user project and which
-      #   should not be used to generate the documentation.
+      #   should not be used to generate the documentation. When the library
+      #   is built, these headers will appear in the build directory.
+      #
+      #   Header files that are not listed as neither public nor private will
+      #   be treated as private, but in addition will not appear in the build
+      #   directory at all.
+      #
       #
       #   @example
       #
@@ -1316,6 +1325,46 @@ module Pod
         subspec
       end
 
+      # The list of the test types currently supported.
+      #
+      SUPPORTED_TEST_TYPES = [:unit].freeze
+
+      # The test type this specification supports. This only applies to test specifications.
+      #
+      # ---
+      #
+      # @example
+      #
+      #   test_spec.test_type = :unit
+      #
+      # @param  [Symbol] type
+      #         The test type to use.
+      attribute :test_type,
+                :types => [Symbol],
+                :multi_platform => false
+
+      # Represents a test specification for the library. Here you can place all
+      # your tests for your podspec along with the test dependencies.
+      #
+      # ---
+      #
+      # @example
+      #
+      #   Pod::Spec.new do |spec|
+      #     spec.name = 'NSAttributedString+CCLFormat'
+      #
+      #     spec.test_spec do |test_spec|
+      #       test_spec.source_files = 'NSAttributedString+CCLFormatTests.m'
+      #       test_spec.dependency 'Expecta'
+      #     end
+      #   end
+      #
+      def test_spec(name = 'Tests', &block)
+        subspec = Specification.new(self, name, true, &block)
+        @subspecs << subspec
+        subspec
+      end
+
       #------------------#
 
       # @!method default_subspecs=(subspec_array)
@@ -1390,6 +1439,8 @@ module Pod
         PlatformProxy.new(self, :osx)
       end
 
+      alias macos osx
+
       # Provides support for specifying tvOS attributes.
       #
       # @example

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

@@ -59,6 +59,7 @@ module Pod
       attributes_hash = hash.dup
       subspecs = attributes_hash.delete('subspecs')
       spec.attributes_hash = attributes_hash
+      spec.test_specification = !attributes_hash['test_type'].nil?
       if subspecs
         spec.subspecs = subspecs.map do |s_hash|
           Specification.from_hash(s_hash, spec)

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

@@ -128,7 +128,7 @@ module Pod
         run_validation_hooks(attributes, spec)
       end
 
-      # Run validations for multi-platform attributes activating .
+      # Run validations for multi-platform attributes activating.
       #
       # @return [void]
       #
@@ -364,6 +364,16 @@ module Pod
         end
       end
 
+      def _validate_test_type(t)
+        unless consumer.spec.test_specification?
+          results.add_error('test_type', 'Test type can only be used for test specifications.')
+          return
+        end
+        supported_test_types = Specification::DSL::SUPPORTED_TEST_TYPES
+        results.add_error('test_type', "The test type `#{t}` is not supported. " \
+          "Supported test type values are #{supported_test_types}.") unless supported_test_types.include?(t)
+      end
+
       # Performs validations related to github sources.
       #
       def perform_github_source_checks(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -20,7 +20,7 @@ dependencies:
         version: 4.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 4.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement