cocoapods 1.5.3 → 1.6.0.beta.1

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/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

@@ -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.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/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/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.5.3'.freeze unless defined? Pod::VERSION
+  VERSION = '1.6.0.beta.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
@@ -9,6 +11,15 @@ module Pod
         Xcodeproj::Plist.write_to_path(plist, path)
       end
 
+      # @return [String] The contents of the plist
+      #
+      def generate
+        plist = Nanaimo::Plist.new(plist, :xml)
+        contents = StringIO.new
+        Nanaimo::Writer::XMLWriter.new(plist, :pretty => true, :output => contents, :strict => false).write
+        contents.string
+      end
+
       def plist
         {
           :Title => plist_title,

data/lib/cocoapods/generator/app_target_helper.rb

@@ -38,26 +38,46 @@ module Pod
       # @param  [Symbol] platform
       #         the platform of the target. Can be `:ios` or `:osx`, etc.
       #
-      # @param  [Boolean] use_frameworks
-      #         whether to use frameworks or not when generating the contents of the import file.
-      #
       # @param  [String] name
       #         The name to use for the target, defaults to 'App'.
       #
       # @return [Array<PBXBuildFile>] the created build file references.
       #
-      def self.add_app_project_import(project, target, pod_target, platform, use_frameworks, name = 'App')
-        source_file = AppTargetHelper.create_app_import_source_file(project, pod_target, platform, use_frameworks, name)
-        source_file_ref = project.new_group(name, name).new_file(source_file)
+      def self.add_app_project_import(project, target, pod_target, platform, name = 'App')
+        source_file = AppTargetHelper.create_app_import_source_file(project, pod_target, platform, name)
+        group = project[name] || project.new_group(name, name)
+        source_file_ref = group.new_file(source_file)
         target.add_file_references([source_file_ref])
       end
 
-      # Creates and links a default app host 'main.m' file.
+      # Creates and links an empty Swift file for the given target.
       #
       # @param  [Project] project
       #         the Xcodeproj to generate the target into.
       #
       # @param  [PBXNativeTarget] target
+      #         the native target to link the generated import file into.
+      #
+      # @param  [String] name
+      #         The name to use for the target, defaults to 'App'.
+      #
+      # @return [Array<PBXBuildFile>] the created build file references.
+      #
+      def self.add_empty_swift_file(project, target, name = 'App')
+        swift_file = project.path.dirname.+("#{name}/dummy.swift")
+        swift_file.parent.mkpath
+        File.write(swift_file, '')
+        group = project[name] || project.new_group(name, name)
+        swift_file_ref = group.new_file(swift_file)
+        target.add_file_references([swift_file_ref])
+      end
+
+      # Creates and links a default app host 'main.m' file.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the main file into.
+      #
+      # @param  [PBXNativeTarget] target
       #         the native target to link the generated main file into.
       #
       # @param  [Symbol] platform
@@ -70,10 +90,34 @@ module Pod
       #
       def self.add_app_host_main_file(project, target, platform, name = 'App')
         source_file = AppTargetHelper.create_app_host_main_file(project, platform, name)
-        source_file_ref = project.new_group(name, name).new_file(source_file)
+        group = project[name] || project.new_group(name, name)
+        source_file_ref = group.new_file(source_file)
         target.add_file_references([source_file_ref])
       end
 
+      # Creates a default launchscreen storyboard.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the launchscreen storyboard into.
+      #
+      # @param  [PBXNativeTarget] target
+      #         the native target to link the generated launchscreen storyboard into.
+      #
+      # @param  [Symbol] platform
+      #         the platform of the target. Can be `:ios` or `:osx`, etc.
+      #
+      # @param  [String] name
+      #         The name to use for the target, defaults to 'App'.
+      #
+      # @return [PBXFileReference] the created file reference of the launchscreen storyboard.
+      #
+      def self.add_launchscreen_storyboard(project, target, name = 'App')
+        launch_storyboard_file = AppTargetHelper.create_launchscreen_storyboard_file(project, name)
+        group = project[name] || project.new_group(name, name)
+        launch_storyboard_ref = group.new_file(launch_storyboard_file)
+        target.resources_build_phase.add_file_reference(launch_storyboard_ref)
+      end
+
       # Adds the xctest framework search paths into the given target.
       #
       # @param  [PBXNativeTarget] target
@@ -116,26 +160,23 @@ module Pod
       # @param  [Symbol] platform
       #         the platform of the target. Can be `:ios` or `:osx`, etc.
       #
-      # @param  [Boolean] use_frameworks
-      #         whether to use frameworks or not when generating the contents of the import file.
-      #
       # @param  [String] name
       #         The name of the folder to use and save the generated main file.
       #
       # @return [Pathname] the new source file that was generated.
       #
-      def self.create_app_import_source_file(project, pod_target, platform, use_frameworks, name = 'App')
+      def self.create_app_import_source_file(project, pod_target, platform, name = 'App')
         language = pod_target.uses_swift? ? :swift : :objc
 
         if language == :swift
           source_file = project.path.dirname.+("#{name}/main.swift")
           source_file.parent.mkpath
-          import_statement = use_frameworks && pod_target.should_build? ? "import #{pod_target.product_module_name}\n" : ''
+          import_statement = pod_target.should_build? && pod_target.defines_module? ? "import #{pod_target.product_module_name}\n" : ''
           source_file.open('w') { |f| f << import_statement }
         else
           source_file = project.path.dirname.+("#{name}/main.m")
           source_file.parent.mkpath
-          import_statement = if use_frameworks && pod_target.should_build?
+          import_statement = if pod_target.should_build? && pod_target.defines_module?
                                "@import #{pod_target.product_module_name};\n"
                              else
                                header_name = "#{pod_target.product_module_name}/#{pod_target.product_module_name}.h"
@@ -155,6 +196,23 @@ module Pod
         source_file
       end
 
+      # Creates a default launchscreen storyboard file.
+      #
+      # @param  [Project] project
+      #         the Xcodeproj to generate the launchscreen storyboard into.
+      #
+      # @param  [String] name
+      #         The name of the folder to use and save the generated launchscreen storyboard file.
+      #
+      # @return [Pathname] the new launchscreen storyboard file that was generated.
+      #
+      def self.create_launchscreen_storyboard_file(project, name = 'App')
+        launch_storyboard_file = project.path.dirname.+("#{name}/LaunchScreen.storyboard")
+        launch_storyboard_file.parent.mkpath
+        File.write(launch_storyboard_file, LAUNCHSCREEN_STORYBOARD_CONTENTS)
+        launch_storyboard_file
+      end
+
       # Creates a default app host 'main.m' file.
       #
       # @param  [Project] project
@@ -176,7 +234,7 @@ module Pod
           when :ios, :tvos
             f << IOS_APP_HOST_MAIN_CONTENTS
           when :osx
-            f << MACOS_APP_APP_HOST_MAIN_CONTENTS
+            f << MACOS_APP_HOST_MAIN_CONTENTS
           end
         end
         source_file
@@ -215,13 +273,41 @@ int main(int argc, char *argv[])
 }
 EOS
 
-      MACOS_APP_APP_HOST_MAIN_CONTENTS = <<EOS.freeze
+      MACOS_APP_HOST_MAIN_CONTENTS = <<EOS.freeze
 #import <Cocoa/Cocoa.h>
 
 int main(int argc, const char * argv[]) {
     return NSApplicationMain(argc, argv);
 }
 EOS
+
+      LAUNCHSCREEN_STORYBOARD_CONTENTS = <<-XML.strip_heredoc.freeze
+              <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+              <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+                <dependencies>
+                  <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
+                  <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+                  <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+                </dependencies>
+                <scenes>
+                  <!--View Controller-->
+                  <scene sceneID="EHf-IW-A2E">
+                    <objects>
+                      <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                        <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                          <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                          <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                          <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        </view>
+                      </viewController>
+                      <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                    </objects>
+                    <point key="canvasLocation" x="53" y="375"/>
+                  </scene>
+                </scenes>
+              </document>
+      XML
     end
   end
 end