Commit c7a04df1 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master' into git-cache

* master:
  [Command::Spec::Linter] Fix - Skip documentation generation
  [Config#doc] Renamed to generate_docs
  [Command::Spec::Linter] Bug fix.
parents e108fe91 5210cffc
...@@ -35,7 +35,7 @@ module Pod ...@@ -35,7 +35,7 @@ module Pod
def initialize(argv) def initialize(argv)
config.clean = !argv.option('--no-clean') config.clean = !argv.option('--no-clean')
config.doc = !argv.option('--no-doc') config.generate_docs = !argv.option('--no-doc')
config.force_doc = argv.option('--force-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')
......
...@@ -247,7 +247,7 @@ module Pod ...@@ -247,7 +247,7 @@ module Pod
config.project_pods_root = tmp_dir + 'Pods' config.project_pods_root = tmp_dir + 'Pods'
config.silent = !config.verbose config.silent = !config.verbose
config.integrate_targets = false config.integrate_targets = false
config.doc_install = false config.generate_docs = false
end end
def tear_down_lint_environment def tear_down_lint_environment
...@@ -296,7 +296,8 @@ module Pod ...@@ -296,7 +296,8 @@ module Pod
# Skip Filelist that would otherwise be resolved from the working directory resulting # Skip Filelist that would otherwise be resolved from the working directory resulting
# in a potentially very expensi operation # in a potentially very expensi operation
next if pattern.is_a?(FileList) next if pattern.is_a?(FileList)
if pattern.any? { |path| path.start_with?('/') } invalid = pattern.is_a?(Array) ? pattern.any? { |path| path.start_with?('/') } : pattern.start_with?('/')
if invalid
messages << "Paths cannot start with a slash (#{accessor})" messages << "Paths cannot start with a slash (#{accessor})"
break break
end end
......
...@@ -12,13 +12,13 @@ module Pod ...@@ -12,13 +12,13 @@ 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 :doc, :doc_install, :force_doc attr_accessor :generate_docs, :doc_install, :force_doc
attr_accessor :integrate_targets attr_accessor :integrate_targets
alias_method :clean?, :clean alias_method :clean?, :clean
alias_method :verbose?, :verbose alias_method :verbose?, :verbose
alias_method :silent?, :silent alias_method :silent?, :silent
alias_method :doc?, :doc # TODO rename to 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 :force_doc?, :force_doc
alias_method :integrate_targets?, :integrate_targets alias_method :integrate_targets?, :integrate_targets
...@@ -26,7 +26,7 @@ module Pod ...@@ -26,7 +26,7 @@ module Pod
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 = @force_doc = false
@clean = @doc = @doc_install = @integrate_targets = true @clean = @generate_docs = @doc_install = @integrate_targets = true
end end
def project_root def project_root
......
...@@ -59,7 +59,7 @@ module Pod ...@@ -59,7 +59,7 @@ module Pod
end end
end end
if (should_install && config.doc?) || config.force_doc? if (should_install && config.generate_docs?) || config.force_doc?
puts "Installing Documentation for #{pod.specification}".green if config.verbose? puts "Installing Documentation for #{pod.specification}".green if config.verbose?
Generator::Documentation.new(pod).generate(config.doc_install?) Generator::Documentation.new(pod).generate(config.doc_install?)
end end
......
...@@ -45,7 +45,7 @@ else ...@@ -45,7 +45,7 @@ else
@config_before = config @config_before = config
create_config! create_config!
config.doc = false config.generate_docs = false
end end
after do after do
......
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