cocoapods-core 0.38.2 → 0.39.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3fc24da680129a3130376b3444590ac2a77b2fb
-  data.tar.gz: 3f949758aef66e352df50571f21dbe0eff9bf7bd
+  metadata.gz: c783da84523246e5bc4076ef3f3713a231028d1a
+  data.tar.gz: bbae7cfc7b1d93c750c1162e6b0d11166db0fa80
 SHA512:
-  metadata.gz: c8e9c2da39000cd59549884a794575a74331e774731a3641539eb366df1d333945ad7acad22e632ba7bd94e74f7f3105bd53eba06d4161fd020d586462ba9279
-  data.tar.gz: 0d8568b52cf35e7361017fae55e9551f02d3fe56e069682db950d89054c180e86307589c1634fa165fd03cf023f902dc448d1d06f9a6d3210943e99ec7dcb62a
+  metadata.gz: 3c856b520fe158afc3adaa6f91e41fd913af0f58496a3068b690420149c8c5e6fdff7a1e60570a5d52cfe19057cafa06f22a1cf889b3f46cb81f65086f0f9021
+  data.tar.gz: 68a0026ddeb29950db30f3b834cd743361cf6e086fdcb56ba811096221f95a0ceba3a2e1b7f04e214ecc810a51392b818aeb99c5dbf805db842ce70473498c27

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -30,7 +30,7 @@ module Pod
     #     end
     #
     #     post_install do |installer|
-    #       installer.project.targets.each do |target|
+    #       installer.pods_project.targets.each do |target|
     #         puts "#{target.name}"
     #       end
     #     end

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

@@ -695,7 +695,13 @@ module Pod
           podfile.defined_in_file.dirname + name
         elsif options[:autodetect]
           glob_pattern = podfile.defined_in_file.dirname + '*.podspec{,.json}'
-          Pathname.glob(glob_pattern).first
+          path = Pathname.glob(glob_pattern).first
+          unless path
+            raise Informative, 'Could not locate a podspec in the current directory. '\
+              'You can specify the path via the path option.'
+          end
+
+          path
         end
       end
 

data/lib/cocoapods-core/requirement.rb

@@ -15,6 +15,8 @@ module Pod
     #
     PATTERN = /\A\s*(#{quoted_operators})?\s*(#{Version::VERSION_PATTERN})\s*\z/
 
+    DefaultRequirement = ['>=', Version.new(0)] # rubocop:disable Style/ConstantName
+
     #-------------------------------------------------------------------------#
 
     # Factory method to create a new requirement.
@@ -66,6 +68,37 @@ module Pod
       [operator, version]
     end
 
+    # Constructs a requirement from `requirements`.
+    #
+    # @param [String, Version, Array<String>, Array<Version>] requirements
+    #        The set of requirements
+    #
+    # @note Duplicate requirements are ignored.
+    #
+    # @note An empty set of `requirements` is the same as `">= 0"`
+    #
+    def initialize(*requirements)
+      requirements = requirements.flatten
+      requirements.compact!
+      requirements.uniq!
+
+      if requirements.empty?
+        @requirements = [DefaultRequirement]
+      else
+        @requirements = requirements.map! { |r| self.class.parse r }
+      end
+    end
+
+    #
+    # @return [Bool] true if this pod has no requirements.
+    #
+    def none?
+      if @requirements.size == 1
+        @requirements[0] == DefaultRequirement
+      else
+        false
+      end
+    end
     #-------------------------------------------------------------------------#
   end
 end

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

@@ -91,8 +91,8 @@ module Pod
         linter = Specification::Linter.new(spec_path)
         linter.lint
         linter.results.each do |result|
-          type = result.type == :error ? :error : :warning
-          report.add_message(type, result.message, name, version)
+          next if result.public_only?
+          report.add_message(result.type, result.message, name, version)
         end
         linter.spec
       end
@@ -183,15 +183,10 @@ module Pod
         # @return [void]
         #
         def add_message(type, message, spec_name, spec_version = nil)
-          if type == :error
-            pods_by_error[message] ||= {}
-            pods_by_error[message][spec_name] ||= []
-            pods_by_error[message][spec_name] << spec_version
-          else
-            pods_by_warning[message] ||= {}
-            pods_by_warning[message][spec_name] ||= []
-            pods_by_warning[message][spec_name] << spec_version
-          end
+          pods = send(:"pods_by_#{type}")
+          pods[message] ||= {}
+          pods[message][spec_name] ||= []
+          pods[message][spec_name] << spec_version
         end
       end
 

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

@@ -221,10 +221,14 @@ module Pod
       #                      LICENSE
       #                    }
       #
-      #   @param  [String, Hash{Symbol=>String}] license
-      #           The type of the license and the text of the grant that
-      #           allows to use the library (or the relative path to the file
-      #           that contains it).
+      #   @param  [String] license
+      #           The type of the license
+      #
+      #   @overload license=(license)
+      #     @param  [String, Hash{Symbol=>String}] license
+      #     @option license [String] :type license type
+      #     @option license [String] :file file containing full license text. Supports txt, md, and markdown
+      #     @option license [String] :text full license text
       #
       root_attribute :license,
                      :container => Hash,
@@ -290,8 +294,36 @@ module Pod
       #     spec.source = { :http => 'http://dev.wechatapp.com/download/sdk/WeChat_SDK_iOS_en.zip',
       #                     :sha1 => '7e21857fe11a511f472cfd7cfa2d979bd7ab7d96' }
       #
-      #   @param  [Hash{Symbol=>String}] source
-      #           The location from where the library should be retrieved.
+      #
+      #   @overload source=(git)
+      #     @param  [Hash] git
+      #     @option git [String] :git git source URI
+      #     @option git [String] :tag version tag
+      #     @option git [Bool] :submodules Whether to checkout submodules
+      #     @option git [String] :branch branch name
+      #     @option git [String] :commit commit hash
+      #
+      #   @overload source=(svn)
+      #     @param  [Hash] svn
+      #     @option svn [String] :svn svn source URI
+      #     @option svn [String] :tag version tag
+      #     @option svn [String] :folder folder
+      #     @option svn [String] :revision revision
+      #
+      #   @overload source=(hg)
+      #     @param  [Hash] hg
+      #     @option hg [String] :hg mercurial source URI
+      #     @option hg [String] :revision revision
+      #
+      #   @overload source=(http)
+      #     @param  [Hash] http
+      #     @option http [String] :http compressed source URL
+      #     @option http [String] :type file type. Supports zip, tgz, bz2, txz and tar
+      #     @option http [String] :sha1 SHA hash. Supports SHA1 and SHA256
+      #
+      #   @overload source=(path)
+      #     @param  [Hash] path
+      #     @option path [String] :path local source path
       #
       root_attribute :source,
                      :container => Hash,

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

@@ -244,14 +244,14 @@ module Pod
       # Performs validations related to the `description` attribute.
       #
       def _validate_description(d)
-        if d =~ /An optional longer description of/
-          results.add_warning('description', 'The description is not meaningful.')
-        end
         if d == spec.summary
           results.add_warning('description', 'The description is equal to' \
            ' the summary.')
         end
-        if d.length < spec.summary.length
+
+        if d.strip.empty?
+          results.add_error('description', 'The description is empty.')
+        elsif d.length < spec.summary.length
           results.add_warning('description', 'The description is shorter ' \
           'than the summary.')
         end
@@ -347,7 +347,7 @@ module Pod
              ' the Git tag.')
           end
           if tag.nil?
-            results.add_warning('source', 'Git sources should specify a tag.')
+            results.add_warning('source', 'Git sources should specify a tag.', true)
           end
         end
 
@@ -389,7 +389,7 @@ module Pod
         end
         unless git_uri.scheme == 'https'
           results.add_warning('github_sources', 'Github repositories ' \
-            'should use an `https` link.')
+            'should use an `https` link.', true)
         end
       end
 
@@ -400,7 +400,7 @@ module Pod
           if git =~ /\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.')
+              'therefore HTTPS is preferred.', true)
           end
         end
       end

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

@@ -17,13 +17,19 @@ module Pod
           #
           attr_reader :message
 
+          # @return [Boolean] whether the result only applies to public specs.
+          #
+          attr_reader :public_only
+          alias_method :public_only?, :public_only
+
           # @param [Symbol] type    @see type
           # @param [String] message @see message
           #
-          def initialize(type, attribute_name, message)
+          def initialize(type, attribute_name, message, public_only = false)
             @type    = type
             @attribute_name = attribute_name
             @message = message
+            @public_only = public_only
             @platforms = []
           end
 
@@ -72,8 +78,8 @@ module Pod
         #
         # @return [void]
         #
-        def add_error(attribute_name, message)
-          add_result(:error, attribute_name, message)
+        def add_error(attribute_name, message, public_only = false)
+          add_result(:error, attribute_name, message, public_only)
         end
 
         # Adds a warning result with the given message.
@@ -83,8 +89,8 @@ module Pod
         #
         # @return [void]
         #
-        def add_warning(attribute_name, message)
-          add_result(:warning, attribute_name, message)
+        def add_warning(attribute_name, message, public_only = false)
+          add_result(:warning, attribute_name, message, public_only)
         end
 
         private
@@ -106,12 +112,12 @@ module Pod
         #
         # @return [void]
         #
-        def add_result(type, attribute_name, message)
+        def add_result(type, attribute_name, message, public_only)
           result = results.find do |r|
-            r.type == type && r.attribute_name == attribute_name && r.message == message
+            r.type == type && r.attribute_name == attribute_name && r.message == message && r.public_only? == public_only
           end
           unless result
-            result = Result.new(type, attribute_name, message)
+            result = Result.new(type, attribute_name, message, public_only)
             results << result
           end
           result.platforms << @consumer.platform_name if @consumer

data/lib/cocoapods-core/version.rb

@@ -140,10 +140,47 @@ module Pod
       numeric_segments[2].to_i
     end
 
-    private
+    # Compares the versions for sorting.
+    #
+    # @param  [Version] other
+    #         The other version to compare.
+    #
+    # @return [Fixnum] -1, 0, or +1 depending on whether the receiver is less
+    #         than, equal to, or greater than other.
+    #
+    # @note   Attempts to compare something that's not a {Version} return nil
+    #
+    def <=>(other)
+      return unless other.is_a?(Pod::Version)
+      return 0 if @version == other.version
+
+      compare = proc do |segments, other_segments|
+        limit = [segments.size, other_segments.size].max
+
+        (0..limit).each do |i|
+          lhs, rhs = segments[i] || 0, other_segments[i] || 0
+
+          next if lhs == rhs
+          return lhs <=> rhs if lhs <=> rhs
+          return -1 if lhs.is_a?(String) && rhs.is_a?(Numeric)
+          return  1 if lhs.is_a?(Numeric) && rhs.is_a?(String)
+        end
+      end
+
+      compare[numeric_segments, other.numeric_segments]
+      compare[prerelease_segments, other.prerelease_segments]
+
+      version <=> other.version
+    end
+
+    protected
 
     def numeric_segments
-      segments.take_while { |s| s.is_a?(Numeric) }
+      segments.take_while { |s| s.is_a?(Numeric) }.reverse_each.drop_while { |s| s == 0 }.reverse
+    end
+
+    def prerelease_segments
+      segments.drop_while { |s| s.is_a?(Numeric) }
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods-core/yaml_helper.rb

@@ -94,16 +94,10 @@ module Pod
       #
       def process_according_to_class(value, hash_keys_hint = nil)
         case value
-        when String     then YAML.dump(value).sub(/^---/, '').sub(/[.]{3}\s*$/, '').strip
-        when Symbol     then ":#{value}"
-        when TrueClass  then 'true'
-        when FalseClass then 'false'
         when Array      then process_array(value)
         when Hash       then process_hash(value, hash_keys_hint)
-        else
-          raise StandardError, 'Unsupported class for YAML conversion ' \
-            "#{value.class}"
-        end
+        else                 YAML.dump(value).sub(/\A---/, '').sub(/[.]{3}\s*\Z/, '').strip
+        end.strip
       end
 
       # Converts an array to YAML after sorting it.
@@ -114,9 +108,8 @@ module Pod
       # @return [String] the YAML representation of the given object.
       #
       def process_array(array)
-        result = []
-        sorted_array(array).each do |array_value|
-          result << process_according_to_class(array_value)
+        result = sorted_array(array).map do |array_value|
+          process_according_to_class(array_value)
         end
         "- #{result * "\n- "}"
       end
@@ -138,17 +131,16 @@ module Pod
       #
       def process_hash(hash, hash_keys_hint = nil, line_separator = "\n")
         keys = sorted_array_with_hint(hash.keys, hash_keys_hint)
-        key_lines = []
-        keys.each do |key|
+        key_lines = keys.map do |key|
           key_value = hash[key]
           processed = process_according_to_class(key_value)
           processed_key = process_according_to_class(key)
           case key_value
           when Array, Hash
             key_partial_yaml = processed.lines.map { |line| "  #{line}" } * ''
-            key_lines << "#{processed_key}:\n#{key_partial_yaml}"
+            "#{processed_key}:\n#{key_partial_yaml}"
           else
-            key_lines << "#{processed_key}: #{processed}"
+            "#{processed_key}: #{processed}"
           end
         end
         key_lines * line_separator

metadata

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