cocoapods 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c98eebfe9dd50b6b4da71a5ac302de8192cfd6
-  data.tar.gz: 2e03f615d405ef0a985a8583c49a8391f9879c15
+  metadata.gz: 8e3045ee47d6e2cd362547dc9d63ca8b0eafdd8b
+  data.tar.gz: 323a2df715f634f7b5fe0d5febb3d02f475e132a
 SHA512:
-  metadata.gz: cf0a9ac7b7cff55600dcbaf3b02945e15eea8948f11d688e0bd3a6a9e7ead00d7165d0fd641e1a00e5e96da60b05b8e58c4b289dce05eb59ffb6b564471946cf
-  data.tar.gz: 48a8203cc6981508df7e8e717621a6b9b4c79b576fcadb0865f388f074a38c2d54af094c49c37f4fe21ceb1b654e16c9087e5c816c7a3a146a22c2441d797d40
+  metadata.gz: c5cf5bf33c28c079571ea78cabc844bef8b08a1f667bc5b79ea256c54264740a0481b62b3739f08818b3ac2a29fb78c4603b84ed6f08269c57217e48aee5c5ac
+  data.tar.gz: 2c6b18713fbf58d90fef4290ccc550bd946cc0e5dcd404bb746ab49f3c3fe8d98790c637160ab0242408f25cab813479394ed7d98f539bd7960d25bdbbb6f578

data/CHANGELOG.md

@@ -4,6 +4,81 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ## Master
 
+## 0.20.0
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.0...0.20.0)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.19.0...0.20.0)
+• [cocoapods-downloader](https://github.com/CocoaPods/CLAide/compare/0.1.0...0.1.1)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.5...0.6.0)
+• [CLAide](https://github.com/CocoaPods/CLAide/compare/0.2.0...0.3.0)
+
+###### Enhancements
+
+* Introduces an experimental sandbox feature.
+  [#939](https://github.com/CocoaPods/CocoaPods/issues/939)
+
+  Let’s face it, even though we have a great community that spends an amazing
+  amount of time on curating the specifications, the internet can be a hostile
+  place and the community is growing too large to take a naive approach any
+  longer.
+
+  As such, we have started leveraging OS X’s sandbox facilities to disallow
+  unsanctioned operations. This is still very experimental and therefore has to
+  be used explicitely, for now, but that does **not** mean we don’t want you to
+  start using it and **report issues**.
+
+  To use the sandbox, simply use the `sandbox-pod` command instead. E.g.:
+
+        $ sandbox-pod install
+
+  In case of issues, be sure to check `/var/log/system.log` for ‘deny’ messages.
+  For instance, here’s an example where the sandbox denies read access to `/`:
+
+        May 16 00:23:35 Khaos kernel[0]: Sandbox: ruby(98430) deny file-read-data /
+
+  **NOTE**: _The above example is actually one that we know of. We’re not sure
+  yet which process causes this, but there shouldn’t be a need for any process
+  to read data from the root path anyways._
+
+  **NOTE 2**: _At the moment the sandbox is not compatible with the `:path` option
+  when referencing Pods that are not stored within the directory of the Podfile._
+
+* The naked `pod` command now defaults to `pod install`.
+  [#958](https://github.com/CocoaPods/CocoaPods/issues/958)
+
+* CocoaPods will look for the Podfile in the ancestors paths if one is
+  not available in the working directory.
+  [#940](https://github.com/CocoaPods/CocoaPods/issues/940)
+
+* Documentation generation has been removed from CocoaPods as it graduated
+  to CocoaDocs. This decision was taken because CocoaDocs is a much better
+  solution which doesn't clutter Xcode's docsets while still allowing
+  access to the docsets with Xcode and with Dash. Removing this feature
+  keeps the installer leaner and easier to develop and paves the way for the
+  upcoming sandbox. Private pods can use pre install hook to generate the
+  documentation. If there will be enough demand this feature might be
+  reintegrated as plugin (see
+  [#1037](https://github.com/CocoaPods/CocoaPods/issues/1037)).
+
+* Improved performance of the copy resources script and thus build time of
+  the integrated targets. Contribution by [@onato](https://github.com/onato)
+  [#1050](https://github.com/CocoaPods/CocoaPods/issues/1050).
+
+* The changelog for the current version is printed after CocoaPods is
+  installed/updated.
+  [#853](https://github.com/CocoaPods/CocoaPods/issues/853).
+
+
+###### Bug fixes
+
+* Inheriting `inhibit_warnings` per pod is now working
+  [#1032](https://github.com/CocoaPods/CocoaPods/issues/1032)
+* Fix copy resources script for iOS < 6 and OS X < 10.8 by removing the
+  `--reference-external-strings-file`
+  flag. [#1030](https://github.com/CocoaPods/CocoaPods/pull/1030)
+* Fixed issues with the `:head` option of the Podfile.
+  [#1046](https://github.com/CocoaPods/CocoaPods/issues/1046)
+  [#1039](https://github.com/CocoaPods/CocoaPods/issues/1039)
+
 ## 0.19.1
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.0...0.19.1)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.19.0...0.19.1)
@@ -29,6 +104,9 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 * CocoaPods now defines the `COCOAPODS=1` macro in the Pod and the Client
   targets. This is useful for libraries which conditionally expose interfaces.
   [#903](https://github.com/CocoaPods/CocoaPods/issues/903)
+* Added support for the `private_header_files` attribute of the Specification
+  DSL.
+  [#998](https://github.com/CocoaPods/CocoaPods/issues/998)
 * CocoaPods now defines the deployment target of the Pods project computed as
   the minimum deployment target of the Pods libraries.
   [#556](https://github.com/CocoaPods/CocoaPods/issues/556)
@@ -46,8 +124,8 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ###### Deprecations
 
-* The `:local` flag in Podfile has been renamed to `:path` and has been 
-  deprecated.
+* The `:local` flag in Podfile has been renamed to `:path` and the old syntax
+  has been deprecated.
   [#971](https://github.com/CocoaPods/CocoaPods/issues/971)
 
 ###### Bug fixes

data/README.md

@@ -1,8 +1,9 @@
 # CocoaPods – an Objective-C library manager
 
-[![Gem Version](https://badge.fury.io/rb/cocoapods.png)](http://badge.fury.io/rb/cocoapods)
-[![Dependency Status](https://gemnasium.com/CocoaPods/CocoaPods.png)](https://gemnasium.com/CocoaPods/CocoaPods)
 [![Build Status](https://travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://travis-ci.org/CocoaPods/CocoaPods)
+[![Code Climate](https://codeclimate.com/github/CocoaPods/CocoaPods.png)](https://codeclimate.com/github/CocoaPods/CocoaPods)
+[![Dependency Status](https://gemnasium.com/CocoaPods/CocoaPods.png)](https://gemnasium.com/CocoaPods/CocoaPods)
+[![Gem Version](https://badge.fury.io/rb/cocoapods.png)](http://badge.fury.io/rb/cocoapods)
 
 CocoaPods manages library dependencies for your Xcode project.
 

data/bin/sandbox-pod

@@ -0,0 +1,130 @@
+#!/usr/bin/env ruby
+
+# This bin wrapper runs the `pod` command in a OS X sandbox. The reason for this
+# is to ensure that people can’t use malicious code from pod specifications.
+#
+# It does this by creating a ‘seatbelt’ profile on the fly and executing the
+# given command through `/usr/bin/sandbox-exec`. This profile format is an
+# undocumented format, which uses TinyScheme to implement its DSL.
+#
+# Even though it uses a undocumented format, it’s actually very self-explanatory.
+# Because we use a whitelist approach, `(deny default)`, any action that is
+# denied is logged to `/var/log/system.log`. So tailing that should provide
+# enough information on steps that need to be take to get something to work.
+#
+# For more information see:
+#
+# * https://github.com/CocoaPods/CocoaPods/issues/939
+# * http://reverse.put.as/wp-content/uploads/2011/08/The-Apple-Sandbox-BHDC2011-Slides.pdf
+# * http://reverse.put.as/wp-content/uploads/2011/08/The-Apple-Sandbox-BHDC2011-Paper.pdf
+# * https://github.com/s7ephen/OSX-Sandbox--Seatbelt--Profiles
+# * `$ man sandbox-exec`
+# * `$ ls /usr/share/sandbox`
+
+if $0 == __FILE__
+  $:.unshift File.expand_path('../../lib', __FILE__)
+end
+require 'pathname'
+require 'cocoapods/config'
+
+
+pod_bin = File.expand_path('../pod', __FILE__)
+pod_prefix = File.expand_path('../..', pod_bin)
+
+require 'rbconfig'
+ruby_bin = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+ruby_prefix = RbConfig::CONFIG['prefix']
+
+prefixes = ['/bin', '/usr/bin', '/usr/libexec']
+prefixes << `brew --prefix`.strip unless `which brew`.strip.empty?
+# From asking people, it seems MacPorts does not have a `prefix` command, like
+# Homebrew does, so make an educated guess:
+unless (port = `which port`.strip).empty?
+  prefixes << File.dirname(File.dirname(port))
+end
+
+developer_prefix = `xcode-select --print-path`.strip
+xcode_app_path = File.expand_path('../..', developer_prefix)
+
+require 'erb'
+profile = ERB.new(DATA.read, 0, '>').result(TOPLEVEL_BINDING)
+#puts profile
+
+command = ['/usr/bin/sandbox-exec', '-p', profile, pod_bin, *ARGV]
+exec *command
+
+
+__END__
+(version 1)
+(debug allow)
+
+(import "mDNSResponder.sb")
+
+(allow file-ioctl)
+(allow sysctl-read)
+(allow mach-lookup)
+(allow ipc-posix-shm)
+(allow process-fork)
+(allow system-socket)
+
+; TODO make this stricter if possible
+(allow network-outbound)
+
+(allow process-exec
+  (literal
+    "<%= pod_bin %>"
+    "<%= ruby_bin %>"
+    "<%= File.join(developer_prefix, 'usr/bin/xcrun') %>"
+    "<%= File.join(developer_prefix, 'usr/bin/xcodebuild') %>"
+  )
+  (regex 
+<% prefixes.each do |prefix| %>
+    #"^<%= prefix %>/*"
+<% end %>
+  )
+)
+
+(allow file-read-metadata)
+(allow file-read*
+  ; This is currenly only added because using `xcodebuild` to build a resource
+  ; bundle target starts a FSEvents stream on `/`. No idea why that would be
+  ; needed, but for now it doesn’t seem like a real problem.
+  (literal "/")
+  (regex
+    ; TODO see if we can restrict this more, but it's going to be hard
+    #"^/Users/[^.]+/*"
+    ;#"^/Users/[^.]+/.netrc"
+    ;#"^/Users/[^.]+/.gemrc"
+    ;#"^/Users/[^.]+/.gem/*"
+    ;#"^/Users/[^.]+/Library/.*"
+    #"^/Library/*"
+    #"^/System/Library/*"
+    #"^/usr/lib/*"
+    #"^/usr/share/*"
+    #"^/private/*"
+    #"^/dev/*"
+    #"^<%= ruby_prefix %>"
+    #"^<%= pod_prefix %>"
+    #"^<%= xcode_app_path %>"
+    #"^<%= Pod::Config.instance.repos_dir %>"
+<% prefixes.each do |prefix| %>
+    #"^<%= prefix %>/*"
+<% end %>
+  )
+)
+
+(allow file-write*
+  (literal
+    "/dev/dtracehelper"
+    "/dev/null"
+  )
+  (regex
+    #"^<%= Pod::Config.instance.project_root %>"
+    #"^<%= Pod::Config.instance.repos_dir %>"
+    #"^/Users/[^.]+/Library/Caches/CocoaPods/*"
+    #"^/dev/tty"
+    #"^/private/var"
+  )
+)
+
+(deny default)

data/lib/cocoapods.rb

@@ -9,8 +9,7 @@ module Pod
   require 'cocoapods-core'
   require 'cocoapods/file_list'
   require 'cocoapods/config'
-
-  autoload :Downloader, 'cocoapods/downloader'
+  require 'cocoapods/downloader'
 
   # Indicates an user error. This is defined in cocoapods-core.
   #
@@ -55,7 +54,6 @@ module Pod
     autoload :Acknowledgements,        'cocoapods/generator/acknowledgements'
     autoload :BridgeSupport,           'cocoapods/generator/bridge_support'
     autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
-    autoload :Documentation,           'cocoapods/generator/documentation'
     autoload :DummySource,             'cocoapods/generator/dummy_source'
     autoload :Markdown,                'cocoapods/generator/acknowledgements/markdown'
     autoload :Plist,                   'cocoapods/generator/acknowledgements/plist'

data/lib/cocoapods/command.rb

@@ -21,6 +21,7 @@ module Pod
     require 'cocoapods/command/podfile_info'
 
     self.abstract_command = true
+    self.default_subcommand = 'install'
     self.command = 'pod'
     self.description = 'CocoaPods, the Objective-C library package manager.'
 

data/lib/cocoapods/command/help.rb

@@ -5,7 +5,7 @@ module Pod
       self.arguments = '[COMMAND]'
 
       def initialize(argv)
-        @help_command = Pod::Command.parse(argv) unless argv.empty?
+        @help_command = Pod::Command.parse(argv)
         super
       end
 
@@ -16,7 +16,7 @@ module Pod
       private
 
       def help_command
-        @help_command || self
+        @help_command
       end
     end
   end

data/lib/cocoapods/command/project.rb

@@ -9,7 +9,6 @@ module Pod
         def options
           [
             ["--no-clean",       "Leave SCM dirs like `.git' and `.svn' intact after downloading"],
-            ["--no-doc",         "Skip documentation generation with appledoc"],
             ["--no-integrate",   "Skip integration of the Pods libraries in the Xcode project(s)"],
             ["--no-repo-update", "Skip running `pod repo update` before install"],
           ].concat(super)
@@ -22,7 +21,6 @@ module Pod
 
       def initialize(argv)
         config.clean = argv.flag?('clean', config.clean)
-        config.generate_docs = argv.flag?('doc', config.generate_docs)
         config.integrate_targets = argv.flag?('integrate', config.integrate_targets)
         config.skip_repo_update = !argv.flag?('repo-update', !config.skip_repo_update)
         super

data/lib/cocoapods/command/search.rb

@@ -12,12 +12,12 @@ module Pod
       self.arguments = '[QUERY]'
 
       def self.options
-        [[
-          "--full",  "Search by name, summary, and description",
-          "--stats", "Show additional stats (like GitHub watchers and forks)",
-          "--ios",   "Restricts the search to Pods supported on iOS",
-          "--osx",   "Restricts the search to Pods supported on OS X",
-        ]].concat(super)
+        [
+          ["--full",  "Search by name, summary, and description"],
+          ["--stats", "Show additional stats (like GitHub watchers and forks)"],
+          ["--ios",   "Restricts the search to Pods supported on iOS"],
+          ["--osx",   "Restricts the search to Pods supported on OS X"]
+        ].concat(super)
       end
 
       def initialize(argv)

data/lib/cocoapods/config.rb

@@ -11,8 +11,7 @@ module Pod
     #
     #     ---
     #     skip_repo_update: true
-    #     generate_docs: false
-    #     install_docs: false
+    #     new_version_message: false
     #
     DEFAULTS = {
       :verbose             => false,
@@ -21,13 +20,13 @@ module Pod
       :aggressive_cache    => false,
 
       :clean               => true,
-      :generate_docs       => true,
-      :install_docs        => true,
       :integrate_targets   => true,
       :new_version_message => true,
     }
 
-    #--------------------------------------#
+    public
+
+    #-------------------------------------------------------------------------#
 
     # @!group UI
 
@@ -42,13 +41,13 @@ module Pod
     attr_accessor :silent
     alias_method  :silent?, :silent
 
-    # @return [Bool] Whether the generated documentation should be installed to
-    #         Xcode.
+    # @return [Bool] Whether a message should be printed when a new version of
+    #         CocoaPods is available.
     #
     attr_accessor :new_version_message
     alias_method  :new_version_message?, :new_version_message
 
-    #--------------------------------------#
+    #-------------------------------------------------------------------------#
 
     # @!group Installation
 
@@ -57,18 +56,6 @@ module Pod
     attr_accessor :clean
     alias_method  :clean?, :clean
 
-    # @return [Bool] Whether the documentation should be generated for the
-    #         installed Pods.
-    #
-    attr_accessor :generate_docs
-    alias_method  :generate_docs?, :generate_docs
-
-    # @return [Bool] Whether the generated documentation should be installed to
-    #         Xcode.
-    #
-    attr_accessor :install_docs
-    alias_method  :install_docs?, :install_docs
-
     # @return [Bool] Whether CocoaPods should integrate a user target and build
     #         the workspace or just create the Pods project.
     #
@@ -81,13 +68,24 @@ module Pod
     attr_accessor :skip_repo_update
     alias_method  :skip_repo_update?, :skip_repo_update
 
+    # Allows to set whether the downloader should use more aggressive caching
+    # options.
+    #
+    # @note The aggressive cache has lead to issues if a tag is updated to
+    #       point to another commit.
+    #
+    attr_writer :aggressive_cache
+
     # @return [Bool] Whether the downloader should use more aggressive caching
     #         options.
     #
-    attr_accessor :aggressive_cache
-    alias_method  :aggressive_cache?, :aggressive_cache
+    def aggressive_cache?
+      @aggressive_cache || (ENV['CP_AGGRESSIVE_CACHE'] != 'FALSE')
+    end
+
+    public
 
-    #--------------------------------------#
+    #-------------------------------------------------------------------------#
 
     # @!group Initialization
 
@@ -105,7 +103,9 @@ module Pod
       @verbose && !silent
     end
 
-    #--------------------------------------#
+    public
+
+    #-------------------------------------------------------------------------#
 
     # @!group Paths
 
@@ -121,7 +121,22 @@ module Pod
     #         Podfile is located.
     #
     def installation_root
-      @installation_root ||= Pathname.pwd
+      current_path = Pathname.pwd
+      unless @installation_root
+        while(!current_path.root?)
+          if podfile_path_in_dir(current_path)
+            @installation_root = current_path
+            unless current_path == Pathname.pwd
+              UI.puts ("[in #{current_path}]")
+            end
+            break
+          else
+            current_path = current_path.parent
+          end
+        end
+        @installation_root ||= Pathname.pwd
+      end
+      @installation_root
     end
 
     attr_writer :installation_root
@@ -143,23 +158,46 @@ module Pod
     end
 
     # @return [Podfile] The Podfile to use for the current execution.
+    # @return [Nil] If no Podfile is available.
     #
     def podfile
-      @podfile ||= Podfile.from_file(podfile_path) if podfile_path.exist?
+      @podfile ||= Podfile.from_file(podfile_path) if podfile_path
     end
     attr_writer :podfile
 
     # @return [Lockfile] The Lockfile to use for the current execution.
+    # @return [Nil] If no Lockfile is available.
     #
     def lockfile
-      @lockfile ||= Lockfile.from_file(lockfile_path) if lockfile_path.exist?
+      @lockfile ||= Lockfile.from_file(lockfile_path) if lockfile_path
+    end
+
+    # Returns the path of the Podfile.
+    #
+    # @note The Podfile can be named either `CocoaPods.podfile.yaml`,
+    #       `CocoaPods.podfile` or `Podfile`.  The first two are preferred as
+    #       they allow to specify an OS X UTI.
+    #
+    # @return [Pathname]
+    # @return [Nil]
+    #
+    def podfile_path
+      @podfile_path ||= podfile_path_in_dir(installation_root)
+    end
+
+    # Returns the path of the Lockfile.
+    #
+    # @note The Lockfile is named `Podfile.lock`.
+    #
+    def lockfile_path
+      @lockfile_path ||= installation_root + 'Podfile.lock'
     end
 
-    #--------------------------------------#
+    private
 
-    # @!group Helpers
+    #-------------------------------------------------------------------------#
 
-    # private
+    # @!group Private helpers
 
     # @return [Pathname] The path of the file which contains the user settings.
     #
@@ -181,30 +219,38 @@ module Pod
       end
     end
 
-    # Returns the path of the Podfile.
+    # @return [Array<String>] The filenames that the Podfile can have ordered
+    #         by priority.
     #
-    # @note The Podfile can be named either `CocoaPods.podfile` or `Podfile`.
-    #       The first is preferred as it allows to specify an OS X UTI.
-    #
-    def podfile_path
-      unless @podfile_path
-        path = installation_root + 'CocoaPods.podfile.yaml'
-        path = installation_root + 'CocoaPods.podfile' unless path.exist?
-        path = installation_root + 'Podfile' unless path.exist?
-        @podfile_path = path
-      end
-      @podfile_path
-    end
+    PODFILE_NAMES = [
+      'CocoaPods.podfile.yaml',
+      'CocoaPods.podfile',
+      'Podfile',
+    ]
 
-    # Returns the path of the Lockfile.
+    # Returns the path of the Podfile in the given dir if any exists.
     #
-    # @note The Lockfile is named `Podfile.lock`.
+    # @param  [Pathname] dir
+    #         The directory where to look for the Podfile.
     #
-    def lockfile_path
-      @lockfile_path ||= installation_root + 'Podfile.lock'
+    # @return [Pathname] The path of the Podfile.
+    # @return [Nil] If not Podfile was found in the given dir
+    #
+    def podfile_path_in_dir(dir)
+      PODFILE_NAMES.each do |filename|
+        candidate = dir + filename
+        if candidate.exist?
+          return candidate
+        end
+      end
+      nil
     end
 
-    #--------------------------------------#
+    public
+
+    #-------------------------------------------------------------------------#
+
+    # @!group Singleton
 
     # @return [Config] the current config instance creating one if needed.
     #
@@ -223,8 +269,6 @@ module Pod
       @instance = instance
     end
 
-    #-------------------------------------------------------------------------#
-
     # Provides support for accessing the configuration instance in other
     # scopes.
     #