cocoapods 0.34.4 → 0.35.0.rc1

data/lib/cocoapods/resolver/lazy_specification.rb

@@ -0,0 +1,60 @@
+module Pod
+  class Specification
+    class Set
+      class LazySpecification < BasicObject
+        attr_reader :name, :version, :source
+
+        def initialize(name, version, source)
+          @name = name
+          @version = version
+          @source = source
+        end
+
+        def method_missing(method, *args, &block)
+          specification.send(method, *args, &block)
+        end
+
+        def subspec_by_name(name = nil, raise_if_missing = true)
+          if !name || name == self.name
+            self
+          else
+            specification.subspec_by_name(name, raise_if_missing)
+          end
+        end
+
+        def specification
+          @specification ||= source.specification(name, version)
+        end
+      end
+
+      class External
+        def all_specifications
+          [specification]
+        end
+      end
+
+      def all_specifications
+        @all_specifications ||= begin
+          sources_by_version = {}
+          versions_by_source.each do |source, versions|
+            versions.each { |v| (sources_by_version[v] ||= []) << source }
+            sources_by_version
+          end
+
+          duplicate_versions = sources_by_version.select { |_version, sources| sources.count > 1 }
+
+          duplicate_versions.each do |version, sources|
+            UI.warn "Found multiple specifications for `#{name} (#{version})`:\n" +
+              sources.
+                map { |s| s.specification_path(name, version) }.
+                map { |v| "- #{v}" }.join("\n")
+          end
+
+          versions_by_source.map do |source, versions|
+            versions.map { |version| LazySpecification.new(name, version, source) }
+          end.flatten
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/sandbox.rb

@@ -219,6 +219,7 @@ module Pod
     # @return [Nil] if the podspec is not stored.
     #
     def specification_path(name)
+      name = Specification.root_name(name)
       path = specifications_root + "#{name}.podspec"
       if path.exist?
         path
@@ -378,7 +379,7 @@ module Pod
     end
 
     # @return [Hash{String=>String}] The path of the Pods with a local source
-    #         grouped by their name.
+    #         grouped by their root name.
     #
     # @todo   Rename (e.g. `pods_with_local_path`)
     #

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -9,6 +9,13 @@ module Pod
     class FileAccessor
       HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
 
+      GLOB_PATTERNS = {
+        :readme              => 'readme{*,.*}'.freeze,
+        :license             => 'licen{c,s}e{*,.*}'.freeze,
+        :source_files        => '*.{h,hpp,hh,m,mm,c,cpp}'.freeze,
+        :public_header_files => "*{#{HEADER_EXTENSIONS.join(',')}}".freeze,
+      }.freeze
+
       # @return [Sandbox::PathList] the directory where the source of the Pod
       #         is located.
       #
@@ -78,9 +85,13 @@ module Pod
         source_files.select { |f| extensions.include?(f.extname) }
       end
 
+      # @param [Boolean] include_frameworks
+      #        Whether or not to include the headers of the vendored frameworks.
+      #        Defaults to not include them.
+      #
       # @return [Array<Pathname>] the public headers of the specification.
       #
-      def public_headers
+      def public_headers(include_frameworks = false)
         public_headers = paths_for_attribute(:public_header_files)
         private_headers = paths_for_attribute(:private_header_files)
         if public_headers.nil? || public_headers.empty?
@@ -88,6 +99,7 @@ module Pod
         else
           header_files = public_headers
         end
+        header_files += vendored_frameworks_headers if include_frameworks
         header_files - private_headers
       end
 
@@ -111,6 +123,16 @@ module Pod
         paths_for_attribute(:vendored_frameworks, true)
       end
 
+      # @return [Array<Pathname>] The paths of the framework headers that come
+      #         shipped with the Pod.
+      #
+      def vendored_frameworks_headers
+        vendored_frameworks.map do |framework|
+          headers_dir = (framework + 'Headers').realpath
+          Pathname.glob(headers_dir + GLOB_PATTERNS[:public_header_files])
+        end.flatten.uniq
+      end
+
       # @return [Array<Pathname>] The paths of the library bundles that come
       #         shipped with the Pod.
       #
@@ -149,7 +171,7 @@ module Pod
       # @return [Pathname] The path of the auto-detected README file.
       #
       def readme
-        path_list.glob(%w(        readme{*,.*}        )).first
+        path_list.glob([GLOB_PATTERNS[:readme]]).first
       end
 
       # @return [Pathname] The path of the license file as indicated in the
@@ -159,7 +181,7 @@ module Pod
         if spec_consumer.spec.root.license[:file]
           path_list.root + spec_consumer.spec.root.license[:file]
         else
-          path_list.glob(%w(          licen{c,s}e{*,.*}          )).first
+          path_list.glob([GLOB_PATTERNS[:license]]).first
         end
       end
 
@@ -182,27 +204,12 @@ module Pod
         file_patterns = spec_consumer.send(attribute)
         options = {
           :exclude_patterns => spec_consumer.exclude_files,
-          :dir_pattern => glob_for_attribute(attribute),
+          :dir_pattern => GLOB_PATTERNS[attribute],
           :include_dirs => include_dirs,
         }
         expanded_paths(file_patterns, options)
       end
 
-      # Returns the pattern to use to glob a directory for an attribute.
-      #
-      # @param  [Symbol] attribute
-      #         the name of the attribute
-      #
-      # @return [String] the glob pattern.
-      #
-      def glob_for_attribute(attrbute)
-        globs = {
-          :source_files => '*.{h,hpp,hh,m,mm,c,cpp}'.freeze,
-          :public_header_files => "*.{#{ HEADER_EXTENSIONS * ',' }}".freeze,
-        }
-        globs[attrbute]
-      end
-
       # Matches the given patterns to the file present in the root of the path
       # list.
       #

data/lib/cocoapods/sandbox/headers_store.rb

@@ -23,16 +23,18 @@ module Pod
       def initialize(sandbox, relative_path)
         @sandbox       = sandbox
         @relative_path = relative_path
-        @search_paths  = [relative_path]
+        @search_paths  = []
       end
 
       # @return [Array<String>] All the search paths of the header directory in
       #         xcconfig format. The paths are specified relative to the pods
       #         root with the `${PODS_ROOT}` variable.
       #
-      def search_paths
+      def search_paths(platform)
+        platform_search_paths = @search_paths.select { |entry| entry[:platform] == platform }
+
         headers_dir = root.relative_path_from(sandbox.root).dirname
-        @search_paths.uniq.map { |path| "${PODS_ROOT}/#{headers_dir}/#{path}" }
+        ["${PODS_ROOT}/#{headers_dir}/#{@relative_path}"] + platform_search_paths.uniq.map { |entry| "${PODS_ROOT}/#{headers_dir}/#{entry[:path]}" }
       end
 
       # Removes the directory as it is regenerated from scratch during each
@@ -64,8 +66,8 @@ module Pod
       #
       # @return [Pathname]
       #
-      def add_files(namespace, relative_header_paths)
-        add_search_path(namespace)
+      def add_files(namespace, relative_header_paths, platform)
+        add_search_path(namespace, platform)
         namespaced_path = root + namespace
         namespaced_path.mkpath unless File.exist?(namespaced_path)
 
@@ -84,10 +86,13 @@ module Pod
       # @param  [Pathname] path
       #         the path tho add.
       #
+      # @param  [String] platform
+      #         the platform the search path applies to
+      #
       # @return [void]
       #
-      def add_search_path(path)
-        @search_paths << Pathname.new(@relative_path) + path
+      def add_search_path(path, platform)
+        @search_paths << {:platform => platform, :path => (Pathname.new(@relative_path) + path) }
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/sources_manager.rb

@@ -433,16 +433,16 @@ module Pod
         end
 
         case url.to_s.downcase
-        when %r{github.com(:|/)cocoapods/specs}
+        when %r{github.com[:/]+cocoapods/specs}
           base = 'master'
-        when %r{github.com(:|/)(.+)/(.+)}
-          base = Regexp.last_match[2]
+        when %r{github.com[:/]+(.+)/(.+)}
+          base = Regexp.last_match[1]
+        when %r{^\S+@(\S+)[:/]+(.+)$}
+          host, path = Regexp.last_match.captures
+          base = base_from_host_and_path[host, path]
         when URI.regexp
           url = URI(url.downcase)
           base = base_from_host_and_path[url.host, url.path]
-        when %r{^\S+@(\S+)[:/](.+)$}
-          host, path = Regexp.last_match.captures
-          base = base_from_host_and_path[host, path]
         else
           base = url.to_s.downcase
         end

data/lib/cocoapods/target.rb

@@ -52,7 +52,7 @@ module Pod
     # @return [PBXNativeTarget] the target generated in the Pods project for
     #         this library.
     #
-    attr_accessor :target
+    attr_accessor :native_target
 
     # @return [Platform] the platform for this library.
     #

data/lib/cocoapods/target/pod_target.rb

@@ -57,8 +57,8 @@ module Pod
     #         depends.
     #
     def dependencies
-      specs.map do |spec|
-        spec.consumer(platform).dependencies.map { |dep| Specification.root_name(dep.name) }
+      spec_consumers.map do |consumer|
+        consumer.dependencies.map { |dep| Specification.root_name(dep.name) }
       end.flatten
     end
 

data/lib/cocoapods/user_interface.rb

@@ -140,7 +140,7 @@ module Pod
       end
 
       # Returns a string containing relative location of a path from the Podfile.
-      # The returned path is quoted. If the argument is nit it returns the
+      # The returned path is quoted. If the argument is nil it returns the
       # empty string.
       #
       def path(pathname)

data/lib/cocoapods/user_interface/error_report.rb

@@ -57,6 +57,9 @@ Repositories : #{repo_information.join("\n               ")}
 #{'If none exists, create a ticket, with the template displayed above, on:'.yellow}
 https://github.com/CocoaPods/CocoaPods/issues/new
 
+#{'Be sure to first read the contributing guide for details on how to properly submit a ticket:'.yellow}
+https://github.com/CocoaPods/CocoaPods/blob/master/CONTRIBUTING.md
+
 Don't forget to anonymize any private data!
 
 EOS

data/lib/cocoapods/validator.rb

@@ -192,7 +192,7 @@ module Pod
     #
     def perform_linting
       linter.lint
-      @results.concat(linter.results)
+      @results.concat(linter.results.to_a)
     end
 
     # Perform analysis for a given spec (or subspec)
@@ -401,7 +401,7 @@ module Pod
 
     # Specialized Result to support subspecs aggregation
     #
-    class Result < Specification::Linter::Result
+    class Result < Specification::Linter::Results::Result
       def initialize(type, message)
         super(type, message)
         @subspecs = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.34.4
+  version: 0.35.0.rc1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.4
+        version: 0.35.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.4
+        version: 0.35.0.rc1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
@@ -110,47 +110,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: escape
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -172,9 +172,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.15
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -182,9 +179,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.15
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +256,6 @@ files:
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/project.rb
-- lib/cocoapods/command/push.rb
 - lib/cocoapods/command/repo/push.rb
 - lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/search.rb
@@ -284,6 +277,7 @@ files:
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
+- lib/cocoapods/generator/header.rb
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/target_environment_header.rb
 - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
@@ -295,6 +289,7 @@ files:
 - lib/cocoapods/hooks/library_representation.rb
 - lib/cocoapods/hooks/pod_representation.rb
 - lib/cocoapods/hooks_manager.rb
+- lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
 - lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/file_references_installer.rb
@@ -310,6 +305,7 @@ files:
 - lib/cocoapods/installer.rb
 - lib/cocoapods/open_uri.rb
 - lib/cocoapods/project.rb
+- lib/cocoapods/resolver/lazy_specification.rb
 - lib/cocoapods/resolver.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
@@ -340,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -353,4 +349,3 @@ signing_key:
 specification_version: 3
 summary: An Objective-C library package manager.
 test_files: []
-has_rdoc: