cocoapods-core 0.27.1 → 0.28.0

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

@@ -30,7 +30,7 @@ module Pod
         @children = []
 
         unless internal_hash
-          self.name = name 
+          self.name = name
         end
         if parent.is_a?(TargetDefinition)
           parent.children << self
@@ -75,7 +75,11 @@ module Pod
       #         definition including the inherited ones.
       #
       def dependencies
-        non_inherited_dependencies + ((exclusive? || parent.nil?) ? [] : parent.dependencies)
+        if exclusive? || parent.nil?
+          non_inherited_dependencies
+        else
+          non_inherited_dependencies + parent.dependencies
+        end
       end
 
       # @return [Array] The list of the dependencies of the target definition,
@@ -105,7 +109,7 @@ module Pod
         end
       end
 
-      alias :to_s :label
+      alias_method :to_s, :label
 
       # @return [String] A string representation suitable for debug.
       #
@@ -153,8 +157,10 @@ module Pod
       def exclusive?
         if root?
           true
+        elsif get_hash_value('exclusive')
+          true
         else
-          get_hash_value('exclusive') || ( platform && parent && parent.platform != platform )
+          platform && parent && parent.platform != platform
         end
       end
 
@@ -250,7 +256,11 @@ module Pod
       #         represents their type (`:debug` or `:release`).
       #
       def build_configurations
-        get_hash_value('build_configurations') || (parent.build_configurations unless root?)
+        if root?
+          get_hash_value('build_configurations')
+        else
+          get_hash_value('build_configurations') || parent.build_configurations
+        end
       end
 
       # Sets the build configurations for this target.
@@ -272,10 +282,14 @@ module Pod
       #         return true for any asked pod.
       #
       def inhibits_warnings_for_pod?(pod_name)
-        return true if inhibit_warnings_hash['all'] || (parent.inhibits_warnings_for_pod?(pod_name) unless root?)
-
-        inhibit_warnings_hash['for_pods'] ||= []
-        inhibit_warnings_hash['for_pods'].include? pod_name
+        if inhibit_warnings_hash['all']
+          true
+        elsif !root? && parent.inhibits_warnings_for_pod?(pod_name)
+          true
+        else
+          inhibit_warnings_hash['for_pods'] ||= []
+          inhibit_warnings_hash['for_pods'].include? pod_name
+        end
       end
 
       # Sets whether the target definition should inhibit the warnings during
@@ -339,11 +353,12 @@ module Pod
       #
       def set_platform(name, target = nil)
         unless [:ios, :osx].include?(name)
-          raise StandardError, "Unsupported platform `#{name}`. Platform must be `:ios` or `:osx`."
+          raise StandardError, "Unsupported platform `#{name}`. Platform " \
+            "must be `:ios` or `:osx`."
         end
 
         if target
-          value = {name.to_s => target}
+          value = { name.to_s => target }
         else
           value = name.to_s
         end
@@ -401,7 +416,8 @@ module Pod
       def store_podspec(options = nil)
         if options
           unless options.keys.all? { |key| [:name, :path].include?(key) }
-            raise StandardError, "Unrecognized options for the podspec method `#{options}`"
+            raise StandardError, "Unrecognized options for the podspec " \
+              "method `#{options}`"
           end
           get_hash_value('podspecs', []) << options
         else
@@ -418,18 +434,18 @@ module Pod
       # @return [Array] The keys used by the hash representation of the
       #         target definition.
       #
-      HASH_KEYS = [
-        'name',
-        'platform',
-        'podspecs',
-        'exclusive',
-        'link_with',
-        'link_with_first_target',
-        'inhibit_warnings',
-        'user_project_path',
-        'build_configurations',
-        'dependencies',
-        'children'
+      HASH_KEYS = %w[
+        name
+        platform
+        podspecs
+        exclusive
+        link_with
+        link_with_first_target
+        inhibit_warnings
+        user_project_path
+        build_configurations
+        dependencies
+        children
       ].freeze
 
       # @return [Hash] The hash representation of the target definition.
@@ -488,7 +504,9 @@ module Pod
       # @return [void]
       #
       def set_hash_value(key, value)
-        raise StandardError, "Unsupported hash key `#{key}`" unless HASH_KEYS.include?(key)
+        unless HASH_KEYS.include?(key)
+          raise StandardError, "Unsupported hash key `#{key}`"
+        end
         internal_hash[key] = value
       end
 
@@ -506,20 +524,21 @@ module Pod
       # @return [Object] The value for the key.
       #
       def get_hash_value(key, base_value = nil)
-        raise StandardError, "Unsupported hash key `#{key}`" unless HASH_KEYS.include?(key)
+        unless HASH_KEYS.include?(key)
+          raise StandardError, "Unsupported hash key `#{key}`"
+        end
         internal_hash[key] ||= base_value
       end
 
-      # Returns the inhibit_warnings hash prepopulated with default values
+      # Returns the inhibit_warnings hash pre-populated with default values.
       #
-      # @return [Hash<String, Array>] Hash with :all key for inhibiting all warnings,
-      #         and :for_pods key for inhibiting warnings per pod
+      # @return [Hash<String, Array>] Hash with :all key for inhibiting all
+      #         warnings, and :for_pods key for inhibiting warnings per Pod.
       #
       def inhibit_warnings_hash
         get_hash_value('inhibit_warnings', {})
       end
 
-
       # @return [Array<Dependency>] The dependencies specified by the user for
       #         this target definition.
       #
@@ -550,7 +569,7 @@ module Pod
           file = podspec_path_from_options(options)
           spec = Specification.from_file(file)
           all_specs = [spec, *spec.recursive_subspecs]
-          all_deps = all_specs.map{ |s| s.dependencies(platform) }.flatten
+          all_deps = all_specs.map { |s| s.dependencies(platform) }.flatten
           all_deps.reject { |dep| dep.root_name == spec.root.name }
         end.flatten.uniq
       end
@@ -565,14 +584,19 @@ module Pod
       #
       def podspec_path_from_options(options)
         if path = options[:path]
-          path_with_ext = File.extname(path) == '.podspec' ? path : "#{path}.podspec"
+          if File.extname(path) == '.podspec'
+            path_with_ext = path
+          else
+            path_with_ext = "#{path}.podspec"
+          end
           path_without_tilde = path_with_ext.gsub('~', ENV['HOME'])
-          file = podfile.defined_in_file.dirname + path_without_tilde
+          podfile.defined_in_file.dirname + path_without_tilde
         elsif name = options[:name]
           name = File.extname(name) == '.podspec' ? name : "#{name}.podspec"
-          file = podfile.defined_in_file.dirname + name
+          podfile.defined_in_file.dirname + name
         elsif options[:autodetect]
-          file = Pathname.glob(podfile.defined_in_file.dirname + '*.podspec').first
+          glob_pattern = podfile.defined_in_file.dirname + '*.podspec'
+          Pathname.glob(glob_pattern).first
         end
       end
 
@@ -582,7 +606,7 @@ module Pod
       # @param [String] pod name
       #
       # @param [Array] requirements
-      #        If :inhibit_warnings is the only key in the hash, the hash 
+      #        If :inhibit_warnings is the only key in the hash, the hash
       #        should be destroyed because it confuses Gem::Dependency.
       #
       # @return [void]

data/lib/cocoapods-core/requirement.rb

@@ -63,8 +63,8 @@ module Pod
         raise ArgumentError, "Illformed requirement `#{input.inspect}`"
       end
 
-      operator = $1 || "="
-      version = Version.new($2)
+      operator = Regexp.last_match[1] || "="
+      version = Version.new(Regexp.last_match[2])
       [operator, version]
     end
 

data/lib/cocoapods-core/source.rb

@@ -34,7 +34,6 @@ module Pod
 
     alias_method :to_s, :name
 
-
     # @return [Integer] compares a source with another one for sorting
     #         purposes.
     #
@@ -42,7 +41,7 @@ module Pod
     #         this convention should be used in any case where sources need to
     #         be disambiguated.
     #
-    def <=> (other)
+    def <=>(other)
       name <=> other.name
     end
 
@@ -57,7 +56,7 @@ module Pod
     def pods
       specs_dir_as_string = specs_dir.to_s
       Dir.entries(specs_dir).select do |entry|
-        valid_name = !(entry =='.' || entry == '..' || entry == '.git')
+        valid_name = !(entry == '.' || entry == '..' || entry == '.git')
         valid_name && File.directory?(File.join(specs_dir_as_string, entry))
       end
     end
@@ -90,7 +89,7 @@ module Pod
       return unless pod_dir.exist?
       pod_dir.children.map do |v|
         basename = v.basename.to_s
-        Version.new(basename) if v.directory? && basename[0,1] != '.'
+        Version.new(basename) if v.directory? && basename[0, 1] != '.'
       end.compact.sort.reverse
     end
 
@@ -147,10 +146,16 @@ module Pod
     # @return [Set] a set for a given dependency. The set is identified by the
     #               name of the dependency and takes into account subspecs.
     #
-    def search(dependency)
+    # @todo   Rename to #load_set
+    #
+    def search(query)
+      if query.is_a?(Dependency)
+        name = query.root_name
+      else
+        name = query
+      end
       pod_sets.find do |set|
-        # First match the (top level) name, which does not yet load the spec from disk
-        set.name == dependency.root_name
+        set.name == name
       end
     end
 
@@ -173,16 +178,33 @@ module Pod
             s = set.specification
             text = "#{s.name} #{s.authors} #{s.summary} #{s.description}"
           rescue
-            CoreUI.warn "Skipping `#{set.name}` because the podspec contains errors."
+            CoreUI.warn "Skipping `#{set.name}` because the podspec " \
+              "contains errors."
           end
           set if text && text.downcase.include?(query.downcase)
         end.compact
       else
-        names = pods.select { |pod_name| pod_name.downcase.include?(query.downcase) }
+        names = pods.select { |name| name.downcase.include?(query.downcase) }
         names.map { |pod_name| set(pod_name) }
       end
     end
 
+    # Returns the set of the Pod whose name fuzzily matches the given query.
+    #
+    # @param  [String] query
+    #         The query to search for.
+    #
+    # @return [Set] The name of the Pod.
+    # @return [Nil] If no Pod with a suitable name was found.
+    #
+    def fuzzy_search(query)
+      require 'fuzzy_match'
+      pod_name = FuzzyMatch.new(pods).find(query)
+      if pod_name
+        search(pod_name)
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     # @!group Representations
@@ -225,8 +247,10 @@ module Pod
         specs_sub_dir = repo + 'Specs'
         if specs_sub_dir.exist?
           @specs_dir = specs_sub_dir
-        else
+        elsif repo.exist?
           @specs_dir = repo
+        else
+          raise Informative, "Unable to find a source named: `#{name}`"
         end
       end
       @specs_dir

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

@@ -68,10 +68,11 @@ module Pod
         source = spec.source.values_at(*keys).compact.first
         old_source = reference_spec(spec).source.values_at(*keys).compact.first
         unless source == old_source
-          errors << "The source of the spec doesn't match with the recorded ones." \
-            "Source: `#{source}`. Previous: `#{old_source}`.\n " \
-            "Please contact the specs repo maintainers if the library changed " \
-            "location."
+          message = "The source of the spec doesn't match with the recorded "
+          message << "ones. Source: `#{source}`. Previous: `#{old_source}`.\n "
+          message << "Please contact the specs repo maintainers if the"
+          message << "library changed location."
+          errors << message
         end
       end
 
@@ -85,10 +86,12 @@ module Pod
         return if !spec.source[:git] || spec.source[:tag]
         return unless related_specifications(spec)
         return if previous_spec
-        has_tagged_spec = related_specifications(spec).any? { |s| s.version != '0.0.1' }
+        has_tagged_spec = related_specifications(spec).any? do |s|
+          s.version != '0.0.1'
+        end
         if has_tagged_spec
-          errors << "There is already at least one versioned specification so " \
-            "untagged versions cannot be accepted."
+          errors << "There is already at least one versioned specification " \
+            "so untagged versions cannot be accepted."
         end
       end
 
@@ -114,7 +117,8 @@ module Pod
         spec.dependencies.each do |dep|
           set = source.search(dep)
           unless set && set.specification
-            errors << "Unable to find a specification for the `#{dep}` dependency."
+            errors << "Unable to find a specification for the `#{dep}` " \
+              "dependency."
           end
         end
       end

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

@@ -43,7 +43,8 @@ module Pod
         pods = pods_by_source.values.flatten.uniq
 
         pods.map do |pod|
-          pod_sources = sources.select{ |s| pods_by_source[s].include?(pod) }.compact
+          pod_sources = sources.select { |s| pods_by_source[s].include?(pod) }
+          pod_sources = pod_sources.compact
           Specification::Set.new(pod, pod_sources)
         end
       end
@@ -102,7 +103,9 @@ module Pod
       #
       def search(dependency)
         sources = all.select { |s| !s.search(dependency).nil? }
-        Specification::Set.new(dependency.root_name, sources) unless sources.empty?
+        unless sources.empty?
+          Specification::Set.new(dependency.root_name, sources)
+        end
       end
 
       # @return [Array<Set>]  the sets that contain the search term.
@@ -116,17 +119,22 @@ module Pod
       def search_by_name(query, full_text_search = false)
         pods_by_source = {}
         result = []
-        all.each { |s| pods_by_source[s] = s.search_by_name(query, full_text_search).map(&:name) }
+        all.each do |s|
+          source_pods = s.search_by_name(query, full_text_search)
+          pods_by_source[s] = source_pods.map(&:name)
+        end
         root_spec_names = pods_by_source.values.flatten.uniq
         root_spec_names.each do |pod|
           sources = []
-          pods_by_source.each{ |source, pods| sources << source if pods.include?(pod) }
+          pods_by_source.each do |source, pods|
+            sources << source if pods.include?(pod)
+          end
           result << Specification::Set.new(pod, sources)
         end
         if result.empty?
           extra = ", author, summary, or description" if full_text_search
-          raise(Informative, "Unable to find a pod with name" \
-                "#{extra} matching `#{query}'")
+          raise Informative, "Unable to find a pod with name" \
+            "#{extra} matching `#{query}'"
         end
         result
       end
@@ -170,8 +178,12 @@ module Pod
           enumerated_names << set.name
           set_data = search_data[set.name]
           has_data = set_data && set_data['version']
-          needs_update = !has_data || Version.new(set_data['version']) < set.required_version
-          if needs_update
+          if has_data
+            stored_version = Version.new(set_data['version'])
+            if stored_version < set.required_version
+              search_data[set.name] = search_data_from_set(set)
+            end
+          else
             search_data[set.name] = search_data_from_set(set)
           end
         end
@@ -218,7 +230,8 @@ module Pod
         result['authors'] = spec.authors.keys.sort * ', '
         result
       rescue
-        CoreUI.warn "Skipping `#{set.name}` because the podspec contains errors."
+        CoreUI.warn "Skipping `#{set.name}` because the podspec contains " \
+          "errors."
         result
       end
 

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

@@ -111,7 +111,8 @@ module Pod
       #
       def check_spec_path(name, version, spec)
         unless spec.name == name && spec.version.to_s == version.to_s
-          report.add_message(:error, "Incorrect path #{ spec.defined_in_file }", name, spec.version)
+          message = "Incorrect path #{ spec.defined_in_file }"
+          report.add_message(:error, message, name, spec.version)
         end
       end
 
@@ -198,4 +199,3 @@ module Pod
     end
   end
 end
-

data/lib/cocoapods-core/specification.rb

@@ -68,7 +68,7 @@ module Pod
       #   subspecs == other.subspecs &&
       #   pre_install_callback == other.pre_install_callback &&
       #   post_install_callback == other.post_install_callback
-      self.to_s == other.to_s
+      to_s == other.to_s
     end
 
     # @see ==
@@ -126,7 +126,8 @@ module Pod
     def self.name_and_version_from_string(string_representation)
       match_data = string_representation.match(/(\S*) \((.*)\)/)
       unless match_data
-        raise Informative, "Invalid string representation for a Specification: `#{string_representation}`."
+        raise Informative, "Invalid string representation for a " \
+          "Specification: `#{string_representation}`."
       end
       name = match_data[1]
       vers = Version.new(match_data[2])
@@ -202,12 +203,12 @@ module Pod
       if relative_name.nil? || relative_name == base_name
         self
       else
-        remainder = relative_name[base_name.size+1..-1]
+        remainder = relative_name[base_name.size + 1..-1]
         subspec_name = remainder.split('/').shift
-        subspec = subspecs.find { |s| s.name == "#{self.name}/#{subspec_name}" }
+        subspec = subspecs.find { |s| s.name == "#{name}/#{subspec_name}" }
         unless subspec
           raise Informative, "Unable to find a specification named " \
-            "`#{relative_name}` in `#{self.name} (#{self.version})`."
+            "`#{relative_name}` in `#{name} (#{version})`."
         end
         subspec.subspec_by_name(remainder)
       end
@@ -368,7 +369,7 @@ module Pod
       when Hash
         value
       else
-        Hash.new
+        {}
       end
     end
 
@@ -531,7 +532,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') { |f| f.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')
@@ -603,10 +604,11 @@ module Pod
   #
   #
   def self._eval_podspec(string, path)
-    begin
-      eval(string, nil, path.to_s)
-    rescue Exception => e
-      raise DSLError.new("Invalid `#{path.basename}` file: #{e.message}", path, e.backtrace)
-    end
+    # rubocop:disable Eval
+    eval(string, nil, path.to_s)
+    # rubocop:enable Eval
+  rescue Exception => e
+    message = "Invalid `#{path.basename}` file: #{e.message}"
+    raise DSLError.new(message, path, e.backtrace)
   end
 end