cocoapods 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117688488a845efec8bddd33f13c596243fa2ee3
-  data.tar.gz: ebbb976236e9b57427e2736fa4a9cbd9be0fab65
+  metadata.gz: af7d6a3b7351a1ce2268eaaa3eed8c42cfd4fbdc
+  data.tar.gz: f70c26b92240ccd444d2b654d377b008ddd00f68
 SHA512:
-  metadata.gz: 9b8d6696c213744889e323b7903fdc44355f32d1325082fb5aab10a50e2df59505c7f58eb9d125e56c00549e66f3353ac8be9442effec4312062715d8a9ef350
-  data.tar.gz: 926fc7919f094716979f130be82c0e7a7b0446a51741a548110751c91cc1e14d3e3b4d4ae6b7a415501b41e9b44c2ef1a488b702b392708d4b964fc2afd10139
+  metadata.gz: cb11133140778a88ed6ffcd50c85fcb9eca03986598396357bd503188ddccd3e91248537d438a7c83233da67db4058729c071cdb988051e2ae64e55dd2a5d971
+  data.tar.gz: dc8f39cf7327e565ae923b68daab0385f0917c8288fb7f19640583cba5d787d5cc0a7e2371326d9ad4977eb8f0089ae63aa5b7489747f69688e61e1f0d54a9b5

data/CHANGELOG.md

@@ -2,6 +2,98 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.32.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/master...0.31.1)
+• [CocoaPods-Core](https://github.com/CocoaPods/Core/compare/master...0.31.1)
+
+##### Enhancements
+
+* Allow to update only a list of given pods with `pod update [POD_NAMES...]`.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [CocoaPods#760](https://github.com/CocoaPods/CocoaPods/issues/760)
+
+* `pod update` prints the previous version of the updated pods.  
+  [Andrea Mazzini](https://github.com/andreamazz)
+  [#2008](https://github.com/CocoaPods/CocoaPods/issues/2008)
+
+* `pod update` falls back to `pod install` if no Lockfile is present.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+
+* File references in the Pods project for development Pods now are absolute if
+  the dependency is specified with an absolute paths.  
+  [Samuel Ford](https://github.com/samuelwford)
+  [#1042](https://github.com/CocoaPods/CocoaPods/issues/1042)
+
+* Added `deprecated` and `deprecated_in_favor_of` attributes to Specification
+  DSL.  
+  [Paul Young](https://github.com/paulyoung)
+  [Core#87](https://github.com/CocoaPods/Core/pull/87)
+
+* Numerous improvements to the validator and to the linter.
+  * Validate the reachability of screenshot URLs in podspecs while linting a
+    specification.  
+    [Kyle Fuller](https://github.com/kylef)
+    [#2010](https://github.com/CocoaPods/CocoaPods/issues/2010)
+  * Support HTTP redirects when linting homepage and screenshots.  
+    [Boris Bügling](https://github.com/neonichu)
+    [#2027](https://github.com/CocoaPods/CocoaPods/pull/2027)
+  * The linter now checks `framework` and `library` attributes for invalid
+    strings.  
+    [Paul Williamson](https://github.com/squarefrog)
+    [Fabio Pelosin](irrationalfab)
+    [Core#66](https://github.com/CocoaPods/Core/issues/66)
+    [Core#96](https://github.com/CocoaPods/Core/pull/96)
+    [Core#105](https://github.com/CocoaPods/Core/issues/105)
+  * The Linter will not check for comments anymore.  
+    [Fabio Pelosin][irrationalfab]
+    [Core#108](https://github.com/CocoaPods/Core/issues/108)
+  * Removed legacy checks from the linter.  
+    [Fabio Pelosin][irrationalfab]
+    [Core#108](https://github.com/CocoaPods/Core/issues/108)
+  * Added logic to handle subspecs and platform scopes to linter check of
+    the `requries_arc` attribute.  
+    [Fabio Pelosin][irrationalfab]
+    [CocoaPods#2005](https://github.com/CocoaPods/CocoaPods/issues/2005)
+  * The linter no longer considers empty a Specification if it only specifies the
+    `resource_bundle` attribute.  
+    [Joshua Kalpin][Kapin]
+    [#63](https://github.com/CocoaPods/Core/issues/63)
+    [#95](https://github.com/CocoaPods/Core/pull/95)
+
+* `pod lib create` is now using the `configure` file instead of the
+  `_CONFIGURE.rb` file.  
+  [Piet Brauer](https://github.com/pietbrauer)
+  [Orta Therox](https://github.com/orta)
+
+* `pod lib create` now disallows any pod name that begins with a `.`  
+  [Dustin Clark](https://github.com/clarkda)
+  [#2026](https://github.com/CocoaPods/CocoaPods/pull/2026)
+  [Core#97](https://github.com/CocoaPods/Core/pull/97)
+  [Core#98](https://github.com/CocoaPods/Core/issues/98)
+
+* Prevent the user from using `pod` commands as root.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#1815](https://github.com/CocoaPods/CocoaPods/issues/1815)
+
+* Dependencies declared with external sources now support HTTP downloads and
+  have improved support for all the options supported by the downloader.  
+  [Fabio Pelosin][irrationalfab]
+
+* An informative error message is presented when merge conflict is detected in
+  a YAML file.  
+  [Luis de la Rosa](https://github.com/luisdelarosa)
+  [#69](https://github.com/CocoaPods/Core/issues/69)
+  [#100](https://github.com/CocoaPods/Core/pull/100)
+
+##### Bug Fixes
+
+* Fixed the Podfile `default_subspec` attribute in nested subspecs.  
+  [Fabio Pelosin][irrationalfab]
+  [#1021](https://github.com/CocoaPods/CocoaPods/issues/1021)
+
+
+
 ## 0.31.1
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.31.1...0.31.0)
 • [CocoaPods-Core](https://github.com/CocoaPods/Core/compare/0.31.1...0.31.0)
@@ -37,6 +129,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Robert Zuber](https://github.com/z00b)
   [#1617](https://github.com/CocoaPods/CocoaPods/issues/1617)
 
+* Generated prefix header file will now have unique prefix_header_contents for
+  Pods with subspecs.  
+  [Luis de la Rosa](https://github.com/luisdelarosa)
+  [#1449](https://github.com/CocoaPods/CocoaPods/issues/1449)
+
 * The linter will now check the reachability of the homepage of Podspecs during
   a full lint.  
   [Richard Lee](https://github.com/dlackty)

data/lib/cocoapods.rb

@@ -72,24 +72,3 @@ if ENV['COCOA_PODS_ENV'] == 'development'
   # require 'awesome_print'
   # require 'pry'
 end
-
-# TODO remove for CocoaPods 0.31
-#
-module Pod
-  class Specification
-    def pre_install(&block)
-      UI.warn "[#{self}] The pre install hook of the specification " \
-        "DSL has been deprecated, use the `resource_bundles` or the " \
-        "`prepare_command` attributes."
-      UI.puts "[#{self}] The pre_install hook will be removed in the next release".red
-      @pre_install_callback = block
-    end
-    def post_install(&block)
-      UI.warn "[#{self}] The post install hook of the specification " \
-        "DSL has been deprecated, use the `resource_bundles` or the " \
-        "`prepare_command` attributes."
-      UI.puts "[#{self}] The post_install hook will be removed in the next release".red
-      @post_install_callback = block
-    end
-  end
-end

data/lib/cocoapods/command.rb

@@ -43,11 +43,14 @@ module Pod
     end
 
     def self.run(argv)
+      help! "You cannot run CocoaPods as root." if Process.uid == 0
+
       argv = CLAide::ARGV.new(argv)
       if argv.flag?('version')
         UI.puts VERSION
         exit 0
       end
+
       super(argv)
       UI.print_warnings
     end

data/lib/cocoapods/command/lib.rb

@@ -26,6 +26,7 @@ module Pod
           super
           help! "A name for the Pod is required." unless @name
           help! "The Pod name cannot contain spaces." if @name.match(/\s/)
+          help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
         end
 
         def run
@@ -54,7 +55,7 @@ module Pod
         # @return [void]
         #
         def clone_template
-          UI.section("Creating `#{@name}` Pod") do
+          UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
             git!"clone '#{template_repo_url}' #{@name}"
           end
         end
@@ -64,9 +65,13 @@ module Pod
         # @return [void]
         #
         def configure_template
-          UI.section("Configuring template") do
+          UI.section("Configuring #{@name} template.") do
             Dir.chdir(@name) do
-              ruby! "_CONFIGURE.rb #{@name}"
+              if File.exists? "configure"
+                system "./configure #{@name}"
+              else
+                UI.warn "Template does not have a configure file."
+              end
             end
           end
         end

data/lib/cocoapods/command/project.rb

@@ -28,13 +28,15 @@ module Pod
 
       # Runs the installer.
       #
-      # @param  [update] whether the installer should be run in update mode.
+      # @param  [Hash, Boolean, nil] update
+      #         Pods that have been requested to be updated or true if all Pods
+      #         should be updated
       #
       # @return [void]
       #
       def run_install_with_update(update)
         installer = Installer.new(config.sandbox, config.podfile, config.lockfile)
-        installer.update_mode = update
+        installer.update = update
         installer.install!
       end
     end
@@ -76,10 +78,40 @@ module Pod
 
       self.summary = 'Update outdated project dependencies'
 
+      self.description = <<-DESC
+        Updates the Pods identified by the specified POD_NAMES. If no POD_NAMES are
+        specified it updates all the Pods ignoring the contents of the Podfile.lock.
+        This command is reserved to the update of dependencies and pod install should
+        be used to install changes to the Podfile.
+      DESC
+
+      self.arguments = '[POD_NAMES...]'
+
+      def initialize(argv)
+        @pods = argv.arguments! unless argv.arguments.empty?
+        super
+      end
+
       def run
         verify_podfile_exists!
-        verify_lockfile_exists!
-        run_install_with_update(true)
+
+        if @pods
+          verify_lockfile_exists!
+
+          # Check if all given pods are installed
+          missing_pods = @pods.select { |pod| !config.lockfile.pod_names.include?(pod) }
+          if missing_pods.length > 0
+            raise Informative, (missing_pods.length > 1 \
+              ? "Pods %s are not installed and cannot be updated" \
+              : "Pod %s is not installed and cannot be updated"
+            ) % missing_pods.map { |p| "`#{p}'" }.join(', ')
+          end
+
+          run_install_with_update(:pods => @pods)
+        else
+          UI.puts "Update all pods".yellow unless @pods
+          run_install_with_update(true)
+        end
       end
     end
 

data/lib/cocoapods/command/spec.rb

@@ -480,7 +480,7 @@ Pod::Spec.new do |s|
                    DESC
 
   s.homepage     = "#{data[:homepage]}"
-  # s.screenshots  = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
+  # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"
 
 
   # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

data/lib/cocoapods/external_sources.rb

@@ -1,3 +1,8 @@
+require 'cocoapods/external_sources/abstract_external_source'
+require 'cocoapods/external_sources/downloader_source'
+require 'cocoapods/external_sources/path_source'
+require 'cocoapods/external_sources/podspec_source'
+
 module Pod
 
   # Provides support for initializing the correct concrete class of an external
@@ -13,20 +18,7 @@ module Pod
       name   = dependency.root_name
       params = dependency.external_source
 
-      klass  =  if params.key?(:git)          then GitSource
-                elsif params.key?(:svn)       then SvnSource
-                elsif params.key?(:hg)        then MercurialSource
-                elsif params.key?(:bzr)       then BazaarSource                  
-                elsif params.key?(:podspec)   then PodspecSource
-                elsif params.key?(:path)      then PathSource
-                end
-
-      if params.key?(:local)
-        klass = PathSource
-        UI.warn "The `:local` option of the Podfile has been renamed to `:path` and is deprecated." \
-      end
-
-      if klass
+      if klass = concrete_class_from_params(params)
         klass.new(name, params, podfile_path)
       else
         msg = "Unknown external source parameters for `#{name}`: `#{params}`"
@@ -34,357 +26,20 @@ module Pod
       end
     end
 
-    #-------------------------------------------------------------------------#
-
-    # Abstract class that defines the common behaviour of external sources.
-    #
-    class AbstractExternalSource
-
-      # @return [String] the name of the Pod described by this external source.
-      #
-      attr_reader :name
-
-      # @return [Hash{Symbol => String}] the hash representation of the
-      #         external source.
-      #
-      attr_reader :params
-
-      # @return [String] the path where the podfile is defined to resolve
-      #         relative paths.
-      #
-      attr_reader :podfile_path
-
-      # @param [String] name @see name
-      # @param [Hash] params @see params
-      # @param [String] podfile_path @see podfile_path
-      #
-      def initialize(name, params, podfile_path)
-        @name = name
-        @params = params
-        @podfile_path = podfile_path
-      end
-
-      # @return [Bool] whether an external source source is equal to another
-      #         according to the {#name} and to the {#params}.
-      #
-      def ==(other)
-        return false if other.nil?
-        name == other.name && params == other.params
-      end
-
-      #--------------------------------------#
-
-      public
-
-      # @!group Fetching
-
-      # Fetches the external source from the remote according to the params.
-      #
-      # @param  [Sandbox] sandbox
-      #         the sandbox where the specification should be stored.
-      #
-      # @return [void]
-      #
-      def fetch(sandbox)
-        raise "Abstract method"
-      end
-
-      #--------------------------------------#
-
-      public
-
-      # @!group Subclasses hooks
-
-      # Fetches the external source from the remote according to the params.
-      #
-      # @param  [Sandbox] sandbox
-      #         the sandbox where the specification should be stored.
-      #
-      # @return [void]
-      #
-      def fetch(sandbox)
-        raise "Abstract method"
-      end
-
-      # @return [String] a string representation of the source suitable for UI.
-      #
-      def description
-        raise "Abstract method"
-      end
-
-      #--------------------------------------#
-
-      private
-
-      # @! Subclasses helpers
-
-      # Pre-downloads a Pod passing the options to the downloader and informing
-      # the sandbox.
-      #
-      # @param  [Sandbox] sandbox
-      #         The sandbox where the Pod should be downloaded.
-      #
-      # @note   To prevent a double download of the repository the pod is
-      #         marked as pre-downloaded indicating to the installer that only
-      #         clean operations are needed.
-      #
-      # @todo  The downloader configuration is the same of the
-      #        #{PodSourceInstaller} and it needs to be kept in sync.
-      #
-      # @return [void]
-      #
-      def pre_download(sandbox)
-        UI.titled_section("Pre-downloading: `#{name}` #{description}", { :verbose_prefix => "-> " }) do
-          target = sandbox.root + name
-          target.rmtree if target.exist?
-          downloader = Config.instance.downloader(target, params)
-          downloader.download
-          store_podspec(sandbox, target + "#{name}.podspec")
-          sandbox.store_pre_downloaded_pod(name)
-          if downloader.options_specific?
-            source = params
-          else
-            source = downloader.checkout_options
-          end
-          sandbox.store_checkout_source(name, source)
-        end
-      end
-
-      # Stores the podspec in the sandbox and marks it as from an external
-      # source.
-      #
-      # @param  [Sandbox] sandbox
-      #         The sandbox where the specification should be stored.
-      #
-      # @param  [Pathname, String] spec
-      #         The path of the specification or its contents.
-      #
-      # @note   All the concrete implementations of #{fetch} should invoke this
-      #         method.
-      #
-      # @note   The sandbox ensures that the podspec exists and that the names
-      #         match.
-      #
-      # @return [void]
-      #
-      def store_podspec(sandbox, spec)
-        sandbox.store_podspec(name, spec, true)
-      end
-
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # Provides support for fetching a specification file from a Git remote.
-    #
-    # Supports all the options of the downloader (is similar to the git key of
-    # `source` attribute of a specification).
-    #
-    # @note The podspec must be in the root of the repository and should have a
-    #       name matching the one of the dependency.
-    #
-    class GitSource < AbstractExternalSource
-
-      # @see AbstractExternalSource#fetch
-      #
-      def fetch(sandbox)
-        pre_download(sandbox)
-      end
-
-      # @see AbstractExternalSource#description
-      #
-      def description
-        "from `#{params[:git]}`".tap do |description|
-          description << ", commit `#{params[:commit]}`" if params[:commit]
-          description << ", branch `#{params[:branch]}`" if params[:branch]
-          description << ", tag `#{params[:tag]}`" if params[:tag]
-        end
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # Provides support for fetching a specification file from a SVN source
-    # remote.
-    #
-    # Supports all the options of the downloader (is similar to the git key of
-    # `source` attribute of a specification).
-    #
-    # @note The podspec must be in the root of the repository and should have a
-    #       name matching the one of the dependency.
-    #
-    class SvnSource < AbstractExternalSource
-
-      # @see AbstractExternalSource#fetch
-      #
-      def fetch(sandbox)
-        pre_download(sandbox)
-      end
-
-      # @see AbstractExternalSource#description
-      #
-      def description
-        "from `#{params[:svn]}`".tap do |description|
-          description << ", folder `#{params[:folder]}`" if params[:folder]
-          description << ", tag `#{params[:tag]}`" if params[:tag]
-          description << ", revision `#{params[:revision]}`" if params[:revision]
-        end
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # Provides support for fetching a specification file from a Mercurial
-    # source remote.
-    #
-    # Supports all the options of the downloader (is similar to the git key of
-    # `source` attribute of a specification).
-    #
-    # @note The podspec must be in the root of the repository and should have a
-    #       name matching the one of the dependency.
-    #
-    class MercurialSource < AbstractExternalSource
-
-      # @see AbstractExternalSource#fetch
-      #
-      def fetch(sandbox)
-        pre_download(sandbox)
-      end
-
-      # @see AbstractExternalSource#description
-      #
-      def description
-        "from `#{params[:hg]}`".tap do |description|
-          description << ", revision `#{params[:revision]}`" if params[:revision]
-        end
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # Provides support for fetching a specification file from a Bazaar
-    # source remote.
-    #
-    # Supports all the options of the downloader (is similar to the git key of
-    # `source` attribute of a specification).
-    #
-    # @note The podspec must be in the root of the repository and should have a
-    #       name matching the one of the dependency.
+    # @return [Class]
     #
-    class BazaarSource < AbstractExternalSource
-
-      # @see AbstractExternalSource#fetch
-      #
-      def fetch(sandbox)
-        pre_download(sandbox)
-      end
-
-      # @see AbstractExternalSource#description
-      #
-      def description
-        "from `#{params[:bzr]}`".tap do |description|
-          description << ", tag `#{params[:tag]}`" if params[:tag]
-          description << ", revision `#{params[:revision]}`" if params[:revision]
-        end
+    def self.concrete_class_from_params(params)
+      if params.key?(:podspec)
+        PodspecSource
+      elsif params.key?(:path)
+        PathSource
+      elsif params.key?(:local)
+        UI.warn "The `:local` option of the Podfile has been " \
+          "renamed to `:path` and it is deprecated."
+        PathSource
+      elsif Downloader.strategy_from_options(params)
+        DownloaderSource
       end
     end
-
-    #-------------------------------------------------------------------------#
-
-    # Provides support for fetching a specification file from an URL. Can be
-    # http, file, etc.
-    #
-    class PodspecSource < AbstractExternalSource
-
-      # @see AbstractExternalSource#fetch
-      #
-      def fetch(sandbox)
-        UI.titled_section("Fetching podspec for `#{name}` #{description}", { :verbose_prefix => "-> " }) do
-
-          require 'open-uri'
-          open(podspec_uri) { |io| store_podspec(sandbox, io.read) }
-        end
-      end
-
-      # @see AbstractExternalSource#description
-      #
-      def description
-        "from `#{params[:podspec]}`"
-      end
-
-      #--------------------------------------#
-
-      private
-
-      # @!group Helpers
-
-      # @return [String] The uri of the podspec appending the name of the file
-      #         and expanding it if necessary.
-      #
-      # @note   If the declared path is expanded only if the represents a path
-      #         relative to the file system.
-      #
-      def podspec_uri
-        declared_path = params[:podspec].to_s
-        if declared_path.match(%r{^.+://})
-          declared_path
-        else
-          path_with_ext = File.extname(declared_path) == '.podspec' ? declared_path : "#{declared_path}/#{name}.podspec"
-          podfile_dir   = File.dirname(podfile_path || '')
-          absolute_path = File.expand_path(path_with_ext, podfile_dir)
-          absolute_path
-        end
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # Provides support for fetching a specification file from a path local to
-    # the machine running the installation.
-    #
-    # Works with the {LocalPod::LocalSourcedPod} class.
-    #
-    class PathSource < AbstractExternalSource
-
-      # @see  AbstractExternalSource#fetch
-      #
-      def fetch(sandbox)
-        UI.titled_section("Fetching podspec for `#{name}` #{description}", { :verbose_prefix => "-> " }) do
-          podspec = podspec_path
-          store_podspec(sandbox, podspec)
-          sandbox.store_local_path(name, podspec.dirname)
-        end
-      end
-
-      # @see  AbstractExternalSource#description
-      #
-      def description
-        "from `#{params[:path] || params[:local]}`"
-      end
-
-      #--------------------------------------#
-
-      private
-
-      # @!group Helpers
-
-      # @return [Pathname] the path of the podspec.
-      #
-      def podspec_path
-        declared_path = (params[:path] || params[:local]).to_s
-        path_with_ext = File.extname(declared_path) == '.podspec' ? declared_path : "#{declared_path}/#{name}.podspec"
-        podfile_dir   = File.dirname(podfile_path || '')
-        absolute_path = File.expand_path(path_with_ext, podfile_dir)
-        pathname      = Pathname.new(absolute_path)
-
-        unless pathname.exist?
-          raise Informative, "No podspec found for `#{name}` in `#{declared_path}`"
-        end
-        pathname
-      end
-    end
-
-    #-------------------------------------------------------------------------#
-
   end
 end