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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124e2ed7abb0379ce9ee365c6ced5ea69ff08865
-  data.tar.gz: 877153422ec76b1f609d8c21410ab76942e2052c
+  metadata.gz: 04b207ad7a8be3b249df95233970fce16e662b04
+  data.tar.gz: 131a182b0be16d16ece4207bced166973a85ba78
 SHA512:
-  metadata.gz: cb481a17edf85583140125d9b9b25b5f079edb1354fcf023f71b28f41c95a5c1069f4947cf63b5c8db8345c2851d6977aef705fcbc5884a7f336ffaf347f4005
-  data.tar.gz: 2516b6cb3b755936f8d969f1a348804e9634634f4cb848e2e9690f03a2b3e797730092b5904860cab9568f22d32dab1be6ebfa5be6c613c1c4c1217016d2648e
+  metadata.gz: a2d83bbe5b1d2816b492ed9a06721824ef2b6e4838a655f1ea30fd7a5732cdf333a47474ed8160dfe8d959f5291384392e3b935d2c71c6c8c467b24a89889ddb
+  data.tar.gz: c383a7b24f524330eded861d3d3309e144a899fee2c034b6a868df4b14eb0434186b1f7805c404bcbdcfe694e40a27772a08be777fc0f039c5e4c663e8c59474

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -368,6 +368,10 @@ module Pod
       # @option   options [Boolean] :show_env_vars_in_log
       #           whether this script phase should output the environment variables during execution.
       #
+      # @option   options [Symbol] :execution_position
+      #           specifies the position of which this script phase should be executed. The currently supported values are:
+      #           `:before_compile`, `:after_compile` and `:any` which is the default.
+      #
       # @return   [void]
       #
       def script_phase(options)

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

@@ -585,29 +585,23 @@ module Pod
 
       #--------------------------------------#
 
-      SCRIPT_PHASE_REQUIRED_KEYS = [:name, :script].freeze
-
-      SCRIPT_PHASE_OPTIONAL_KEYS = [:shell_path, :input_files, :output_files, :show_env_vars_in_log].freeze
-
-      ALL_SCRIPT_PHASE_KEYS = (SCRIPT_PHASE_REQUIRED_KEYS + SCRIPT_PHASE_OPTIONAL_KEYS).freeze
-
       # Stores the script phase to add for this target definition.
       #
       # @param  [Hash] options
       #         The options to use for this script phase. The required keys
       #         are: `:name`, `:script`, while the optional keys are:
-      #         `:shell_path`, `:input_files`, `:output_files` and `:show_env_vars_in_log`.
+      #         `:shell_path`, `:input_files`, `:output_files`, `:show_env_vars_in_log` and `:execution_position`.
       #
       # @return [void]
       #
       def store_script_phase(options)
         option_keys = options.keys
-        unrecognized_keys = option_keys - ALL_SCRIPT_PHASE_KEYS
+        unrecognized_keys = option_keys - Specification::ALL_SCRIPT_PHASE_KEYS
         unless unrecognized_keys.empty?
-          raise StandardError, "Unrecognized options `#{unrecognized_keys}` in shell script `#{options}` within `#{name}` target. " \
-            "Available options are `#{ALL_SCRIPT_PHASE_KEYS}`."
+          raise StandardError, "Unrecognized options `#{unrecognized_keys}` in shell script `#{options[:name]}` within `#{name}` target. " \
+            "Available options are `#{Specification::ALL_SCRIPT_PHASE_KEYS}`."
         end
-        missing_required_keys = SCRIPT_PHASE_REQUIRED_KEYS - option_keys
+        missing_required_keys = Specification::SCRIPT_PHASE_REQUIRED_KEYS - option_keys
         unless missing_required_keys.empty?
           raise StandardError, "Missing required shell script phase options `#{missing_required_keys.join(', ')}`"
         end
@@ -615,6 +609,11 @@ module Pod
         if script_phases_hash.map { |script_phase_options| script_phase_options[:name] }.include?(options[:name])
           raise StandardError, "Script phase with name `#{options[:name]}` name already present for target `#{name}`."
         end
