cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -1,6 +1,5 @@
 module Pod
   class Sandbox
-
     # Resolves the file patterns of a specification against its root directory,
     # taking into account any exclude pattern and the default extensions to use
     # for directories.
@@ -8,7 +7,6 @@ module Pod
     # @note The FileAccessor always returns absolute paths.
     #
     class FileAccessor
-
       HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
 
       # @return [Sandbox::PathList] the directory where the source of the Pod
@@ -33,7 +31,7 @@ module Pod
         @spec_consumer = spec_consumer
 
         unless @spec_consumer
-          raise Informative, "Attempt to initialize File Accessor without a specification consumer."
+          raise Informative, 'Attempt to initialize File Accessor without a specification consumer.'
         end
       end
 
@@ -151,7 +149,7 @@ module Pod
       # @return [Pathname] The path of the auto-detected README file.
       #
       def readme
-        path_list.glob(%w[ readme{*,.*} ]).first
+        path_list.glob(%w(        readme{*,.*}        )).first
       end
 
       # @return [Pathname] The path of the license file as indicated in the
@@ -161,7 +159,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(%w(          licen{c,s}e{*,.*}          )).first
         end
       end
 
@@ -229,9 +227,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end
-
-

data/lib/cocoapods/sandbox/headers_store.rb

@@ -1,15 +1,13 @@
 module Pod
   class Sandbox
-
     # Provides support for managing a header directory. It also keeps track of
     # the header search paths.
     #
     class HeadersStore
-
       # @return [Pathname] the absolute path of this header directory.
       #
       def root
-        @root ||= @sandbox.root + @relative_path
+        sandbox.headers_root + @relative_path
       end
 
       # @return [Sandbox] the sandbox where this header directory is stored.
@@ -33,7 +31,8 @@ module Pod
       #         root with the `${PODS_ROOT}` variable.
       #
       def search_paths
-        @search_paths.uniq.map { |path| "${PODS_ROOT}/#{path}" }
+        headers_dir = root.relative_path_from(sandbox.root).dirname
+        @search_paths.uniq.map { |path| "${PODS_ROOT}/#{headers_dir}/#{path}" }
       end
 
       # Removes the directory as it is regenerated from scratch during each
@@ -58,7 +57,8 @@ module Pod
       #         headers directory.
       #
       # @param  [Pathname] relative_header_path
-      #         the path of the header file relative to the sandbox.
+      #         the path of the header file relative to the Pods project
+      #         (`PODS_ROOT` variable of the xcconfigs).
       #
       # @note   This method adds the files to the search paths.
       #
@@ -70,7 +70,7 @@ module Pod
         namespaced_path.mkpath unless File.exist?(namespaced_path)
 
         relative_header_paths.map do |relative_header_path|
-          absolute_source = (@sandbox.root + relative_header_path)
+          absolute_source = (sandbox.root + relative_header_path)
           source = absolute_source.relative_path_from(namespaced_path)
           Dir.chdir(namespaced_path) do
             FileUtils.ln_sf(source, relative_header_path.basename)
@@ -91,7 +91,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/sandbox/path_list.rb

@@ -1,6 +1,5 @@
 module Pod
   class Sandbox
-
     # The PathList class is designed to perform multiple glob matches against
     # a given directory. Basically, it generates a list of all the children
     # paths and matches the globs patterns against them, resulting in just one
@@ -11,7 +10,6 @@ module Pod
     #         {#read_file_system}
     #
     class PathList
-
       # @return [Pathname] The root of the list whose files and directories
       #         are used to perform the matching operations.
       #
@@ -46,15 +44,15 @@ module Pod
         unless root.exist?
           raise Informative, "Attempt to read non existent folder `#{root}`."
         end
-        root_length  = root.to_s.length+1
+        root_length  = root.to_s.length + 1
         escaped_root = escape_path_for_glob(root)
-        paths  = Dir.glob(escaped_root + "**/*", File::FNM_DOTMATCH)
+        paths  = Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH)
         absolute_dirs  = paths.select { |path| File.directory?(path) }
         relative_dirs  = absolute_dirs.map  { |p| p[root_length..-1] }
         absolute_paths = paths.reject { |p| p == "#{root}/." || p == "#{root}/.." }
         relative_paths = absolute_paths.map { |p| p[root_length..-1] }
         @files = relative_paths - relative_dirs
-        @dirs  = relative_dirs.map { |d| d.gsub(/\/\.\.?$/,'') }.reject { |d| d == '.' || d == '..' } .uniq
+        @dirs  = relative_dirs.map { |d| d.gsub(/\/\.\.?$/, '') }.reject { |d| d == '.' || d == '..' } .uniq
       end
 
       #-----------------------------------------------------------------------#
@@ -67,7 +65,7 @@ module Pod
       #         paths.
       #
       def glob(patterns, options = {})
-        relative_glob(patterns, options).map {|p| root + p }
+        relative_glob(patterns, options).map { |p| root + p }
       end
 
       # @return [Array<Pathname>] The list of relative paths that are case
@@ -164,9 +162,9 @@ module Pod
         end
 
         if values_by_set.empty?
-          [ pattern ]
+          [pattern]
         else
-          patterns = [ pattern ]
+          patterns = [pattern]
           values_by_set.each do |set, values|
             patterns = patterns.map do |old_pattern|
               values.map do |value|
@@ -192,13 +190,12 @@ module Pod
         result = path.to_s
         characters_to_escape = ['[', ']', '{', '}', '?', '*']
         characters_to_escape.each do |character|
-          result.gsub!(character, "\\#{character}" )
+          result.gsub!(character, "\\#{character}")
         end
         Pathname.new(result)
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/sources_manager.rb

@@ -1,32 +1,40 @@
 module Pod
-
   # Manages all the sources known to the running CocoaPods Instance.
   #
   class SourcesManager
-
     class << self
-
       include Config::Mixin
 
-      # @return [Source::Aggregate] the aggregate of all the sources known to
-      #         this installation of CocoaPods.
+      # @return [Source::Aggregate] The aggregate of all the sources with the
+      #         known Pods.
       #
       def aggregate
-        Source::Aggregate.new(config.repos_dir)
+        dirs = config.repos_dir.children.select(&:directory?)
+        Source::Aggregate.new(dirs)
+      end
+
+      # @return [Array<Source>] The list of the sources with the given names.
+      #
+      # @param  [Array<#to_s>] names
+      #         The names of the sources.
+      #
+      def sources(names)
+        dirs = names.map { |name| source_dir(name) }
+        dirs.map { |repo| Source.new(repo) }
       end
 
-      # @return [Array<Source>] the list of all the sources known to this
+      # @return [Array<Source>] The list of all the sources known to this
       #         installation of CocoaPods.
       #
       def all
-        aggregate.all
+        dirs = config.repos_dir.children.select(&:directory?)
+        dirs.map { |repo| Source.new(repo) }
       end
 
-      # @return [Array<Specification::Set>] the list of all the specification
-      #         sets know to this installation of CocoaPods.
+      # @return [Source] The CocoaPods Master Repo source.
       #
-      def all_sets
-        aggregate.all_sets
+      def master
+        sources(['master'])
       end
 
       # Search all the sources to match the set for the given dependency.
@@ -71,13 +79,16 @@ module Pod
             end
             set_names << name unless texts.grep(query_regexp).empty?
           end
-          sets = set_names.sort.map { |name| aggregate.representative_set(name) }
+          sets = set_names.sort.map do |name|
+            aggregate.representative_set(name)
+          end
         else
           sets = aggregate.search_by_name(query, false)
         end
         if sets.empty?
-          extra = ", author, summary, or description" if full_text_search
-          raise Informative, "Unable to find a pod with name#{extra} matching `#{query}`"
+          extra = ', author, summary, or description' if full_text_search
+          raise Informative, "Unable to find a pod with name#{extra}" \
+            "matching `#{query}`"
         end
         sets
       end
@@ -108,7 +119,9 @@ module Pod
             search_index = aggregate.generate_search_index
           end
 
-          File.open(search_index_path, 'w') {|f| f.write(search_index.to_yaml) }
+          File.open(search_index_path, 'w') do |file|
+            file.write(search_index.to_yaml)
+          end
           @updated_search_index = search_index
         end
         @updated_search_index
@@ -124,10 +137,7 @@ module Pod
         Config.instance.search_index_file
       end
 
-      public
-
       # @!group Updating Sources
-      #-----------------------------------------------------------------------#
 
       extend Executable
       executable :git
@@ -141,23 +151,22 @@ module Pod
       #
       def update(source_name = nil, show_output = false)
         if source_name
-          specified_source = aggregate.all.find { |s| s.name == source_name }
-          raise Informative, "Unable to find the `#{source_name}` repo."    unless specified_source
-          raise Informative, "The `#{source_name}` repo is not a git repo." unless git_repo?(specified_source.data_provider.repo)
-          sources = [specified_source]
+          sources = [git_source_named(source_name)]
         else
-          sources = aggregate.all.select { |source| git_repo?(source.data_provider.repo) && git_remote_reachable?(source.data_provider.repo) }
+          sources =  git_sources
         end
 
         sources.each do |source|
           UI.section "Updating spec repo `#{source.name}`" do
             Dir.chdir(source.data_provider.repo) do
               begin
-                output = git!("pull --ff-only")
+                output = git!('pull --ff-only')
                 UI.puts output if show_output && !config.verbose?
               rescue Informative => e
-                raise Informative, 'An error occurred while performing ' \
-                  "`git pull` on repo `#{source.name}`.\n" + e.message
+                UI.warn 'CocoaPods was not able to update the ' \
+                  "`#{source.name}` repo. If this is an unexpected issue " \
+                  'and persists you can inspect it running ' \
+                  '`pod repo update --verbose`'
               end
             end
             check_version_information(source.data_provider.repo)
@@ -165,18 +174,6 @@ module Pod
         end
       end
 
-      # Returns whether a git repo's remote is reachable.
-      #
-      # @param  [Pathname] dir
-      #         The directory where the source is stored.
-      #
-      # @return [Bool] Whether the given source's remote is reachable.
-      #
-      def git_remote_reachable?(dir)
-        Dir.chdir(dir) { git('ls-remote') }
-        $?.success?
-      end
-
       # Returns whether a source is a GIT repo.
       #
       # @param  [Pathname] dir
@@ -204,10 +201,10 @@ module Pod
         versions = version_information(dir)
         unless repo_compatible?(dir)
           min, max = versions['min'], versions['max']
-          version_msg = ( min == max ) ? min : "#{min} - #{max}"
+          version_msg = ( min == max) ? min : "#{min} - #{max}"
           raise Informative, "The `#{dir.basename}` repo requires " \
           "CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red +
-          "Update CocoaPods, or checkout the appropriate tag in the repo."
+          'Update CocoaPods, or checkout the appropriate tag in the repo.'
         end
 
         needs_sudo = path_writable?(__FILE__)
@@ -269,8 +266,7 @@ module Pod
         yaml_file  = dir + 'CocoaPods-version.yml'
         return {} unless yaml_file.exist?
         begin
-          yaml = Pathname.new(yaml_file).read
-          YAMLHelper.load(yaml)
+          YAMLHelper.load_file(yaml_file)
         rescue Informative => e
           raise Informative, "There was an error reading '#{yaml_file}'.\n" \
             'Please consult http://blog.cocoapods.org/' \
@@ -279,10 +275,7 @@ module Pod
         end
       end
 
-      public
-
       # @!group Master repo
-      #-----------------------------------------------------------------------#
 
       # @return [Pathname] The path of the master repo.
       #
@@ -299,15 +292,54 @@ module Pod
         master_repo_dir.exist? && repo_compatible?(master_repo_dir)
       end
 
-      #-----------------------------------------------------------------------#
-
       private
 
+      # @return [Bool] Whether the given path is writable by the current user.
+      #
+      # @param  [#to_s] path
+      #         The path.
+      #
       def path_writable?(path)
         Pathname(path).dirname.writable?
       end
 
+      # @return [Source] The git source with the given name. If no git source
+      #         with given name is found it raises.
+      #
+      # @param  [String] name
+      #         The name of the source.
+      #
+      def git_source_named(name)
+        specified_source = aggregate.sources.find { |s| s.name == name }
+        unless specified_source
+          raise Informative, "Unable to find the `#{name}` repo."
+        end
+        unless git_repo?(specified_source.data_provider.repo)
+          raise Informative, "The `#{name}` repo is not a git repo."
+        end
+        specified_source
+      end
+
+      # @return [Source] The list of the git sources.
+      #
+      def git_sources
+        all.select do |source|
+          git_repo?(source.data_provider.repo)
+        end
+      end
+
+      # @return [Pathname] The path of the source with the given name.
+      #
+      # @param  [String] name
+      #         The name of the source.
+      #
+      def source_dir(name)
+        if dir = config.repos_dir + name
+          dir
+        else
+          raise Informative, "Unable to find the `#{name}` repo."
+        end
+      end
     end
   end
 end
-

data/lib/cocoapods/target.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # Model class which describes a Pods target.
   #
   # The Target class stores and provides the information necessary for
@@ -7,7 +6,6 @@ module Pod
   # This class is used to represent both the targets and their libraries.
   #
   class Target
-
     # @return [PBXNativeTarget] the target definition of the Podfile that
     #         generated this target.
     #
@@ -73,48 +71,56 @@ module Pod
     # @return [Pathname] the folder where to store the support files of this
     #         library.
     #
-    def support_files_root
-      @sandbox.library_support_files_dir(name)
+    def support_files_dir
+      sandbox.target_support_files_dir(name)
     end
 
+    # @param  [String] variant
+    #         The variant of the xcconfig. Used to differentiate build
+    #         configurations.
+    #
     # @return [Pathname] the absolute path of the xcconfig file.
     #
-    def xcconfig_path
-      support_files_root + "#{label}.xcconfig"
+    def xcconfig_path(variant = nil)
+      if variant
+        support_files_dir + "#{label}.#{variant.downcase}.xcconfig"
+      else
+        support_files_dir + "#{label}.xcconfig"
+      end
     end
 
     # @return [Pathname] the absolute path of the private xcconfig file.
     #
     def xcconfig_private_path
-      support_files_root + "#{label}-Private.xcconfig"
+      support_files_dir + "#{label}-Private.xcconfig"
     end
 
     # @return [Pathname] the absolute path of the header file which contains
     #         the information about the installed pods.
     #
     def target_environment_header_path
-      support_files_root + "#{target_definition.label.to_s}-environment.h"
+      name = target_definition.label
+      sandbox.target_support_files_dir(name) + "#{name}-environment.h"
     end
 
     # @return [Pathname] the absolute path of the prefix header file.
     #
     def prefix_header_path
-      support_files_root + "#{label}-prefix.pch"
+      support_files_dir + "#{label}-prefix.pch"
     end
 
     # @return [Pathname] the absolute path of the bridge support file.
     #
     def bridge_support_path
-      support_files_root + "#{label}.bridgesupport"
+      support_files_dir + "#{label}.bridgesupport"
     end
 
     # @return [Pathname] the path of the dummy source generated by CocoaPods
     #
     def dummy_source_path
-      support_files_root + "#{label}-dummy.m"
+      support_files_dir + "#{label}-dummy.m"
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end