cocoapods-core 0.39.0.beta.5 → 0.39.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0cce19a9396dc1ae60513185830afbf3af68a6a
-  data.tar.gz: 92f9afcaca4c08a68c2d50871c263bd0f02e4ea4
+  metadata.gz: 4b5811fb8da66a24c3eec196ba8e7c03d5e10d15
+  data.tar.gz: 72861dbb796f441a58371a120baf8f92110d8b04
 SHA512:
-  metadata.gz: e9fa0d1e8b277d29d151f90a08a7060aa5f3014770fe79fb210f977904b34944bc64bb6f9b0de4ea92b871d9276e8dfbd659d6c54175aba696499e8f2a65aaee
-  data.tar.gz: 0432b37f724696727e94ccbd7265ab5b7f0f35ff79714ba98f5b322123751470121da64dbced2b9bb5be3eaa54a84e3a4ef69eca1e7e56b30d81a7a77935e670
+  metadata.gz: f0ffeff25cfbf0a2c888c04babb2806f2c269c924e93219c242b40a2f0a14e0a7a3b2ed4edfb3f2fdcd7255522b540005ca9ec58e9257dcee00cb19a193f0e3b
+  data.tar.gz: b13968326dbe8279f8c6b2126e0a7ef163a1ee16d00d5221548c9a0fd1cc7105eb106d1b410fc717dc0c5118f499ce7b2154b2523d75965bb01f90ddfdce06e3

data/lib/cocoapods-core/dependency.rb

@@ -335,7 +335,7 @@ module Pod
       when /HEAD/
         Dependency.new(name, :head)
       else
-        version_requirements =  version.split(',') if version
+        version_requirements = version.split(',') if version
         Dependency.new(name, version_requirements)
       end
     end

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/lockfile.rb

@@ -259,7 +259,7 @@ module Pod
       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
+      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 }

data/lib/cocoapods-core/platform.rb

@@ -206,7 +206,8 @@ module Pod
       when :osx then 'OS X'
       when :watchos then 'watchOS'
       when :tvos then 'tvOS'
-      else symbolic_name.to_s end
+      else symbolic_name.to_s
+      end
     end
   end
 end

data/lib/cocoapods-core/podfile.rb

@@ -183,12 +183,12 @@ module Pod
     # @return [Array] The keys used by the hash representation of the Podfile.
     #
     HASH_KEYS = %w(
-      target_definitions
       workspace
       sources
-      generate_bridge_support
-      set_arc_compatibility_flag
       plugins
+      set_arc_compatibility_flag
+      generate_bridge_support
+      target_definitions
     ).freeze
 
     # @return [Hash] The hash representation of the Podfile.
@@ -203,7 +203,22 @@ module Pod
     # @return [String] The YAML representation of the Podfile.
     #
     def to_yaml
-      to_hash.to_yaml
+      require 'cocoapods-core/yaml_helper'
+      "---\n" << YAMLHelper.convert_hash(to_hash, HASH_KEYS)
+    end
+
+    # @return [String] The SHA1 digest of the file in which the Podfile
+    #         is defined.
+    #
+    # @return [Nil] If the podfile is not defined in a file.
+    #
+    def checksum
+      unless defined_in_file.nil?
+        require 'digest'
+        checksum = Digest::SHA1.hexdigest(File.read(defined_in_file))
+        checksum = checksum.encode('UTF-8') if checksum.respond_to?(:encode)
+        checksum
+      end
     end
 
     # @!group Class methods
@@ -243,7 +258,7 @@ module Pod
     # @return [Podfile] the new Podfile
     #
     def self.from_ruby(path, contents = nil)
-      contents ||= File.open(path, 'r:utf-8') { |f| f.read }
+      contents ||= File.open(path, 'r:utf-8', &:read)
 
       # Work around for Rubinius incomplete encoding in 1.9 mode
       if contents.respond_to?(:encoding) && contents.encoding.name != 'UTF-8'
@@ -285,7 +300,7 @@ module Pod
     # @return [Podfile] the new Podfile
     #
     def self.from_yaml(path)
-      string = File.open(path, 'r:utf-8') { |f| f.read }
+      string = File.open(path, 'r:utf-8', &:read)
       # Work around for Rubinius incomplete encoding in 1.9 mode
       if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
         string.encode!('UTF-8')

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

@@ -20,8 +20,6 @@ module Pod
       # @!group Configuration
       #-----------------------------------------------------------------------#
 
-      # rubocop:disable Style/TrivialAccessors
-
       # Allows to specify an optional callback which is called before
       # analysing every spec. Suitable for UI.
       #
@@ -35,8 +33,6 @@ module Pod
         @pre_check_callback = block
       end
 
-      # rubocop:enable Style/TrivialAccessors
-
       public
 
       # @!group Actions
@@ -113,7 +109,7 @@ module Pod
       #
       def check_spec_path(name, version, spec)
         unless spec.name == name && spec.version.to_s == version.to_s
-          message = "Incorrect path #{ spec.defined_in_file }"
+          message = "Incorrect path #{spec.defined_in_file}"
           report.add_message(:error, message, name, spec.version)
         end
       end

data/lib/cocoapods-core/specification.rb

@@ -495,8 +495,8 @@ module Pod
     # @return [Nil] If the specification is not defined in a file.
     #
     def checksum
-      require 'digest'
       unless defined_in_file.nil?
+        require 'digest'
         checksum = Digest::SHA1.hexdigest(File.read(defined_in_file))
         checksum = checksum.encode('UTF-8') if checksum.respond_to?(:encode)
         checksum
@@ -530,7 +530,7 @@ module Pod
         raise Informative, "No podspec exists at path `#{path}`."
       end
 
-      string = File.open(path, 'r:utf-8') { |f| f.read }
+      string = File.open(path, 'r:utf-8', &:read)
       # Work around for Rubinius incomplete encoding in 1.9 mode
       if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
         string.encode!('UTF-8')

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

@@ -298,7 +298,7 @@ module Pod
       #         prepare hook was defined.
       #
       def prepare_value(attr, value)
-        if attr.container ==  Array
+        if attr.container == Array
           value = [*value].compact
         end
 

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

@@ -18,7 +18,8 @@ module Pod
         # @param  [Symbol] platform @see platform
         #
         def initialize(spec, platform)
-          @spec, @platform = spec, platform
+          @spec = spec
+          @platform = platform
         end
 
         # Defines a setter method for each attribute of the specification

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

@@ -185,7 +185,7 @@ module Pod
       # Performs validations related to the `name` attribute.
       #
       def _validate_name(name)
-        if name =~ /\//
+        if name =~ %r{/}
           results.add_error('name', 'The name of a spec should not contain ' \
                          'a slash.')
         end
@@ -316,7 +316,7 @@ module Pod
         if type.nil?
           results.add_warning('license', 'Missing license type.')
         end
-        if type && type.gsub(' ', '').gsub("\n", '').empty?
+        if type && type.delete(' ').delete("\n").empty?
           results.add_warning('license', 'Invalid license type.')
         end
         if type && type =~ /\(example\)/
@@ -397,7 +397,7 @@ module Pod
       #
       def check_git_ssh_source(s)
         if git = s[:git]
-          if git =~ /\w+\@(\w|\.)+\:(\/\w+)*/
+          if git =~ %r{\w+\@(\w|\.)+\:(/\w+)*}
             results.add_warning('source', 'Git SSH URLs will NOT work for ' \
               'people behind firewalls configured to only allow HTTP, ' \
               'therefore HTTPS is preferred.', true)

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

@@ -26,7 +26,7 @@ module Pod
           # @param [String] message @see message
           #
           def initialize(type, attribute_name, message, public_only = false)
-            @type    = type
+            @type = type
             @attribute_name = attribute_name
             @message = message
             @public_only = public_only

data/lib/cocoapods-core/standard_error.rb

@@ -77,16 +77,16 @@ module Pod
 
         lines      = contents.lines
         indent     = ' #  '
-        indicator  = indent.gsub('#', '>')
+        indicator  = indent.tr('#', '>')
         first_line = (line_numer.zero?)
         last_line  = (line_numer == (lines.count - 1))
 
         m << "\n"
         m << "#{indent}from #{trace_line.gsub(/:in.*$/, '')}\n"
         m << "#{indent}-------------------------------------------\n"
-        m << "#{indent}#{    lines[line_numer - 1] }" unless first_line
-        m << "#{indicator}#{ lines[line_numer] }"
-        m << "#{indent}#{    lines[line_numer + 1] }" unless last_line
+        m << "#{indent}#{lines[line_numer - 1]}" unless first_line
+        m << "#{indicator}#{lines[line_numer]}"
+        m << "#{indent}#{lines[line_numer + 1]}" unless last_line
         m << "\n" unless m.end_with?("\n")
         m << "#{indent}-------------------------------------------\n"
       end

data/lib/cocoapods-core/version.rb

@@ -158,7 +158,8 @@ module Pod
         limit = [segments.size, other_segments.size].max
 
         (0..limit).each do |i|
-          lhs, rhs = segments[i] || 0, other_segments[i] || 0
+          lhs = segments[i] || 0
+          rhs = other_segments[i] || 0
 
           next if lhs == rhs
           return lhs <=> rhs if lhs <=> rhs

data/lib/cocoapods-core/yaml_helper.rb

@@ -55,12 +55,12 @@ module Pod
       #
       def load_string(yaml_string, file_path = nil)
         YAML.load(yaml_string)
-        rescue
-          if yaml_has_merge_error?(yaml_string)
-            raise Informative, yaml_merge_conflict_msg(yaml_string, file_path)
-          else
-            raise Informative, yaml_parsing_error_msg(yaml_string, file_path)
-          end
+      rescue
+        if yaml_has_merge_error?(yaml_string)
+          raise Informative, yaml_merge_conflict_msg(yaml_string, file_path)
+        else
+          raise Informative, yaml_parsing_error_msg(yaml_string, file_path)
+        end
       end
 
       # Loads a YAML file and leans on the #load_string imp
@@ -109,9 +109,21 @@ module Pod
       #
       def process_array(array)
         result = sorted_array(array).map do |array_value|
-          process_according_to_class(array_value)
+          processed = process_according_to_class(array_value)
+          case array_value
+          when Array, Hash
+            if array_value.size > 1
+              processed = processed.gsub(/^.*/).to_a
+              head = processed.shift
+              processed.map { |s| "  #{s}" }.prepend(head).join("\n")
+            else
+              processed
+            end
+          else
+            processed
+          end
         end
-        "- #{result * "\n- "}"
+        "- #{result.join("\n- ").strip}"
       end
 
       # Converts a hash to YAML after sorting its keys. Optionally accepts a
@@ -136,7 +148,7 @@ module Pod
           processed = process_according_to_class(key_value)
           processed_key = process_according_to_class(key)
           case key_value
-          when Array, Hash
+          when Hash, Array
             key_partial_yaml = processed.lines.map { |line| "  #{line}" } * ''
             "#{processed_key}:\n#{key_partial_yaml}"
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.39.0.beta.5
+  version: 0.39.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport