Commit 7b148d39 authored by Fabio Pelosin's avatar Fabio Pelosin

[Generator::Documentation] Namespace ids by Pod

Closes #659
parent e83f01b0
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
[#918](https://github.com/CocoaPods/CocoaPods/issues/918) [#918](https://github.com/CocoaPods/CocoaPods/issues/918)
* Improved support for pre-release versions using dashes. * Improved support for pre-release versions using dashes.
[#935](https://github.com/CocoaPods/CocoaPods/issues/935) [#935](https://github.com/CocoaPods/CocoaPods/issues/935)
* Documentation sets are now namespaced by pod solving improper attribution.
[#659](https://github.com/CocoaPods/CocoaPods/issues/659)
## 0.17.2 ## 0.17.2
......
...@@ -54,8 +54,7 @@ module Pod ...@@ -54,8 +54,7 @@ module Pod
# #
def generate(install_docset) def generate(install_docset)
if `which appledoc`.strip.empty? if `which appledoc`.strip.empty?
UI.warn "[!] Skipping documentation generation because appledoc can't be found.", UI.warn "[!] Skipping documentation generation because appledoc can't be found.", [], true
actions = [], verbose_only = true
return return
end end
...@@ -106,10 +105,10 @@ module Pod ...@@ -106,10 +105,10 @@ module Pod
specification.summary || specification.description || 'Generated by CocoaPods.' specification.summary || specification.description || 'Generated by CocoaPods.'
end end
# @return [String] The id of the docset. # @return [String] The id of the docset, uniq for every Pod.
# #
def docs_id def docs_id
'org.cocoapods' "org.cocoapods.#{specification.name.downcase}"
end end
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
...@@ -25,7 +25,7 @@ module Pod ...@@ -25,7 +25,7 @@ module Pod
'--docset-desc', 'Chunky bananas!', '--docset-desc', 'Chunky bananas!',
'--project-company', 'Banana Corp and Monkey Boy', '--project-company', 'Banana Corp and Monkey Boy',
'--docset-copyright', 'Banana Corp and Monkey Boy', '--docset-copyright', 'Banana Corp and Monkey Boy',
'--company-id', 'org.cocoapods', '--company-id', 'org.cocoapods.bananalib',
'--ignore', '.m', '--ignore', '.m',
'--keep-undocumented-objects', '--keep-undocumented-objects',
'--keep-undocumented-members', '--keep-undocumented-members',
...@@ -47,7 +47,7 @@ module Pod ...@@ -47,7 +47,7 @@ module Pod
arguments.should.include?(" --docset-desc 'Chunky bananas!' ") arguments.should.include?(" --docset-desc 'Chunky bananas!' ")
arguments.should.include?(" --project-company 'Banana Corp and Monkey Boy' ") arguments.should.include?(" --project-company 'Banana Corp and Monkey Boy' ")
arguments.should.include?(" --docset-copyright 'Banana Corp and Monkey Boy' ") arguments.should.include?(" --docset-copyright 'Banana Corp and Monkey Boy' ")
arguments.should.include?(" --company-id org.cocoapods ") arguments.should.include?(" --company-id org.cocoapods.bananalib ")
arguments.should.include?(" --ignore .m ") arguments.should.include?(" --ignore .m ")
arguments.should.include?(" --keep-undocumented-objects ") arguments.should.include?(" --keep-undocumented-objects ")
arguments.should.include?(" --keep-undocumented-members ") arguments.should.include?(" --keep-undocumented-members ")
......
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