cocoapods-core 0.34.1 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66913ba427c63f53357342686a63e63ba07c863
-  data.tar.gz: f958368c60696a32d4960c0e2703c18a450887d6
+  metadata.gz: a94f1af3077b3e043f869fbdbb2e09c242aefeb5
+  data.tar.gz: a73fb826f1d22b75ead258ac0e148bd6cf82a510
 SHA512:
-  metadata.gz: 7e274277975927d3a9fba81f4813df67d540dcf648e20f1edb0657c0b7b01896b74a7232402a591631b4c3ef059350bcb453d48418298b8883137ea00217e6e2
-  data.tar.gz: 54418fabcd515910c7c04cf97bb5fb5204cfcf1b6c8e256e2bb61d4f36c7602a42f4047ece29aad42a8c2672b5dc984467b61dbe8930872728cbee3b201e906b
+  metadata.gz: bf461d926d3deddaf2aab6a6e6fcd68c9c3c85a4b1eb1730fcc1d9399f5b390d53f3a57f8544c54962a6ad31916f0858995adc9b0495958046b8ce180ae1c3b2
+  data.tar.gz: 5d409665efa687120435c9186ae0a58dbf14725ca5afca4a46b9169fe6b2e8c54e1e983037e6053634ab631c2460482585d0a3f2e62adb36a7c352b6ff13329d

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -145,6 +145,16 @@ module Pod
       #     pod 'AFNetworking', :git => 'https://github.com/gowalla/AFNetworking.git'
       #
       #
+      # To use a different branch of the repo:
+      #
+      #     pod 'AFNetworking', :git => 'https://github.com/gowalla/AFNetworking.git', :branch => 'dev'
+      #
+      #
+      # To use a tag of the repo:
+      #
+      #     pod 'AFNetworking', :git => 'https://github.com/gowalla/AFNetworking.git', :tag => '0.7.0'
+      #
+      #
       # Or specify a commit:
       #
       #     pod 'AFNetworking', :git => 'https://github.com/gowalla/AFNetworking.git', :commit => '082f8319af'

data/lib/cocoapods-core/source.rb

@@ -1,8 +1,6 @@
 require 'cocoapods-core/source/acceptor'
 require 'cocoapods-core/source/aggregate'
 require 'cocoapods-core/source/health_reporter'
-require 'cocoapods-core/source/abstract_data_provider'
-require 'cocoapods-core/source/file_system_data_provider'
 
 module Pod
   # The Source class is responsible to manage a collection of podspecs.
@@ -16,37 +14,40 @@ module Pod
   #     "#{SPEC_NAME}/#{VERSION}/#{SPEC_NAME}.podspec"
   #
   class Source
-    # @return [AbstractDataProvider] the data provider for this source.
+    # @return [Pathname] The path where the source is stored.
     #
-    attr_accessor :data_provider
+    attr_reader :repo
 
     # @param  [Pathname, String] repo @see #repo.
     #
-    def initialize(repo = nil)
-      # TODO: Temporary solution to aide the transition
-      if repo.is_a?(String) || repo.is_a?(Pathname)
-        @data_provider = FileSystemDataProvider.new(repo)
-      else
-        @data_provider = repo
-      end
+    def initialize(repo)
+      @repo = Pathname.new(repo)
     end
 
     # @return [String] The name of the source.
     #
     def name
-      data_provider.name
+      repo.basename.to_s
     end
 
     # @return [String] The URL of the source.
     #
     def url
-      data_provider.url
+      Dir.chdir(repo) do
+        remote = `git ls-remote --get-url`.chomp
+
+        if $?.success?
+          remote
+        elsif (repo + '.git').exist?
+          "file://#{repo}/.git"
+        end
+      end
     end
 
     # @return [String] The type of the source.
     #
     def type
-      data_provider.type
+      'file system'
     end
 
     alias_method :to_s, :name
@@ -77,12 +78,14 @@ module Pod
     #
     #
     def pods
-      pods = data_provider.pods
-      unless pods
-        raise Informative, "Unable to find the #{data_provider.type} source " \
-          "named: `#{data_provider.name}`"
+      unless specs_dir
+        raise Informative, "Unable to find a source named: `#{name}`"
       end
-      pods
+      specs_dir_as_string = specs_dir.to_s
+      Dir.entries(specs_dir).select do |entry|
+        valid_name = entry[0, 1] != '.'
+        valid_name && File.directory?(File.join(specs_dir_as_string, entry))
+      end.sort
     end
 
     # @return [Array<Version>] all the available versions for the Pod, sorted
@@ -92,8 +95,20 @@ module Pod
     #         the name of the Pod.
     #
     def versions(name)
-      versions = data_provider.versions(name)
-      versions.map { |version| Version.new(version) } if versions
+      return nil unless specs_dir
+      raise ArgumentError, 'No name' unless name
+      pod_dir = specs_dir + name
+      return unless pod_dir.exist?
+      pod_dir.children.map do |v|
+        basename = v.basename.to_s
+        begin
+          Version.new(basename) if v.directory? && basename[0, 1] != '.'
+        rescue ArgumentError => e
+          raise Informative, 'An unexpected version directory ' \
+           "`#{basename}` was encountered for the " \
+           "`#{pod_dir}` Pod in the `#{name}` repository."
+        end
+      end.compact.sort.reverse
     end
 
     # @return [Specification] the specification for a given version of Pod.
@@ -115,6 +130,8 @@ module Pod
     # @return [Pathname] The path of the specification.
     #
     def specification_path(name, version)
+      raise ArgumentError, 'No name' unless name
+      raise ArgumentError, 'No version' unless version
       path = specs_dir + name + version.to_s
       specification_path = path + "#{name}.podspec.json"
       unless specification_path.exist?
@@ -124,7 +141,7 @@ module Pod
         raise StandardError, "Unable to find the specification #{name} " \
           "(#{version}) in the #{name} source."
       end
-      spec
+      specification_path
     end
 
     # @return [Array<Specification>] all the specifications contained by the
@@ -159,22 +176,6 @@ module Pod
       pods.map { |pod_name| set(pod_name) }
     end
 
-    # Returns the path of the specification with the given name and version.
-    #
-    # @param  [String] name
-    #         the name of the Pod.
-    #
-    # @param  [Version,String] version
-    #         the version for the specification.
-    #
-    # @return [Pathname] The path of the specification.
-    #
-    # @todo   Remove.
-    #
-    def specification_path(name, version)
-      data_provider.specification_path(name, version)
-    end
-
     public
 
     # @!group Searching the source
@@ -183,16 +184,20 @@ 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.
     #
+    # @note   This method is optimized for fast lookups by name, i.e. it does
+    #         *not* require iterating through {#pod_sets}
+    #
     # @todo   Rename to #load_set
     #
     def search(query)
+      unless specs_dir
+        raise Informative, "Unable to find a source named: `#{name}`"
+      end
       if query.is_a?(Dependency)
-        name = query.root_name
-      else
-        name = query
+        query = query.root_name
       end
-      pod_sets.find do |set|
-        set.name == name
+      if (specs_dir + query).directory?
+        set(query)
       end
     end
 
@@ -213,23 +218,19 @@ module Pod
     def search_by_name(query, full_text_search = false)
       regexp_query = /#{query}/i
       if full_text_search
-        if data_provider.is_a?(FileSystemDataProvider)
-          pod_sets.reject do |set|
-            texts = []
-            begin
-              s = set.specification
-              texts << s.name
-              texts += s.authors.keys
-              texts << s.summary
-              texts << s.description
-            rescue
-              CoreUI.warn "Skipping `#{set.name}` because the podspec " \
-                'contains errors.'
-            end
-            texts.grep(regexp_query).empty?
+        pod_sets.reject do |set|
+          texts = []
+          begin
+            s = set.specification
+            texts << s.name
+            texts += s.authors.keys
+            texts << s.summary
+            texts << s.description
+          rescue
+            CoreUI.warn "Skipping `#{set.name}` because the podspec " \
+              'contains errors.'
           end
-        else
-          []
+          texts.grep(regexp_query).empty?
         end
       else
         names = pods.grep(regexp_query)
@@ -302,6 +303,24 @@ module Pod
       nil
     end
 
+    # @return [Pathname] The directory where the specs are stored.
+    #
+    # @note   In previous versions of CocoaPods they used to be stored in
+    #         the root of the repo. This lead to issues, especially with
+    #         the GitHub interface and now the are stored in a dedicated
+    #         folder.
+    #
+    def specs_dir
+      @specs_dir ||= begin
+        specs_sub_dir = repo + 'Specs'
+        if specs_sub_dir.exist?
+          specs_sub_dir
+        elsif repo.exist?
+          repo
+        end
+      end
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

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

@@ -37,7 +37,6 @@ module Pod
         sources.each do |source|
           pods_by_source[source] = source.pods
         end
-        sources = pods_by_source.keys
         pods = pods_by_source.values.flatten.uniq
 
         pods.map do |pod|
@@ -110,8 +109,8 @@ module Pod
         root_spec_names = pods_by_source.values.flatten.uniq
         root_spec_names.each do |pod|
           sources = []
-          pods_by_source.each do |source, pods|
-            sources << source if pods.include?(pod)
+          @sources.each do |s|
+            sources << s if pods_by_source[s].include?(pod)
           end
           result << Specification::Set.new(pod, sources)
         end

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

@@ -122,7 +122,7 @@ module Pod
       # @return [void]
       #
       def check_stray_specs
-        all_paths = Pathname.glob(source.data_provider.repo + '**/*.podspec{,.json}')
+        all_paths = Pathname.glob(source.repo + '**/*.podspec{,.json}')
         stray_specs = all_paths - report.analyzed_paths
         stray_specs.each do |path|
           report.add_message(:error, 'Stray spec', path)

data/lib/cocoapods-core/specification.rb

@@ -120,7 +120,7 @@ module Pod
     #           pod.
     #
     def self.name_and_version_from_string(string_representation)
-      match_data = string_representation.match(/\A(\S*)(?: \((.+)\))?\Z/)
+      match_data = string_representation.match(/\A((?:\s?[^\s(])+)(?: \((.+)\))?\Z/)
       unless match_data
         raise Informative, 'Invalid string representation for a ' \
           "specification: `#{string_representation}`. " \

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

@@ -8,7 +8,7 @@ module Pod
     # a Pod. This class stores the information of the dependencies that required
     # a Pod in the resolution process.
     #
-    # @note   The alphabetical order of the sets is used to select a
+    # @note   The order in which the sets are provided is used to select a
     #         specification if multiple are available for a given version.
     #
     # @note   The set class is not and should be not aware of the backing store
@@ -32,8 +32,7 @@ module Pod
       #
       def initialize(name, sources = [])
         @name    = name
-        sources  = sources.is_a?(Array) ? sources : [sources]
-        @sources = sources.sort_by(&:name)
+        @sources = Array(sources)
         @dependencies_by_requirer_name = {}
         @dependencies = []
       end
@@ -84,23 +83,20 @@ module Pod
       #         {#required_version}.
       #
       # @note   If multiple sources have a specification for the
-      #         {#required_version} The alphabetical order of their names is
-      #         used to disambiguate.
+      #         {#required_version}, the order in which they are provided
+      #         is used to disambiguate.
       #
       def specification
-        path = specification_path_for_version(required_version)
+        path = specification_paths_for_version(required_version).first
         Specification.from_file(path)
       end
 
-      # TODO
+      # @return [Array<String>] the paths to specifications for the given
+      #         version
       #
-      def specification_path_for_version(_version)
-        sources = []
-        versions_by_source.each do |source, source_versions|
-          sources << source if source_versions.include?(required_version)
-        end
-        source = sources.sort_by(&:name).first
-        source.specification_path(name, required_version)
+      def specification_paths_for_version(_version)
+        sources = @sources.select { |source| versions_by_source[source].include?(required_version) }
+        sources.map { |source| source.specification_path(name, required_version) }
       end
 
       # @return [Version] the highest version that satisfies the stored
@@ -139,8 +135,12 @@ module Pod
 
       # @return [Pathname] The path of the highest version.
       #
+      # @note   If multiple sources have a specification for the
+      #         {#required_version}, the order in which they are provided
+      #         is used to disambiguate.
+      #
       def highest_version_spec_path
-        specification_path_for_version(highest_version)
+        specification_paths_for_version(highest_version).first
       end
 
       # @return [Hash{Source => Version}] all the available versions for the

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

@@ -218,7 +218,7 @@ module Pod
         def compute_creation_date(set)
           date = get_value(set, :creation_date)
           unless date
-            Dir.chdir(set.sources.first.data_provider.repo) do
+            Dir.chdir(set.sources.first.repo) do
               git_log = `git log --first-parent --format=%ct "#{set.name}"`
               creation_date = git_log.split("\n").last.to_i
               date = Time.at(creation_date)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,10 +103,8 @@ files:
 - lib/cocoapods-core/podfile/target_definition.rb
 - lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/requirement.rb
-- lib/cocoapods-core/source/abstract_data_provider.rb
 - lib/cocoapods-core/source/acceptor.rb
 - lib/cocoapods-core/source/aggregate.rb
-- lib/cocoapods-core/source/file_system_data_provider.rb
 - lib/cocoapods-core/source/health_reporter.rb
 - lib/cocoapods-core/source.rb
 - lib/cocoapods-core/specification/consumer.rb

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

@@ -1,74 +0,0 @@
-module Pod
-  class Source
-    # Defines the required and the optional methods of a data provider.
-    #
-    class AbstractDataProvider
-      public
-
-      # @group Required methods
-      #-----------------------------------------------------------------------#
-
-      # @return [String] The name of the source.
-      #
-      def name
-        raise StandardError, 'Abstract method.'
-      end
-
-      # @return [String] The URL of the source.
-      #
-      def url
-        raise StandardError, 'Abstract method.'
-      end
-
-      # @return [String] The user friendly type of the source.
-      #
-      def type
-        raise StandardError, 'Abstract method.'
-      end
-
-      # @return [Array<String>] The list of the name of all the Pods known to
-      #         the Source.
-      #
-      def pods
-        raise StandardError, 'Abstract method.'
-      end
-
-      # @return [Array<String>] All the available versions of a given Pod,
-      #         sorted from highest to lowest.
-      #
-      # @param  [String] name
-      #         The name of the Pod.
-      #
-      def versions(_name)
-        raise StandardError, 'Abstract method.'
-      end
-
-      # @return [Specification] The specification for a given version of a Pod.
-      #
-      # @param  [String] name
-      #         The name of the Pod.
-      #
-      # @param  [String] version
-      #         The version of the Pod.
-      #
-      def specification(_name, _version)
-        raise StandardError, 'Abstract method.'
-      end
-
-      # @return [Specification] The contents of the specification for a given
-      #         version of a Pod.
-      #
-      # @param  [String] name
-      #         the name of the Pod.
-      #
-      # @param  [String] version
-      #         the version of the Pod.
-      #
-      def specification_contents(_name, _version)
-        raise StandardError, 'Abstract method.'
-      end
-
-      #-----------------------------------------------------------------------#
-    end
-  end
-end

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

@@ -1,162 +0,0 @@
-module Pod
-  class Source
-    # Data provider for a `Pod::Source` backed by a repository hosted in the
-    # file system.
-    #
-    class FileSystemDataProvider < AbstractDataProvider
-      # @return [Pathname] The path where the source is stored.
-      #
-      attr_reader :repo
-
-      # @param  [Pathname, String] repo @see #repo.
-      #
-      def initialize(repo)
-        @repo = Pathname.new(repo)
-      end
-
-      public
-
-      # @group Required methods
-      #-----------------------------------------------------------------------#
-
-      # @return [String] The name of the source.
-      #
-      def name
-        repo.basename.to_s
-      end
-
-      # @return [String] The URL of the source.
-      #
-      def url
-        Dir.chdir(repo) do
-          remote = `git ls-remote --get-url`.chomp
-          remote if $?.success?
-        end
-      end
-
-      # @return [String] The user friendly type of the source.
-      #
-      def type
-        'file system'
-      end
-
-      # @return [Array<String>] The list of the name of all the Pods known to
-      #         the Source.
-      #
-      # @note   Using Pathname#children is sensibly slower.
-      #
-      def pods
-        return nil unless specs_dir
-        specs_dir_as_string = specs_dir.to_s
-        Dir.entries(specs_dir).select do |entry|
-          valid_name = entry[0, 1] != '.'
-          valid_name && File.directory?(File.join(specs_dir_as_string, entry))
-        end.sort
-      end
-
-      # @return [Array<String>] All the available versions of a given Pod,
-      #         sorted from highest to lowest.
-      #
-      # @param  [String] name
-      #         The name of the Pod.
-      #
-      def versions(name)
-        return nil unless specs_dir
-        raise ArgumentError, 'No name' unless name
-        pod_dir = specs_dir + name
-        return unless pod_dir.exist?
-        pod_dir.children.map do |v|
-          basename = v.basename.to_s
-          begin
-            Version.new(basename) if v.directory? && basename[0, 1] != '.'
-          rescue ArgumentError => e
-            raise Informative, 'An unexpected version directory ' \
-             "`#{basename}` was encountered for the " \
-             "`#{pod_dir}` Pod in the `#{name}` repository."
-          end
-        end.compact.sort.reverse.map(&:to_s)
-      end
-
-      # @return [Specification] The specification for a given version of a Pod.
-      #
-      # @param  [String] name
-      #         The name of the Pod.
-      #
-      # @param  [String] version
-      #         The version of the Pod.
-      #
-      def specification(name, version)
-        path = specification_path(name, version)
-        Pod::Specification.from_file(path) if path && path.exist?
-      end
-
-      # @return [Specification] The contents of the specification for a given
-      #         version of a Pod.
-      #
-      # @param  [String] name
-      #         the name of the Pod.
-      #
-      # @param  [String] version
-      #         the version of the Pod.
-      #
-      def specification_contents(name, version)
-        path = specification_path(name, version)
-        File.open(path, 'r:utf-8') { |f| f.read } if path && path.exist?
-      end
-
-      public
-
-      # @group Other methods
-      #-----------------------------------------------------------------------#
-
-      # Returns the path of the specification with the given name and version.
-      #
-      # @param  [String] name
-      #         the name of the Pod.
-      #
-      # @param  [Version,String] version
-      #         the version for the specification.
-      #
-      # @return [Pathname] The path of the specification.
-      #
-      def specification_path(name, version)
-        raise ArgumentError, 'No name' unless name
-        raise ArgumentError, 'No version' unless version
-        return nil unless specs_dir
-        path = specs_dir + name + version.to_s
-        specification_path = path + "#{name}.podspec.json"
-        specification_path.exist?
-        unless specification_path.exist?
-          specification_path = path + "#{name}.podspec"
-        end
-        specification_path
-      end
-
-      private
-
-      # @group Private Helpers
-      #-----------------------------------------------------------------------#
-
-      # @return [Pathname] The directory where the specs are stored.
-      #
-      # @note   In previous versions of CocoaPods they used to be stored in
-      #         the root of the repo. This lead to issues, especially with
-      #         the GitHub interface and now the are stored in a dedicated
-      #         folder.
-      #
-      def specs_dir
-        unless @specs_dir
-          specs_sub_dir = repo + 'Specs'
-          if specs_sub_dir.exist?
-            @specs_dir = specs_sub_dir
-          elsif repo.exist?
-            @specs_dir = repo
-          end
-        end
-        @specs_dir
-      end
-
-      #-----------------------------------------------------------------------#
-    end
-  end
-end