Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: CocoaPods/CocoaPods
...
head fork: CocoaPods/CocoaPods
Commits on Jul 23, 2013
Chris McKnight Add licenses command to pod cli 11124e9
Chris McKnight Move license info into podfile-info command 2019ee3
@alloy alloy [Bundle] Always add simplecov as a coveralls dependency. 2f35641
Chris McKnight Just add license as a key to get from the specification beaaa73
Commits on Jul 24, 2013
@orta orta update new podspec help file b20160b
@gfontenot gfontenot Fix for the xcrun commands and dirs with spaces
This looks like it was introduced in b32cae7.

Fixes #1226
434cd36
@gfontenot gfontenot Fix escaping 0c48019
@gfontenot gfontenot Fix specs 4e7ec59
Commits on Jul 25, 2013
@alloy alloy Merge pull request #1227 from CocoaPods/gf-fix-spaces
Fix for the xcrun commands and dirs with spaces
8d16e1b
@dhennessy dhennessy Fix for momc command where data model or resources folder path contai…
…n spaces
ff8417f
Commits on Jul 27, 2013
@orta orta more copy tweaks f77fe09
Commits on Jul 29, 2013
@fabiopelosin fabiopelosin Merge branch 'licenses' of https://github.com/cmckni3/CocoaPods into …
…cmckni3-licenses

* 'licenses' of https://github.com/cmckni3/CocoaPods:
  Just add license as a key to get from the specification
  Move license info into podfile-info command
  Add licenses command to pod cli
944f340
@orta orta add licenses & tweaks for grammar ebe8829
@orta orta Merge pull request #1223 from orta/master
New Podspec Example file
4c72934
@fabiopelosin fabiopelosin Pretty podfile-info && add license note to changelog 47c4e66
@fabiopelosin fabiopelosin Merge branch 'cmckni3-licenses'
* cmckni3-licenses:
  Pretty podfile-info && add license note to changelog
  Just add license as a key to get from the specification
  Move license info into podfile-info command
  Add licenses command to pod cli
529cce5
@fabiopelosin fabiopelosin Merge branch 'dh-fix-momc-spaces' of https://github.com/dhennessy/Coc…
…oaPods into dhennessy-dh-fix-momc-spaces

* 'dh-fix-momc-spaces' of https://github.com/dhennessy/CocoaPods:
  Fix for momc command where data model or resources folder path contain spaces
ddc4956
@fabiopelosin fabiopelosin [Changelog] Fix for momc command where data model or resources folder…
… path contai…
94dd569
@fabiopelosin fabiopelosin [Integration] Fix for momc command where data model or resources fold…
…er path contai…
5643a19
@fabiopelosin fabiopelosin [Specs] Pretty podfile-info b5a8905
@fabiopelosin fabiopelosin [Specification] Add support for framework_bundles e5388f6
@fabiopelosin fabiopelosin [Command::Spec] Revert template license to MIT (Example)
This is done to prevent an user to indicate the wrong license in the spec.
The linter checks for it and fails the validation if the example keyword is
present.

/c @orta
5e0f356
@fabiopelosin fabiopelosin Merge branch 'master' into feature-frameworks-bundles
* master:
  [Command::Spec] Revert template license to MIT (Example)

Conflicts:
	Gemfile.lock
7f2fdc0
Commits on Jul 31, 2013
@fabiopelosin fabiopelosin [Integration] Update for support framework bundles 3488a3d
@fabiopelosin fabiopelosin [Generator::XCConfig] Favor composition over inheritance 05d0f7d
@fabiopelosin fabiopelosin [Specification] add support for library_files 3b75290
@fabiopelosin fabiopelosin [UI] Add copy&paste friendly dependency to descriptions of Pods 81d7561
Commits on Aug 01, 2013
@ianyh ianyh Move repos_dir to .cocoapods/repos 921fcee
@ianyh ianyh Move config.yml path back to cocoapods dir. 85cfae9
@ianyh ianyh Fix some text references to .cocoapods to be .cocoapods/repos 726799b
@ianyh ianyh rename cocoapods_dir to home_dir 43d71e2
@ianyh ianyh Migrate existing repos when running setup. 0478e8b
@ianyh ianyh Fix up some comments and add a missing test for config. 798459a
@ianyh ianyh Move tempo repos generated by spec_helper to a repos subdir. c4641c5
@ianyh ianyh Add a test for migrating repos to new repo dir. 3d0d6ed
@ianyh ianyh Clean up config/sources manager interfaces to not be polluted with ol…
…d directory structure stuff.
58be5c5
@ianyh ianyh Add a note to the CHANGELOG about directory restructure. 3113632
@ianyh ianyh Remove an incorrect unit test. 539bc53
@fabiopelosin fabiopelosin Merge pull request #1233 from ianyh/cocoapods-directory
Restructure .cocoapods directory to contain repos as a subdirectory.
6ef994b
@fabiopelosin fabiopelosin [Changelog] 1726172
@fabiopelosin fabiopelosin [Specification] Add support for resource bundles de5b15a
@fabiopelosin fabiopelosin [Installer] Move target dependency logic to Xcodeproj c7ee8cc
@fabiopelosin fabiopelosin [Changelog]
Closes #743
Closes #1186
Closes #809
Closes #1075
01f2a94
@fabiopelosin fabiopelosin [Installer] Move target dependency logic to Xcodeproj 2 e4eec8d
@fabiopelosin fabiopelosin [Specification::DSL] frameworks_bundles -> vendored_frameworks; libra…
…ry_files -> vendored_libraries
f0bc470
@fabiopelosin fabiopelosin [Changelog] cc29d1a
@fabiopelosin fabiopelosin Merge branch 'master' into feature-frameworks-bundles
* master:
  [Changelog]
  [Changelog]
  Remove an incorrect unit test.
  Add a note to the CHANGELOG about directory restructure.
  Clean up config/sources manager interfaces to not be polluted with old directory structure stuff.
  Add a test for migrating repos to new repo dir.
  Move tempo repos generated by spec_helper to a repos subdir.
  Fix up some comments and add a missing test for config.
  Migrate existing repos when running setup.
  rename cocoapods_dir to home_dir
  Fix some text references to .cocoapods to be .cocoapods/repos
  Move config.yml path back to cocoapods dir.
  Move repos_dir to .cocoapods/repos
  [UI] Add copy&paste friendly dependency to descriptions of Pods

Conflicts:
	CHANGELOG.md
	Gemfile.lock
59b1b01
@fabiopelosin fabiopelosin Merge pull request #1238 from CocoaPods/feature-frameworks-bundles
[Specification] Add support for framework_bundles
b329ce0
Commits on Aug 02, 2013
@fabiopelosin fabiopelosin [Specification::DSL] Add prepare_command
Closes #1274
d4dcab4
@fabiopelosin fabiopelosin [Gemspec] Bump dependencies version fc84b06
@fabiopelosin fabiopelosin [Gemfile] Require cocoapods-core from the master branch a0160e7
@fabiopelosin fabiopelosin Merge branch 'master' into feature-prepare_command
* master:
  [Gemfile] Require cocoapods-core from the master branch
  [Gemspec] Bump dependencies version
ad0e5c0
@fabiopelosin fabiopelosin [Gemfile] Require cocoapods-core from the feature-prepare_command branch 4048558
@fabiopelosin fabiopelosin Merge pull request #1252 from CocoaPods/feature-prepare_command
[Specification::DSL] Add prepare_command
c7b274f
@fabiopelosin fabiopelosin [Gemfile] Require cocoapods-core:master af802c5
@fabiopelosin fabiopelosin [RakeFile] Add note about the examples f6e5708
@fabiopelosin fabiopelosin [Rakefile] Allow to release with changes in the Gemfile.lock file 8ee4b05
@fabiopelosin fabiopelosin Release 0.23.0.rc1 e0c97ae