cocoapods-core 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27023cacaa567adc10f3c6c07f9fa9f3b60246771e1ac6960db97d3b7524b10e
-  data.tar.gz: 22d2ddd9b8d6566cd64f3a3827ff670592af8c774e88242d85e3d42e6afc9025
+  metadata.gz: 0ad2c3c33b4ea9899853422195b23e20e9b86acfe646575db6f255fbfc1db989
+  data.tar.gz: 326792eaebedfcb50b51c2f23770e878e5050cc93f63e2e7fd3dde7cdbf4061c
 SHA512:
-  metadata.gz: c048a6eb46799df401205b91a0d8aebf1021735cbc3d2f818d08ca6305232c8689cb6727ad61054ba7fd97bfeb3c5e096bdb4a96fc69e5fc3c0402fc748d5a2b
-  data.tar.gz: 7140a164772ee9faa275056c866c3a1bfeba18cddc8d17b691df6ccc6c190ab47ff85fadf6b8ecca02560c210e464e9205537c97c8b1085875b893cdafb9b0f0
+  metadata.gz: 95ea884f860997afdf5532d3641c6eeb3a4048dfca3ab6b0e7416f5f79332bb61fa8b7c2e8b8c9367ca05c00a99183370af2383c0285b9e751bf338e20e68bb2
+  data.tar.gz: 2920b288267a62a81d1cbb73c14129c4d847b3805202e71e70a306bbae86009b31a01dc6d5f82d0da12a2b607b563c306569785f7b7c48b8d51649204854d98d

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/lockfile.rb

@@ -290,13 +290,23 @@ module Pod
       result = {}
       [:added, :changed, :removed, :unchanged].each { |k| result[k] = [] }
 
-      installed_deps = dependencies.map do |dep|
-        dependencies_to_lock_pod_named(dep.root_name)
-      end.flatten
-      all_dep_names = (dependencies + podfile.dependencies).map(&:name).uniq
+      installed_deps = {}
+      dependencies.each do |dep|
+        name = dep.root_name
+        installed_deps[name] ||= dependencies_to_lock_pod_named(name)
+      end
+
+      installed_deps = installed_deps.values.flatten(1).group_by(&:name)
+
+      podfile_dependencies = podfile.dependencies
+      podfile_dependencies_by_name = podfile_dependencies.group_by(&:name)
+
+      all_dep_names = (dependencies + podfile_dependencies).map(&:name).uniq
       all_dep_names.each do |name|
-        installed_dep = installed_deps.find { |d| d.name == name }
-        podfile_dep   = podfile.dependencies.find { |d| d.name == name }
+        installed_dep   = installed_deps[name]
+        installed_dep &&= installed_dep.first
+        podfile_dep     = podfile_dependencies_by_name[name]
+        podfile_dep   &&= podfile_dep.first
 
         if installed_dep.nil?  then key = :added
         elsif podfile_dep.nil? then key = :removed
@@ -477,13 +487,14 @@ module Pod
       # Generates the hash of spec repo sources used in the Podfile.
       #
       # @example  Output
-      #           { "https://github.com/CocoaPods/CocoaPods.git" => ["Alamofire", "Moya"] }
+      #           { "https://github.com/cocoapods/cocoapods.git" => ["Alamofire", "Moya"] }
       #
       def generate_spec_repos(spec_repos)
         Hash[spec_repos.map do |source, specs|
           next unless source
           next if specs.empty?
           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]
         end.compact]

data/lib/cocoapods-core/master_source.rb

@@ -3,5 +3,6 @@ module Pod
     # 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.
+    MASTER_REPO_NAME = 'master'.freeze
   end
 end

data/lib/cocoapods-core/podfile.rb

@@ -231,6 +231,11 @@ module Pod
       end
     end
 
+    def ==(other)
+      self.class == other.class &&
+        root_target_definitions == other.root_target_definitions
+    end
+
     # @!group Class methods
     #-------------------------------------------------------------------------#
 

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

@@ -748,6 +748,12 @@ module Pod
         hash
       end
 
+      def ==(other)
+        self.class == other.class &&
+          internal_hash == other.internal_hash &&
+          children == other.children
+      end
+
       # Configures a new target definition from the given hash.
       #
       # @param  [Hash] the hash which contains the information of the
@@ -767,7 +773,7 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      private
+      protected
 
       # @!group Private helpers
 
@@ -780,6 +786,8 @@ module Pod
       #
       attr_accessor :internal_hash
 
+      private
+
       # Set a value in the internal hash of the target definition for the given
       # key.
       #

data/lib/cocoapods-core/source.rb

