Skip to content

Commit

Permalink
Release 0.14.0 and update gems (#1274)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfairh committed Aug 14, 2021
1 parent 5c9d5bd commit 6df391c
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 55 deletions.
6 changes: 5 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ AllCops:
SuggestExtensions: false
TargetRubyVersion: 2.6

#- Pending Cops as of 1.18.3 ---------------------------------------------#
#- Pending Cops as of 1.19.0 ---------------------------------------------#

Gemspec/DateAssignment: # (new in 1.10)
Enabled: true
Layout/SpaceBeforeBrackets: # (new in 1.7)
Enabled: true
Lint/AmbiguousAssignment: # (new in 1.7)
Enabled: true
Lint/AmbiguousRange: # (new in 1.19)
Enabled: true
Lint/DeprecatedConstants: # (new in 1.8)
Enabled: true
Lint/DuplicateBranch: # (new in 1.3)
Expand Down Expand Up @@ -75,6 +77,8 @@ Style/QuotedSymbols: # (new in 1.16)
Enabled: true
Style/RedundantArgument: # (new in 1.4)
Enabled: true
Style/RedundantSelfAssignmentBranch: # (new in 1.19)
Enabled: true
Style/StringChars: # (new in 1.12)
Enabled: true
Style/SwapValues: # (new in 1.1)
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Master
## 0.14.0

##### Breaking

Expand Down
36 changes: 19 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
jazzy (0.13.7)
jazzy (0.14.0)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4 (~> 1.3)
Expand Down Expand Up @@ -37,10 +37,10 @@ GEM
clintegracon (0.7.0)
colored (~> 1.2)
diffy
cocoapods (1.10.1)
cocoapods (1.10.2)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-core (= 1.10.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -55,7 +55,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
cocoapods-core (1.10.2)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
Expand All @@ -69,7 +69,7 @@ GEM
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-search (1.0.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
Expand Down Expand Up @@ -98,14 +98,15 @@ GEM
escape (0.0.4)
ethon (0.14.0)
ffi (>= 1.15.0)
faraday (1.5.0)
faraday (1.7.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
Expand All @@ -115,13 +116,14 @@ GEM
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
ffi (1.15.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.9.0)
git (1.9.1)
rchardet (~> 1.8)
hashdiff (1.0.1)
httpclient (2.8.3)
Expand Down Expand Up @@ -149,32 +151,32 @@ GEM
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
parallel (1.20.1)
parser (3.0.1.1)
parser (3.0.2.0)
ast (~> 2.4.1)
prettybacon (0.0.2)
bacon (~> 1.2)
public_suffix (4.0.6)
rainbow (3.0.0)
rake (13.0.4)
rake (13.0.6)
rchardet (1.8.0)
redcarpet (3.5.1)
regexp_parser (2.1.1)
rexml (3.2.5)
rouge (3.26.0)
rubocop (1.18.3)
rubocop (1.19.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.7.0, < 2.0)
rubocop-ast (>= 1.9.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.7.0)
rubocop-ast (1.10.0)
parser (>= 3.0.1.1)
ruby-macho (1.4.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
ruby2_keywords (0.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sawyer (0.8.2)
Expand All @@ -189,13 +191,13 @@ GEM
tzinfo (1.2.9)
thread_safe (~> 0.1)
unicode-display_width (2.0.0)
webmock (3.13.0)
addressable (>= 2.3.6)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.20.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
70 changes: 35 additions & 35 deletions lib/jazzy/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ def hide_objc?
config_attr :hide_declarations,
command_line: '--hide-declarations [objc|swift] ',
description: 'Hide declarations in the specified language. Given that ' \
'generating Swift docs only generates Swift declarations, ' \
'this is useful for hiding a specific interface for ' \
'either Objective-C or mixed Objective-C and Swift ' \
'projects.',
'generating Swift docs only generates Swift declarations, ' \
'this is useful for hiding a specific interface for ' \
'either Objective-C or mixed Objective-C and Swift ' \
'projects.',
default: ''

config_attr :keep_property_attributes,
Expand All @@ -174,7 +174,7 @@ def hide_objc?
config_attr :build_tool_arguments,
command_line: ['-b', '--build-tool-arguments arg1,arg2,…argN', Array],
description: 'Arguments to forward to xcodebuild, swift build, or ' \
'sourcekitten.',
'sourcekitten.',
default: []

alias_config_attr :xcodebuild_arguments, :build_tool_arguments,
Expand All @@ -196,7 +196,7 @@ def hide_objc?
config_attr :excluded_files,
command_line: ['-e', '--exclude filepath1,filepath2,…filepathN', Array],
description: 'Source file pathnames to be excluded from documentation. '\
'Supports wildcards.',
'Supports wildcards.',
default: [],
parse: ->(files) do
Array(files).map { |f| expand_glob_path(f).to_s }
Expand All @@ -205,7 +205,7 @@ def hide_objc?
config_attr :included_files,
command_line: ['-i', '--include filepath1,filepath2,…filepathN', Array],
description: 'Source file pathnames to be included in documentation. '\
'Supports wildcards.',
'Supports wildcards.',
default: [],
parse: ->(files) do
Array(files).map { |f| expand_glob_path(f).to_s }
Expand All @@ -229,9 +229,9 @@ def hide_objc?
config_attr :swift_build_tool,
command_line: "--swift-build-tool #{SWIFT_BUILD_TOOLS.join(' | ')}",
description: 'Control whether Jazzy uses Swift Package Manager, '\
'xcodebuild, or swift-symbolgraph to build the module '\
'to be documented. By default it uses xcodebuild if '\
'there is a .xcodeproj file in the source directory.',
'xcodebuild, or swift-symbolgraph to build the module '\
'to be documented. By default it uses xcodebuild if '\
'there is a .xcodeproj file in the source directory.',
parse: ->(tool) do
return tool.to_sym if SWIFT_BUILD_TOOLS.include?(tool)

Expand Down Expand Up @@ -260,13 +260,13 @@ def hide_objc?
config_attr :version,
command_line: '--module-version VERSION',
description: 'Version string to use as part of the default docs '\
'title and inside the docset.',
'title and inside the docset.',
default: '1.0'

config_attr :title,
command_line: '--title TITLE',
description: 'Title to display at the top of each page, overriding the '\
'default generated from module name and version.',
'default generated from module name and version.',
default: ''

config_attr :copyright,
Expand All @@ -291,16 +291,16 @@ def hide_objc?
config_attr :podspec,
command_line: '--podspec FILEPATH',
description: 'A CocoaPods Podspec that describes the Swift library to '\
'document',
'document',
parse: ->(ps) { PodspecDocumenter.create_podspec(Pathname(ps)) if ps },
default: Dir['*.podspec{,.json}'].first

config_attr :pod_sources,
command_line: ['--pod-sources url1,url2,…urlN', Array],
description: 'A list of sources to find pod dependencies. Used only '\
'with --podspec when the podspec contains references to '\
'privately hosted pods. You must include the default pod '\
'source if public pods are also used.',
'with --podspec when the podspec contains references to '\
'privately hosted pods. You must include the default pod '\
'source if public pods are also used.',
default: []

config_attr :docset_icon,
Expand All @@ -322,7 +322,7 @@ def hide_objc?
config_attr :dash_url,
command_line: ['-d', '--dash_url URL'],
description: 'Location of the dash XML feed '\
'e.g. https://realm.io/docsets/realm.xml)',
'e.g. https://realm.io/docsets/realm.xml)',
parse: ->(d) { URI(d) }

SOURCE_HOSTS = %w[github gitlab bitbucket].freeze
Expand Down Expand Up @@ -365,13 +365,13 @@ def hide_objc?
config_attr :docset_playground_url,
command_line: '--docset-playground-url URL',
description: 'URL of an interactive playground to demonstrate the '\
'framework, linked to from the docset.'
'framework, linked to from the docset.'

# ──────── Doc generation options ────────
config_attr :disable_search,
command_line: '--disable-search',
description: 'Avoid generating a search index. '\
'Search is available in some themes.',
'Search is available in some themes.',
default: false

config_attr :skip_documentation,
Expand All @@ -391,7 +391,7 @@ def hide_objc?
config_attr :skip_undocumented,
command_line: '--[no-]skip-undocumented',
description: "Don't document declarations that have no documentation "\
'comments.',
'comments.',
default: false

config_attr :hide_documentation_coverage,
Expand All @@ -401,21 +401,21 @@ def hide_objc?

config_attr :custom_categories,
description: 'Custom navigation categories to replace the standard '\
"'Classes', 'Protocols', etc. Types not explicitly named "\
'in a custom category appear in generic groups at the '\
'end. Example: https://git.io/v4Bcp',
"'Classes', 'Protocols', etc. Types not explicitly named "\
'in a custom category appear in generic groups at the '\
'end. Example: https://git.io/v4Bcp',
default: []

config_attr :custom_categories_unlisted_prefix,
description: "Prefix for navigation section names that aren't "\
'explicitly listed in `custom_categories`.',
'explicitly listed in `custom_categories`.',
default: 'Other '

config_attr :hide_unlisted_documentation,
command_line: '--[no-]hide-unlisted-documentation',
description: "Don't include documentation in the sidebar from the "\
"`documentation` config value that aren't explicitly "\
'listed in `custom_categories`.',
"`documentation` config value that aren't explicitly "\
'listed in `custom_categories`.',
default: false

config_attr :custom_head,
Expand All @@ -429,9 +429,9 @@ def hide_objc?
config_attr :theme_directory,
command_line: "--theme [#{BUILTIN_THEMES.join(' | ')} | DIRPATH]",
description: "Which theme to use. Specify either 'apple' (default), "\
'one of the other built-in theme names, or the path to '\
'your mustache templates and other assets for a custom '\
'theme.',
'one of the other built-in theme names, or the path to '\
'your mustache templates and other assets for a custom '\
'theme.',
default: 'apple',
parse: ->(t) do
if BUILTIN_THEMES.include?(t)
Expand All @@ -444,9 +444,9 @@ def hide_objc?
config_attr :use_safe_filenames,
command_line: '--use-safe-filenames',
description: 'Replace unsafe characters in filenames with an encoded '\
'representation. This will reduce human readability of '\
'some URLs, but may be necessary for projects that '\
'expose filename-unfriendly functions such as /(_:_:)',
'representation. This will reduce human readability of '\
'some URLs, but may be necessary for projects that '\
'expose filename-unfriendly functions such as /(_:_:)',
default: false

config_attr :template_directory,
Expand All @@ -466,14 +466,14 @@ def hide_objc?
config_attr :undocumented_text,
command_line: '--undocumented-text UNDOCUMENTED_TEXT',
description: 'Default text for undocumented symbols. The default '\
'is "Undocumented", put "" if no text is required',
'is "Undocumented", put "" if no text is required',
default: 'Undocumented'

config_attr :separate_global_declarations,
command_line: '--[no-]separate-global-declarations',
description: 'Create separate pages for all global declarations '\
"(classes, structures, enums etc.) even if they don't "\
'have children.',
"(classes, structures, enums etc.) even if they don't "\
'have children.',
default: false

# rubocop:enable Layout/ArgumentAlignment
Expand Down
2 changes: 1 addition & 1 deletion lib/jazzy/gem_version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Jazzy
VERSION = '0.13.7' unless defined? Jazzy::VERSION
VERSION = '0.14.0' unless defined? Jazzy::VERSION
end

0 comments on commit 6df391c

Please sign in to comment.