cocoapods 0.5.1 → 0.6.0.rc1

data/CHANGELOG.md

@@ -1,3 +1,227 @@
+## 0.6.0
+
+A full list of all the changes since 0.5.1 can be found [here][6].
+
+
+### Link with specific targets
+
+CocoaPods can now integrate all the targets specified in your `Podfile`.
+
+To specify which target, in your Xcode project, a Pods target should be linked
+with, use the `link_with` method like so:
+
+```ruby
+platform :ios
+
+workspace 'MyWorkspace'
+
+link_with ['MyAppTarget', 'MyOtherAppTarget']
+dependency 'JSONKit'
+
+target :test, :exclusive => true do
+  xcodeproj 'TestProject', 'Test' => :debug
+  link_with 'TestRunnerTarget'
+  dependency 'Kiwi'
+end
+```
+
+_NOTE: As you can see it can take either one target name, or an array of names._
+
+* If no explicit Xcode workspace is specified and only **one** project exists in
+the same directory as the Podfile, then the name of that project is used as the
+workspace’s name.
+
+* If no explicit Xcode project is specified for a target, it will use the Xcode
+project of the parent target. If no target specifies an expicit Xcode project
+and there is only **one** project in the same directory as the Podfile then that
+project will be used.
+
+* If no explicit target is specified, then the Pods target will be linked with
+the first target in your project. So if you only have one target you do not
+need to specify the target to link with.
+
+See [#76](https://github.com/CocoaPods/CocoaPods/issues/76) for more info.
+
+Finally, CocoaPods will add build configurations to the Pods project for all
+configurations in the other projects in the workspace. By default the
+configurations are based on the `Release` configuration, to base them on the
+`Debug` configuration you will have to explicitely specify them as can be seen
+above in the following line:
+
+```ruby
+xcodeproj 'TestProject', 'Test' => :debug
+```
+
+
+### Documentation
+
+CocoaPods will now generate documentation for every library with the
+[`appledoc`][5] tool and install it into Xcode’s documentation viewer.
+
+You can customize the settings used like so:
+
+```ruby
+s.documentation = { :appledoc => ['--product-name', 'My awesome project!'] }
+```
+
+Alternatively, you can specify a URL where an HTML version of the documentation
+can be found:
+
+```ruby
+s.documentation = { :html => 'http://example.com/docs/index.html' }
+```
+
+See [#149](https://github.com/CocoaPods/CocoaPods/issues/149) and
+[#151](https://github.com/CocoaPods/CocoaPods/issues/151) for more info.
+
+
+### Licenses & Documentation
+
+CocoaPods will now generate two 'Acknowledgements' files for each target specified
+in your Podfile which contain the License details for each Pod used in that target
+(assuming details have been specified in the Pod spec).
+
+There is a markdown file, for general consumption, as well as a property list file
+that can be added to a settings bundle for an iOS application.
+
+You don't need to do anything for this to happen, it should just work.
+
+If you're not happy with the default boilerplate text generated for the title, header
+and footnotes in the files, it's possible to customise these by overriding the methods
+that generate the text in your `Podfile` like this:
+
+```ruby
+class ::Pod::Generator::Acknowledgements
+  def header_text
+    "My custom header text"
+  end
+end
+```
+
+You can even go one step further and customise the text on a per target basis by 
+checking against the target name, like this:
+
+```ruby
+class ::Pod::Generator::Acknowledgements
+  def header_text
+    if @target_definition.label.end_with?("MyTargetName")
+      "Custom header text for MyTargetName"
+    else
+      "Custom header text for other targets"
+    end
+  end
+end
+```
+
+Finally, here's a list of the methods that are available to override:
+
+```ruby
+header_title
+header_text
+footnote_title
+footnote_text
+```
+
+
+### Introduced two new classes: LocalPod and Sandbox.
+
+The Sandbox represents the entire contents of the `POD_ROOT` (normally
+`SOURCE_ROOT/Pods`). A LocalPod represents a pod that has been installed within
+the Sandbox.
+
+These two classes can be used as better homes for various pieces of logic
+currently spread throughout the installation process and provide a better API
+for working with the contents of this directory.
+
+
+### Xcodeproj API
+
+All Xcodeproj APIs are now in `snake_case`, instead of `camelCase`. If you are
+manipulating the project from your Podfile's `post_install` hook, or from a
+podspec, then update these method calls.
+
+
+### Enhancements
+
+* [#188](https://github.com/CocoaPods/CocoaPods/pull/188): `list` command now
+  displays the specifications introduced in the master repo if it is given as an
+  option the number of days to take into account.
+
+* [#188](https://github.com/CocoaPods/CocoaPods/pull/188): Transferred search
+  layout improvements and options to `list` command.
+
+* [#166](https://github.com/CocoaPods/CocoaPods/issues/166): Added printing
+  of homepage and source to search results.
+
+* [#177](https://github.com/CocoaPods/CocoaPods/issues/177): Added `--stat`
+  option to display watchers and forks for pods hosted on GitHub.
+
+* [#177](https://github.com/CocoaPods/CocoaPods/issues/177): Introduced colors
+  and tuned layout of search.
+
+* [#112](https://github.com/CocoaPods/CocoaPods/issues/112): Introduced `--push`
+  option to `$ pod setup`. It configures the master spec repository to use the private
+  push URL. The change is preserved in future calls to `$ pod setup`.
+
+* [#153](https://github.com/CocoaPods/CocoaPods/issues/153): It is no longer
+  required to call `$ pod setup`.
+
+* [#163](https://github.com/CocoaPods/CocoaPods/issues/163): Print a template
+  for a new ticket when an error occurs.
+
+* Added a new Github-specific downloader that can download repositories as a
+  gzipped tarball.
+
+* No more global state is kept during resolving of dependencies.
+
+* Updated Xcodeproj to have a friendlier API.
+
+
+### Fixes
+
+* [#142](https://github.com/CocoaPods/CocoaPods/issues/142): Xcode 4.3.2 no longer
+  supports passing the -fobj-arc flag to the linker and will fail to build. The
+  addition of this flag was a workaround for a compiler bug in previous versions.
+  This flag is no longer included by default - to keep using this flag, you need to
+  add `set_arc_compatibility_flag!` to your Podfile.
+
+* [#183](https://github.com/CocoaPods/CocoaPods/issues/183): Fix for
+  `.DS_Store` file in `~/.cocoapods` prevents `$ pod install` from running.
+
+* [#134](https://github.com/CocoaPods/CocoaPods/issues/134): Match
+  `IPHONEOS_DEPLOYMENT_TARGET` build setting with `deployment_target` option in
+  generated Pods project file.
+
+* [#142](https://github.com/CocoaPods/CocoaPods/issues/): Add `-fobjc-arc` to
+  `OTHER_LD_FLAGS` if _any_ pods require ARC.
+
+* [#148](https://github.com/CocoaPods/CocoaPods/issues/148): External encoding
+  set to UTF-8 on Ruby 1.9 to fix crash caused by non-ascii characters in pod
+  description.
+
+* Ensure all header search paths are quoted in the xcconfig file.
+
+* Added weak quoting to `ibtool` input paths.
+
+
+---------------------------------------
+
+## 0.5.0
+
+No longer requires MacRuby. Runs on MRI 1.8.7 (OS X system version) and 1.9.3.
+
+A full list of all the changes since 0.3.0 can be found [here][7].
+
+
+---------------------------------------
+
+## 0.4.0
+
+Oops, accidentally skipped this version.
+
+
+---------------------------------------
+
 ## 0.3.0
 
 ### Multiple targets
@@ -78,8 +302,8 @@ _before_ it’s written to disk. [[docs][3]]
 # Enable garbage collection support for MacRuby applications.
 post_install do |installer|
   installer.project.targets.each do |target|
-    target.buildConfigurations.each do |config|
-      config.buildSettings['GCC_ENABLE_OBJC_GC'] = 'supported'
+    target.build_configurations.each do |config|
+      config.build_settings['GCC_ENABLE_OBJC_GC'] = 'supported'
     end
   end
 end
@@ -127,3 +351,6 @@ allowing you to automate Xcode related tasks.
 [2]: https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/podfile.rb#L82
 [3]: https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/podfile.rb#L185
 [4]: https://github.com/CocoaPods/Xcodeproj
+[5]: https://github.com/tomaz/appledoc
+[6]: https://github.com/CocoaPods/CocoaPods/compare/0.5.1...HEAD
+[7]: https://github.com/CocoaPods/CocoaPods/compare/0.3.10...0.5.0

data/README.md

@@ -1,6 +1,6 @@
 # CocoaPods – an Objective-C library manager
 
-[![Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png)](https://secure.travis-ci.org/CocoaPods/CocoaPods)
+[![Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://secure.travis-ci.org/CocoaPods/CocoaPods)
 
 CocoaPods manages library dependencies for your Xcode project.
 
@@ -12,7 +12,7 @@ You specify the dependencies for your project in one easy text file. CocoaPods r
 
 Ultimately, the goal is to improve discoverability of, and engagement in, third party open-source libraries, by creating a more centralized ecosystem.
 
-See [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
+See the [NSScreencast episode about CocoaPods](http://nsscreencast.com/episodes/5-cocoapods) for a quick overview on how to get started, or [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
 
 
 ## Installation
@@ -21,50 +21,80 @@ Downloading and installing CocoaPods only takes a few minutes.
 
 CocoaPods runs on [Ruby](http://www.ruby-lang.org/en/). To install it run the following commands:
 
-    $ sudo gem install cocoapods
-    $ pod setup
+```
+$ sudo gem install cocoapods
+$ pod setup
+```
+
+If you want to have CocoaPods generate documentation for each library, then install the [appledoc](http://gentlebytes.com/appledoc/) tool:
+
+```
+$ brew install appledoc --HEAD
+$ ln -sf "`brew --prefix`/Cellar/appledoc/HEAD/Templates" ~/Library/Application\ Support/appledoc
+```
 
 Now that you've got CocoaPods installed you can easily add it to your project.
 
+**NOTES**
+
+1. If you're using a fresh out of the box Mac with Lion using Xcode from the Mac App Store, you will need to install the Command Line Tools for Xcode first: [here](https://developer.apple.com/downloads/index.action)
+
+2. CocoaPods re-uses some of the RubyGems 1.3.6 classes. If you have an older version (pre OS X 10.7), you will have to update RubyGems: `$ gem update --system`.
+
 
 ## Adding it to your project
 
 Search for Pods by name or description.
 
-    $ pod search asi
-    ==> ASIHTTPRequest (1.8.1)
-        Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone
+```
+$ pod search asi
+==> ASIHTTPRequest (1.8.1)
+    Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone
 
-    ==> ASIWebPageRequest (1.8.1)
-        The ASIWebPageRequest class included with ASIHTTPRequest lets you download
-        complete webpages, including external resources like images and stylesheets.
+==> ASIWebPageRequest (1.8.1)
+    The ASIWebPageRequest class included with ASIHTTPRequest lets you download
+    complete webpages, including external resources like images and stylesheets.
+```
 
 After you've found your favorite dependencies you add them to your [Podfile](https://github.com/CocoaPods/CocoaPods/wiki/A-Podfile).
 
-    $ edit Podfile
-    platform :ios
-    dependency 'JSONKit',           '~> 1.4'
-    dependency 'Reachability',      '~> 2.0.4'
+```
+$ edit Podfile
+```
+
+```ruby
+platform :ios
+dependency 'JSONKit',           '~> 1.4'
+dependency 'Reachability',      '~> 2.0.4'
+```
 
 And then you [install the dependencies](https://github.com/CocoaPods/CocoaPods/wiki/Creating-a-project-that-uses-CocoaPods) in your project.
 
-    $ pod install App.xcodeproj
+```
+$ pod install App.xcodeproj
+```
 
 _Where ‘App.xcodeproj’ is the name of your actual application project._
 
 The next time you change your Podfile, you can update your project by simply running:
 
-    $ pod install
+```
+$ pod install
+```
 
 Remember to always open the Xcode workspace instead of the project file when you're building.
 
-    $ open App.xcworkspace
+```
+$ open App.xcworkspace
+```
 
 Sometimes CocoaPods doesn't have a Pod for one of your dependencies yet. Fortunately [creating a Pod](https://github.com/CocoaPods/CocoaPods/wiki/A-pod-specification) is really easy.
 
-    $ pod spec create Peanuts
-    $ edit Peanuts.podspec
-    $ pod spec lint Peanuts.podspec
+```
+$ pod spec create Peanuts
+$ edit Peanuts.podspec
+$ pod spec lint Peanuts.podspec
+```
 
 Once you've got it running [create a ticket](https://github.com/CocoaPods/CocoaPods/issues) and upload the Pod. If you're familiar with Git you can also fork the [CocoaPods specs](https://github.com/CocoaPods/Specs) repository and send a pull request. We really love contributions!
 

data/bin/pod

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
 if $0 == __FILE__
-  $:.unshift File.expand_path('../../external/xcodeproj/ext', __FILE__)
-  $:.unshift File.expand_path('../../external/xcodeproj/lib', __FILE__)
+  ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+  require "rubygems"
+  require "bundler/setup"
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
 

data/lib/cocoapods.rb

@@ -1,19 +1,30 @@
+Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > '1.8.7'
+
 module Pod
-  VERSION = '0.5.1'
+  VERSION = '0.6.0.rc1'
+
+  class PlainInformative < StandardError
+  end
 
-  class Informative < StandardError
+  class Informative < PlainInformative
+    def message
+      #TODO: remove formatting from raise calls and remove conditional
+      super !~ /\[!\]/ ? "[!] #{super}\n".red : super
+    end
   end
 
-  autoload :BridgeSupportGenerator, 'cocoapods/bridge_support_generator'
   autoload :Command,                'cocoapods/command'
   autoload :Config,                 'cocoapods/config'
   autoload :Dependency,             'cocoapods/dependency'
   autoload :Downloader,             'cocoapods/downloader'
   autoload :Executable,             'cocoapods/executable'
   autoload :Installer,              'cocoapods/installer'
+  autoload :LocalPod,               'cocoapods/local_pod'
   autoload :Platform,               'cocoapods/platform'
   autoload :Podfile,                'cocoapods/podfile'
+  autoload :Project,                'cocoapods/project'
   autoload :Resolver,               'cocoapods/resolver'
+  autoload :Sandbox,                'cocoapods/sandbox'
   autoload :Source,                 'cocoapods/source'
   autoload :Spec,                   'cocoapods/specification'
   autoload :Specification,          'cocoapods/specification'
@@ -25,18 +36,21 @@ module Pod
   module Generator
     autoload :BridgeSupport,        'cocoapods/generator/bridge_support'
     autoload :CopyResourcesScript,  'cocoapods/generator/copy_resources_script'
+    autoload :Documentation,        'cocoapods/generator/documentation'
+    autoload :Acknowledgements,     'cocoapods/generator/acknowledgements'
+    autoload :Plist,                'cocoapods/generator/acknowledgements/plist'
+    autoload :Markdown,             'cocoapods/generator/acknowledgements/markdown'
+    autoload :DummySource,          'cocoapods/generator/dummy_source'
   end
 end
 
-module Xcodeproj
-  autoload :Config,                 'xcodeproj/config'
-  autoload :Project,                'cocoapods/xcodeproj_pods'
-  autoload :Workspace,              'xcodeproj/workspace'
-end
-
 class Pathname
   def glob(pattern = '')
     Dir.glob((self + pattern).to_s).map { |f| Pathname.new(f) }
   end
 end
 
+if ENV['COCOA_PODS_ENV'] == 'development'
+  require 'pry'
+  require 'awesome_print'
+end

data/lib/cocoapods/command.rb

@@ -1,11 +1,16 @@
+require 'colored'
+
 module Pod
   class Command
-    autoload :Install, 'cocoapods/command/install'
-    autoload :Repo,    'cocoapods/command/repo'
-    autoload :Search,  'cocoapods/command/search'
-    autoload :List,    'cocoapods/command/list'
-    autoload :Setup,   'cocoapods/command/setup'
-    autoload :Spec,    'cocoapods/command/spec'
+    autoload :ErrorReport, 'cocoapods/command/error_report'
+    autoload :Install,     'cocoapods/command/install'
+    autoload :List,        'cocoapods/command/list'
+    autoload :Presenter,   'cocoapods/command/presenter'
+    autoload :Push,        'cocoapods/command/push'
+    autoload :Repo,        'cocoapods/command/repo'
+    autoload :Search,      'cocoapods/command/search'
+    autoload :Setup,       'cocoapods/command/setup'
+    autoload :Spec,        'cocoapods/command/spec'
 
     class Help < Informative
       def initialize(command_class, argv)
@@ -14,14 +19,24 @@ module Pod
 
       def message
         [
-          @command_class.banner,
           '',
-          'Options',
-          '-------',
+          @command_class.banner.gsub(/\$ pod (.*)/, '$ pod \1'.green),
+          '',
+          'Options:',
           '',
-          @command_class.options
+          options,
+          "\n",
         ].join("\n")
       end
+
+      private
+
+      def options
+        options  = @command_class.options
+        keys     = options.map(&:first)
+        key_size = keys.inject(0) { |size, key| key.size > size ? key.size : size }
+        options.map { |key, desc| "    #{key.ljust(key_size)}   #{desc}" }.join("\n")
+      end
     end
 
     class ARGV < Array
@@ -32,44 +47,51 @@ module Pod
     end
 
     def self.banner
-      "To see help for the available commands run:\n" \
-      "\n" \
-      "  * $ pod setup --help\n" \
-      "  * $ pod search --help\n" \
-      "  * $ pod list --help\n" \
-      "  * $ pod install --help\n" \
-      "  * $ pod repo --help\n" \
-      "  * $ pod spec --help"
+      commands = ['install', 'list', 'push', 'repo', 'search', 'setup', 'spec'].sort
+      banner   = "\nTo see help for the available commands run:\n\n"
+      commands.each {|cmd| banner << "  * $ pod #{cmd.green} --help\n"}
+      banner
     end
 
     def self.options
-      "    --help      Show help information\n" \
-      "    --silent    Print nothing\n" \
-      "    --verbose   Print more information while working\n" \
-      "    --version   Prints the version of CocoaPods"
+      [
+        ['--help',     'Show help information'],
+        ['--silent',   'Print nothing'],
+        ['--no-color', 'Print output without color'],
+        ['--verbose',  'Print more information while working'],
+        ['--version',  'Prints the version of CocoaPods'],
+      ]
     end
 
     def self.run(*argv)
-      parse(*argv).run
+      sub_command = parse(*argv)
+      Setup.new(ARGV.new).run_if_needed
+      sub_command.run
+
+    rescue Interrupt
+      puts "[!] Cancelled".red
+      Config.instance.verbose? ? raise : exit(1)
+
     rescue Exception => e
-      unless e.is_a?(Informative)
-        puts "Oh no, an error occurred. Please run with `--verbose' and report " \
-             "on https://github.com/CocoaPods/CocoaPods/issues."
-        puts ""
+      if e.is_a?(PlainInformative) # also catches Informative
+        puts e.message
+        puts *e.backtrace if Config.instance.verbose?
+      else
+        puts ErrorReport.report(e)
       end
-      puts e.message
-      puts *e.backtrace if Config.instance.verbose
       exit 1
     end
 
     def self.parse(*argv)
       argv = ARGV.new(argv)
-      raise Informative, VERSION if argv.option('--version')
+      raise PlainInformative, VERSION if argv.option('--version')
 
       show_help = argv.option('--help')
       Config.instance.silent = argv.option('--silent')
       Config.instance.verbose = argv.option('--verbose')
 
+      String.send(:define_method, :colorize) { |string , _| string } if argv.option( '--no-color' )
+
       command_class = case argv.shift_argument
       when 'install' then Install
       when 'repo'    then Repo
@@ -77,6 +99,7 @@ module Pod
       when 'list'    then List
       when 'setup'   then Setup
       when 'spec'    then Spec
+      when 'push'    then Push
       end
 
       if show_help || command_class.nil?
@@ -91,6 +114,24 @@ module Pod
     def initialize(argv)
       raise Help.new(self.class, argv)
     end
+
+    private
+
+    def print_title(title, only_verbose = true)
+      if config.verbose?
+        puts "\n" + title.yellow
+      elsif !config.silent? && !only_verbose
+        puts title
+      end
+    end
+
+    def print_subtitle(title, only_verbose = false)
+      if config.verbose?
+        puts "\n" + title.green
+      elsif !config.silent? && !only_verbose
+        puts title
+      end
+    end
   end
 end