CocoaPods · Jul 6, 2012 · Jul 6, 2012 · Jul 6, 2012 · Jul 6, 2012 · Jul 6, 2012
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,31 @@
-## 0.7.0 (unreleased)
+## 0.8.0
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.6.1...develop) | [XcodeProj](https://github.com/CocoaPods/XcodeProj/compare/0.2.1...develop)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.7.0...0.8.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.2.2...0.2.3)
+
+###### Breaking change
+
+Syntax change in Podfile: `dependency` has been replaced by `pod`.
+
+```ruby
+platform :ios
+pod 'JSONKit',      '~> 1.4'
+pod 'Reachability', '~> 2.0.4'
+```
+
+###### Bug fixes
+
+- Properly quote all paths given to Git.
+
+
+## 0.7.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.6.1...0.7.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.2.1...0.2.2)
 
 ###### Features
 
 - Added support for branches in git repos.
 - Added support for linting remote files, i.e. `pod spec lint http://raw/file.podspec`.
-- Improved `Spec create template`
+- Improved `Spec create template`.
 - The indentation is automatically stripped for podspecs strings.
 
 ###### Bug fixes
@@ -19,7 +38,7 @@
 
 ## 0.6.1
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.6.0...0.6.1) | [XcodeProj](https://github.com/CocoaPods/XcodeProj/compare/0.2.0...0.2.1)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.6.0...0.6.1) • [Xcodeproj](https://github.com/CocoaPods/XcodeProj/compare/0.2.0...0.2.1)
 
 ###### Bug fixes
 

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development do
-  gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git", :branch => "develop"
+  gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git"
 
   gem "mocha", "~> 0.11.4"
   gem "bacon"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,14 @@
 GIT
   remote: git://github.com/CocoaPods/Xcodeproj.git
-  revision: afbbabf609322db2069c9b0a5f603c9c31cf66fc
-  branch: develop
+  revision: 2da2c3688dfd240b376f671e8e6525ba28729f38
   specs:
-    xcodeproj (0.2.2)
+    xcodeproj (0.2.3)
+      activesupport (~> 3.2.6)
 
 PATH
   remote: .
   specs:
-    cocoapods (0.7.0)
+    cocoapods (0.8.0)
       activesupport (~> 3.2.6)
       colored (~> 1.2)
       escape (~> 0.0.4)
@@ -17,7 +17,7 @@ PATH
       octokit (~> 1.7.0)
       open4 (~> 1.3.0)
       rake (~> 0.9.0)
-      xcodeproj (~> 0.2.2)
+      xcodeproj (~> 0.2.3)
 
 GEM
   remote: http://rubygems.org/

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # CocoaPods – an Objective-C library manager
 
-| Master branch | Develop branch | CocoaPods/Specs |
+| CocoaPods | Xcodeproj | Specs |
 | :---: | :---: | :---: |
-[![Master Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://secure.travis-ci.org/CocoaPods/CocoaPods)|[![Develop Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png?branch=develop)](https://secure.travis-ci.org/CocoaPods/CocoaPods)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Specs.png?branch=master)](http://travis-ci.org/CocoaPods/Specs)
+[![Master Build Status](https://secure.travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://secure.travis-ci.org/CocoaPods/CocoaPods)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Xcodeproj.png?branch=master)](http://travis-ci.org/CocoaPods/Xcodeproj)|[![Build Status](https://secure.travis-ci.org/CocoaPods/Specs.png?branch=master)](http://travis-ci.org/CocoaPods/Specs)
 
 
 CocoaPods manages library dependencies for your Xcode project.
@@ -17,6 +17,8 @@ Ultimately, the goal is to improve discoverability of, and engagement in, third
 
 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.
 
+Or, if you’re already using CocoaPods, you can find the changelog [here](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md), which contains an overview of the changes in recent versions.
+
 
 ## Installation
 
@@ -25,8 +27,7 @@ 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 --pre
-$ pod setup
+$ [sudo] gem install cocoapods
 ```
 
 If you want to have CocoaPods generate documentation for each library, then install the [appledoc](http://gentlebytes.com/appledoc/) tool:
@@ -71,20 +72,12 @@ $ edit Podfile
 
 ```ruby
 platform :ios
-dependency 'JSONKit',           '~> 1.4'
-dependency 'Reachability',      '~> 2.0.4'
+pod 'JSONKit',           '~> 1.4'
+pod '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
-```
-
-_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
 ```
@@ -114,8 +107,6 @@ All CocoaPods development happens on GitHub, there is a repository for [CocoaPod
 
 Follow [@CocoaPodsOrg](http://twitter.com/CocoaPodsOrg) to get up to date information about what's going on in the CocoaPods world.
 
-If you're really oldschool and you want to discuss CocoaPods development you can join #cocoapods on irc.freenode.net.
-
 
 # Donations
 

diff --git a/Rakefile b/Rakefile
@@ -79,8 +79,8 @@ namespace :gem do
   task :release do
 
     unless ENV['SKIP_CHECKS']
-      if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'develop'
-        $stderr.puts "[!] You need to be on the `develop' branch in order to be able to do a release."
+      if `git symbolic-ref HEAD 2>/dev/null`.strip.split('/').last != 'master'
+        $stderr.puts "[!] You need to be on the `master' branch in order to be able to do a release."
         exit 1
       end
 
@@ -110,16 +110,21 @@ namespace :gem do
     # First check if the required Xcodeproj gem has ben pushed
     gem_spec = eval(File.read(File.expand_path('../cocoapods.gemspec', __FILE__)))
     xcodeproj = gem_spec.dependencies.find { |d| d.name == 'xcodeproj' }
-    xcodeproj_version = xcodeproj.requirement.requirements.first.last.to_s
+    required_xcodeproj_version = xcodeproj.requirement.requirements.first.last.to_s
 
-    puts "* Checking if xcodeproj #{xcodeproj_version} exists on the gem host"
-    unless silent_sh("gem search --remote xcodeproj --version #{xcodeproj_version}").include?(xcodeproj_version)
-      $stderr.puts "[!] The Xcodeproj version `#{xcodeproj_version}' required by " \
+    puts "* Checking if xcodeproj #{required_xcodeproj_version} exists on the gem host"
+    search_result = silent_sh("gem search --remote xcodeproj")
+    remote_xcodeproj_version = search_result.match(/xcodeproj \(([\d\.]+)\)/m)[1]
+    unless Gem::Version.new(required_xcodeproj_version) <= Gem::Version.new(remote_xcodeproj_version)
+      $stderr.puts "[!] The Xcodeproj version `#{required_xcodeproj_version}' required by " \
                    "this version of CocoaPods does not exist on the gem host. " \
                    "Either push that first, or fix the version requirement."
       exit 1
     end
 
+    # Ensure that the branches are up to date with the remote
+    sh "git pull"
+
     puts "* Running specs"
     silent_sh('rake spec:all')
 
@@ -138,15 +143,8 @@ namespace :gem do
     # ENV['FROM_GEM'] = '1'
     # silent_sh "rake examples:build"
 
-    # Ensure that the branches are up to date with the remote
-    sh "git pull"
-
     # Then release
     sh "git commit lib/cocoapods.rb -m 'Release #{gem_version}'"
-    sh "git push origin develop"
-    sh "git checkout master"
-    sh "git pull"
-    sh "git merge develop -m 'Release #{gem_version}'"
     sh "git tag -a #{gem_version} -m 'Release #{gem_version}'"
     sh "git push origin master"
     sh "git push origin --tags"

diff --git a/cocoapods.gemspec b/cocoapods.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json',          '~> 1.7.3'
   s.add_runtime_dependency 'open4',         '~> 1.3.0'
   s.add_runtime_dependency 'rake',          '~> 0.9.0'
-  s.add_runtime_dependency 'xcodeproj',     '~> 0.2.2'
+  s.add_runtime_dependency 'xcodeproj',     '~> 0.2.3'
   s.add_runtime_dependency 'activesupport', '~> 3.2.6'
 
   s.add_development_dependency 'bacon', '~> 1.1'

diff --git a/examples/AFNetworking Mac Example/Podfile b/examples/AFNetworking Mac Example/Podfile
@@ -1,4 +1,4 @@
 platform :osx
 
-dependency 'FormatterKit'
-dependency 'AFNetworking', '~> 0.7.0'
+pod 'FormatterKit'
+pod 'AFNetworking', '~> 0.7.0'
diff --git a/examples/AFNetworking iOS Example/Podfile b/examples/AFNetworking iOS Example/Podfile
@@ -1,4 +1,4 @@
 platform :ios
 
-dependency 'FormatterKit'
-dependency 'AFNetworking', '~> 0.7.0'
+pod 'FormatterKit'
+pod 'AFNetworking', '~> 0.7.0'
diff --git a/examples/MGSplitView/Podfile b/examples/MGSplitView/Podfile
@@ -1,3 +1,3 @@
 platform :ios
 
-dependency 'MGSplitViewController', '1.0.0'
+pod 'MGSplitViewController', '1.0.0'
diff --git a/examples/RKTwitter/Podfile b/examples/RKTwitter/Podfile
@@ -1,3 +1,3 @@
 platform :ios
 
-dependency 'RestKit'
+pod 'RestKit'
diff --git a/examples/RelativePathProject/Podfile b/examples/RelativePathProject/Podfile
@@ -11,4 +11,4 @@ platform :ios
 
 xcodeproj "RelativePathProject/RelativePathProject.xcodeproj"
 
-dependency "AFNetworking"
+pod "AFNetworking"
diff --git a/examples/SSCatalog/Podfile b/examples/SSCatalog/Podfile
@@ -1,4 +1,4 @@
 platform :ios
 
-dependency 'AFNetworking'
-dependency 'SSToolkit'
+pod 'AFNetworking'
+pod 'SSToolkit'
diff --git a/examples/TargetTest/Podfile b/examples/TargetTest/Podfile
@@ -2,5 +2,5 @@ platform :ios
 
 target :test, :exclusive => true do
   link_with 'TargetTest'
-  dependency 'JSONKit'
+  pod 'JSONKit'
 end
diff --git a/lib/cocoapods.rb b/lib/cocoapods.rb
@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 
   class PlainInformative < StandardError
   end

diff --git a/lib/cocoapods/command/spec.rb b/lib/cocoapods/command/spec.rb
@@ -258,7 +258,7 @@ def podfile_from_spec
           platform = @platform
           podfile  = Pod::Podfile.new do
             platform(platform)
-            dependency name, :podspec => podspec
+            pod name, :podspec => podspec
           end
           podfile
         end

diff --git a/lib/cocoapods/downloader/git.rb b/lib/cocoapods/downloader/git.rb
@@ -30,7 +30,7 @@ def create_cache
         puts "-> Creating cache git repo (#{cache_path})" if config.verbose?
         cache_path.rmtree if cache_path.exist?
         cache_path.mkpath
-        git "clone '#{url}' #{cache_path}"
+        clone(url, cache_path)
       end
 
       def removed_cached_repos_if_needed
@@ -100,7 +100,7 @@ def ensure_remote_branch_exists(branch)
 
       def download_head
         update_cache
-        git "clone '#{clone_url}' '#{target_path}'"
+        clone(clone_url, target_path)
       end
 
       def download_tag
@@ -116,22 +116,26 @@ def download_tag
 
       def download_commit
         ensure_ref_exists(options[:commit])
-        git "clone '#{clone_url}' '#{target_path}'"
+        clone(clone_url, target_path)
         Dir.chdir(target_path) do
           git "checkout -b activated-pod-commit #{options[:commit]}"
         end
       end
 
       def download_branch
         ensure_remote_branch_exists(options[:branch])
-        git "clone '#{clone_url}' '#{target_path}'"
+        clone(clone_url, target_path)
         Dir.chdir(target_path) do
-          git "remote add upstream #{@url}" # we need to add the original url, not the cache url
+          git "remote add upstream '#{@url}'" # we need to add the original url, not the cache url
           git "fetch -q upstream" # refresh the branches
           git "checkout --track -b activated-pod-commit upstream/#{options[:branch]}" # create a new tracking branch
           puts "Just downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}" if config.verbose?
         end
       end
+
+      def clone(from, to)
+        git "clone '#{from}' '#{to}'"
+      end
     end
 
     class GitHub < Git
Original file line number	Diff line number	Diff line change
		@@ -11,4 +11,4 @@ platform :ios

		xcodeproj "RelativePathProject/RelativePathProject.xcodeproj"

		dependency "AFNetworking"
		pod "AFNetworking"