Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Alias "dependency" to "dep" in Podfile #331

Closed
wants to merge 23 commits into
from
Commits
Jump to file or symbol
Failed to load files and symbols.
+376 −91
Split
View
@@ -18,3 +18,6 @@ spec/fixtures/integration/Headers/
spec/fixtures/mercurial-repo/.hg/*cache
.hg
spec/fixtures/vcr
+.yardoc
+/doc
+.rbx/
View
@@ -0,0 +1 @@
+--markup markdown
View
@@ -20,4 +20,8 @@ group :development do
gem "webmock"
gem "awesome_print"
gem "pry"
+
+ gem 'yard'
+ gem 'redcarpet'
+ gem 'github-markup'
end
View
@@ -19,6 +19,7 @@ GEM
multipart-post (~> 1.1)
faraday_middleware (0.8.7)
faraday (>= 0.7.4, < 0.9)
+ github-markup (0.7.2)
hashie (1.2.0)
json (1.7.3)
kicker (2.5.0)
@@ -44,11 +45,13 @@ GEM
slop (>= 2.4.4, < 3)
rake (0.9.2.2)
rb-fsevent (0.9.1)
+ redcarpet (2.1.1)
slop (2.4.4)
vcr (2.2.0)
webmock (1.8.7)
addressable (>= 2.2.7)
crack (>= 0.1.7)
+ yard (0.8.2)
PLATFORMS
ruby
@@ -59,6 +62,7 @@ DEPENDENCIES
colored
escape
faraday (>= 0.8.1)
+ github-markup
json
kicker
mocha-on-bacon
@@ -67,6 +71,8 @@ DEPENDENCIES
pry
rake
rb-fsevent
+ redcarpet
vcr
webmock
xcodeproj!
+ yard
View
@@ -50,13 +50,17 @@ Now that you've got CocoaPods installed you can easily add 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 json
-==> ASIWebPageRequest (1.8.1)
- The ASIWebPageRequest class included with ASIHTTPRequest lets you download
- complete webpages, including external resources like images and stylesheets.
+--> JSONKit (1.4, 1.5pre)
+ A Very High Performance Objective-C JSON Library.
+ - Homepage: https://github.com/johnezang/JSONKit
+ - Source: https://github.com/johnezang/JSONKit.git
+
+--> SBJson (2.2.3, 3.0.4, 3.1)
+ This library implements strict JSON parsing and generation in Objective-C.
+ - Homepage: http://stig.github.com/json-framework/
+ - Source: https://github.com/stig/json-framework.git
```
After you've found your favorite dependencies you add them to your [Podfile](https://github.com/CocoaPods/CocoaPods/wiki/A-Podfile).
View
@@ -78,6 +78,7 @@ namespace :gem do
desc "Run all specs, build and install gem, commit version change, tag version change, and push everything"
task :release do
+
unless ENV['SKIP_CHECKS']
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."
@@ -140,6 +141,29 @@ namespace :gem do
sh "git push origin master"
sh "git push origin --tags"
sh "gem push #{gem_filename}"
+
+ # Update the last version in CocoaPods-version.yml
+ specs_branch = '0.6'
+
+ Dir.chdir ('../Specs') do
+ puts Dir.pwd
+ sh "git checkout #{specs_branch}"
+ sh "git pull"
+
+ yaml_file = 'CocoaPods-version.yml'
+ unless File.exist?(yaml_file)
+ $stderr.puts "[!] Unable to find #{yaml_file}!"
+ exit 1
+ end
+ cocoapods_version = YAML.load_file(yaml_file)
+ cocoapods_version['last'] = gem_version
+ File.open(yaml_file, "w") do |f|
+ f.write(cocoapods_version.to_yaml)
+ end
+
+ sh "git commit #{yaml_file} -m 'CocoaPods release #{gem_version}'"
+ sh "git push"
+ end
end
end
@@ -186,7 +210,7 @@ namespace :spec do
sh "cd #{File.dirname(tarball)} && rm #{basename} && tar -zcf #{basename} #{basename[0..-8]}"
end
end
-
+
desc "Unpacks all the fixture tarballs"
task :unpack_fixture_tarballs do
tarballs = FileList['spec/fixtures/**/*.tar.gz']
View
@@ -25,9 +25,6 @@ Gem::Specification.new do |s|
s.executables = %w{ pod }
s.require_paths = %w{ lib }
- s.post_install_message = "[!] If this is your first time install of CocoaPods, or if " \
- "you are upgrading, first run: $ pod setup"
-
s.add_runtime_dependency 'faraday', '~> 0.8.1'
s.add_runtime_dependency 'octokit', '~> 1.3.0'
View
@@ -1,5 +1,3 @@
-Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > '1.8.7'
-
module Pod
VERSION = '0.6.0.rc2'
@@ -241,13 +241,14 @@ def install_pod
end
def podfile_from_spec
- name = spec.name
- podspec = file.realpath.to_s
- platform_sym = @platform.to_sym
- podfile = Pod::Podfile.new do
- platform(platform_sym)
+ name = spec.name
+ podspec = file.realpath.to_s
+ platform = @platform
+ podfile = Pod::Podfile.new do
+ platform(platform)
dependency name, :podspec => podspec
end
+ podfile
end
def set_up_lint_environment
Oops, something went wrong.