cocoapods 1.5.2 → 1.6.1

data/lib/cocoapods/command/spec/create.rb

@@ -60,7 +60,7 @@ module Pod
           data[:author_email]  = `git config --get user.email`.strip
           data[:source_url]    = "http://EXAMPLE/#{name}.git"
           data[:ref_type]      = ':tag'
-          data[:ref]           = '#{s.version}'
+          data[:ref]           = '#{spec.version}'
           data
         end
 
@@ -100,8 +100,8 @@ module Pod
           else
             data[:ref_type] = ':tag'
             data[:ref]      = versions_tags[version]
-            data[:ref]      = '#{s.version}' if "#{version}" == versions_tags[version]
-            data[:ref]      = 'v#{s.version}' if "v#{version}" == versions_tags[version]
+            data[:ref]      = '#{spec.version}' if "#{version}" == versions_tags[version]
+            data[:ref]      = 'v#{spec.version}' if "v#{version}" == versions_tags[version]
           end
           data
         end
@@ -112,11 +112,11 @@ module Pod
 #  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.
 #
-#  To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+#  To learn more about Podspec attributes see https://docs.cocoapods.org/specification.html
 #  To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
 #
 
-Pod::Spec.new do |s|
+Pod::Spec.new do |spec|
 
   # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
@@ -125,31 +125,31 @@ Pod::Spec.new do |s|
   #  summary should be tweet-length, and the description more in depth.
   #
 
-  s.name         = "#{data[:name]}"
-  s.version      = "#{data[:version]}"
-  s.summary      = "#{data[:summary]}"
+  spec.name         = "#{data[:name]}"
+  spec.version      = "#{data[:version]}"
+  spec.summary      = "#{data[:summary]}"
 
   # This description is used to generate tags and improve search results.
   #   * Think: What does it do? Why did you write it? What is the focus?
   #   * Try to keep it short, snappy and to the point.
   #   * Write the description between the DESC delimiters below.
   #   * Finally, don't worry about the indent, CocoaPods strips it!
-  s.description  = <<-DESC
+  spec.description  = <<-DESC
                    DESC
 
-  s.homepage     = "#{data[:homepage]}"
-  # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"
+  spec.homepage     = "#{data[:homepage]}"
+  # spec.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"
 
 
   # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
-  #  Licensing your code is important. See http://choosealicense.com for more info.
+  #  Licensing your code is important. See https://choosealicense.com for more info.
   #  CocoaPods will detect a license file if there is a named LICENSE*
   #  Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'.
   #
 
-  s.license      = "MIT (example)"
-  # s.license      = { :type => "MIT", :file => "FILE_LICENSE" }
+  spec.license      = "MIT (example)"
+  # spec.license      = { :type => "MIT", :file => "FILE_LICENSE" }
 
 
   # ――― Author Metadata  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -162,10 +162,10 @@ Pod::Spec.new do |s|
   #  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]}" }
-  # s.social_media_url   = "http://twitter.com/#{data[:author_name]}"
+  spec.author             = { "#{data[:author_name]}" => "#{data[:author_email]}" }
+  # Or just: spec.author    = "#{data[:author_name]}"
+  # spec.authors            = { "#{data[:author_name]}" => "#{data[:author_email]}" }
+  # spec.social_media_url   = "https://twitter.com/#{data[:author_name]}"
 
   # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
@@ -173,14 +173,14 @@ Pod::Spec.new do |s|
   #  the deployment target. You can optionally include the target after the platform.
   #
 
-  # s.platform     = :ios
-  # s.platform     = :ios, "5.0"
+  # spec.platform     = :ios
+  # spec.platform     = :ios, "5.0"
 
   #  When using multiple platforms
-  # s.ios.deployment_target = "5.0"
-  # s.osx.deployment_target = "10.7"
-  # s.watchos.deployment_target = "2.0"
-  # s.tvos.deployment_target = "9.0"
+  # spec.ios.deployment_target = "5.0"
+  # spec.osx.deployment_target = "10.7"
+  # spec.watchos.deployment_target = "2.0"
+  # spec.tvos.deployment_target = "9.0"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -189,7 +189,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
+  spec.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -200,10 +200,10 @@ Pod::Spec.new do |s|
   #  Not including the public_header_files will make all headers public.
   #
 
-  s.source_files  = "Classes", "Classes/**/*.{h,m}"
-  s.exclude_files = "Classes/Exclude"
+  spec.source_files  = "Classes", "Classes/**/*.{h,m}"
+  spec.exclude_files = "Classes/Exclude"
 
-  # s.public_header_files = "Classes/**/*.h"
+  # spec.public_header_files = "Classes/**/*.h"
 
 
   # ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -214,10 +214,10 @@ Pod::Spec.new do |s|
   #  non-essential files like tests, examples and documentation.
   #
 
-  # s.resource  = "icon.png"
-  # s.resources = "Resources/*.png"
+  # spec.resource  = "icon.png"
+  # spec.resources = "Resources/*.png"
 
-  # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
+  # spec.preserve_paths = "FilesToSave", "MoreFilesToSave"
 
 
   # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -226,11 +226,11 @@ Pod::Spec.new do |s|
   #  the lib prefix of their name.
   #
 
-  # s.framework  = "SomeFramework"
-  # s.frameworks = "SomeFramework", "AnotherFramework"
+  # spec.framework  = "SomeFramework"
+  # spec.frameworks = "SomeFramework", "AnotherFramework"
 
-  # s.library   = "iconv"
-  # s.libraries = "iconv", "xml2"
+  # spec.library   = "iconv"
+  # spec.libraries = "iconv", "xml2"
 
 
   # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -239,10 +239,10 @@ Pod::Spec.new do |s|
   #  where they will only apply to your library. If you depend on other Podspecs
   #  you can include multiple dependencies to ensure it works.
 
-  # s.requires_arc = true
+  # spec.requires_arc = true
 
-  # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
-  # s.dependency "JSONKit", "~> 1.4"
+  # spec.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
+  # spec.dependency "JSONKit", "~> 1.4"
 
 end
           SPEC
@@ -259,7 +259,7 @@ CocoaPods is a tool for managing dependencies for OSX and iOS Xcode projects and
 
 However, #{repo} doesn't have any version tags. I’ve added the current HEAD as version 0.0.1, but a version tag will make dependency resolution much easier.
 
-[Semantic version](http://semver.org) tags (instead of plain commit hashes/revisions) allow for [resolution of cross-dependencies](https://github.com/CocoaPods/Specs/wiki/Cross-dependencies-resolution-example).
+[Semantic version](https://semver.org) tags (instead of plain commit hashes/revisions) allow for [resolution of cross-dependencies](https://github.com/CocoaPods/Specs/wiki/Cross-dependencies-resolution-example).
 
 In case you didn’t know this yet; you can tag the current HEAD as, for instance, version 1.0.0, like so:
 

data/lib/cocoapods/command/spec/lint.rb

@@ -23,9 +23,13 @@ module Pod
             ['--no-clean', 'Lint leaves the build directory intact for inspection'],
             ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
             ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            ['--use-modular-headers', 'Lint uses modular headers during installation'],
             ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
              '(defaults to https://github.com/CocoaPods/Specs.git). ' \
              'Multiple sources must be comma-delimited.'],
+            ['--platforms=ios,macos', 'Lint against specific platforms' \
+              '(defaults to all platforms supported by the podspec).' \
+              'Multiple platforms must be comma-delimited'],
             ['--private', 'Lint skips checks that apply only to public specs'],
             ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
              'This takes precedence over a .swift-version file.'],
@@ -42,7 +46,9 @@ module Pod
           @subspecs        = argv.flag?('subspecs', true)
           @only_subspec    = argv.option('subspec')
           @use_frameworks  = !argv.flag?('use-libraries')
+          @use_modular_headers = argv.flag?('use-modular-headers')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @platforms       = argv.option('platforms', '').split(',')
           @private         = argv.flag?('private', false)
           @swift_version   = argv.option('swift-version', nil)
           @skip_import_validation = argv.flag?('skip-import-validation', false)
@@ -55,7 +61,7 @@ module Pod
           UI.puts
           failure_reasons = []
           podspecs_to_lint.each do |podspec|
-            validator                = Validator.new(podspec, @source_urls)
+            validator                = Validator.new(podspec, @source_urls, @platforms)
             validator.quick          = @quick
             validator.no_clean       = !@clean
             validator.fail_fast      = @fail_fast
@@ -63,6 +69,7 @@ module Pod
             validator.no_subspecs    = !@subspecs || @only_subspec
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
+            validator.use_modular_headers = @use_modular_headers
             validator.ignore_public_only_results = @private
             validator.swift_version = @swift_version
             validator.skip_import_validation = @skip_import_validation

data/lib/cocoapods/command.rb

@@ -114,7 +114,9 @@ module Pod
     #
     def self.git_version
       raw_version = Executable.capture_command('git', ['--version']).first
-      match = raw_version.scan(/\d+\.\d+\.\d+/).first
+      unless match = raw_version.scan(/\d+\.\d+\.\d+/).first
+        raise "Failed to extract git version from `git --version` (#{raw_version.inspect})"
+      end
       Gem::Version.new(match)
     end
 

data/lib/cocoapods/config.rb

@@ -100,11 +100,19 @@ module Pod
     def initialize(use_user_settings = true)
       configure_with(DEFAULTS)
 
+      unless ENV['CP_HOME_DIR'].nil?
+        @cache_root = home_dir + 'cache'
+      end
+
       if use_user_settings && user_settings_file.exist?
         require 'yaml'
         user_settings = YAML.load_file(user_settings_file)
         configure_with(user_settings)
       end
+
+      unless ENV['CP_CACHE_DIR'].nil?
+        @cache_root = Pathname.new(ENV['CP_CACHE_DIR']).expand_path
+      end
     end
 
     def verbose
@@ -127,7 +135,7 @@ module Pod
     # @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'] || (home_dir + 'repos')).expand_path
     end
 
     attr_writer :repos_dir
@@ -140,7 +148,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'] || (home_dir + 'templates')).expand_path
     end
 
     # @return [Pathname] the root of the CocoaPods installation where the
@@ -268,6 +276,9 @@ module Pod
     def configure_with(values_by_key)
       return unless values_by_key
       values_by_key.each do |key, value|
+        if key == :cache_root
+          value = Pathname.new(value).expand_path
+        end
         instance_variable_set("@#{key}", value)
       end
     end

data/lib/cocoapods/downloader/cache.rb

@@ -180,7 +180,7 @@ module Pod
         tmpdir = Pathname(Dir.mktmpdir)
         blk.call(tmpdir)
       ensure
-        FileUtils.remove_entry(tmpdir) if tmpdir && tmpdir.exist?
+        FileUtils.remove_entry(tmpdir, :force => true) if tmpdir && tmpdir.exist?
       end
 
       # Copies the `source` directory to `destination`, cleaning the directory

data/lib/cocoapods/executable.rb

@@ -177,7 +177,7 @@ module Pod
               output << (string << separator)
             end
           end
-        rescue EOFError
+        rescue EOFError, IOError
           output << (buf << $/) unless buf.empty?
         end
       end
@@ -191,11 +191,11 @@ module Pod
     class Indenter < ::Array
       # @return [Fixnum] The indentation level of the UI.
       #
-      attr_accessor :indent
+      attr_reader :indent
 
       # @return [IO] the {IO} to which the output should be printed.
       #
-      attr_accessor :io
+      attr_reader :io
 
       # Init a new Indenter
       #

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -19,20 +19,21 @@ module Pod
 
       # @return [Boolean] Whether the source is allowed to touch the cache.
       #
-      attr_accessor :can_cache
+      attr_reader :can_cache
       alias_method :can_cache?, :can_cache
 
       # Initialize a new instance
       #
-      # @param [String] name @see name
-      # @param [Hash] params @see params
-      # @param [String] podfile_path @see podfile_path
+      # @param [String] name @see #name
+      # @param [Hash] params @see #params
+      # @param [String] podfile_path @see #podfile_path
+      # @param [Boolean] can_cache @see #can_cache
       #
-      def initialize(name, params, podfile_path)
+      def initialize(name, params, podfile_path, can_cache = true)
         @name = name
         @params = params
         @podfile_path = podfile_path
-        @can_cache = true
+        @can_cache = can_cache
       end
 
       # @return [Bool] whether an external source source is equal to another
@@ -115,13 +116,17 @@ module Pod
             download_result = Downloader.download(download_request, target, :can_cache => can_cache)
           rescue Pod::DSLError => e
             raise Informative, "Failed to load '#{name}' podspec: #{e.message}"
-          rescue => _
-            raise Informative, "Failed to download '#{name}'."
+          rescue => e
+            raise Informative, "Failed to download '#{name}': #{e.message}"
           end
-          spec = download_result.spec
 
+          spec = download_result.spec
           raise Informative, "Unable to find a specification for '#{name}'." unless spec
 
+          # since the podspec might be cleaned, we want the checksum to refer
+          # to the json in the sandbox
+          spec.defined_in_file = nil
+
           store_podspec(sandbox, spec)
           sandbox.store_pre_downloaded_pod(name)
           sandbox.store_checkout_source(name, download_result.checkout_options)
@@ -160,7 +165,7 @@ module Pod
                  when String
                    path = "#{name}.podspec"
                    path << '.json' if json
-                   Specification.from_string(spec, path)
+                   Specification.from_string(spec, path).tap { |s| s.defined_in_file = nil }
                  when Specification
                    spec.dup
                  else
@@ -169,12 +174,15 @@ module Pod
         rescue Pod::DSLError => e
           raise Informative, "Failed to load '#{name}' podspec: #{e.message}"
         end
-        spec.defined_in_file = nil
+
         validate_podspec(spec)
-        sandbox.store_podspec(name, spec.to_pretty_json, true, true)
+        sandbox.store_podspec(name, spec, true, true)
       end
 
       def validate_podspec(podspec)
+        defined_in_file = podspec.defined_in_file
+        podspec.defined_in_file = nil
+
         validator = validator_for_podspec(podspec)
         validator.quick = true
         validator.allow_warnings = true
@@ -185,10 +193,12 @@ module Pod
         unless validator.validated?
           raise Informative, "The `#{name}` pod failed to validate due to #{validator.failure_reason}:\n#{validator.results_message}"
         end
+      ensure
+        podspec.defined_in_file = defined_in_file
       end
 
       def validator_for_podspec(podspec)
-        Validator.new(podspec, [])
+        Validator.new(podspec, [], [])
       end
     end
   end

data/lib/cocoapods/external_sources.rb

@@ -16,18 +16,21 @@ module Pod
     # @param  [String] podfile_path
     #         @see AbstractExternalSource#podfile_path
     #
+    # @param  [Boolean] can_cache
+    #         @see AbstractExternalSource#can_cache
+    #
     # @return [AbstractExternalSource] an initialized instance of the concrete
     #         external source class associated with the option specified in the
     #         hash.
     #
-    def self.from_dependency(dependency, podfile_path)
-      from_params(dependency.external_source, dependency, podfile_path)
+    def self.from_dependency(dependency, podfile_path, can_cache)
+      from_params(dependency.external_source, dependency, podfile_path, can_cache)
     end
 
-    def self.from_params(params, dependency, podfile_path)
+    def self.from_params(params, dependency, podfile_path, can_cache)
       name = dependency.root_name
       if klass = concrete_class_from_params(params)
-        klass.new(name, params, podfile_path)
+        klass.new(name, params, podfile_path, can_cache)
       else
         msg = "Unknown external source parameters for `#{name}`: `#{params}`"
         raise Informative, msg

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.5.2'.freeze unless defined? Pod::VERSION
+  VERSION = '1.6.1'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/acknowledgements/markdown.rb

@@ -11,6 +11,12 @@ module Pod
         file.close
       end
 
+      # @return [String] The contents of the acknowledgements in Markdown format.
+      #
+      def generate
+        licenses
+      end
+
       def title_from_string(string, level)
         unless string.empty?
           '#' * level << " #{string}"

data/lib/cocoapods/generator/acknowledgements/plist.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Pod
   module Generator
     class Plist < Acknowledgements
@@ -6,10 +8,19 @@ module Pod
       end
 
       def save_as(path)
-        Xcodeproj::Plist.write_to_path(plist, path)
+        Xcodeproj::Plist.write_to_path(plist_hash, path)
+      end
+
+      # @return [String] The contents of the plist
+      #
+      def generate
+        plist = Nanaimo::Plist.new(plist_hash, :xml)
+        contents = StringIO.new
+        Nanaimo::Writer::XMLWriter.new(plist, :pretty => true, :output => contents, :strict => false).write
+        contents.string
       end
 
-      def plist
+      def plist_hash
         {
           :Title => plist_title,
           :StringsTable => plist_title,