@@ -435,7 +435,7 @@ module Pod
 
     def git_tracking_branch
       path = repo.join('.git', 'cocoapods_branch')
-      path.file? ? path.read.strip : 'master'
+      path.file? ? path.read.strip : Pod::MasterSource::MASTER_REPO_NAME
     end
 
     def diff_until_commit_hash(commit_hash)

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

@@ -64,7 +64,7 @@ module Pod
       # @return [Array<Source>] The CocoaPods Master Repo source.
       #
       def master
-        sources(['master']).select { |s| s.repo.directory? }
+        sources([Pod::MasterSource::MASTER_REPO_NAME]).select { |s| s.repo.directory? }
       end
 
       # @!group Master repo
@@ -72,7 +72,7 @@ module Pod
       # @return [Pathname] The path of the master repo.
       #
       def master_repo_dir
-        source_dir('master')
+        source_dir(Pod::MasterSource::MASTER_REPO_NAME)
       end
 
       # @return [Bool] Checks if the master repo is usable.
@@ -283,7 +283,7 @@ module Pod
       #
       def source_from_path(path)
         @sources_by_path ||= Hash.new do |hash, key|
-          hash[key] = if key.basename.to_s == 'master'
+          hash[key] = if key.basename.to_s == Pod::MasterSource::MASTER_REPO_NAME
                         MasterSource.new(key)
                       else
                         Source.new(key)
@@ -386,7 +386,7 @@ module Pod
 
         case url.to_s.downcase
         when %r{github.com[:/]+cocoapods/specs}
-          base = 'master'
+          base = Pod::MasterSource::MASTER_REPO_NAME
         when %r{github.com[:/]+(.+)/(.+)}
           base = Regexp.last_match[1]
         when %r{^\S+@(\S+)[:/]+(.+)$}

data/lib/cocoapods-core/specification.rb

@@ -50,6 +50,16 @@ module Pod
       yield self if block_given?
     end
 
+    def initialize_copy(other)
+      super
+
+      @subspecs = @subspecs.map do |subspec|
+        subspec = subspec.dup
+        subspec.instance_variable_set :@parent, self
+        subspec
+      end
+    end
+
     # @return [Hash] the hash that stores the information of the attributes of
     #         the specification.
     #

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

@@ -666,6 +666,12 @@ module Pod
         attributes_hash['dependencies'][name] = version_requirements
       end
 
+      def dependency=(args)
+        joined = args.join('\', \'')
+        arguments = "\'#{joined}\'"
+        raise Informative, "Cannot assign value to `dependency`. Did you mean: `dependency #{arguments}`?"
+      end
+
       #------------------#
 
       # @!method requires_arc=(flag)
@@ -950,6 +956,55 @@ module Pod
       attribute :header_mappings_dir,
                 :inherited => 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 File patterns
@@ -1157,9 +1212,9 @@ module Pod
       #   hash where the keys represent the name of the bundles and the values
       #   the file patterns that they should include.
       #
-      #   We strongly **recommend** library developers to adopt resource
-      #   bundles as there can be name collisions using the resources
-      #   attribute.
+      #   For building the Pod as a static library, we strongly **recommend**
+      #   library developers to adopt resource bundles as there can be name
+      #   collisions using the resources attribute.
       #
       #   The names of the bundles should at least include the name of the Pod
       #   to minimise the chance of name collisions.
@@ -1194,8 +1249,8 @@ module Pod
       #
       #   A list of resources that should be copied into the target bundle.
       #
-      #   We strongly **recommend** library developers to adopt [resource
-      #   bundles](http://guides.cocoapods.org/syntax/podspec.html#resource_bundles)
+      #   For building the Pod as a static library, we strongly **recommend**
+      #   library developers to adopt [resource bundles](http://guides.cocoapods.org/syntax/podspec.html#resource_bundles)
       #   as there can be name collisions using the resources attribute.
       #   Moreover, resources specified with this attribute are copied
       #   directly to the client target and therefore they are not
@@ -1288,55 +1343,6 @@ 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/yaml_helper.rb

@@ -254,11 +254,9 @@ module Pod
       # @return [Array] The sorted array.
       #
       def sorted_array(array)
-        array.sort do |x, y|
-          x_string = sorting_string(x)
-          y_string = sorting_string(y)
-          x_string <=> y_string
-        end
+        array.each_with_index.sort_by do |element, index|
+          [sorting_string(element), index]
+        end.map(&:first)
       end
 
       # Returns the string representation of a value useful for sorting.
@@ -275,7 +273,7 @@ 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}"
+        else             raise ArgumentError, "Cannot sort #{value.inspect}"
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport