cocoapods-core 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c063b0b4e40e944f935689ca0428f16995165a1
-  data.tar.gz: 080d1eb8b262d0b82a96988c993bccc0565648cf
+  metadata.gz: 96af737ecf934debea04d7435690a369c6f23560
+  data.tar.gz: 336c3874933dc9d7176bba6c8195365b23e34e56
 SHA512:
-  metadata.gz: 1cb45d36de1199af2850a25e01c98c0fe5665d4e69d501accfc9bf816c596440fe76c9de6b3d5406f9f75c115713ee013e520cb89a7ef04ab4acc8c739e55305
-  data.tar.gz: d2bd75318fd914971f490e6c8d9f5744c382519667289c1fce767e2a55467788bd725eeb4b55985b7ed3c45fca76d38f5fb3ff2f2bcd25ba298de4d6a5c50b00
+  metadata.gz: 2f1d8ae60360d5bc05fb344fcd63a4347a1df6cb9a48bc76337e2f32cdd6ab8bc384d93dcf5dadb033af42eb9b49b99a8451a28ecfddd3efb6fb9b573e8dcdaf
+  data.tar.gz: 0aa890f8197e50892c1ea190b83e3d8596fffa578866adf5f7568ee36104f1d5ac90c05bb924db947f4fe9f58bcb1f520e99de76a154765e795ba385b5176f79

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -458,6 +458,25 @@ module Pod
 
       #------------------#
 
+      # @!method static_framework=(flag)
+      #
+      #   Indicates, that if use_frameworks! is specified, the
+      #   pod should include a static library framework.
+      #
+      #   @example
+      #
+      #     spec.static_framework = true
+      #
+      #   @param [Bool] flag
+      #          Indicates, that if use_frameworks! is specified, the
+      #          pod should include a static library framework.
+      #
+      root_attribute :static_framework,
+                     :types => [TrueClass, FalseClass],
+                     :default_value => false
+
+      #------------------#
+
       # @!method deprecated=(flag)
       #
       #   Whether the library has been deprecated.
@@ -1336,10 +1355,14 @@ module Pod
       #
       #   test_spec.test_type = :unit
       #
-      # @param  [Symbol] type
+      # @example
+      #
+      #   test_spec.test_type = 'unit'
+      #
+      # @param  [Symbol, String] type
       #         The test type to use.
       attribute :test_type,
-                :types => [Symbol],
+                :types => [Symbol, String],
                 :multi_platform => false
 
       # Represents a test specification for the library. Here you can place all

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

@@ -26,8 +26,12 @@ module Pod
           platforms = Hash[available_platforms.map { |p| [p.name.to_s, p.deployment_target && p.deployment_target.to_s] }]
           hash['platforms'] = platforms
         end
-        unless subspecs.empty?
-          hash['subspecs'] = subspecs.map(&:to_hash)
+        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
         hash
       end
@@ -49,25 +53,33 @@ module Pod
 
     # Configures a new specification from the given hash.
     #
-    # @param  [Hash] the hash which contains the information of the
+    # @param  [Hash] hash the hash which contains the information of the
     #         specification.
     #
+    # @param  [Specification] parent the parent of the specification unless the
+    #         specification is a root.
+    #
     # @return [Specification] the specification
     #
     def self.from_hash(hash, parent = nil)
       spec = Spec.new(parent)
       attributes_hash = hash.dup
       subspecs = attributes_hash.delete('subspecs')
+      testspecs = attributes_hash.delete('testspecs')
       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)
-        end
-      end
+      spec.subspecs.concat(subspecs_from_hash(spec, subspecs))
+      spec.subspecs.concat(subspecs_from_hash(spec, testspecs))
       spec
     end
 
+    def self.subspecs_from_hash(spec, subspecs)
+      return [] if subspecs.nil?
+      subspecs.map do |s_hash|
+        Specification.from_hash(s_hash, spec)
+      end
+    end
+
     #-----------------------------------------------------------------------#
   end
 end

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

@@ -384,8 +384,8 @@ module Pod
           results.add_error('test_type', 'Test type can only be used for test specifications.')
           return
         end
-        supported_test_types = Specification::DSL::SUPPORTED_TEST_TYPES
-        unless supported_test_types.include?(t)
+        supported_test_types = Specification::DSL::SUPPORTED_TEST_TYPES.map(&:to_s)
+        unless supported_test_types.include?(t.to_s)
           results.add_error('test_type', "The test type `#{t}` is not supported. " \
             "Supported test type values are #{supported_test_types}.")
         end

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

@@ -152,6 +152,13 @@ module Pod
           command.strip_heredoc.chomp if command
         end
 
+        # @return [Bool] Indicates, that if use_frameworks! is specified, the
+        #         framework should include a static library.
+        #
+        def static_framework
+          attributes_hash['static_framework']
+        end
+
         # @return [Bool] Whether the Pod has been deprecated.
         #
         def deprecated

data/lib/cocoapods-core/yaml_helper.rb

@@ -96,6 +96,7 @@ module Pod
         case value
         when Array      then process_array(value)
         when Hash       then process_hash(value, hash_keys_hint)
+        when String     then process_string(value)
         else                 YAML.dump(value, :line_width => 2**31 - 1).sub(/\A---/, '').sub(/[.]{3}\s*\Z/, '')
         end.strip
       end
@@ -270,6 +271,35 @@ module Pod
         when Symbol then sorting_string(value.to_s)
         when Array  then sorting_string(value.first)
         when Hash   then value.keys.map { |key| key.to_s.downcase }.sort.first
+        else             raise "Cannot sort #{value.inspect}"
+        end
+      end
+
+      RESOLVED_TAGS = [
+        'null', 'Null', 'NULL', '~', '', # resolve to null
+        'true', 'True', 'TRUE', 'false', 'False', 'FALSE', # bool
+        /[-+]?[0-9]+/, # base 10 int
+        /00[0-7]+/, # base 8 int
+        /0x[0-9a-fA-F]+/, # base 16 int
+        /[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?/, # float
+        /[-+]?\.(inf|Inf|INF)/, # infinity
+        /\.(nan|NaN|NAN)/, # NaN
+      ].freeze
+      private_constant :RESOLVED_TAGS
+
+      RESOLVED_TAGS_PATTERN = /\A#{Regexp.union(RESOLVED_TAGS)}\z/
+      private_constant :RESOLVED_TAGS_PATTERN
+
+      def process_string(string)
+        case string
+        when /\A\s*\z/
+          string.inspect
+        when RESOLVED_TAGS_PATTERN
+          "'#{string}'"
+        when %r{\A\w[\w/ \(\)~<>=\.-]*\z}
+          string
+        else
+          string.inspect
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport