cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/command/setup.rb

@@ -16,8 +16,8 @@ module Pod
 
       def self.options
         [
-          ["--no-shallow", "Clone full history so push will work"],
-          ["--push",       "Use this option to enable push access once granted"],
+          ['--no-shallow', 'Clone full history so push will work'],
+          ['--push', 'Use this option to enable push access once granted'],
         ].concat(super)
       end
 
@@ -31,7 +31,7 @@ module Pod
       end
 
       def run
-        UI.section "Setting up CocoaPods master repo" do
+        UI.section 'Setting up CocoaPods master repo' do
           if master_repo_dir.exist?
             set_master_repo_url
             set_master_repo_branch
@@ -43,7 +43,7 @@ module Pod
           end
         end
 
-        access_type = push? ? "push" : "read-only"
+        access_type = push? ? 'push' : 'read-only'
         UI.puts "Setup completed (#{access_type} access)".green
       end
 
@@ -51,16 +51,17 @@ module Pod
 
       # @!group Setup steps
 
-      # Migrates any repos from the old directory structure to the new directory
-      # structure.
+      # Migrates any repos from the old directory structure to the new
+      # directory structure.
+      #
+      # @todo: Remove by 1.0
       #
-      # @return [void]
       def migrate_repos
         config.repos_dir.mkpath
         Dir.foreach old_master_repo_dir.parent do |repo_dir|
           source_repo_dir = old_master_repo_dir.parent + repo_dir
           target_repo_dir = config.repos_dir + repo_dir
-          if not repo_dir =~ /\.+/ and source_repo_dir != config.repos_dir
+          if repo_dir !~ /\.+/ && source_repo_dir != config.repos_dir
             FileUtils.mv source_repo_dir, target_repo_dir
           end
         end
@@ -103,7 +104,7 @@ module Pod
       #
       def set_master_repo_branch
         Dir.chdir(master_repo_dir) do
-          git("checkout master")
+          git('checkout master')
         end
       end
 

data/lib/cocoapods/command/spec.rb

@@ -19,7 +19,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME | https://github.com/USER/REPO', :optional]
+          CLAide::Argument.new(%w(NAME https://github.com/USER/REPO), false),
         ]
 
         def initialize(argv)
@@ -29,7 +29,7 @@ module Pod
 
         def validate!
           super
-          help! "A pod name or repo URL is required." unless @name_or_url
+          help! 'A pod name or repo URL is required.' unless @name_or_url
         end
 
         def run
@@ -53,21 +53,21 @@ module Pod
         self.summary = 'Validates a spec file.'
 
         self.description = <<-DESC
-          Validates `NAME.podspec'. If a directory is provided it validates
+          Validates `NAME.podspec`. If a `DIRECTORY` is provided, it validates
           the podspec files found, including subfolders. In case
           the argument is omitted, it defaults to the current working dir.
         DESC
 
         self.arguments = [
-            ['NAME.podspec | DIRECTORY | http://PATH/NAME.podspec, ...', :optional]
+          CLAide::Argument.new(%w(NAME.podspec DIRECTORY http://PATH/NAME.podspec), false, true),
         ]
 
         def self.options
-          [ ["--quick",       "Lint skips checks that would require to download and build the spec"],
-            ["--only-errors", "Lint validates even if warnings are present"],
-            ["--subspec=NAME","Lint validates only the given subspec"],
-            ["--no-subspecs", "Lint skips validation of subspecs"],
-            ["--no-clean",    "Lint leaves the build directory intact for inspection"] ].concat(super)
+          [['--quick',       'Lint skips checks that would require to download and build the spec'],
+           ['--only-errors', 'Lint validates even if warnings are present'],
+           ['--subspec=NAME', 'Lint validates only the given subspec'],
+           ['--no-subspecs', 'Lint skips validation of subspecs'],
+           ['--no-clean',    'Lint leaves the build directory intact for inspection']].concat(super)
         end
 
         def initialize(argv)
@@ -102,10 +102,10 @@ module Pod
           count = podspecs_to_lint.count
           UI.puts "Analyzed #{count} #{'podspec'.pluralize(count)}.\n\n"
           if invalid_count == 0
-            lint_passed_message = count == 1 ? "#{podspecs_to_lint.first.basename} passed validation." : "All the specs passed validation."
+            lint_passed_message = count == 1 ? "#{podspecs_to_lint.first.basename} passed validation." : 'All the specs passed validation.'
             UI.puts lint_passed_message.green << "\n\n"
           else
-            raise Informative, count == 1 ? "The spec did not pass validation." : "#{invalid_count} out of #{count} specs failed validation."
+            raise Informative, count == 1 ? 'The spec did not pass validation.' : "#{invalid_count} out of #{count} specs failed validation."
           end
           podspecs_tmp_dir.rmtree if podspecs_tmp_dir.exist?
         end
@@ -114,32 +114,32 @@ module Pod
 
         def podspecs_to_lint
           @podspecs_to_lint ||= begin
-            files = []
-            @podspecs_paths << '.' if @podspecs_paths.empty?
-            @podspecs_paths.each do |path|
-              if path =~ /https?:\/\//
-                require 'open-uri'
-                output_path = podspecs_tmp_dir + File.basename(path)
-                output_path.dirname.mkpath
-                open(path) do |io|
-                  output_path.open('w') { |f| f << io.read }
-                end
-                files << output_path
-              else if (pathname = Pathname.new(path)).directory?
-                files += Pathname.glob(pathname + '**/*.podspec{.json,}')
-                raise Informative, "No specs found in the current directory." if files.empty?
-              else
-                files << (pathname = Pathname.new(path))
-                raise Informative, "Unable to find a spec named `#{path}'." unless pathname.exist? && path.include?('.podspec')
+          files = []
+          @podspecs_paths << '.' if @podspecs_paths.empty?
+          @podspecs_paths.each do |path|
+            if path =~ /https?:\/\//
+              require 'open-uri'
+              output_path = podspecs_tmp_dir + File.basename(path)
+              output_path.dirname.mkpath
+              open(path) do |io|
+                output_path.open('w') { |f| f << io.read }
               end
+              files << output_path
+            else if (pathname = Pathname.new(path)).directory?
+                   files += Pathname.glob(pathname + '**/*.podspec{.json,}')
+                   raise Informative, 'No specs found in the current directory.' if files.empty?
+            else
+              files << (pathname = Pathname.new(path))
+              raise Informative, "Unable to find a spec named `#{path}'." unless pathname.exist? && path.include?('.podspec')
             end
           end
+          end
           files
         end
       end
 
         def podspecs_tmp_dir
-          Pathname.new(File.join(Pathname.new('/tmp').realpath, '/CocoaPods/Lint_podspec'))
+          Pathname(File.join(Pathname.new('/tmp').realpath, '/CocoaPods/Lint_podspec'))
         end
       end
 
@@ -153,11 +153,13 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+          CLAide::Argument.new('NAME', false),
         ]
 
         def self.options
-          [["--show-all", "Print all versions of the given podspec"]].concat(super)
+          [
+            ['--show-all', 'Print all versions of the given podspec'],
+          ].concat(super)
         end
 
         def initialize(argv)
@@ -169,7 +171,7 @@ module Pod
 
         def validate!
           super
-          help! "A podspec name is required." unless @spec
+          help! 'A podspec name is required.' unless @spec
         end
 
         def run
@@ -187,11 +189,11 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+          CLAide::Argument.new('NAME', false),
         ]
 
         def self.options
-          [["--show-all", "Pick from all versions of the given podspec"]].concat(super)
+          [['--show-all', 'Pick from all versions of the given podspec']].concat(super)
         end
 
         def initialize(argv)
@@ -203,14 +205,14 @@ module Pod
 
         def validate!
           super
-          help! "A podspec name is required." unless @spec
+          help! 'A podspec name is required.' unless @spec
         end
 
         def run
           filepath = if @show_all
-            specs = get_path_of_spec(@spec, @show_all).split(/\n/)
-            index = choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
-            specs[index]
+                       specs = get_path_of_spec(@spec, @show_all).split(/\n/)
+                       index = choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
+                       specs[index]
           else
             get_path_of_spec(@spec)
           end
@@ -229,11 +231,12 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+          CLAide::Argument.new('NAME', false),
         ]
 
         def self.options
-          [["--show-all", "Pick which spec to edit from all available versions of the given podspec"]].concat(super)
+          [['--show-all', 'Pick which spec to edit from all available' \
+            'versions of the given podspec']].concat(super)
         end
 
         def initialize(argv)
@@ -245,19 +248,20 @@ module Pod
 
         def validate!
           super
-          help! "A podspec name is required." unless @spec
+          help! 'A podspec name is required.' unless @spec
         end
 
         def run
-          filepath = if @show_all
+          if @show_all
             specs = get_path_of_spec(@spec, @show_all).split(/\n/)
-            index = choose_from_array(specs, "Which spec would you like to edit [1-#{ specs.count }]? ")
-            specs[index]
+            message = "Which spec would you like to edit [1-#{specs.count}]? "
+            index = choose_from_array(specs, message)
+            filepath = specs[index]
           else
-            get_path_of_spec(@spec)
+            filepath = get_path_of_spec(@spec)
           end
 
-          exec_editor(filepath.to_s) if File.exists? filepath
+          exec_editor(filepath.to_s) if File.exist? filepath
           raise Informative, "#{ filepath } doesn't exist."
         end
 
@@ -284,7 +288,7 @@ module Pod
           raise Informative, "Failed to open editor. Set your 'EDITOR' environment variable."
         end
 
-        def exec_editor *args
+        def exec_editor(*args)
           return if args.to_s.empty?
           safe_exec(which_editor, *args)
         end
@@ -292,7 +296,7 @@ module Pod
         def safe_exec(cmd, *args)
           # This buys us proper argument quoting and evaluation
           # of environment variables in the cmd parameter.
-          exec "/bin/sh", "-i", "-c", cmd + ' "$@"', "--", *args
+          exec('/bin/sh', '-i', '-c', cmd + ' "$@"', '--', *args)
         end
       end
 
@@ -337,7 +341,7 @@ module Pod
         elsif sets.map(&:name).include?(spec)
           set = sets.find { |s| s.name == spec }
         else
-          names = sets.collect(&:name) * ', '
+          names = sets.map(&:name) * ', '
           raise Informative, "More than one spec found for '#{ spec }':\n#{ names }"
         end
 
@@ -346,19 +350,19 @@ module Pod
           return pathname_from_spec(best_spec, spec_source)
         end
 
-        return all_paths_from_set(set)
+        all_paths_from_set(set)
       end
 
       # @return [Pathname] the absolute path of the given spec and source
       #
-      def pathname_from_spec(spec, source)
+      def pathname_from_spec(spec, _source)
         Pathname(spec.defined_in_file)
       end
 
       # @return [String] of spec paths one on each line
       #
       def all_paths_from_set(set)
-        paths = ""
+        paths = ''
 
         sources = set.sources
 
@@ -384,18 +388,18 @@ module Pod
         sources.each do |source|
           versions = source.versions(set.name)
           versions.each do |version|
-            if !best_version or version > best_version
+            if !best_version || version > best_version
               best_source = source
               best_version = version
             end
           end
         end
 
-        if !best_source or !best_version
+        if !best_source || !best_version
           raise Informative, "Unable to locate highest known specification for `#{ set.name }'"
         end
 
-        return best_source.specification(set.name, best_version), best_source
+        [best_source.specification(set.name, best_version), best_source]
       end
 
       #--------------------------------------#
@@ -427,7 +431,7 @@ module Pod
 
         data[:name]          = repo['name']
         data[:summary]       = (repo['description'] || '').gsub(/["]/, '\"')
-        data[:homepage]      = (repo['homepage'] && !repo['homepage'].empty? ) ? repo['homepage'] : repo['html_url']
+        data[:homepage]      = (repo['homepage'] && !repo['homepage'].empty?) ? repo['homepage'] : repo['html_url']
         data[:author_name]   = user['name']  || user['login']
         data[:author_email]  = user['email'] || 'email@address.com'
         data[:source_url]    = repo['clone_url']
@@ -436,18 +440,18 @@ module Pod
       end
 
       def suggested_ref_and_version(repo)
-        tags = GitHub.tags(repo['html_url']).map {|tag| tag["name"]}
+        tags = GitHub.tags(repo['html_url']).map { |tag| tag['name'] }
         versions_tags = {}
         tags.each do |tag|
-          clean_tag = tag.gsub(/^v(er)? ?/,'')
+          clean_tag = tag.gsub(/^v(er)? ?/, '')
           versions_tags[Gem::Version.new(clean_tag)] = tag if Gem::Version.correct?(clean_tag)
         end
         version = versions_tags.keys.sort.last || '0.0.1'
-        data = {:version => version}
+        data = { :version => version }
         if version == '0.0.1'
           branches        = GitHub.branches(repo['html_url'])
           master_name     = repo['master_branch'] || 'master'
-          master          = branches.find {|branch| branch['name'] == master_name }
+          master          = branches.find { |branch| branch['name'] == master_name }
           data[:ref_type] = ':commit'
           data[:ref]      = master['commit']['sha']
         else
@@ -458,7 +462,7 @@ module Pod
       end
 
       def spec_template(data)
-        return <<-SPEC
+        <<-SPEC
 #
 #  Be sure to run `pod spec lint #{data[:name]}.podspec' to ensure this is a
 #  valid spec and to remove all comments including this before submitting the spec.
@@ -513,7 +517,7 @@ Pod::Spec.new do |s|
   #  Specify a social_media_url where others can refer to, for example a twitter
   #  profile URL.
   #
-  
+
   s.author             = { "#{data[:author_name]}" => "#{data[:author_email]}" }
   # Or just: s.author    = "#{data[:author_name]}"
   # s.authors            = { "#{data[:author_name]}" => "#{data[:author_email]}" }
@@ -599,7 +603,7 @@ end
     end
 
       def semantic_versioning_notice(repo_id, repo)
-        return <<-EOS
+        <<-EOS
 
 #{'――― MARKDOWN TEMPLATE ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'.reversed}
 

data/lib/cocoapods/config.rb

@@ -1,9 +1,7 @@
 module Pod
-
   # Stores the global configuration of CocoaPods.
   #
   class Config
-
     # The default settings for the configuration.
     #
     # Users can specify custom settings in `~/.cocoapods/config.yaml`.
@@ -23,8 +21,6 @@ module Pod
       :new_version_message => true,
 
       :cache_root          => Pathname.new(File.join(ENV['HOME'], 'Library/Caches/CocoaPods')),
-      :max_cache_size      => 500,
-      :aggressive_cache    => false,
     }
 
     public
@@ -37,18 +33,18 @@ module Pod
     #         performed actions.
     #
     attr_accessor :verbose
-    alias_method  :verbose?, :verbose
+    alias_method :verbose?, :verbose
 
     # @return [Bool] Whether CocoaPods should produce not output.
     #
     attr_accessor :silent
-    alias_method  :silent?, :silent
+    alias_method :silent?, :silent
 
     # @return [Bool] Whether a message should be printed when a new version of
     #         CocoaPods is available.
     #
     attr_accessor :new_version_message
-    alias_method  :new_version_message?, :new_version_message
+    alias_method :new_version_message?, :new_version_message
 
     #-------------------------------------------------------------------------#
 
@@ -57,19 +53,18 @@ module Pod
     # @return [Bool] Whether the installer should clean after the installation.
     #
     attr_accessor :clean
-    alias_method  :clean?, :clean
+    alias_method :clean?, :clean
 
     # @return [Bool] Whether CocoaPods should integrate a user target and build
     #         the workspace or just create the Pods project.
     #
     attr_accessor :integrate_targets
-    alias_method  :integrate_targets?, :integrate_targets
-
+    alias_method :integrate_targets?, :integrate_targets
 
     # @return [Bool] Whether the installer should skip the repos update.
     #
     attr_accessor :skip_repo_update
-    alias_method  :skip_repo_update?, :skip_repo_update
+    alias_method :skip_repo_update?, :skip_repo_update
 
     public
 
@@ -77,10 +72,6 @@ module Pod
 
     # @!group Cache
 
-    # @return [Fixnum] The maximum size for the cache expressed in Mb.
-    #
-    attr_accessor :max_cache_size
-
     # @return [Pathname] The directory where CocoaPods should cache remote data
     #         and other expensive to compute information.
     #
@@ -91,21 +82,6 @@ module Pod
       @cache_root
     end
 
-    # Allows to set whether the downloader should use more aggressive caching
-    # options.
-    #
-    # @note The aggressive cache has lead to issues if a tag is updated to
-    #       point to another commit.
-    #
-    attr_writer :aggressive_cache
-
-    # @return [Bool] Whether the downloader should use more aggressive caching
-    #         options.
-    #
-    def aggressive_cache?
-      @aggressive_cache || (ENV['CP_AGGRESSIVE_CACHE'] == 'TRUE')
-    end
-
     public
 
     #-------------------------------------------------------------------------#
@@ -136,13 +112,13 @@ module Pod
     #         files are stored.
     #
     def home_dir
-      @home_dir ||= Pathname.new(ENV['CP_HOME_DIR'] || "~/.cocoapods").expand_path
+      @home_dir ||= Pathname.new(ENV['CP_HOME_DIR'] || '~/.cocoapods').expand_path
     end
 
     # @return [Pathname] the directory where the CocoaPods sources are stored.
     #
     def repos_dir
-      @repos_dir ||= Pathname.new(ENV['CP_REPOS_DIR'] || "~/.cocoapods/repos").expand_path
+      @repos_dir ||= Pathname.new(ENV['CP_REPOS_DIR'] || '~/.cocoapods/repos').expand_path
     end
 
     attr_writer :repos_dir
@@ -150,7 +126,7 @@ module Pod
     # @return [Pathname] the directory where the CocoaPods templates are stored.
     #
     def templates_dir
-      @templates_dir ||= Pathname.new(ENV['CP_TEMPLATES_DIR'] || "~/.cocoapods/templates").expand_path
+      @templates_dir ||= Pathname.new(ENV['CP_TEMPLATES_DIR'] || '~/.cocoapods/templates').expand_path
     end
 
     # @return [Pathname] the root of the CocoaPods installation where the
@@ -159,7 +135,7 @@ module Pod
     def installation_root
       current_path = Pathname.pwd
       unless @installation_root
-        while(!current_path.root?)
+        until current_path.root?
           if podfile_path_in_dir(current_path)
             @installation_root = current_path
             unless current_path == Pathname.pwd
@@ -176,7 +152,7 @@ module Pod
     end
 
     attr_writer :installation_root
-    alias :project_root :installation_root
+    alias_method :project_root, :installation_root
 
     # @return [Pathname] The root of the sandbox.
     #
@@ -185,7 +161,7 @@ module Pod
     end
 
     attr_writer :sandbox_root
-    alias :project_pods_root :sandbox_root
+    alias_method :project_pods_root, :sandbox_root
 
     # @return [Sandbox] The sandbox of the current project.
     #
@@ -236,7 +212,7 @@ module Pod
     # @return [Pathname]
     #
     def default_podfile_path
-      @default_podfile_path ||= templates_dir + "Podfile.default"
+      @default_podfile_path ||= templates_dir + 'Podfile.default'
     end
 
     # Returns the path of the default Podfile test pods.
@@ -246,7 +222,7 @@ module Pod
     # @return [Pathname]
     #
     def default_test_podfile_path
-      @default_test_podfile_path ||= templates_dir + "Podfile.test"
+      @default_test_podfile_path ||= templates_dir + 'Podfile.test'
     end
 
     # @return [Pathname] The file to use a cache of the statistics provider.
@@ -255,7 +231,7 @@ module Pod
       cache_root + 'statistics.yml'
     end
 
-   # @return [Pathname] The file to use to cache the search data.
+    # @return [Pathname] The file to use to cache the search data.
     #
     def search_index_file
       cache_root + 'search_index.yaml'
@@ -267,17 +243,6 @@ module Pod
 
     # @!group Dependency Injection
 
-    # @return [Downloader] The downloader to use for the retrieving remote
-    #         source.
-    #
-    def downloader(target_path, options)
-      downloader = Downloader.for_target(target_path, options)
-      downloader.cache_root = cache_root
-      downloader.max_cache_size = max_cache_size
-      downloader.aggressive_cache = aggressive_cache?
-      downloader
-    end
-
     # @return [Specification::Set::Statistics] The statistic provider to use
     #         for specifications.
     #
@@ -294,7 +259,7 @@ module Pod
     # @return [Pathname] The path of the file which contains the user settings.
     #
     def user_settings_file
-      home_dir + "config.yaml"
+      home_dir + 'config.yaml'
     end
 
     # Sets the values of the attributes with the given hash.
@@ -307,7 +272,7 @@ module Pod
     def configure_with(values_by_key)
       return unless values_by_key
       values_by_key.each do |key, value|
-        self.instance_variable_set("@#{key}", value)
+        instance_variable_set("@#{key}", value)
       end
     end
 
@@ -320,6 +285,8 @@ module Pod
       'Podfile',
     ]
 
+    public
+
     # Returns the path of the Podfile in the given dir if any exists.
     #
     # @param  [Pathname] dir
@@ -357,8 +324,8 @@ module Pod
     #
     # @return [void]
     #
-    def self.instance=(instance)
-      @instance = instance
+    class << self
+      attr_writer :instance
     end
 
     # Provides support for accessing the configuration instance in other