Commit ea632ada authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master' into pod_update

* master:
  Updated installation notes.
  [Gemfile.lock] update.
  Release 0.11.0
  [Rakefile] fine tuned release task.
  [CHANGELOG] Updated.
  fixing path on push command documentation description
  updating description for pod push with more detail about how it works
parents c290bf9f 0821ad22
## 0.10.1 ## 0.11.0
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.10.0...master) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.10.0...master)
###### Enhancements ###### Enhancements
- Added support for public headers. [#440]
- Added `pod repo lint`. [#423] - Added `pod repo lint`. [#423]
- Improved support for `:head` option and svn repositories. - Improved support for `:head` option and svn repositories.
- When integrating Pods with a project without "Frameworks" group in root of the project, raise an informative message. [#431](https://github.com/CocoaPods/CocoaPods/pull/431) - When integrating Pods with a project without "Frameworks" group in root of the project, raise an informative message. [#431](https://github.com/CocoaPods/CocoaPods/pull/431)
...@@ -11,8 +12,8 @@ ...@@ -11,8 +12,8 @@
###### Bug fixes ###### Bug fixes
- Version message terminates with 0 exit status. - Version message now correctly terminates with a 0 exit status.
- Don't output git error messages in the error report if there are no repos or if a repo is not under git source control. - Resolved an issue that lead to git error messages in the error report.
## 0.10.0 ## 0.10.0
......
...@@ -17,7 +17,7 @@ GIT ...@@ -17,7 +17,7 @@ GIT
PATH PATH
remote: . remote: .
specs: specs:
cocoapods (0.10.0) cocoapods (0.11.0)
activesupport (~> 3.2.6) activesupport (~> 3.2.6)
colored (~> 1.2) colored (~> 1.2)
escape (~> 0.0.4) escape (~> 0.0.4)
......
...@@ -41,7 +41,8 @@ Now that you've got CocoaPods installed you can easily add it to your project. ...@@ -41,7 +41,8 @@ Now that you've got CocoaPods installed you can easily add it to your project.
**NOTES** **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) 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)
Or from `Xcode > Settings > Downloads > Components > Command Line Tools`
2. CocoaPods re-uses some of the RubyGems classes. If you have a version older than 1.4.0, you will have to update RubyGems: `$ gem update --system`. 2. CocoaPods re-uses some of the RubyGems classes. If you have a version older than 1.4.0, you will have to update RubyGems: `$ gem update --system`.
......
...@@ -99,6 +99,7 @@ namespace :gem do ...@@ -99,6 +99,7 @@ namespace :gem do
exit 1 exit 1
end end
diff_lines.delete('Gemfile.lock')
if diff_lines != ['lib/cocoapods.rb'] if diff_lines != ['lib/cocoapods.rb']
$stderr.puts "[!] Only change the version number in a release commit!" $stderr.puts "[!] Only change the version number in a release commit!"
exit 1 exit 1
......
...@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new( ...@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
end end
module Pod module Pod
VERSION = '0.10.0' VERSION = '0.11.0'
class PlainInformative < StandardError class PlainInformative < StandardError
end end
......
...@@ -8,9 +8,10 @@ module Pod ...@@ -8,9 +8,10 @@ module Pod
$ pod push REPO [NAME.podspec] $ pod push REPO [NAME.podspec]
Validates NAME.podspec or `*.podspec' in the current working dir, updates Validates NAME.podspec or `*.podspec' in the current working dir, creates
the local copy of the repository named REPO, adds the specifications a directory and version folder for the pod in the local copy of
to the REPO, and finally it pushes REPO to its remote.} REPO (~/.cocoapods/[REPO]), copies the podspec file into the version directory,
and finally it pushes REPO to its remote.}
end end
def self.options def self.options
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment