cocoapods-core 0.17.0.rc5 → 0.17.0.rc6

data/lib/cocoapods-core/specification.rb

@@ -102,7 +102,13 @@ module Pod
     #         clients.
     #
     def to_s
-      "#{name} (#{version})"
+      if name && version.version != ""
+        "#{name} (#{version})"
+      elsif name
+        name
+      else
+        "No-name"
+      end
     end
 
     # @return [String] A string suitable for debugging.
@@ -234,7 +240,7 @@ module Pod
       if platform
         specs = specs.select { |s| s.supported_on_platform?(platform) }
       end
-      specs = specs.map { |s| Dependency.new(s.name, version) }
+      specs.map { |s| Dependency.new(s.name, version) }
     end
 
     # Returns the dependencies on other Pods or subspecs of other Pods.
@@ -527,19 +533,19 @@ module Pod
     def self.from_file(path, subspec_name = nil)
       path = Pathname.new(path)
       unless path.exist?
-        raise StandardError, "No podspec exists at path `#{path}`."
+        raise Informative, "No podspec exists at path `#{path}`."
       end
 
       case path.extname
       when '.podspec'
         spec = ::Pod._eval_podspec(path)
         unless spec.is_a?(Specification)
-          raise StandardError, "Invalid podspec file at path `#{path}`."
+          raise Informative, "Invalid podspec file at path `#{path}`."
         end
       when '.yaml'
         spec = Specification.from_yaml(path.read)
       else
-        raise StandardError, "Unsupported specification format `#{path.extname}`."
+        raise Informative, "Unsupported specification format `#{path.extname}`."
       end
 
       spec.defined_in_file = path

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

@@ -144,13 +144,7 @@ module Pod
       def dependencies
         value = value_for_attribute(:dependencies)
         value.map do |name, requirements|
-          if Array(requirements).all?{ |req| req.is_a?(String) }
-            Dependency.new(name, requirements)
-          else
-            raise Informative, "Unsupported parameters for `#{name}` " \
-              "dependency `#{requirements.to_s}` in #{spec}.\n" \
-              "Specifications don't support external sources"
-          end
+          Dependency.new(name, requirements)
         end
       end
 

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

@@ -391,7 +391,7 @@ module Pod
       #           The deployment target of the platform.
       #
       def deployment_target=(*args)
-        raise StandardError, "The deployment target can be declared only per platform."
+        raise Informative, "The deployment target can be declared only per platform."
       end
 
       #-----------------------------------------------------------------------#
@@ -435,8 +435,9 @@ module Pod
       #
       def dependency(*args)
         name, *version_requirements = args
-        raise StandardError, "A specification can't require self as a subspec" if name == self.name
-        raise StandardError, "A subspec can't require one of its parents specifications" if @parent && @parent.name.include?(name)
+        raise Informative, "A specification can't require itself as a subspec" if name == self.name
+        raise Informative, "A subspec can't require one of its parents specifications" if @parent && @parent.name.include?(name)
+        raise Informative, "Unsupported version requirements" unless version_requirements.all? { |req| req.is_a?(String) }
         attributes_hash["dependencies"] ||= {}
         attributes_hash["dependencies"][name] = version_requirements
       end

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

@@ -25,18 +25,23 @@ module Pod
             end
 
           elsif method == :header_mappings
-            raise StandardError, "[#{to_s}] The use of the `header_mappings` hook has been deprecated."
+            raise Informative, "[#{to_s}] The use of the `header_mappings` hook has been deprecated.\n" \
+              "Use the `header_dir` and the `header_mappings_dir` attributes."
+
+          elsif method == :copy_header_mapping
+            raise Informative, "[#{to_s}] The use of the `copy_header_mapping` hook has been deprecated.\n" \
+              "Use the `header_dir` and the `header_mappings_dir` attributes."
           end
         end
 
         def clean_paths=(value)
-          raise StandardError, "[#{to_s}] Clean paths are deprecated. CocoaPods now " \
-            "cleans unused files by default. Use preserver paths if needed."
+          raise Informative, "[#{to_s}] Clean paths are deprecated. CocoaPods now " \
+            "cleans unused files by default. Use the `preserve_paths` attribute if needed."
         end
 
         [ :part_of_dependency=, :part_of=, :exclude_header_search_paths= ].each do |method|
           define_method method do |value|
-            raise StandardError, "[#{to_s}] Attribute `#{method.to_s[0..-2]}` has been deprecated."
+            raise Informative, "[#{to_s}] Attribute `#{method.to_s[0..-2]}` has been deprecated."
           end
         end
 

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

@@ -35,6 +35,12 @@ module Pod
         end
       end
 
+      # @return [Bool] Whether the more strict validation of the master repo
+      #         should be used. Specifically The master repo treats certain
+      #         warnings as errors.
+      #
+      attr_accessor :master_repo_mode
+
       # Lints the specification adding a {Result} for any failed check to the
       # {#results} list.
       #
@@ -90,30 +96,28 @@ module Pod
       def perform_textual_analysis
         return unless @file
         text = @file.read
-        error "`config.ios?' and `config.osx?' are deprecated."  if text =~ /config\..?os.?/
+        error "`config.ios?` and `config.osx?` are deprecated."  if text =~ /config\..?os.?/
         error "clean_paths are deprecated (use preserve_paths)." if text =~ /clean_paths/
-        warning "Comments must be deleted." if text.scan(/^\s*#/).length > 24
+        master_repo_error "Comments must be deleted." if text.scan(/^\s*#\s+/).length > 24
       end
 
       # Checks that every root only attribute which is required has a value.
       #
       # @return [void]
       #
-      def  check_required_root_attributes
+      def check_required_root_attributes
         attributes = DSL.attributes.values.select(&:root_only?)
         attributes.each do |attr|
-          # if spec.respond_to?(attr.name)
-            value = spec.send(attr.name)
-            next unless attr.required?
-            unless value && (!value.respond_to?(:empty?) || !value.empty?)
-              if attr.name == :license
-                warning("Missing required attribute `#{attr.name}`.")
-              else
-                error("Missing required attribute `#{attr.name}`.")
-              end
+          value = spec.send(attr.name)
+          next unless attr.required?
+          unless value && (!value.respond_to?(:empty?) || !value.empty?)
+            if attr.name == :license
+              warning("Missing required attribute `#{attr.name}`.")
+            else
+              error("Missing required attribute `#{attr.name}`.")
             end
           end
-        # end
+        end
       end
 
       # Runs the validation hook for root only attributes.
@@ -200,18 +204,18 @@ module Pod
       # Performs validations related to the `summary` attribute.
       #
       def _validate_summary(s)
-        warning "The summary should be short use `description` (max 140 characters)." if s.length > 140
-        warning "The summary is not meaningful." if s =~ /A short description of/
+        master_repo_error "The summary should be short use `description` (max 140 characters)." if s.length > 140
+        master_repo_error "The summary is not meaningful." if s =~ /A short description of/
         warning "The summary should end with proper punctuation." if s !~ /(\.|\?|!)$/
       end
 
       # Performs validations related to the `description` attribute.
       #
       def _validate_description(d)
-        warning "The description is not meaningful." if d =~ /An optional longer description of/
-        warning "The description should end with proper punctuation." if d !~ /(\.|\?|!)$/
-        warning "The description is equal to the summary." if d == spec.summary
-        warning "The description is shorter than the summary." if d.length < spec.summary.length
+        master_repo_error "The description is not meaningful." if d =~ /An optional longer description of/
+        master_repo_error "The description should end with proper punctuation." if d !~ /(\.|\?|!)$/
+        master_repo_error "The description is equal to the summary." if d == spec.summary
+        master_repo_error "The description is shorter than the summary." if d.length < spec.summary.length
       end
 
       # Performs validations related to the `license` attribute.
@@ -219,8 +223,8 @@ module Pod
       def _validate_license(l)
         type = l[:type]
         warning "Missing license type." if type.nil?
-        warning "Sample license type."  if type && type =~ /\(example\)/
-        warning "Invalid license type." if type && type.gsub(' ', '').gsub("\n", '').empty?
+        master_repo_error "Invalid license type." if type && type.gsub(' ', '').gsub("\n", '').empty?
+        error   "Sample license type."  if type && type =~ /\(example\)/
       end
 
       # Performs validations related to the `source` attribute.
@@ -233,14 +237,14 @@ module Pod
 
           error "Example source." if git =~ /http:\/\/EXAMPLE/
           error 'The commit of a Git source cannot be `HEAD`.'    if commit && commit.downcase =~ /head/
-          warning 'The version should be included in the Git tag.' if tag && !tag.include?(version)
-          warning "Github repositories should end in `.git`."      if github && !git.end_with?('.git')
-          warning "Github repositories should use `https` link."   if github && !git.start_with?('https://github.com') && !git.start_with?('git://gist.github.com')
+          master_repo_error 'The version should be included in the Git tag.' if tag && !tag.include?(version)
+          master_repo_error "Github repositories should end in `.git`."      if github && !git.end_with?('.git')
+          master_repo_error "Github repositories should use `https` link."   if github && !git.start_with?('https://github.com') && !git.start_with?('git://gist.github.com')
 
           if version == '0.0.1'
             error 'Git sources should specify either a commit or a tag.' if commit.nil? && tag.nil?
           else
-            warning 'Git sources should specify a tag.' if tag.nil?
+            master_repo_error 'Git sources should specify a tag.' if tag.nil?
           end
         end
       end
@@ -272,7 +276,10 @@ module Pod
           end
           patterns.each do |pattern|
             if pattern.is_a?(Rake::FileList)
-              warning "Rake::FileList is deprecated, use `exclude_files` (#{attrb.name})."
+              # TODO: enable for the 0.17 release
+              unless master_repo_mode
+                warning "Rake::FileList is deprecated, use `exclude_files` (#{attrb.name})."
+              end
             else
               if pattern.start_with?('/')
                 error "File patterns must be relative and cannot start with a slash (#{attrb.name})."
@@ -293,11 +300,11 @@ module Pod
       # Check empty subspec attributes
       #
       def check_if_spec_is_empty
-        methods = %w[ source_files resources preserve_paths ]
-        empty_patterns = methods.all? { |m| consumer.send(m).empty? } && consumer.spec.subspecs.empty?
+        methods = %w[ source_files resources preserve_paths dependencies ]
+        empty_patterns = methods.all? { |m| consumer.send(m).empty? }
         empty = empty_patterns && consumer.spec.subspecs.empty?
         if empty
-          warning "The #{consumer.spec} spec appears to be empty (no source files, resources, preserve paths or subspecs)."
+          error "The #{consumer.spec} spec is empty (no source files, resources, preserve paths, dependencies or subspecs)."
         end
       end
 
@@ -329,6 +336,22 @@ module Pod
         add_result(:warning, message)
       end
 
+      # Adds an error if the master repo mode is enabled, otherwise logs a
+      # warning.
+      #
+      # @param  [String] message
+      #         The message of the result.
+      #
+      # @return [void]
+      #
+      def master_repo_error(message)
+        if master_repo_mode
+          error(message)
+        else
+          warning(message)
+        end
+      end
+
       # Adds a result of the given type with the given message. If there is a
       # current platform it is added to the result. If a result with the same
       # type and the same message is already available the current platform is

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

@@ -35,8 +35,8 @@ module Pod
           @set.versions.first
         end
 
-        # @return   [Array<Version>] all the versions available sorted
-        #           ascendingly.
+        # @return   [Array<Version>] all the versions available ascending
+        #           order.
         #
         def versions
           @set.versions.sort.reverse

data/lib/cocoapods-core/version.rb

@@ -68,6 +68,9 @@ module Pod
     # @note   The raw version string is still accessible with the {#version}
     #         method.
     #
+    # @todo   Adding the head information to the string representation creates
+    #         issues (see Dependency#requirement).
+    #
     def to_s
       head? ? "HEAD based on #{super}" : super
     end

data/lib/cocoapods-core/yaml_converter.rb

@@ -67,21 +67,10 @@ module Pod
         when Array      then process_array(value)
         when Hash       then process_hash(value, hash_keys_hint)
         else
-          raise "Unsupported class for YAML conversion #{value.class}"
+          raise StandardError, "Unsupported class for YAML conversion #{value.class}"
         end
       end
 
-      # Converts a string to YAML.
-      #
-      # @param  [String] string
-      #         the string to convert.
-      #
-      # @return [String] the YAML representation of the given object.
-      #
-      def process_string(string)
-        string
-      end
-
       # Converts an array to YAML after sorting it.
       #
       # @param  [Array] array
@@ -194,7 +183,7 @@ module Pod
         when String then value.downcase
         when Symbol then sorting_string(value.to_s)
         when Array  then sorting_string(value.first)
-        when Hash   then sorting_string(value.keys.sort.first)
+        when Hash   then value.keys.map { |key| key.to_s.downcase }.sort.first
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc5
+  version: 0.17.0.rc6
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,7 +101,9 @@ files:
 - lib/cocoapods-core/podfile/target_definition.rb
 - lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/requirement.rb
-- lib/cocoapods-core/source/validator.rb
+- lib/cocoapods-core/source/acceptor.rb
+- lib/cocoapods-core/source/aggregate.rb
+- lib/cocoapods-core/source/health_reporter.rb
 - lib/cocoapods-core/source.rb
 - lib/cocoapods-core/specification/consumer.rb
 - lib/cocoapods-core/specification/dsl/attribute.rb

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

@@ -1,183 +0,0 @@
-module Pod
-  class Source
-
-    # TODO: THIS CLASS IS A STUB
-
-    # Checks whether a podspec can be accepted by a source.
-    #
-    # This class can work on Travis but some checks are lost as the repo is
-    # already merged during the test.
-    #
-    class Validator
-
-      # @return [Source] the source where the podspec should be added.
-      #
-      attr_reader :source
-
-      # @param  [Pathname] repo @see Source#repo.
-      #
-      def initialize(repo)
-        @source = Source.new(repo)
-        @errors = {}
-        @linter_results = {}
-      end
-
-      # @param  [Array<Pathname>] spec_paths
-      #         a list of path that should be checked for being accepted in
-      #         specs repo.
-      #
-      # @return [Bool] whether to podspec can be accepted by the source.
-      #
-      def check(spec_paths)
-        spec_paths = [ spec_paths ] unless spec_paths.is_a?(Array)
-        @errors = {}
-        spec_paths.each do |path|
-          @spec_path = Pathname.new(path)
-          lint
-          next unless spec
-          # check_spec_path
-          check_spec_source_change
-          check_if_untagged_version_is_acceptable
-          check_commit_change_for_untagged_version
-          check_dependencies
-        end
-        errors.values.empty?
-      end
-
-      #-----------------------------------------------------------------------#
-
-      # @!group Validation results
-
-      public
-
-
-      # @return [Hash{Pathname=>Array<String>}] the errors generated by the
-      #         validation. If there is any error the podspec cannot be
-      #         accepted.
-      #
-      attr_reader :errors
-
-      # @return [Hash{Pathname=>Array<Specification::Linter::Result>}] the
-      #         result generated by the linter for not approved specifications.
-      #
-      attr_reader :linter_results
-
-      #-----------------------------------------------------------------------#
-
-      # @!group Validation helpers
-
-      private
-
-      # @return [Pathname] The path of the current specification that should be
-      #         checked.
-      #
-      attr_reader :spec_path
-
-      # @return [Specification] The current specification that should be
-      #         checked.
-      #
-      # @note   The specification is generated by the linter that catches any
-      #         exception.
-      #
-      attr_reader :spec
-
-
-      #
-      #
-      def error(message)
-        @errors[spec_path] ||= []
-        @errors[spec_path] << message
-      end
-
-      #-----------------------------------------------------------------------#
-
-      # @!group Check steps
-
-      private
-
-      def lint
-        linter = Specification::Linter.new(spec_path)
-        if linter.lint
-          @spec = linter.spec
-        else
-          error 'Linter failed validation.'
-        end
-      end
-
-      # TODO: this check cannot be performed before a merge.
-      def check_spec_path
-        expected = "#{spec.name}/#{spec.version}/#{spec.name}.podspec"
-        relative_path = spec_path.relative_path_from(source.repo).to_s
-        unless relative_path == expected
-          error "Incorrect path, the path is `#{relative_path}` and should be `#{expected}`."
-        end
-      end
-
-      def check_spec_source_change
-        return unless spec
-        return unless reference_spec
-        keys = Spec::DSL::SOURCE_KEYS.keys
-        source = spec.source.values_at(*keys).compact.first
-        old_source = reference_spec.source.values_at(*keys).compact.first
-        unless source == old_source
-          error "Attempt to change the source of the specification. " \
-            "Source: `#{source}`. Previous: `#{old_source}`.\n " \
-            "Contact specs repos maintainers if the library changed location."
-        end
-      end
-
-      def check_if_untagged_version_is_acceptable
-        return unless spec
-        return if !spec.source[:git] || spec.source[:tag]
-
-        # Allow to fix a 0.0.1 podspec
-        if !related_specifications.any? { |s| s.version == '0.0.1' }
-          error "There is already versioned specifications so " \
-            "untagged versions cannot be added."
-        elsif spec.version != Version.new('0.0.1')
-          error "Untagged Git repositories should be versioned as 0.0.1"
-        end
-      end
-
-      # TODO: this cannot be tested on Travis with the current setup
-      def check_commit_change_for_untagged_version
-        return unless spec
-        return unless spec.version == Version.new('0.0.1')
-        ref_spec = related_specifications.find { |s| s.version != '0.0.1' }
-        return unless ref_spec
-        unless ref_spec.source[:commit] == spec.source[:commit]
-          error "Attempt to rewrite the commit of 0.0.1 version."
-        end
-      end
-
-      def check_dependencies
-        return unless spec
-        spec.external_dependencies(true).each do |dep|
-          set = source.search(dep)
-          unless set && set.specification
-            error "Unable to find a specification for the `#{dep}` dependency."
-          end
-        end
-      end
-
-      #-----------------------------------------------------------------------#
-
-      # @!group Source helpers
-
-      private
-
-      def related_specifications
-        versions = source.versions(spec.name)
-        return unless versions
-        specs = versions.sort.map { |v| source.specification(spec.name, v) }
-        specs.reject { |s| s.defined_in_file == spec_path }
-      end
-
-      def reference_spec
-        specs = related_specifications
-        specs.last if specs
-      end
-
-    end
-  end
-end