Commit 5e57791c authored by Fabio Pelosin's avatar Fabio Pelosin

[Config] Remove #force_doc.

parent 34dac294
...@@ -27,7 +27,6 @@ module Pod ...@@ -27,7 +27,6 @@ module Pod
[ [
["--no-clean", "Leave SCM dirs like `.git' and `.svn' intact after downloading"], ["--no-clean", "Leave SCM dirs like `.git' and `.svn' intact after downloading"],
["--no-doc", "Skip documentation generation with appledoc"], ["--no-doc", "Skip documentation generation with appledoc"],
["--force-doc", "Force the generation of documentation"],
["--no-integrate", "Skip integration of the Pods libraries in the Xcode project(s)"], ["--no-integrate", "Skip integration of the Pods libraries in the Xcode project(s)"],
["--no-update", "Skip running `pod repo update` before install"], ["--no-update", "Skip running `pod repo update` before install"],
].concat(super) ].concat(super)
...@@ -36,7 +35,6 @@ module Pod ...@@ -36,7 +35,6 @@ module Pod
def initialize(argv) def initialize(argv)
config.clean = !argv.option('--no-clean') config.clean = !argv.option('--no-clean')
config.generate_docs = !argv.option('--no-doc') config.generate_docs = !argv.option('--no-doc')
config.force_doc = argv.option('--force-doc')
config.integrate_targets = !argv.option('--no-integrate') config.integrate_targets = !argv.option('--no-integrate')
@update_repo = !argv.option('--no-update') @update_repo = !argv.option('--no-update')
super unless argv.empty? super unless argv.empty?
......
...@@ -12,7 +12,7 @@ module Pod ...@@ -12,7 +12,7 @@ module Pod
attr_accessor :repos_dir, :project_root, :project_pods_root attr_accessor :repos_dir, :project_root, :project_pods_root
attr_accessor :clean, :verbose, :silent attr_accessor :clean, :verbose, :silent
attr_accessor :generate_docs, :doc_install, :force_doc attr_accessor :generate_docs, :doc_install
attr_accessor :integrate_targets attr_accessor :integrate_targets
attr_accessor :git_cache_size attr_accessor :git_cache_size
...@@ -21,12 +21,11 @@ module Pod ...@@ -21,12 +21,11 @@ module Pod
alias_method :silent?, :silent alias_method :silent?, :silent
alias_method :generate_docs?, :generate_docs alias_method :generate_docs?, :generate_docs
alias_method :doc_install?, :doc_install alias_method :doc_install?, :doc_install
alias_method :force_doc?, :force_doc
alias_method :integrate_targets?, :integrate_targets alias_method :integrate_targets?, :integrate_targets
def initialize def initialize
@repos_dir = Pathname.new(File.expand_path("~/.cocoapods")) @repos_dir = Pathname.new(File.expand_path("~/.cocoapods"))
@verbose = @silent = @force_doc = false @verbose = @silent = false
@clean = @generate_docs = @doc_install = @integrate_targets = true @clean = @generate_docs = @doc_install = @integrate_targets = true
end end
......
...@@ -66,7 +66,7 @@ module Pod ...@@ -66,7 +66,7 @@ module Pod
#TODO: move to generator ? #TODO: move to generator ?
def generate_docs(pod) def generate_docs(pod)
doc_generator = Generator::Documentation.new(pod) doc_generator = Generator::Documentation.new(pod)
if ( config.generate_docs? && !doc_generator.already_installed? ) || config.force_doc? if ( config.generate_docs? && !doc_generator.already_installed? )
puts "-> Installing documentation" if config.verbose? puts "-> Installing documentation" if config.verbose?
doc_generator.generate(config.doc_install?) doc_generator.generate(config.doc_install?)
else else
......
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