cocoapods-core 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af31824facc02d25a56d57de96dbc18b7689456f
-  data.tar.gz: 9bf7a512add7a278d436298a05d1ac5f7d363dca
+  metadata.gz: 59ebc8caae99ff0b103a68db5da56f145260a701
+  data.tar.gz: eb4956ae204fe1e15a008927bc56ab09c5c0ca57
 SHA512:
-  metadata.gz: fc07397515bdc6b0c8ac06402763c283bf5710f058c9062bd4513d8977a58b06601b7052a1ac4c4300ca9f182637e63c96962e7919667ba52b05602ea895ecb5
-  data.tar.gz: 591980cb02962d1e296d876599920a5632c1a602238cc944c89fecfdff66c99a4ee4f5daf6eaabe66c332c32050ea4969aa07b0c2600c48697f62d86197f7615
+  metadata.gz: 59cdc3c942852b9143f88b3218c378071e4266a6f197cfa86ad7ca84bef718cd26fe4418792b0e65a4951481e06304d2054a3d541cf9ca6847f238ec0d6ce829
+  data.tar.gz: 3a090a0ab43fc39016d6a079571b66834b8ca04dd3a4cff462aa31883afee60cba36dc3e79af1b1bd4087bc9ddf651b094fee85e531f0f7d2565f8a04d06f166

data/lib/cocoapods-core.rb

@@ -35,5 +35,3 @@ module Pod
   Spec = Specification
 
 end
-
-

data/lib/cocoapods-core/core_ui.rb

@@ -16,4 +16,3 @@ module Pod
 
   end
 end
-

data/lib/cocoapods-core/dependency.rb

@@ -73,14 +73,16 @@ module Pod
       if requirements.last.is_a?(Hash)
         @external_source = requirements.pop
         unless requirements.empty?
-          raise Informative, "A dependency with an external source may not specify version requirements (#{name})."
+          raise Informative, "A dependency with an external source may not " \
+            "specify version requirements (#{name})."
         end
 
       elsif requirements.last == :head
         @head = true
         requirements.pop
         unless requirements.empty?
-          raise Informative, "A `:head` dependency may not specify version requirements (#{name})."
+          raise Informative, "A `:head` dependency may not specify version " \
+            "requirements (#{name})."
         end
       end
 
@@ -103,8 +105,11 @@ module Pod
     #         be better to add something like Version#display_string.
     #
     def requirement
-      return Requirement.new(Version.new(specific_version.version)) if specific_version
-      @requirement
+      if specific_version
+        Requirement.new(Version.new(specific_version.version))
+      else
+        @requirement
+      end
     end
 
     # @return [Bool] whether the dependency points to a subspec.
@@ -175,7 +180,7 @@ module Pod
       return false unless external_source == other.external_source
 
       other.requirement.requirements.all? do | operator, version |
-        self.requirement.satisfied_by? Version.new(version)
+        requirement.satisfied_by? Version.new(version)
       end
     end
 
@@ -184,13 +189,13 @@ module Pod
     #         external source.
     #
     def ==(other)
-      Dependency === other &&
+      self.class == other.class &&
         name == other.name &&
         requirement == other.requirement &&
         head? == other.head? &&
         external_source == other.external_source
     end
-    alias :eql? :==
+    alias_method :eql?, :==
 
     #  @return [Fixnum] The hash value based on the name and on the
     #  requirements.
@@ -202,8 +207,8 @@ module Pod
     # @return [Fixnum] How the dependency should be sorted respect to another
     #         one according to its name.
     #
-    def <=> other
-      self.name <=> other.name
+    def <=>(other)
+      name <=> other.name
     end
 
     # Merges the version requirements of the dependency with another one.
@@ -218,11 +223,11 @@ module Pod
     #         includes also the version requirements of the given one.
     #
     def merge(other)
-      unless name == other.name then
+      unless name == other.name
         raise ArgumentError, "#{self} and #{other} have different names"
       end
       default   = Requirement.default
-      self_req  = self.requirement
+      self_req  = requirement
       other_req = other.requirement
 
       if other_req == default
@@ -254,7 +259,7 @@ module Pod
     # @return [Bool] Whether the dependency is satisfied.
     #
     def match?(name, version)
-      return false unless self.name === name
+      return false unless self.name == name
       return true if requirement.none?
       requirement.satisfied_by?(Version.new(version))
     end
@@ -313,7 +318,7 @@ module Pod
       match_data = string.match(/(\S*)( (.*))?/)
       name = match_data[1]
       version = match_data[2]
-      version = version.gsub(/[()]/,'') if version
+      version = version.gsub(/[()]/, '') if version
       case version
       when nil || /from `(.*)(`|')/
         Dependency.new(name)
@@ -328,8 +333,8 @@ module Pod
     # @return [String] a string representation suitable for debugging.
     #
     def inspect
-      "<#{self.class} name=#{self.name} requirements=#{requirement.to_s} " \
-      "external_source=#{external_source||'nil'}>"
+      "<#{self.class} name=#{name} requirements=#{requirement.to_s} " \
+        "external_source=#{external_source || 'nil'}>"
     end
 
     #--------------------------------------#

data/lib/cocoapods-core/gem_version.rb

@@ -2,5 +2,5 @@ module Pod
 
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.27.1' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.28.0' unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/github.rb

@@ -80,7 +80,7 @@ module Pod
     # @return [Nil] if the given url is not a valid github repo url.
     #
     def self.repo_id_from_url(url)
-      url[/github.com\/([^\/\.]*\/[^\/\.]*)\.*/, 1]
+      url[%r[github.com/([^/\.]*/[^/\.]*)\.*], 1]
     end
 
     # Performs a get request with the given URL.

data/lib/cocoapods-core/lockfile.rb

@@ -12,7 +12,7 @@ module Pod
   #
   class Lockfile
 
-    # TODO    The symbols should be converted to a String and back to symbol
+    # @todo   The symbols should be converted to a String and back to symbol
     #         when reading (EXTERNAL SOURCES Download options)
 
     # @return [String] the hash used to initialize the Lockfile.
@@ -56,7 +56,7 @@ module Pod
     # @return [Bool] Whether the Podfiles are equal.
     #
     def ==(other)
-      other && self.to_hash == other.to_hash
+      other && to_hash == other.to_hash
     end
 
     # @return [String] a string representation suitable for debugging.
@@ -89,7 +89,9 @@ module Pod
     def version(pod_name)
       version = pod_versions[pod_name]
       return version if version
-      root_name = pod_versions.keys.find { |name| Specification.root_name(name) == pod_name }
+      root_name = pod_versions.keys.find do |name|
+        Specification.root_name(name) == pod_name
+      end
       pod_versions[root_name]
     end
 
@@ -140,7 +142,8 @@ module Pod
       version = version(name)
 
       unless dep && version
-        raise StandardError, "Attempt to lock the `#{name}` Pod without an known dependency."
+        raise StandardError, "Attempt to lock the `#{name}` Pod without an " \
+          "known dependency."
       end
 
       locked_dependency = dep.dup
@@ -229,9 +232,11 @@ module Pod
     #
     def detect_changes_with_podfile(podfile)
       result = {}
-      [ :added, :changed, :removed, :unchanged ].each { |k| result[k] = [] }
+      [:added, :changed, :removed, :unchanged].each { |k| result[k] = [] }
 
-      installed_deps = dependencies.map { |d| dependency_to_lock_pod_named(d.name) }
+      installed_deps = dependencies.map do |dep|
+        dependency_to_lock_pod_named(dep.name)
+      end
       all_dep_names  = (dependencies + podfile.dependencies).map(&:name).uniq
       all_dep_names.each do |name|
         installed_dep = installed_deps.find { |d| d.name == name }
@@ -239,7 +244,7 @@ module Pod
 
         if installed_dep.nil?  then key = :added
         elsif podfile_dep.nil? then key = :removed
-        elsif podfile_dep.compatible?(installed_dep ) then key = :unchanged
+        elsif podfile_dep.compatible?(installed_dep) then key = :unchanged
         else key = :changed
         end
         result[key] << name
@@ -262,7 +267,7 @@ module Pod
     #
     def write_to_disk(path)
       path.dirname.mkpath unless path.dirname.exist?
-      File.open(path, 'w') {|f| f.write(to_yaml) }
+      File.open(path, 'w') { |f| f.write(to_yaml) }
       self.defined_in_file = path
     end
 
@@ -391,7 +396,7 @@ module Pod
       # @return   [Array] the generated data.
       #
       def generate_dependencies_data(podfile)
-        podfile.dependencies.map{ |d| d.to_s }.sort
+        podfile.dependencies.map { |d| d.to_s }.sort
       end
 
       # Generates the information of the external sources.
@@ -409,7 +414,7 @@ module Pod
       #
       def generate_external_sources_data(podfile)
         deps = podfile.dependencies.select(&:external?)
-        deps = deps.sort { |d, other| d.name <=> other.name}
+        deps = deps.sort { |d, other| d.name <=> other.name }
         sources = {}
         deps.each { |d| sources[d.root_name] = d.external_source }
         sources
@@ -437,4 +442,3 @@ module Pod
     end
   end
 end
-

data/lib/cocoapods-core/platform.rb

@@ -100,7 +100,7 @@ module Pod
     def supports?(other)
       other = Platform.new(other)
       if other.deployment_target && deployment_target
-      (other.name == name) && (other.deployment_target <= deployment_target)
+        (other.name == name) && (other.deployment_target <= deployment_target)
       else
         other.name == name
       end
@@ -119,7 +119,7 @@ module Pod
     #
     def inspect
       "#<#{self.class.name} name=#{name.inspect} " \
-      "deployment_target=#{deployment_target.inspect}>"
+        "deployment_target=#{deployment_target.inspect}>"
     end
 
     # @return [Symbol] a symbol representing the name of the platform.
@@ -137,10 +137,10 @@ module Pod
     # @return [Fixnum] -1, 0, or +1 depending on whether the receiver is less
     #         than, equal to, or greater than other.
     #
-    def <=> other
-      name_sort = self.name.to_s <=> other.name.to_s
+    def <=>(other)
+      name_sort = name.to_s <=> other.name.to_s
       if name_sort.zero?
-        self.deployment_target <=> other.deployment_target
+        deployment_target <=> other.deployment_target
       else
         name_sort
       end
@@ -150,7 +150,11 @@ module Pod
     #         iOS.
     #
     def requires_legacy_ios_archs?
-      (name == :ios) && deployment_target && (deployment_target < Version.new("4.3"))
+      if name == :ios
+        deployment_target && (deployment_target < Version.new("4.3"))
+      else
+        false
+      end
     end
 
     # Converts the symbolic name of a platform to a string name suitable to be

data/lib/cocoapods-core/podfile.rb

@@ -172,11 +172,11 @@ module Pod
 
     # @return [Array] The keys used by the hash representation of the Podfile.
     #
-    HASH_KEYS = [
-      'target_definitions',
-      'workspace',
-      'generate_bridge_support',
-      'set_arc_compatibility_flag',
+    HASH_KEYS = %w[
+      target_definitions
+      workspace
+      generate_bridge_support
+      set_arc_compatibility_flag
     ].freeze
 
     # @return [Hash] The hash representation of the Podfile.
@@ -234,16 +234,19 @@ module Pod
     # @return [Podfile] the new Podfile
     #
     def self.from_ruby(path)
-      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')
       end
       podfile = Podfile.new(path) do
         begin
+          # rubocop:disable Eval
           eval(string, nil, path.to_s)
+          # rubocop:enable Eval
         rescue Exception => e
-          raise DSLError.new("Invalid `#{path.basename}` file: #{e.message}", path, e.backtrace)
+          message = "Invalid `#{path.basename}` file: #{e.message}"
+          raise DSLError.new(message, path, e.backtrace)
         end
       end
       podfile
@@ -261,7 +264,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') { |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')
@@ -283,7 +286,7 @@ module Pod
     def self.from_hash(hash, path = nil)
       internal_hash = hash.dup
       target_definitions = internal_hash.delete('target_definitions') || []
-      podfile = Podfile.new(path,internal_hash)
+      podfile = Podfile.new(path, internal_hash)
       target_definitions.each do |definition_hash|
         definition = TargetDefinition.from_hash(definition_hash, podfile)
         podfile.root_target_definitions << definition
@@ -314,7 +317,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
 
@@ -328,7 +333,9 @@ module Pod
     # @return [Object] The value for the key.
     #
     def get_hash_value(key)
-      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]
     end
 

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

@@ -36,13 +36,13 @@ module Pod
     module DSL
 
       # @!group Dependencies
-      #   The Podfile specifies the dependencies of each user target. 
+      #   The Podfile specifies the dependencies of each user target.
       #
       #   * `pod` is the way to declare a specific dependency.
       #   * `podspec` provides an easy creation API for local podspecs.
-      #   * `target` allows you to scope your dependencies to specific 
+      #   * `target` allows you to scope your dependencies to specific
       #   targets in your Xcode projects.
-      
+
       #-----------------------------------------------------------------------#
 
       # Specifies a dependency of the project.
@@ -149,7 +149,8 @@ module Pod
       #
       def pod(name = nil, *requirements, &block)
         if block
-          raise StandardError, "Inline specifications are deprecated. Please store the specification in a `podspec` file."
+          raise StandardError, "Inline specifications are deprecated. " \
+            "Please store the specification in a `podspec` file."
         end
 
         unless name
@@ -173,8 +174,8 @@ module Pod
       #   podspec :path => '/Documents/PrettyKit/PrettyKit.podspec'
       #
       # @param    [Hash {Symbol=>String}] options
-      #           the path where to load the {Specification}. If not provided the
-      #           first podspec in the directory of the podfile is used.
+      #           the path where to load the {Specification}. If not provided
+      #           the first podspec in the directory of the podfile is used.
       #
       # @option   options [String] :path
       #           the path of the podspec file
@@ -195,9 +196,10 @@ module Pod
         current_target_definition.store_podspec(options)
       end
 
-      # Defines a new static library target and scopes dependencies defined from
-      # the given block. The target will by default include the dependencies
-      # defined outside of the block, unless the `:exclusive => true` option is
+      # Defines a new static library target and scopes dependencies defined
+      # from the given block. The target will by default include the
+      # dependencies defined outside of the block, unless the `:exclusive =>
+      # true` option is
       # given.
       #
       # ---
@@ -232,7 +234,8 @@ module Pod
       #
       def target(name, options = {})
         if options && !options.keys.all? { |key| [:exclusive].include?(key) }
-          raise Informative, "Unsupported options `#{options}` for target `#{name}`"
+          raise Informative, "Unsupported options `#{options}` for " \
+            "target `#{name}`"
         end
 
         parent = current_target_definition
@@ -250,9 +253,9 @@ module Pod
       #   These settings are used to control the  CocoaPods generated project.
       #
       #   This starts out simply with stating what `platform` you are working
-      #   on. `xcodeproj` allows you to state specifically which project to 
-      #   link with. 
-      
+      #   on. `xcodeproj` allows you to state specifically which project to
+      #   link with.
+
       #-----------------------------------------------------------------------#
 
       # Specifies the platform for which a static library should be build.
@@ -284,8 +287,8 @@ module Pod
         current_target_definition.set_platform(name, target)
       end
 
-      # Specifies the Xcode project that contains the target that the Pods library
-      # should be linked with.
+      # Specifies the Xcode project that contains the target that the Pods
+      # library should be linked with.
       #
       # -----
       #
@@ -304,12 +307,12 @@ module Pod
       #           the path of the project to link with
       #
       # @param    [Hash{String => symbol}] build_configurations
-      #           a hash where the keys are the name of the build configurations
-      #           in your Xcode project and the values are Symbols that specify
-      #           if the configuration should be based on the `:debug` or
-      #           `:release` configuration. If no explicit mapping is specified
-      #           for a configuration in your project, it will default to
-      #           `:release`.
+      #           a hash where the keys are the name of the build
+      #           configurations in your Xcode project and the values are
+      #           Symbols that specify if the configuration should be based on
+      #           the `:debug` or `:release` configuration. If no explicit
+      #           mapping is specified for a configuration in your project, it
+      #           will default to `:release`.
       #
       # @example  Specifying the user project
       #
@@ -366,7 +369,7 @@ module Pod
       #
       # This attribute is inherited by child target definitions.
       #
-      # If you would like to inhibit warnings per Pod you can use the 
+      # If you would like to inhibit warnings per Pod you can use the
       # following syntax:
       #
       #     pod 'SSZipArchive', :inhibit_warnings => true
@@ -493,4 +496,3 @@ module Pod
     end
   end
 end
-