+        options[:execution_position] = :any unless options.key?(:execution_position)
+        unless Specification::EXECUTION_POSITION_KEYS.include?(options[:execution_position])
+          raise StandardError, "Invalid execution position value `#{options[:execution_position]}` in shell script `#{options[:name]}` within `#{name}` target. " \
+            "Available options are `#{Specification::EXECUTION_POSITION_KEYS}`."
+        end
         script_phases_hash << options
       end
 

data/lib/cocoapods-core/source.rb

@@ -263,7 +263,7 @@ module Pod
       found = Pathname.glob(pod_path(query)).map { |path| path.basename.to_s }
       if [query] == found
         set = set(query)
-        set if set.specification.name == query
+        set if set.specification_name == query
       end
     end
 

data/lib/cocoapods-core/specification.rb

@@ -346,6 +346,27 @@ module Pod
       @consumers[platform] ||= Consumer.new(self, platform)
     end
 
+    # @return [Bool, String] The prefix_header_file value.
+    #
+    def prefix_header_file
+      attributes_hash['prefix_header_file']
+    end
+
+    # @return [Array<Hash{Symbol=>String}>] The script_phases value.
+    #
+    def script_phases
+      script_phases = attributes_hash['script_phases'] || []
+      script_phases.map do |script_phase|
+        phase = Specification.convert_keys_to_symbol(script_phase)
+        phase[:execution_position] = if phase.key?(:execution_position)
+                                       phase[:execution_position].to_sym
+                                     else
+                                       :any
+                                     end
+        phase
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -370,11 +391,6 @@ module Pod
     #
     # @overload   supported_on_platform?(symbolic_name, deployment_target)
     #
-    #   @param    [Symbol] symbolic_name
-    #             the name of the platform which is checked for support.
-    #
-    #   @param    [String] deployment_target
-    #             the deployment target which is checked for support.
     #
     def supported_on_platform?(*platform)
       platform = Platform.new(*platform)
@@ -456,7 +472,7 @@ module Pod
     # @param  [Object] value
     #         the value to store.
     #
-    # @param  [Symbol] platform.
+    # @param  [Symbol] platform_name
     #         If provided the attribute is stored only for the given platform.
     #
     # @note   If the provides value is Hash the keys are converted to a string.
@@ -465,7 +481,7 @@ module Pod
     #
     def store_attribute(name, value, platform_name = nil)
       name = name.to_s
-      value = convert_keys_to_string(value) if value.is_a?(Hash)
+      value = Specification.convert_keys_to_string(value) if value.is_a?(Hash)
       value = value.strip_heredoc.strip if value.respond_to?(:strip_heredoc)
       if platform_name
         platform_name = platform_name.to_s
@@ -489,8 +505,6 @@ module Pod
       end
     end
 
-    private
-
     # Converts the keys of the given hash to a string.
     #
     # @param  [Object] value
@@ -498,16 +512,33 @@ module Pod
     #
     # @return [Hash] the hash with the strings instead of the keys.
     #
-    def convert_keys_to_string(value)
+    def self.convert_keys_to_string(value)
       return unless value
       result = {}
       value.each do |key, subvalue|
-        subvalue = convert_keys_to_string(subvalue) if subvalue.is_a?(Hash)
+        subvalue = Specification.convert_keys_to_string(subvalue) if subvalue.is_a?(Hash)
         result[key.to_s] = subvalue
       end
       result
     end
 
+    # Converts the keys of the given hash to a string.
+    #
+    # @param  [Object] value
+    #         the value that needs to be stripped from the Symbols.
+    #
+    # @return [Hash] the hash with the strings instead of the keys.
+    #
+    def self.convert_keys_to_symbol(value)
+      return unless value
+      result = {}
+      value.each do |key, subvalue|
+        subvalue = Specification.convert_keys_to_symbol(subvalue) if subvalue.is_a?(Hash)
+        result[key.to_sym] = subvalue
+      end
+      result
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -649,7 +680,7 @@ module Pod
     def validate_cocoapods_version
       unless cocoapods_version.satisfied_by?(Version.create(CORE_VERSION))
         raise Informative, "`#{name}` requires CocoaPods version `#{cocoapods_version}`, " \
-                           "which is not satisified by your current version, `#{CORE_VERSION}`."
+                           "which is not satisfied by your current version, `#{CORE_VERSION}`."
       end
     end
   end

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

@@ -179,6 +179,11 @@ module Pod
       #
       spec_attr_accessor :resource_bundles
 
+      # @return [Array<Hash{Symbol=>String}>] An array of hashes where each hash
+      #         represents a script phase.
+      #
+      spec_attr_accessor :script_phases
+
       # @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.
@@ -324,7 +329,11 @@ module Pod
       #
       def prepare_value(attr, value)
         if attr.container == Array
-          value = [*value].compact
+          value = if value.is_a?(Hash)
+                    [value]
+                  else
+                    [*value].compact
+                  end
         end
 
         hook_name = prepare_hook_name(attr)
@@ -362,6 +371,29 @@ module Pod
         end
       end
 
+      # Converts the array of hashes (script phases) where keys are strings into symbols.
+      #
+      # @param  [Array<Hash{String=>String}>] value.
+      #         The value of the attribute as specified by the user.
+      #
+      # @return [Array<Hash{Symbol=>String}>] the script phases array with symbols for each hash instead of strings.
+      #
+      def _prepare_script_phases(value)
+        if value
+          value.map do |script_phase|
+            if script_phase.is_a?(Hash)
+              phase = Specification.convert_keys_to_symbol(script_phase)
+              phase[:execution_position] = if phase.key?(:execution_position)
+                                             phase[:execution_position].to_sym
+                                           else
+                                             :any
+                                           end
+              phase
+            end
+          end.compact
+        end
+      end
+
       # Ensures that the file patterns of the resource bundles are contained in
       # an array.
       #

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

@@ -855,20 +855,31 @@ module Pod
       #
       #   A path to a prefix header file to inject in the prefix header of the
       #   pod project.
+      #   `false` indicates that the default CocoaPods prefix header should not
+      #   be generated.
+      #   `true` is the default and indicates that the default CocoaPods prefix
+      #   header should be generated.
       #
       #   ---
       #
-      #   This attribute is __not recommended__ as Pods should not pollute the
-      #   prefix header of other libraries or of the user project.
+      #   The file path options is __not recommended__ as Pods should not
+      #   pollute the prefix header of other libraries or of the user project.
+      #
       #
       #   @example
       #
       #     spec.prefix_header_file = 'iphone/include/prefix.pch'
       #
-      #   @param  [String] path
-      #           The path to the prefix header file.
+      #   @example
+      #
+      #     spec.prefix_header_file = false
+      #
+      #   @param  [Bool, String] path
+      #           The path to the prefix header file or whether to disable
+      #           prefix_header generation.
       #
       attribute :prefix_header_file,
+                :types => [TrueClass, FalseClass, String],
                 :inherited => true
 
       #------------------#
@@ -1123,7 +1134,7 @@ module Pod
 
       #------------------#
 
-      # @!method resource_bundles=(*frameworks)
+      # @!method resource_bundles=(*resource_bundles)
       #
       #   This attribute allows to define the name and the file of the resource
       #   bundles which should be built for the Pod. They are specified as a
@@ -1261,6 +1272,55 @@ module Pod
       attribute :module_map,
                 :root_only     => true
 
+      #------------------#
+
+      SCRIPT_PHASE_REQUIRED_KEYS = [:name, :script].freeze
+
+      SCRIPT_PHASE_OPTIONAL_KEYS = [:shell_path, :input_files, :output_files, :show_env_vars_in_log, :execution_position].freeze
+
+      EXECUTION_POSITION_KEYS = [:before_compile, :after_compile, :any].freeze
+
+      ALL_SCRIPT_PHASE_KEYS = (SCRIPT_PHASE_REQUIRED_KEYS + SCRIPT_PHASE_OPTIONAL_KEYS).freeze
+
+      # @!method script_phases=(*script_phases)
+      #
+      #   This attribute allows to define a script phase to execute as part of compilation of the Pod.
+      #   Unlike a prepare command, script phases execute as part of `xcodebuild` they can also utilize all environment
+      #   variables that are set during compilation.
+      #
+      #   A Pod can provide multiple script phases to execute and they will be added in the order they were
+      #   declared and after taking into consideration their execution position setting.
+      #
+      #   **Note** In order to provide visibility and awareness of the contents of all script phases,
+      #   a warning will be presented to the user upon installing your pod if it includes any script phases.
+      #
+      #   @example
+      #
+      #     spec.script_phase = { :name => 'Hello World', :script => 'echo "Hello World"' }
+      #
+      #   @example
+      #
+      #     spec.script_phase = { :name => 'Hello World', :script => 'echo "Hello World"', :execution_position => :before_compile }
+      #
+      #   @example
+      #
+      #     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' } },
+      #       ]
+      #
+      #   @param  [Array<Hash{Symbol=>String}>] script_phases
+      #           An array of hashes where each hash represents a single script phase.
+      #
+      attribute :script_phases,
+                :types => [Hash],
+                :container => Array,
+                :singularize => true
+
       #-----------------------------------------------------------------------#
 
       # @!group Subspecs

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

@@ -394,6 +394,27 @@ module Pod
         end
       end
 
+      # Performs validations related to the `script_phases` attribute.
+      #
+      def _validate_script_phases(s)
+        s.each do |script_phase|
+          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}`.")
+          end
+          missing_required_keys = Specification::SCRIPT_PHASE_REQUIRED_KEYS - keys
+          unless missing_required_keys.empty?
+            results.add_error('script_phases', "Missing required shell script phase options `#{missing_required_keys.join(', ')}` in script phase `#{script_phase[:name]}`.")
+          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}`.")
+          end
+        end
+      end
+
       # Performs validations related to github sources.
       #
       def perform_github_source_checks(s)

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

@@ -92,7 +92,7 @@ module Pod
           if license.is_a?(String)
             { :type => license }
           elsif license.is_a?(Hash)
-            license = convert_keys_to_symbol(license)
+            license = Specification.convert_keys_to_symbol(license)
             license[:text] = license[:text].strip_heredoc if license[:text]
             license
           else
@@ -110,7 +110,7 @@ module Pod
         #         should be retrieved.
         #
         def source
-          convert_keys_to_symbol(attributes_hash['source'])
+          Specification.convert_keys_to_symbol(attributes_hash['source'])
         end
 
         # @return [String] A short description of the Pod.
@@ -187,27 +187,6 @@ module Pod
         end
 
         #---------------------------------------------------------------------#
-
-        private
-
-        # Converts the keys of the given hash to a string.
-        #
-        # @param  [Object] value
-        #         the value that needs to be stripped from the Symbols.
-        #
-        # @return [Hash] the hash with the strings instead of the keys.
-        #
-        def convert_keys_to_symbol(value)
-          return unless value
-          result = {}
-          value.each do |key, subvalue|
-            subvalue = convert_keys_to_symbol(subvalue) if subvalue.is_a?(Hash)
-            result[key.to_sym] = subvalue
-          end
-          result
-        end
-
-        #---------------------------------------------------------------------#
       end
     end
   end

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

@@ -30,7 +30,7 @@ module Pod
       #         the sources that contain a Pod.
       #
       def initialize(name, sources = [])
-        @name    = name
+        @name = name
         @sources = Array(sources)
       end
 
@@ -50,6 +50,12 @@ module Pod
         Specification.from_file(highest_version_spec_path)
       end
 
+      # @return [Specification] the top level specification for this set for any version.
+      #
+      def specification_name
+        Specification.from_file(specification_paths_for_version(any_version).first).name
+      end
+
       # @return [Array<String>] the paths to specifications for the given
       #         version
       #
@@ -78,18 +84,16 @@ module Pod
       #         is used to disambiguate.
       #
       def highest_version_spec_path
-        specification_paths_for_version(highest_version).first
+        @highest_version_spec_path ||= specification_paths_for_version(highest_version).first
       end
 
       # @return [Hash{Source => Version}] all the available versions for the
       #         Pod grouped by source.
       #
       def versions_by_source
-        result = {}
-        sources.each do |source|
+        @versions_by_source ||= sources.each_with_object({}) do |source, result|
           result[source] = source.versions(name)
         end
-        result
       end
 
       def ==(other)
@@ -127,6 +131,14 @@ module Pod
         }
       end
 
+      private
+
+      # @return [Version] A version known for this specification.
+      #
+      def any_version
+        versions_by_source.values.flatten.uniq.first
+      end
+
       #-----------------------------------------------------------------------#
 
       # The Set::External class handles Pods from external sources. Pods from

metadata

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