Commit e44da0de authored by Marc Boquet's avatar Marc Boquet

Merge branch 'master' of github.com:CocoaPods/CocoaPods

parents 32645a9a 8eace6c0
......@@ -2,8 +2,8 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
## Master
[CocoaPods](https://github.com/jverkoey/CocoaPods/compare/0.29.0...master)
## 0.30.0
[CocoaPods](https://github.com/jverkoey/CocoaPods/compare/0.29.0...0.30.0)
###### Enhancements
......
......@@ -7,10 +7,10 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: d281be39c464418c0b0ee8ba4788c4d2ce074de6
revision: 76c726cb88ec60dc64c62e2a87b1845319e84569
branch: master
specs:
cocoapods-core (0.29.0)
cocoapods-core (0.30.0)
activesupport (>= 3.2.15, < 4)
fuzzy_match (~> 2.0.4)
json_pure (~> 1.8)
......@@ -18,10 +18,10 @@ GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 524d79df5e5e8d5af9c047682bd21de87c3bb593
revision: 607c0a9c40bf0f8a34504efade50fd2b9fd94842
branch: master
specs:
xcodeproj (0.15.0)
xcodeproj (0.15.1)
activesupport (~> 3.0)
colored (~> 1.2)
......@@ -74,10 +74,10 @@ GIT
PATH
remote: .
specs:
cocoapods (0.29.0)
cocoapods (0.30.0)
activesupport (>= 3.2.15, < 4)
claide (~> 0.5.0)
cocoapods-core (= 0.29.0)
cocoapods-core (= 0.30.0)
cocoapods-downloader (~> 0.4.0)
cocoapods-try (~> 0.2.0)
colored (~> 1.2)
......
This diff is collapsed.
#!/usr/bin/env ruby
if RUBY_VERSION > '1.8.7' && Encoding.default_external != Encoding::UTF_8
puts <<-DOC
\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding.
puts "\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding."
if ENV["TRAVIS"]
puts <<-DOC
Consider adding the following settings to .travis.yml
before_script:
- export LANG=en_US.UTF-8\e[0m\n
DOC
else
puts <<-DOC
See https://github.com/CocoaPods/guides.cocoapods.org/issues/26 for
possible solutions.\e[0m\n
DOC
DOC
end
end
if $PROGRAM_NAME == __FILE__ && !ENV['COCOAPODS_NO_BUNDLER']
......
......@@ -65,3 +65,24 @@ if ENV['COCOA_PODS_ENV'] == 'development'
# require 'awesome_print'
# require 'pry'
end
# TODO remove for CocoaPods 0.31
#
module Pod
class Specification
def pre_install(&block)
UI.warn "[#{self}] The pre install hook of the specification " \
"DSL has been deprecated, use the `resource_bundles` or the " \
"`prepare_command` attributes."
UI.puts "[#{self}] The pre_install hook will be removed in the next release".red
@pre_install_callback = block
end
def post_install(&block)
UI.warn "[#{self}] The post install hook of the specification " \
"DSL has been deprecated, use the `resource_bundles` or the " \
"`prepare_command` attributes."
UI.puts "[#{self}] The post_install hook will be removed in the next release".red
@post_install_callback = block
end
end
end
......@@ -42,7 +42,6 @@ module Pod
def run
validate_podspec_files
test_trunk
check_repo_status
update_repo
add_specs_to_repo
......@@ -58,21 +57,6 @@ module Pod
extend Executable
executable :git
# @return [void] Silently test the CocoaPods trunk service.
#
def test_trunk
return unless @repo == "master"
require 'rest'
base_url = 'https://trunk.cocoapods.org/api/v1'
podspec_files.each do |spec_file|
spec = Pod::Specification.from_file(spec_file)
REST.post("#{base_url}/pods", spec.to_json, 'Content-Type' => 'application/json; charset=utf-8',
'Authorization' => "Token 9300632274827cd3e6dde24bf9c608c3")
end
rescue Exception
# Nothing
end
# Performs a full lint against the podspecs.
#
def validate_podspec_files
......
module Pod
# The version of the cocoapods command line tool.
#
VERSION = '0.29.0' unless defined? Pod::VERSION
VERSION = '0.30.0' unless defined? Pod::VERSION
end
......@@ -206,7 +206,8 @@ module Pod
end
if config.new_version_message? && cocoapods_update?(versions)
UI.puts "\nCocoaPods #{versions['last']} is available.\n".green
UI.puts "\nCocoaPods #{versions['last']} is available.\n" \
"To update use: [sudo] gem update cocoapods\n".green
end
end
......
Subproject commit 214c69d0c2e7abeba1c3df3d3a8809998a405d32
Subproject commit 27a44d7c15b58e8fa431ae774f13d348ad315721
......@@ -5,11 +5,6 @@ module Pod
extend SpecHelper::Command
extend SpecHelper::TemporaryRepos
# Don't test push the spec to the trunk app
def command(*a)
super.tap { |cmd| cmd.stubs(:test_trunk) }
end
before do
config.repos_dir = SpecHelper.tmp_repos_path
end
......
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