warn_if_nonmatching_regex should display proper help message when used with exclude-tags-regex (#551)
This commit is contained in:
parent
33f89614d4
commit
d2a8dc3977
|
@ -177,18 +177,19 @@ module GitHubChangelogGenerator
|
||||||
|
|
||||||
def apply_exclude_tags(all_tags)
|
def apply_exclude_tags(all_tags)
|
||||||
if options[:exclude_tags].is_a?(Regexp)
|
if options[:exclude_tags].is_a?(Regexp)
|
||||||
filter_tags_with_regex(all_tags, options[:exclude_tags])
|
filter_tags_with_regex(all_tags, options[:exclude_tags], "--exclude-tags")
|
||||||
else
|
else
|
||||||
filter_exact_tags(all_tags)
|
filter_exact_tags(all_tags)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def apply_exclude_tags_regex(all_tags)
|
def apply_exclude_tags_regex(all_tags)
|
||||||
filter_tags_with_regex(all_tags, Regexp.new(options[:exclude_tags_regex]))
|
regex = Regexp.new(options[:exclude_tags_regex])
|
||||||
|
filter_tags_with_regex(all_tags, regex, "--exclude-tags-regex")
|
||||||
end
|
end
|
||||||
|
|
||||||
def filter_tags_with_regex(all_tags, regex)
|
def filter_tags_with_regex(all_tags, regex, regex_option_name)
|
||||||
warn_if_nonmatching_regex(all_tags)
|
warn_if_nonmatching_regex(all_tags, regex, regex_option_name)
|
||||||
all_tags.reject { |tag| regex =~ tag["name"] }
|
all_tags.reject { |tag| regex =~ tag["name"] }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -199,11 +200,10 @@ module GitHubChangelogGenerator
|
||||||
all_tags.reject { |tag| options[:exclude_tags].include?(tag["name"]) }
|
all_tags.reject { |tag| options[:exclude_tags].include?(tag["name"]) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def warn_if_nonmatching_regex(all_tags)
|
def warn_if_nonmatching_regex(all_tags, regex, regex_option_name)
|
||||||
unless all_tags.map { |t| t["name"] }.any? { |t| options[:exclude_tags] =~ t }
|
unless all_tags.map { |t| t["name"] }.any? { |t| regex =~ t }
|
||||||
Helper.log.warn "Warning: unable to reject any tag, using regex "\
|
Helper.log.warn "Warning: unable to reject any tag, using regex "\
|
||||||
"#{options[:exclude_tags].inspect} in --exclude-tags "\
|
"#{regex.inspect} in #{regex_option_name} option."
|
||||||
"option."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user