cocoapods 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -0,0 +1,129 @@
+## 0.3.0
+
+### Multiple targets
+
+Add support for multiple static library targets in the Pods Xcode project with
+different sets of depedencies. This means that you can create a separate
+library which contains all dependencies, including extra ones that you only use
+in, for instance, a debug or test build. [[docs][1]]
+
+```Ruby
+# This Podfile will build three static libraries:
+# * libPods.a
+# * libPods-debug.a
+# * libPods-test.a
+
+# This dependency is included in the `default` target, which generates the
+# `libPods.a` library, and all non-exclusive targets.
+dependency 'SSCatalog'
+
+target :debug do
+  # This dependency is only included in the `debug` target, which generates
+  # the `libPods-debug.a` library.
+  dependency 'CocoaLumberjack'
+end
+
+target :test, :exclusive => true do
+  # This dependency is *only* included in the `test` target, which generates
+  # the `libPods-test.a` library.
+  dependency 'Kiwi'
+end
+```
+
+### Install libraries from anywhere
+
+A dependency can take a git url if the repo contains a podspec file in its
+root, or a podspec can be loaded from a file or HTTP location. If no podspec is
+available, a specification can be defined inline in the Podfile. [[docs][2]]
+
+```Ruby
+# From a spec repo.
+dependency 'SSToolkit'
+
+# Directly from the Pod’s repo (if it contains a podspec).
+dependency 'SSToolkit', :git => 'https://github.com/samsoffes/sstoolkit.git'
+
+# Directly from the Pod’s repo (if it contains a podspec) with a specific commit (or tag).
+dependency 'SSToolkit', :git    => 'https://github.com/samsoffes/sstoolkit.git',
+                        :commit => '2adcd0f81740d6b0cd4589af98790eee3bd1ae7b'
+
+# From a podspec that's outside a spec repo _and_ the library’s repo. This can be a file or http url.
+dependency 'SSToolkit', :podspec => 'https://raw.github.com/gist/1353347/ef1800da9c5f5d267a642b8d3950b41174f2a6d7/SSToolkit-0.1.1.podspec'
+
+# If no podspec is available anywhere, you can define one right in your Podfile.
+dependency do |s|
+  s.name         = 'SSToolkit'
+  s.version      = '0.1.3'
+  s.platform     = :ios
+  s.source       = { :git => 'https://github.com/samsoffes/sstoolkit.git', :commit => '2adcd0f81740d6b0cd4589af98790eee3bd1ae7b' }
+  s.resources    = 'Resources'
+  s.source_files = 'SSToolkit/**/*.{h,m}'
+  s.frameworks   = 'QuartzCore', 'CoreGraphics'
+
+  def s.post_install(target)
+    prefix_header = config.project_pods_root + target.prefix_header_filename
+    prefix_header.open('a') do |file|
+      file.puts(%{#ifdef __OBJC__\n#import "SSToolkitDefines.h"\n#endif})
+    end
+  end
+end
+```
+
+### Add a `post_install` hook to the Podfile class
+
+This allows the user to customize, for instance, the generated Xcode project
+_before_ it’s written to disk. [[docs][3]]
+
+```Ruby
+# 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'
+    end
+  end
+end
+```
+
+### Manifest
+
+Generate a Podfile.lock file next to the Podfile, which contains a manifest of
+your application’s dependencies and their dependencies.
+
+```
+PODS:
+  - JSONKit (1.4)
+  - LibComponentLogging-Core (1.1.4)
+  - LibComponentLogging-NSLog (1.0.2):
+    - LibComponentLogging-Core (>= 1.1.4)
+  - RestKit-JSON-JSONKit (0.9.3):
+    - JSONKit
+    - RestKit (= 0.9.3)
+  - RestKit-Network (0.9.3):
+    - LibComponentLogging-NSLog
+    - RestKit (= 0.9.3)
+  - RestKit-ObjectMapping (0.9.3):
+    - RestKit (= 0.9.3)
+    - RestKit-Network (= 0.9.3)
+
+DOWNLOAD_ONLY:
+  - RestKit (0.9.3)
+
+DEPENDENCIES:
+  - RestKit-JSON-JSONKit
+  - RestKit-ObjectMapping
+```
+
+### Generate Xcode projects from scratch
+
+We no longer ship template projects with the gem, but instead generate them
+programmatically. This code has moved out into its own [Xcodeproj gem][4],
+allowing you to automate Xcode related tasks.
+
+
+
+
+[1]: https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/podfile.rb#L151
+[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

data/README.md

@@ -1,85 +1,89 @@
-# CocoaPods
+# CocoaPods – an Objective-C library manager
 
-CocoaPods is an Objective-C library dependency/package manager. It tries to take
-away all hard work of maintaining your dependencies.
+CocoaPods manages library dependencies for your Xcode project.
 
-Its goal is to create a more centralized overview of open-source libraries and
-unify the way in which we deal with them, like [RubyGems](http://rubygems.org)
-does for the Ruby community.
+You specify the dependencies for your project in one easy text file. CocoaPods resolves dependencies between libraries, fetches source code for the dependencies, and creates and maintains an Xcode workspace to build your project.
 
-CocoaPods will:
+Ultimately, the goal is to improve discoverability of, and engagement in, third party open-source libraries, by creating a more centralized ecosystem.
 
-* Calculate the right set of versions of all of your project’s dependencies.
-  _Currently the resolver is very naive and any conflicts will have to be solved
-  by you, the user. This will change in the future._
-* Install dependencies.
-* Set them up to be build as part of a ‘dependency’ static library, which your
-  project links against.
+See [the wiki](https://github.com/CocoaPods/CocoaPods/wiki) for more in depth information on several topics.
 
-For more in depth information see the [wiki][wiki], specifically the page about
-[creating a project that uses CocoaPods][wiki-create].
 
+## Installation
 
-## Installing CocoaPods
+Downloading and installing CocoaPods only takes a few minutes.
 
-You’ll need MacRuby. CocoaPods itself installs through RubyGems, the Ruby
-package manager. Download and install [version 0.10][macruby] and then perform
-the following commands:
+CocoaPods runs on [MacRuby](http://macruby.org). If you don't have a recent version of MacRuby installed you will need to download it. CocoaPods works best on version 0.10.
+
+    $ curl -O http://www.macruby.org/files/MacRuby%200.10.zip
+    $ open MacRuby%200.10.zip
+    # open MacRuby\ 0.10/MacRuby\ 0.10.pkg
+
+After that you can install CocoaPods itself.
 
     $ sudo macgem install cocoapods
     $ pod setup
 
-The load time can be improved a bit by compiling the Ruby source files:
+Now that you've got CocoaPods installed you can easily add it to your project.
+
+
+## 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
+
+    ==> ASIWebPageRequest (1.8.1)
+        The ASIWebPageRequest class included with ASIHTTPRequest lets you download
+        complete webpages, including external resources like images and stylesheets.
 
-    $ sudo macgem install rubygems-compile
-    $ sudo macgem compile cocoapods
+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'
 
-## Contributing
+And then you [install the dependencies](https://github.com/CocoaPods/CocoaPods/wiki/Creating-a-project-that-uses-CocoaPods) in your project.
 
-* We need specifications for as many libraries as possible, which will help in
-  adoption and finding CocoaPods issues that need to be addressed.
+    $ pod install App.xcodeproj
 
-* There needs to be [proper documentation and guides with screenshots][wiki],
-  screencasts, blog posts, etcetera.
+_Where ‘App.xcodeproj’ is the name of your actual application project._
 
-* The project is still very young, so there's a lot still on the table. Feel
-  free to create [tickets][tickets] with ideas, feedback, and issues.
+Remember to always open the Xcode workspace instead of the project file when you're building.
 
-* If you're looking for things to do, start by reading this
-  [setup wiki page][dev-setup], then check the [tickets][tickets] and
-  [the example specification][example-spec] which contains a lot of ideas we
-  may, or may not, want to support.
+    $ open App.xcworkspace
 
-**I will give out push access to the [cocoapods][cocoapods] and
-[master spec-repo][cocoapods-specs] to anyone that has _one_) patch accepted.**
+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
 
-## Contact
+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!
 
-IRC:
+There are several other ways to start using **any** library without a Pod specification, which can be seen in the [SSCatalog example](https://github.com/CocoaPods/CocoaPods/blob/master/examples/SSCatalog/Podfile).
 
-* #cocoapods on `irc.freenode.net`
 
-Eloy Durán:
+## Collaborate
 
-* http://github.com/alloy
-* http://twitter.com/alloy
-* eloy.de.enige@gmail.com
+All CocoaPods development happens on GitHub, there is a repository for [CocoaPods](https://github.com/CocoaPods/CocoaPods) and one for the [CocoaPods specs](https://github.com/CocoaPods/Specs). Contributing patches or Pods is really easy and gratifying. You even get push access when one of your specs or patches is accepted.
 
+Follow [@CocoaPodsOrg](http://twitter.com/CocoaPodsOrg) to get up to date information about what's going on in the CocoaPods world.
 
-## LICENSE
+If you're really oldschool and you want to discuss CocoaPods development you can join #cocoapods on irc.freenode.net.
 
-These works are available under the MIT license. See the [LICENSE][license] file
-for more info.
 
+# Endorsements
 
-[macruby]: http://www.macruby.org/files
-[cocoapods]: https://github.com/alloy/cocoapods
-[cocoapods-specs]: https://github.com/alloy/cocoapods-specs
-[tickets]: https://github.com/alloy/cocoapods/issues
-[example-spec]: https://github.com/alloy/cocoapods/blob/master/examples/PodSpec.podspec
-[dev-setup]: https://github.com/alloy/cocoapods/wiki/Setting-up-for-development-on-CocoaPods
-[wiki-create]: https://github.com/alloy/cocoapods/wiki/Creating-a-project-that-uses-CocoaPods
-[wiki]: https://github.com/alloy/cocoapods/wiki/_pages
-[license]: cocoa-pods/blob/master/LICENSE
+* “I am crazy excited about this. With the growing number of Objective-C libraries, this will make things so much better.” –– [Sam Soffes](http://news.ycombinator.com/item?id=3009154)
+* “Are you doing open source iOS components? You really should support @CocoaPodsOrg!” –– [Matthias Tretter](http://twitter.com/#!/myell0w/status/134955697740840961)
+* “So glad someone has finally done this...” –– [Tom Wilson](http://news.ycombinator.com/item?id=3009349)
+* “Anybody who has tasted the coolness of RubyGems (and @gembundler) understands how cool CocoaPods might be.” –– [StuFF mc](http://twitter.com/#!/stuffmc/status/115374231591731200)
+* “I will be working on getting several of my Objective-C libraries ready for CocoaPods this week!” –– [Luke Redpath](http://twitter.com/#!/lukeredpath/status/115510581921988608)
+* “Really digg how @alloy is building a potential game changer” –– [Klaas Speller](https://twitter.com/#!/spllr/status/115914209438601216)
+* “@alloy's making an Objective-C package manager. This is fantastic news kids!” –– [Josh Abernathy](http://twitter.com/#!/joshaber/status/115273577703555073)
+* “A package manager for Cocoa/Objective-C, built with @MacRuby. Awesomeness!” –– [Johannes Fahrenkrug](http://twitter.com/#!/jfahrenkrug/status/115303240286998528)
+* “This is awesome, I love endorsements!” –– [Appie Durán](http://twitter.com/#!/AppieDuran)

data/bin/pod

@@ -1,6 +1,7 @@
 #!/usr/bin/env macruby
 
 if $0 == __FILE__
+  $:.unshift File.expand_path('../../external/xcodeproj/lib', __FILE__)
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
 

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   class Informative < StandardError
   end
@@ -12,26 +12,23 @@ module Pod
   autoload :Executable,             'cocoapods/executable'
   autoload :Installer,              'cocoapods/installer'
   autoload :Podfile,                'cocoapods/podfile'
-  autoload :ProjectTemplate,        'cocoapods/project_template'
   autoload :Resolver,               'cocoapods/resolver'
   autoload :Source,                 'cocoapods/source'
   autoload :Spec,                   'cocoapods/specification'
   autoload :Specification,          'cocoapods/specification'
   autoload :Version,                'cocoapods/version'
 
-  module Xcode
-    autoload :Config,               'cocoapods/xcode/config'
-    autoload :CopyResourcesScript,  'cocoapods/xcode/copy_resources_script'
-    autoload :Project,              'cocoapods/xcode/project'
-    autoload :Workspace,            'cocoapods/xcode/workspace'
-  end
-
   autoload :Pathname,               'pathname'
 end
 
+module Xcodeproj
+  autoload :Config,                 'cocoapods/xcodeproj_ext'
+  autoload :Project,                'cocoapods/xcodeproj_ext'
+  autoload :Workspace,              'cocoapods/xcodeproj_ext'
+end
+
 class Pathname
   def glob(pattern = '')
     Dir.glob((self + pattern).to_s).map { |f| Pathname.new(f) }
   end
 end
-

data/lib/cocoapods/bridge_support_generator.rb

@@ -15,11 +15,9 @@ module Pod
       @headers.map { |header| "-I '#{header.dirname}'" }.uniq
     end
 
-    def create_in(root)
-      puts "==> Generating BridgeSupport metadata file" unless config.silent?
-      file = root + "Pods.bridgesupport"
-      gen_bridge_metadata %{-c "#{search_paths.join(' ')}" -o '#{file}' '#{headers.join("' '")}'}
-      file
+    def save_as(pathname)
+      puts "==> Generating BridgeSupport metadata file at `#{pathname}'" unless config.silent?
+      gen_bridge_metadata %{-c "#{search_paths.join(' ')}" -o '#{pathname}' '#{headers.join("' '")}'}
     end
   end
 end

data/lib/cocoapods/command.rb

@@ -52,7 +52,7 @@ module Pod
     rescue Exception => e
       unless e.is_a?(Informative)
         puts "Oh no, an error occurred. Please run with `--verbose' and report " \
-             "on https://github.com/alloy/cocoapods/issues."
+             "on https://github.com/CocoaPods/CocoaPods/issues."
         puts ""
       end
       puts e.message

data/lib/cocoapods/command/repo.rb

@@ -6,15 +6,19 @@ module Pod
       def self.banner
 %{Managing spec-repos:
 
-    $ pod help repo
+    $ pod repo add NAME URL
 
-      pod repo add NAME URL
-        Clones `URL' in the local spec-repos directory at `~/.cocoapods'. The
-        remote can later be referred to by `NAME'.
+      Clones `URL' in the local spec-repos directory at `~/.cocoapods'. The
+      remote can later be referred to by `NAME'.
 
-      pod repo update NAME
-        Updates the local clone of the spec-repo `NAME'. If `NAME' is omitted
-        this will update all spec-repos in `~/.cocoapods'.}
+    $ pod repo update NAME
+
+      Updates the local clone of the spec-repo `NAME'. If `NAME' is omitted
+      this will update all spec-repos in `~/.cocoapods'.
+
+    $ pod repo set-url NAME URL
+
+      Updates the remote `URL' of the spec-repo `NAME'.}
       end
 
       extend Executable
@@ -22,12 +26,12 @@ module Pod
 
       def initialize(argv)
         case @action = argv.arguments[0]
-        when 'add'
-          unless (@name = argv[1]) && (@url = argv[2])
-            raise Help, "Adding a repo needs a `name' and a `url'."
+        when 'add', 'set-url'
+          unless (@name = argv.arguments[1]) && (@url = argv.arguments[2])
+            raise Informative, "#{@action == 'add' ? 'Adding' : 'Updating the remote of'} a repo needs a `name' and a `url'."
           end
         when 'update'
-          @name = argv[1]
+          @name = argv.arguments[1]
         else
           super
         end
@@ -38,7 +42,7 @@ module Pod
       end
 
       def run
-        send @action
+        send @action.gsub('-', '_')
       end
 
       def add
@@ -54,6 +58,12 @@ module Pod
           Dir.chdir(dir) { git("pull") }
         end
       end
+
+      def set_url
+        Dir.chdir(dir) do
+          git("remote set-url origin '#{@url}'")
+        end
+      end
     end
   end
 end

data/lib/cocoapods/command/setup.rb

@@ -9,7 +9,10 @@ module Pod
       Creates a directory at `~/.cocoapods' which will hold your spec-repos.
       This is where it will create a clone of the public `master' spec-repo from:
 
-          https://github.com/alloy/cocoapods-specs}
+          https://github.com/CocoaPods/Specs
+
+      If the clone already exists, it will ensure that it points to the correct
+      remote.}
       end
 
       def initialize(argv)
@@ -17,15 +20,23 @@ module Pod
       end
 
       def master_repo_url
-        'git://github.com/alloy/cocoapods-specs.git'
+        'git://github.com/CocoaPods/Specs.git'
       end
 
       def add_master_repo_command
         @command ||= Repo.new(ARGV.new(['add', 'master', master_repo_url]))
       end
 
+      def update_master_repo_remote_command
+        @command ||= Repo.new(ARGV.new(['set-url', 'master', master_repo_url]))
+      end
+
       def run
-        add_master_repo_command.run
+        if (config.repos_dir + 'master').exist?
+          update_master_repo_remote_command.run
+        else
+          add_master_repo_command.run
+        end
       end
     end
   end