Browse files

[Generator::Documentation] Namespace ids by Pod

Closes #659
  • Loading branch information...
1 parent e83f01b commit 7b148d392e0835196ec327c7923c23cc0b83a129 @fabiopelosin fabiopelosin committed Apr 6, 2013
Showing with 7 additions and 7 deletions.
  1. +2 −1 CHANGELOG.md
  2. +3 −4 lib/cocoapods/generator/documentation.rb
  3. +2 −2 spec/unit/generator/documentation_spec.rb
View
3 CHANGELOG.md
@@ -23,7 +23,8 @@
[#918](https://github.com/CocoaPods/CocoaPods/issues/918)
* Improved support for pre-release versions using dashes.
[#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
View
7 lib/cocoapods/generator/documentation.rb
@@ -54,8 +54,7 @@ def already_installed?
#
def generate(install_docset)
if `which appledoc`.strip.empty?
- UI.warn "[!] Skipping documentation generation because appledoc can't be found.",
- actions = [], verbose_only = true
+ UI.warn "[!] Skipping documentation generation because appledoc can't be found.", [], true
return
end
@@ -106,10 +105,10 @@ def description
specification.summary || specification.description || 'Generated by CocoaPods.'
end
- # @return [String] The id of the docset.
+ # @return [String] The id of the docset, uniq for every Pod.
#
def docs_id
- 'org.cocoapods'
+ "org.cocoapods.#{specification.name.downcase}"
end
#-----------------------------------------------------------------------#
View
4 spec/unit/generator/documentation_spec.rb
@@ -25,7 +25,7 @@ module Pod
'--docset-desc', 'Chunky bananas!',
'--project-company', 'Banana Corp and Monkey Boy',
'--docset-copyright', 'Banana Corp and Monkey Boy',
- '--company-id', 'org.cocoapods',
+ '--company-id', 'org.cocoapods.bananalib',
'--ignore', '.m',
'--keep-undocumented-objects',
'--keep-undocumented-members',
@@ -47,7 +47,7 @@ module Pod
arguments.should.include?(" --docset-desc 'Chunky bananas!' ")
arguments.should.include?(" --project-company '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?(" --keep-undocumented-objects ")
arguments.should.include?(" --keep-undocumented-members ")

0 comments on commit 7b148d3

Please sign in to comment.