cocoapods-core 1.6.0.beta.1 → 1.6.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dae9d3dece7425ab43ea990f84a8bbe4600503e1f46d19130448e3717ef400b
-  data.tar.gz: 7410712d03ed8f2e9dd6da1474d9381bb7a41b42a0acd9841481edbe379d5854
+  metadata.gz: 0afc2b42bd9023c362660d1bf6319d82e11adc16881b3b32fe28f412e1cae616
+  data.tar.gz: b76bd25972cb5b052938c05219b9aa859e13721de0e22f06f1012524fd535f8e
 SHA512:
-  metadata.gz: 5c8cca08c3b62e15490c366c4798fa36873ef24896a2de729e473985db4f9bb1df80886e0c00da717058a03821afe82785b46204fb4dc4a41f2095deba6df700
-  data.tar.gz: 3b49fa4dc1ad035ef0ae6c96a74977d53f70a62886965d3ad5924c4fac137061b5ea149a3e3d1b1dcf3dc3e8cdc51aa5fc3cd857560192977b85a0c006428b5c
+  metadata.gz: '019d4fa7c2faab7bea1ae65235c95f706d628f6e801c9d8ff14527132b4b22cb974b20bd5ac6d748cdca4439f13f957e33c4a905a5b5d4de1bac776dd43674a1'
+  data.tar.gz: 381cc2e97f447fbfe702a95a0a897456991f627789bde825d5b0ef930d361dfb7281173658228687405a41a3dfa989b23dcf8d02d32f13f95e8dee011bb72147

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/podfile.rb

@@ -307,10 +307,6 @@ module Pod
 
     # Configures a new Podfile from the given YAML representation.
     #
-    # @param  [String] yaml
-    #         The YAML encoded hash which contains the information of the
-    #         Podfile.
-    #
     # @param  [Pathname] path
     #         The path from which the Podfile is loaded.
     #

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

@@ -586,7 +586,7 @@ module Pod
         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`.'
+            'must be `:ios`, `:osx`, `:macos`, `:tvos`, or `:watchos`.'
         end
 
         if target
@@ -663,15 +663,24 @@ module Pod
       # @return [void]
       #
       def store_podspec(options = nil)
-        if options
-          unless options.keys.all? { |key| [:name, :path].include?(key) }
-            raise StandardError, 'Unrecognized options for the podspec ' \
-              "method `#{options}`"
+        options ||= {}
+        unless options.keys.all? { |key| [:name, :path, :subspecs, :subspec].include?(key) }
+          raise StandardError, 'Unrecognized options for the podspec ' \
+            "method `#{options}`"
+        end
+        if subspec_name = options[:subspec]
+          unless subspec_name.is_a?(String)
+            raise StandardError, "Option `:subspec => #{subspec_name.inspect}` should be a String"
+          end
+        end
+        if subspec_names = options[:subspecs]
+          if !subspec_names.is_a?(Array) || !subspec_names.all? { |name| name.is_a? String }
+            raise StandardError, "Option `:subspecs => #{subspec_names.inspect}` " \
+            'should be an Array of Strings'
           end
-          get_hash_value('podspecs', []) << options
-        else
-          get_hash_value('podspecs', []) << { :autodetect => true }
         end
+        options[:autodetect] = true if !options.include?(:name) && !options.include?(:path)
+        get_hash_value('podspecs', []) << options
       end
 
       #--------------------------------------#
@@ -907,9 +916,18 @@ module Pod
         podspecs.map do |options|
           file = podspec_path_from_options(options)
           spec = Specification.from_file(file)
-          all_specs = [spec, *spec.recursive_subspecs]
-          all_deps = all_specs.map { |s| s.dependencies(platform) }.flatten
-          all_deps.reject { |dep| dep.root_name == spec.root.name }
+          subspec_names = options[:subspecs] || options[:subspec]
+          specs = if subspec_names.blank?
+                    [spec]
+                  else
+                    subspec_names = [subspec_names] if subspec_names.is_a?(String)
+                    subspec_names.map { |subspec_name| spec.subspec_by_name("#{spec.name}/#{subspec_name}") }
+                  end
+          specs.map do |subspec|
+            all_specs = [subspec, *subspec.recursive_subspecs]
+            all_deps = all_specs.map { |s| s.dependencies(platform) }.flatten
+            all_deps.reject { |dep| dep.root_name == subspec.root.name }
+          end.flatten
         end.flatten.uniq
       end
 

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

@@ -988,13 +988,13 @@ module Pod
       #
       #   @example
       #
-      #     spec.script_phase = { :name => 'Hello World', :script => 'puts "Hello World"', :shell_path => '/usr/bin/ruby' } }
+      #     spec.script_phase = { :name => 'Hello World', :script => 'puts "Hello World"', :shell_path => '/usr/bin/ruby' }
       #
       #   @example
       #
       #     spec.script_phases = [
       #         { :name => 'Hello World', :script => 'echo "Hello World"' },
-      #         { :name => 'Hello Ruby World', :script => 'puts "Hello World"', :shell_path => '/usr/bin/ruby' } },
+      #         { :name => 'Hello Ruby World', :script => 'puts "Hello World"', :shell_path => '/usr/bin/ruby' },
       #       ]
       #
       #   @param  [Array<Hash{Symbol=>String}>] script_phases

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.6.0.beta.1
+  version: 1.6.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport