cocoapods-core 0.31.1 → 0.32.0

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

@@ -1,17 +1,15 @@
 module Pod
   class Specification
     module DSL
-
       # Provides the accessors methods for the root attributes. Root attributes
       # do not support multi-platform values and inheritance.
       #
       module RootAttributesAccessors
-
         # @return [String] The name of the specification *not* including the
         #         names of the parents, in case of ‘sub-specifications’.
         #
         def base_name
-          attributes_hash["name"]
+          attributes_hash['name']
         end
 
         # @return [String] The name of the specification including the names of
@@ -30,7 +28,7 @@ module Pod
         #
         def version
           if root?
-            @version ||= Version.new(attributes_hash["version"])
+            @version ||= Version.new(attributes_hash['version'])
           else
             @version ||= root.version
           end
@@ -49,7 +47,7 @@ module Pod
         #   'Author'
         #
         def authors
-          authors = attributes_hash["authors"]
+          authors = attributes_hash['authors']
           if authors.is_a?(Hash)
             authors
           elsif authors.is_a?(Array)
@@ -70,13 +68,13 @@ module Pod
         # @return [String] The social media URL.
         #
         def social_media_url
-          attributes_hash["social_media_url"]
+          attributes_hash['social_media_url']
         end
 
         # @return [String] The docset URL.
         #
         def docset_url
-          attributes_hash["docset_url"]
+          attributes_hash['docset_url']
         end
 
         # @return [Hash] A hash containing the license information of the Pod.
@@ -84,7 +82,7 @@ module Pod
         # @note   The indentation is stripped from the license text.
         #
         def license
-          license = attributes_hash["license"]
+          license = attributes_hash['license']
           if license.is_a?(String)
             { :type => license }
           elsif license.is_a?(Hash)
@@ -99,20 +97,20 @@ module Pod
         # @return [String] The URL of the homepage of the Pod.
         #
         def homepage
-          attributes_hash["homepage"]
+          attributes_hash['homepage']
         end
 
         # @return [Hash{Symbol=>String}] The location from where the library
         #         should be retrieved.
         #
         def source
-          convert_keys_to_symbol(attributes_hash["source"])
+          convert_keys_to_symbol(attributes_hash['source'])
         end
 
         # @return [String] A short description of the Pod.
         #
         def summary
-          attributes_hash["summary"]
+          attributes_hash['summary']
         end
 
         # @return [String] A longer description of the Pod.
@@ -120,7 +118,7 @@ module Pod
         # @note   The indentation is stripped from the description.
         #
         def description
-          description = attributes_hash["description"]
+          description = attributes_hash['description']
           description.strip_heredoc.chomp if description
         end
 
@@ -130,23 +128,36 @@ module Pod
         # @note   The value is coerced to an array.
         #
         def screenshots
-          value = attributes_hash["screenshots"]
+          value = attributes_hash['screenshots']
           [*value]
         end
 
         # @return [String, Nil] The documentation URL of the Pod if specified.
         #
         def documentation_url
-          attributes_hash["documentation_url"]
+          attributes_hash['documentation_url']
         end
 
         # @return [String, Nil] The prepare command of the Pod if specified.
         #
         def prepare_command
-          command = attributes_hash["prepare_command"]
+          command = attributes_hash['prepare_command']
           command.strip_heredoc.chomp if command
         end
 
+        # @return [Bool] Whether the Pod has been deprecated.
+        #
+        def deprecated
+          attributes_hash['deprecated']
+        end
+
+        # @return [String] The name of the Pod that this one has been
+        #         deprecated in favor of.
+        #
+        def deprecated_in_favor_of
+          attributes_hash['deprecated_in_favor_of']
+        end
+
         #---------------------------------------------------------------------#
 
         private
@@ -169,7 +180,6 @@ module Pod
         end
 
         #---------------------------------------------------------------------#
-
       end
     end
   end

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

@@ -3,12 +3,10 @@ require 'active_support/core_ext/array/conversions'
 module Pod
   class Specification
     class Set
-
       # Provides support for presenting a Pod described by a {Set} in a
       # consistent way across clients of CocoaPods-Core.
       #
       class Presenter
-
         # @return [Set] the set that should be presented.
         #
         attr_reader :set
@@ -44,7 +42,7 @@ module Pod
         #           order.
         #
         def versions
-          @set.versions.sort.reverse
+          @set.versions
         end
 
         # @return   [String] all the versions available sorted from the highest
@@ -219,20 +217,19 @@ module Pod
 
           case distance_in_days
           when 0..7
-            "less than a week ago"
+            'less than a week ago'
           when 8..29
             "#{distance_in_days} days ago"
           when 30..45
-            "1 month ago"
+            '1 month ago'
           when 46..365
             "#{(distance_in_days.to_f / 30).round} months ago"
           else
-            "more than a year ago"
+            'more than a year ago'
           end
         end
 
         #---------------------------------------------------------------------#
-
       end
     end
   end

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

@@ -1,7 +1,6 @@
 module Pod
   class Specification
     class Set
-
       # The statistics class provides information about one or more {Set} that
       # is not readily available because expensive to compute or provided by a
       # remote source.
@@ -15,7 +14,6 @@ module Pod
       # cache file a shared instance is also available.
       #
       class Statistics
-
         # @return [Statistics] the shared statistics instance.
         #
         def self.instance
@@ -155,7 +153,7 @@ module Pod
         def cache
           unless @cache
             if cache_file && cache_file.exist?
-              @cache = YAML.load(cache_file.read)
+              @cache = YAMLHelper.load(cache_file.read)
             else
               @cache = {}
             end
@@ -259,7 +257,6 @@ module Pod
         end
 
         #---------------------------------------------------------------------#
-
       end
     end
   end

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

@@ -4,7 +4,6 @@ require 'cocoapods-core/specification/set/statistics'
 
 module Pod
   class Specification
-
     # A Specification::Set is responsible of handling all the specifications of
     # a Pod. This class stores the information of the dependencies that required
     # a Pod in the resolution process.
@@ -16,7 +15,6 @@ module Pod
     #         of a Source.
     #
     class Set
-
       # @return [String] the name of the Pod.
       #
       attr_reader :name
@@ -206,7 +204,6 @@ module Pod
       # @note External sources *don't* support subspecs.
       #
       class External < Set
-
         attr_reader :specification
 
         def initialize(spec)
@@ -219,7 +216,7 @@ module Pod
         end
 
         def specification_path
-          raise StandardError, "specification_path"
+          raise StandardError, 'specification_path'
         end
 
         def versions

data/lib/cocoapods-core/specification.rb

@@ -6,7 +6,6 @@ require 'cocoapods-core/specification/set'
 require 'cocoapods-core/specification/json'
 
 module Pod
-
   # The Specification provides a DSL to describe a Pod. A pod is defined as a
   # library originating from a source. A specification can support detailed
   # attributes for modules of code  through subspecs.
@@ -14,7 +13,6 @@ module Pod
   # Usually it is stored in files with `podspec` extension.
   #
   class Specification
-
     include Pod::Specification::DSL
     include Pod::Specification::DSL::Deprecations
     include Pod::Specification::RootAttributesAccessors
@@ -100,7 +98,7 @@ module Pod
       elsif name
         name
       else
-        "No-name"
+        'No-name'
       end
     end
 
@@ -207,7 +205,7 @@ module Pod
       else
         remainder = relative_name[base_name.size + 1..-1]
         subspec_name = remainder.split('/').shift
-        subspec = subspecs.find { |s| s.name == "#{name}/#{subspec_name}" }
+        subspec = subspecs.find { |s| s.base_name == subspec_name }
         unless subspec
           raise Informative, "Unable to find a specification named " \
             "`#{relative_name}` in `#{name} (#{version})`."
@@ -219,7 +217,7 @@ module Pod
     # @return [String] the name of the default subspec if provided.
     #
     def default_subspec
-      attributes_hash["default_subspec"]
+      attributes_hash['default_subspec']
     end
 
     # Returns the dependencies on subspecs.
@@ -232,7 +230,7 @@ module Pod
     #
     def subspec_dependencies(platform = nil)
       if default_subspec
-        specs = [subspec_by_name("#{name}/#{default_subspec}")]
+        specs = [root.subspec_by_name("#{name}/#{default_subspec}")]
       else
         specs = subspecs.compact
       end
@@ -290,7 +288,9 @@ module Pod
     #         source.
     #
     def local?
-      !(source[:path] || source[:local]).nil? rescue false
+      return true if source[:path]
+      return true if source[:local]
+      false
     end
 
     # @return     [Bool] whether the specification is supported in the given
@@ -359,7 +359,7 @@ module Pod
     #         information.
     #
     def platform_hash
-      case value = attributes_hash["platforms"]
+      case value = attributes_hash['platforms']
       when String
         { value => nil }
       when Array
@@ -536,7 +536,7 @@ module Pod
 
       string = File.open(path, 'r:utf-8') { |f| f.read }
       # Work around for Rubinius incomplete encoding in 1.9 mode
-      if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+      if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
         string.encode!('UTF-8')
       end
 
@@ -582,7 +582,7 @@ module Pod
     #
     def defined_in_file=(file)
       unless root?
-        raise StandardError, "Defined in file can be set only for root specs."
+        raise StandardError, 'Defined in file can be set only for root specs.'
       end
       @defined_in_file = file
     end

data/lib/cocoapods-core/standard_error.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # Namespaces all the errors raised by CocoaPods.
   #
   class StandardError < ::StandardError; end
@@ -10,7 +9,6 @@ module Pod
   # contents of the line that raised the exception.
   #
   class DSLError < Informative
-
     # @return [String] the description that should be presented to the user.
     #
     attr_reader :description
@@ -65,8 +63,8 @@ module Pod
         line_numer = trace_line.split(':')[1].to_i - 1
         return m unless line_numer
         lines      = File.readlines(dsl_path.to_s)
-        indent     = " #  "
-        indicator  = indent.dup.gsub("#", ">")
+        indent     = ' #  '
+        indicator  = indent.dup.gsub('#', '>')
         first_line = (line_numer.zero?)
         last_line  = (line_numer == (lines.count - 1))
 
@@ -78,7 +76,7 @@ module Pod
         m << "#{indent}#{    lines[line_numer + 1] }" unless last_line
         m << "\n" unless m.end_with?("\n")
         m << "#{indent}-------------------------------------------\n"
-        m << ""
+        m << ''
         @message = m
       end
       @message

data/lib/cocoapods-core/vendor.rb

@@ -1,9 +1,7 @@
 module Pod
-
   # Namespaces the vendored modules.
   #
   module Vendor
-
     # Namespaces the classes of RubyGems used by CocoaPods.
     #
     # CocoaPods needs to vendor RubyGems because OS X ships with `v1.3.6` which
@@ -19,7 +17,6 @@ module Pod
     # - replaced `::Gem` with `Pod::Vendor::Gem`
     #
     module Gem
-
       require 'cocoapods-core/vendor/version'
       require 'cocoapods-core/vendor/requirement'
 
@@ -48,7 +45,6 @@ module Pod
       # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
       # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
       # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
     end
   end
 end

data/lib/cocoapods-core/version.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # The Version class stores information about the version of a
   # {Specification}.
   #
@@ -31,7 +30,6 @@ module Pod
   # 4. 0.9
   #
   class Version < Pod::Vendor::Gem::Version
-
     # Override the constants defined by the superclass to add Semantic
     # Versioning prerelease support (with a dash). E.g.: 1.0.0-alpha1
     #
@@ -43,7 +41,7 @@ module Pod
     # @return [Bool] whether the version represents the `head` of repository.
     #
     attr_accessor :head
-    alias_method  :head?, :head
+    alias_method :head?, :head
 
     # @param  [String,Version] version
     #         A string representing a version, or another version.
@@ -139,6 +137,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end

data/lib/cocoapods-core/{yaml_converter.rb → yaml_helper.rb}

@@ -1,5 +1,4 @@
 module Pod
-
   # Converts objects to their YAML representation.
   #
   # This class was created for the need having control on how the YAML is
@@ -15,10 +14,8 @@ module Pod
   #       The missing features include:
   #       - Strings are never quoted even when ambiguous.
   #
-  class YAMLConverter
-
+  class YAMLHelper
     class << self
-
       # Returns the YAML representation of the given object. If the given object
       # is an Hash it accepts an optional hint for sorting the keys.
       #
@@ -41,6 +38,18 @@ module Pod
         result << "\n"
       end
 
+      # Load a YAML file and provide more informative error messages in special cases like merge conflict.
+      # @param A YAML string.
+      def load(yaml_string)
+        YAML.load(yaml_string)
+        rescue Exception => exception
+          if yaml_has_merge_error(yaml_string)
+            raise Informative, 'Merge conflict(s) detected'
+          else
+            raise exception
+          end
+      end
+
       #-----------------------------------------------------------------------#
 
       private
@@ -111,7 +120,7 @@ module Pod
           processed_key = process_according_to_class(key)
           case key_value
           when Array, Hash
-            key_partial_yaml = processed.lines.map { |line| "  #{line}" } * ""
+            key_partial_yaml = processed.lines.map { |line| "  #{line}" } * ''
             key_lines << "#{processed_key}:\n#{key_partial_yaml}"
           else
             key_lines << "#{processed_key}: #{processed}"
@@ -120,6 +129,13 @@ module Pod
         key_lines * line_separator
       end
 
+      # Check for merge errors in a YAML string.
+      # @param A YAML string.
+      # @return If a merge error was detected or not.
+      def yaml_has_merge_error(yaml_string)
+        yaml_string.include?('<<<<<<< HEAD')
+      end
+
       #-----------------------------------------------------------------------#
 
       private
@@ -179,7 +195,7 @@ module Pod
       # @return [String] A string useful to compare the value with other ones.
       #
       def sorting_string(value)
-        return "" unless value
+        return '' unless value
         case value
         when String then value.downcase
         when Symbol then sorting_string(value.to_s)

data/lib/cocoapods-core.rb

@@ -1,7 +1,6 @@
 # The Pod modules name-spaces all the classes of CocoaPods.
 #
 module Pod
-
   require 'cocoapods-core/gem_version'
 
   # Indicates a runtime error **not** caused by a bug.
@@ -28,10 +27,9 @@ module Pod
   autoload :Source,         'cocoapods-core/source'
   autoload :Specification,  'cocoapods-core/specification'
   autoload :StandardError,  'cocoapods-core/standard_error'
-  autoload :YAMLConverter,  'cocoapods-core/yaml_converter'
+  autoload :YAMLHelper,  'cocoapods-core/yaml_helper'
 
   # TODO: Fix
   #
   Spec = Specification
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,6 +127,8 @@ files:
 - lib/cocoapods-core/specification/dsl/platform_proxy.rb
 - lib/cocoapods-core/specification/json.rb
 - lib/cocoapods-core/specification/linter.rb
+- lib/cocoapods-core/specification/linter/analyzer.rb
+- lib/cocoapods-core/specification/linter/result.rb
 - lib/cocoapods-core/specification/root_attribute_accessors.rb
 - lib/cocoapods-core/specification/set.rb
 - lib/cocoapods-core/specification/set/presenter.rb
@@ -136,7 +138,7 @@ files:
 - lib/cocoapods-core/vendor/requirement.rb
 - lib/cocoapods-core/vendor/version.rb
 - lib/cocoapods-core/version.rb
-- lib/cocoapods-core/yaml_converter.rb
+- lib/cocoapods-core/yaml_helper.rb
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT