cocoapods 1.5.3 → 1.6.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21aa16719488a078778544cfa272f8f000c0c5fa4c4f3ae27694f1a440e01c9
-  data.tar.gz: 2cc429dd3b839ac42b19f574a1eebff1a112d2036fa93eb78d1a541450bb5bf6
+  metadata.gz: eea82a7d50fbc9129a369914b81e1a7722de54530e1486cc14735c4984694c6a
+  data.tar.gz: 1c5e1381e2d5f513c380a817ba52401eb1480e5a42bf747c57d9042c651d1b0f
 SHA512:
-  metadata.gz: fa3eeada9bda4ad9b3605272fb2cd742a83b2997405061a336787d938cedeeff7cd91c5832410a07dfbf79869ab342dd797e8fb16e5bb07f1a4e6e850c31d474
-  data.tar.gz: 8aae65be343ff7df51de6c83d613e0b56662f7fdd99e6944d50729735f916b1f31df9dddb64c455e5d15b16c77c32d62ef3d880a77511a0850f9718269d9a2d4
+  metadata.gz: e5bb218d53e23686ffae0612f20778d6050e52a135b49a1b35c4a3922d497c5852e442a6e2df71182bb844853b3df5215c8bf9c1acc9ebf24c2078398f0037ca
+  data.tar.gz: 70d05ff41270cec4e2ac020c1f8c0918ae5467694fe0bcb13b230f88170fc74239e0fa89d8067277fb80b49512135b79239556de2f0f20e427cde6feb1b315a9

data/CHANGELOG.md

@@ -4,6 +4,206 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.6.0.beta.1 (2018-08-16)
+
+##### Enhancements
+
+* Every test spec will have its own xctest bundle.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)  
+  [Jenn Kaplan](https://github.com/jkap)
+  [#7908](https://github.com/CocoaPods/CocoaPods/pull/7908)
+
+* Generate a separate app host per pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)  
+  [#8005](https://github.com/CocoaPods/CocoaPods/pull/8005)
+
+* Add default launch screen storyboard to test app hosts.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7971](https://github.com/CocoaPods/CocoaPods/pull/7971)
+
+* Always display downloader error message.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7625](https://github.com/CocoaPods/CocoaPods/issues/7625)
+
+* Warn instead of error when linting if `public_header_files` or
+  `private_header_files` do not match any files.  
+  [Eric Amorde](https://github.com/amorde)
+  [#7427](https://github.com/CocoaPods/CocoaPods/issues/7427) 
+
+* Add `--platforms` parameter to `pod spec lint` and `pod lib lint` to specify
+  which platforms to lint.  
+  [Eric Amorde](https://github.com/amorde)
+  [#7783](https://github.com/CocoaPods/CocoaPods/issues/7783)
+
+* Warn if the `git://` protocol is used as the source of a pod.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7705](https://github.com/CocoaPods/CocoaPods/issues/7705)
+
+* Remove all xcode project state from target objects,
+  improving project generation performance.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7610](https://github.com/CocoaPods/CocoaPods/pull/7610)
+
+* Improve performance of Pods project generation by skipping native targets
+  for which dependent targets have already been added.
+  [Jacek Suliga](https://github.com/jmkk)
+
+* Refactor build settings generation to perform much better on large projects.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Make sure the temporary directory used to download a pod is removed,
+  even if an error is raised.  
+  [augustorsouza](https://github.com/augustorsouza)
+
+* Avoid unlocking sources on every `pod install` when there are no
+  plugin post-install hooks for performance reasons.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Change shell script relative paths to use `${PODS_ROOT}` instead of 
+  `${SRCROOT}/Pods`.  
+  [Whirlwind](https://github.com/Whirlwind)
+  [#7878](https://github.com/CocoaPods/CocoaPods/pull/7878)
+
+* Set the path of the Pods group in the user project.  
+  [Whirlwind](https://github.com/Whirlwind)
+  [#7886](https://github.com/CocoaPods/CocoaPods/pull/7886)
+  [#6194](https://github.com/CocoaPods/CocoaPods/issues/6194)
+
+* Add a `--deployment` flag to `pod install` that errors if there are any
+  changes to the Podfile or Lockfile.  
+  [Samuel Giddins](https://github.com/segiddins)
+  
+* Add `--use-modular-headers` flag to the `pod spec lint`, `pod lib lint`,
+  and `pod repo push` commands.  
+  [Eric Amorde](https://github.com/amorde)
+  [#7683](https://github.com/CocoaPods/CocoaPods/issues/7683)
+
+##### Bug Fixes
+
+* Scope embedded pods to their host targets by their configuration.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8011](https://github.com/CocoaPods/CocoaPods/issues/8011)
+
+* Set the `SWIFT_VERSION` on resource bundle targets that contain compiled
+  sources and use Swift.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7950](https://github.com/CocoaPods/CocoaPods/issues/7950)
+
+* Do not ignore `--no-overwrite` parameter if a commit message is specified.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7926](https://github.com/CocoaPods/CocoaPods/issues/7926)
+  
+* Generate `-ObjC` in `OTHER_LDFLAGS` for apps with static frameworks.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7946](https://github.com/CocoaPods/CocoaPods/pull/7946)
+
+* Do not display that a source was changed if it uses different casing.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7883](https://github.com/CocoaPods/CocoaPods/pull/7883)
+  
+* Set `CURRENT_PROJECT_VERSION` for generated app host targets.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7825](https://github.com/CocoaPods/CocoaPods/pull/7825)
+
+* Properly follow symlinks within macOS universal frameworks.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7587](https://github.com/CocoaPods/CocoaPods/issues/7587)
+  
+* Validator adds a Swift file if any of the pod targets use Swift.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7738](https://github.com/CocoaPods/CocoaPods/issues/7738)
+
+* Fix `INFOPLIST_FILE` being overridden when set in a podspec's `pod_target_xcconfig`.  
+  [Eric Amorde](https://github.com/amorde)
+  [#7530](https://github.com/CocoaPods/CocoaPods/issues/7530)
+
+* Raise an error if user target `SWIFT_VERSION` is missing.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7770](https://github.com/CocoaPods/CocoaPods/issues/7770)
+
+* Fix the umbrella header import path when `header_dir` is specified in the
+  podspec and building a static library with modular headers enabled.  
+  [chuganzy](https://github.com/chuganzy)
+  [#7724](https://github.com/CocoaPods/CocoaPods/pull/7724)
+
+* Do not symlink headers that belong to test specs.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7762](https://github.com/CocoaPods/CocoaPods/pull/7762)
+
+* Do not build pod target if it only contains script phases.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7746](https://github.com/CocoaPods/CocoaPods/issues/7746)
+
+* Do not try to integrate uncreated test native targets.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7394](https://github.com/CocoaPods/CocoaPods/issues/7394)
+
+* Attempt to parse `SWIFT_VERSION` from xcconfig during target inspection.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7731](https://github.com/CocoaPods/CocoaPods/issues/7731)
+
+* Do not crash when creating build settings for a missing user build configuration.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7698](https://github.com/CocoaPods/CocoaPods/pull/7698)
+
+* Do not overwrite App host info plist when using multiple test specs.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7695](https://github.com/CocoaPods/CocoaPods/pull/7695)
+
+* Do not include test dependencies' input and output paths.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7688](https://github.com/CocoaPods/CocoaPods/pull/7688)
+
+* Skip test file accessors for `uses_swift?` and `should_build?` methods.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7671](https://github.com/CocoaPods/CocoaPods/pull/7671)
+
+* When integrating a vendored framework while building pods as static
+  libraries, public headers will be found via `FRAMEWORK_SEARCH_PATHS`
+  instead of via the sandbox headers store.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Improve performance of grouping pods by configuration.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Stop linking frameworks to static libraries to avoid warnings with the new build system.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#7570](https://github.com/CocoaPods/CocoaPods/pull/7570)
+
+* Allow `EXPANDED_CODE_SIGN_IDENTITY` to be unset.  
+  [Keith Smiley](https://github.com/keith)
+  [#7708](https://github.com/CocoaPods/CocoaPods/issues/7708)
+
+* Running `pod install` with static library modules no longer causes pods to
+  be recompiled.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* A pod built as a static library linked into multiple targets will only build
+  as a module when all of the targets it is linked into have opted into it.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Use `CP_HOME_DIR` as the base for all default directories.  
+  [mcfedr](https://github.com/mcfedr)
+  [#7917](https://github.com/CocoaPods/CocoaPods/pull/7917)
+  
+* Exclude 32-bit architectures from Pod targets when the deployment target is
+  iOS 11.0 or higher.  
+  [Eric Amorde](https://github.com/amorde)
+  [#7148](https://github.com/CocoaPods/CocoaPods/issues/7148)
+
+* Fail gracefully when the analyzer has dependencies to fetch, but has been
+  told not to fetch them.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Don't generate framework or resource scripts if they will not be used.  
+  [Eric Amorde](https://github.com/amorde)
+
+* Fix a crash when loading the `macho` gem in certain environments.  
+  [Eric Amorde](https://github.com/amorde)
+  [#7867](https://github.com/CocoaPods/CocoaPods/issues/7867)
+
+
 ## 1.5.3 (2018-05-25)
 
 ##### Enhancements

data/lib/cocoapods.rb

@@ -66,7 +66,6 @@ module Pod
     autoload :ModuleMap,               'cocoapods/generator/module_map'
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :UmbrellaHeader,          'cocoapods/generator/umbrella_header'
-    autoload :XCConfig,                'cocoapods/generator/xcconfig'
     autoload :AppTargetHelper,         'cocoapods/generator/app_target_helper'
   end
 

data/lib/cocoapods/command/init.rb

@@ -14,7 +14,7 @@ module Pod
         It is possible to specify a list of dependencies which will be used by
         the template in the `Podfile.default` (normal targets) `Podfile.test`
         (test targets) files which should be stored in the
-        `~/.cocoapods/templates` folder.
+        `#{Config.instance.templates_dir}` folder.
       DESC
       self.arguments = [
         CLAide::Argument.new('XCODEPROJ', :false),

data/lib/cocoapods/command/install.rb

@@ -30,14 +30,21 @@ module Pod
       def self.options
         [
           ['--repo-update', 'Force running `pod repo update` before install'],
+          ['--deployment', 'Disallow any changes to the Podfile or the Podfile.lock during installation'],
         ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
       end
 
+      def initialize(argv)
+        super
+        @deployment = argv.flag?('deployment', false)
+      end
+
       def run
         verify_podfile_exists!
         installer = installer_for_config
         installer.repo_update = repo_update?(:default => false)
         installer.update = false
+        installer.deployment = @deployment
         installer.install!
       end
     end

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

@@ -17,9 +17,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.'],
@@ -36,7 +40,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)
@@ -52,7 +58,7 @@ module Pod
         def run
           UI.puts
           podspecs_to_lint.each do |podspec|
-            validator                = Validator.new(podspec, @source_urls)
+            validator                = Validator.new(podspec, @source_urls, @platforms)
             validator.local          = true
             validator.quick          = @quick
             validator.no_clean       = !@clean
@@ -61,6 +67,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/outdated.rb

@@ -13,19 +13,14 @@ module Pod
 
       # Run the command
       #
-      # @todo the command reports new dependencies added to the Podfile as
-      #       updates.
-      #
-      # @todo fix.
-      #
       def run
         if updates.empty?
           UI.puts 'No pod updates are available.'.yellow
         else
           UI.section 'The color indicates what happens when you run `pod update`' do
-            UI.puts "#{'<green>'.green}\t\t - Will be updated to the newest version"
+            UI.puts "#{'<green>'.green}\t - Will be updated to the newest version"
             UI.puts "#{'<blue>'.blue}\t - Will be updated, but not to the newest version because of specified version in Podfile"
-            UI.puts "#{'<red>'.red}\t\t - Will not be updated because of specified version in Podfile"
+            UI.puts "#{'<red>'.red}\t - Will not be updated because of specified version in Podfile"
             UI.puts ''
           end
           UI.section 'The following pod updates are available:' do

data/lib/cocoapods/command/repo/add.rb

@@ -5,7 +5,7 @@ module Pod
         self.summary = 'Add a spec repo'
 
         self.description = <<-DESC
-          Clones `URL` in the local spec-repos directory at `~/.cocoapods/repos/`. The
+          Clones `URL` in the local spec-repos directory at `#{Config.instance.repos_dir}`. The
           remote can later be referred to by `NAME`.
         DESC
 

data/lib/cocoapods/command/repo/list.rb

@@ -5,7 +5,7 @@ module Pod
         self.summary = 'List repos'
 
         self.description = <<-DESC
-            List the repos from the local spec-repos directory at `~/.cocoapods/repos/.`
+            List the repos from the local spec-repos directory at `#{Config.instance.repos_dir}`.
         DESC
 
         def self.options

data/lib/cocoapods/command/repo/push.rb

@@ -11,7 +11,7 @@ module Pod
         self.description = <<-DESC
         Validates `NAME.podspec` or `*.podspec` in the current working dir,
         creates a directory and version folder for the pod in the local copy of
-        `REPO` (~/.cocoapods/repos/[REPO]), copies the podspec file into the
+        `REPO` (#{Config.instance.repos_dir}/[REPO]), copies the podspec file into the
         version directory, and finally it pushes `REPO` to its remote.
         DESC
 
@@ -24,6 +24,7 @@ module Pod
           [
             ['--allow-warnings', 'Allows pushing even if there are warnings'],
             ['--use-libraries', 'Linter 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 all available repos). ' \
              'Multiple sources must be comma-delimited.'],
@@ -48,6 +49,7 @@ module Pod
           @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).join(',')).split(',')
           @podspec = argv.shift_argument
           @use_frameworks = !argv.flag?('use-libraries')
+          @use_modular_headers = argv.flag?('use-modular-headers', false)
           @private = argv.flag?('private', true)
           @message = argv.option('commit-message')
           @commit_message = argv.flag?('commit-message', false)
@@ -131,6 +133,7 @@ module Pod
             validator = Validator.new(podspec, @source_urls)
             validator.allow_warnings = @allow_warnings
             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
@@ -182,18 +185,20 @@ module Pod
           podspec_files.each do |spec_file|
             spec = Pod::Specification.from_file(spec_file)
             output_path = @source.pod_path(spec.name) + spec.version.to_s
-            if @message && !@message.empty?
-              message = @message
-            elsif output_path.exist?
-              unless @allow_overwrite
-                raise Informative, "#{spec} already exists and overwriting has been disabled."
-              end
-              message = "[Fix] #{spec}"
-            elsif output_path.dirname.directory?
-              message = "[Update] #{spec}"
-            else
-              message = "[Add] #{spec}"
+            message = if @message && !@message.empty?
+                        @message
+                      elsif output_path.exist?
+                        "[Fix] #{spec}"
+                      elsif output_path.dirname.directory?
+                        "[Update] #{spec}"
+                      else
+                        "[Add] #{spec}"
+                      end
+
+            if output_path.exist? && !@allow_overwrite
+              raise Informative, "#{spec} already exists and overwriting has been disabled."
             end
+
             FileUtils.mkdir_p(output_path)
 
             if @use_json

data/lib/cocoapods/command/repo/remove.rb

@@ -5,7 +5,7 @@ module Pod
         self.summary = 'Remove a spec repo'
 
         self.description = <<-DESC
-          Deletes the remote named `NAME` from the local spec-repos directory at `~/.cocoapods/repos/.`
+          Deletes the remote named `NAME` from the local spec-repos directory at `#{Config.instance.repos_dir}`.
         DESC
 
         self.arguments = [

data/lib/cocoapods/command/repo/update.rb

@@ -6,7 +6,7 @@ module Pod
 
         self.description = <<-DESC
           Updates the local clone of the spec-repo `NAME`. If `NAME` is omitted
-          this will update all spec-repos in `~/.cocoapods/repos`.
+          this will update all spec-repos in `#{Config.instance.repos_dir}`.
         DESC
 
         self.arguments = [

data/lib/cocoapods/command/setup.rb

@@ -6,7 +6,7 @@ module Pod
       self.summary = 'Setup the CocoaPods environment'
 
       self.description = <<-DESC
-        Creates a directory at `~/.cocoapods/repos` which will hold your spec-repos.
+        Creates a directory at `#{Config.instance.repos_dir}` which will hold your spec-repos.
         This is where it will create a clone of the public `master` spec-repo from:
 
             https://github.com/CocoaPods/Specs

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: