From 1e8122dfa077c639dc4afb62cd7e590fa6b36a88 Mon Sep 17 00:00:00 2001 From: John Fairhurst Date: Mon, 18 Sep 2023 13:16:44 +0100 Subject: [PATCH] Release 0.14.4 and update gems (#1367) --- .rubocop.yml | 38 ++++++++++++++- CHANGELOG.md | 2 +- Gemfile.lock | 79 +++++++++++++++++--------------- lib/jazzy/gem_version.rb | 2 +- lib/jazzy/search_builder.rb | 2 +- lib/jazzy/symbol_graph/symbol.rb | 2 +- spec/integration_specs | 2 +- 7 files changed, 83 insertions(+), 44 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 562223495..8d72959f8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,12 +8,12 @@ AllCops: SuggestExtensions: false TargetRubyVersion: 2.6 -#- Pending Cops as of 1.44.0 ---------------------------------------------# +#- Pending Cops as of 1.56.3 ---------------------------------------------# Gemspec/DeprecatedAttributeAssignment: # new in 1.30 Enabled: true Gemspec/DevelopmentDependencies: # new in 1.44 - Enabled: true + Enabled: false Gemspec/RequireMFA: # new in 1.23 Enabled: true Layout/LineContinuationLeadingSpace: # new in 1.31 @@ -34,6 +34,8 @@ Lint/DuplicateBranch: # (new in 1.3) Enabled: true Lint/DuplicateMagicComment: # new in 1.37 Enabled: true +Lint/DuplicateMatchPattern: # new in 1.50 + Enabled: true Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1) Enabled: true Lint/EmptyBlock: # (new in 1.1) @@ -46,6 +48,8 @@ Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21 Enabled: true Lint/LambdaWithoutLiteralBlock: # (new in 1.8) Enabled: true +Lint/MixedCaseRange: # new in 1.53 + Enabled: true Lint/NonAtomicFileOperation: # new in 1.31 Enabled: true Lint/NoReturnInBeginEndBlocks: # (new in 1.2) @@ -56,6 +60,8 @@ Lint/OrAssignmentToConstant: # (new in 1.9) Enabled: true Lint/RedundantDirGlobSort: # (new in 1.8) Enabled: true +Lint/RedundantRegexpQuantifiers: # new in 1.53 + Enabled: true Lint/RefinementImportMethods: # new in 1.27 Enabled: true Lint/RequireRangeParentheses: # new in 1.32 @@ -76,6 +82,8 @@ Lint/UselessRescue: # new in 1.43 Enabled: true Lint/UselessRuby2Keywords: # new in 1.23 Enabled: true +Metrics/CollectionLiteralLength: # new in 1.47 + Enabled: true Naming/BlockForwarding: # new in 1.24 Enabled: true Naming/InclusiveLanguage: # (new in 1.18) @@ -94,6 +102,10 @@ Style/CollectionCompact: # (new in 1.2) Enabled: true Style/ComparableClamp: # new in 1.44 Enabled: true +Style/DataInheritance: # new in 1.49 + Enabled: true +Style/DirEmpty: # new in 1.48 + Enabled: true Style/DocumentDynamicEvalDefinition: # (new in 1.1) Enabled: true Style/EmptyHeredoc: # new in 1.32 @@ -102,8 +114,12 @@ Style/EndlessMethod: # (new in 1.8) Enabled: true Style/EnvHome: # new in 1.29 Enabled: true +Style/ExactRegexpMatch: # new in 1.51 + Enabled: true Style/FetchEnvVar: # new in 1.28 Enabled: true +Style/FileEmpty: # new in 1.48 + Enabled: true Style/FileRead: # new in 1.24 Enabled: true Style/FileWrite: # new in 1.24 @@ -148,24 +164,42 @@ Style/QuotedSymbols: # (new in 1.16) Enabled: true Style/RedundantArgument: # (new in 1.4) Enabled: true +Style/RedundantArrayConstructor: # new in 1.52 + Enabled: true Style/RedundantConstantBase: # new in 1.40 Enabled: true +Style/RedundantCurrentDirectoryInPath: # new in 1.53 + Enabled: true Style/RedundantDoubleSplatHashBraces: # new in 1.41 Enabled: true Style/RedundantEach: # new in 1.38 Enabled: true +Style/RedundantFilterChain: # new in 1.52 + Enabled: true +Style/RedundantHeredocDelimiterQuotes: # new in 1.45 + Enabled: true Style/RedundantInitialize: # new in 1.27 Enabled: true +Style/RedundantLineContinuation: # new in 1.49 + Enabled: true +Style/RedundantRegexpArgument: # new in 1.53 + Enabled: true +Style/RedundantRegexpConstructor: # new in 1.52 + Enabled: true Style/RedundantSelfAssignmentBranch: # (new in 1.19) Enabled: true Style/RedundantStringEscape: # new in 1.37 Enabled: true +Style/ReturnNilInPredicateMethodDefinition: # new in 1.53 + Enabled: true Style/SelectByRegexp: # new in 1.22 Enabled: true Style/StringChars: # (new in 1.12) Enabled: true Style/SwapValues: # (new in 1.1) Enabled: true +Style/YAMLFileRead: # new in 1.53 + Enabled: true # At the moment not ready to be used # https://github.com/bbatsov/rubocop/issues/947 diff --git a/CHANGELOG.md b/CHANGELOG.md index fc9d45ca4..711429bc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Master +## 0.14.4 ##### Breaking diff --git a/Gemfile.lock b/Gemfile.lock index b5df29c6c..aaa70cb2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT PATH remote: . specs: - jazzy (0.14.3) + jazzy (0.14.4) cocoapods (~> 1.5) mustache (~> 1.1) open4 (~> 1.3) @@ -25,13 +25,12 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (6.1.7.2) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) @@ -39,20 +38,21 @@ GEM ast (2.4.2) atomos (0.1.3) bacon (1.2.0) + base64 (0.1.1) claide (1.1.0) claide-plugins (0.9.2) cork nap open4 (~> 1.3) - cocoapods (1.11.3) + cocoapods (1.12.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.12.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -60,10 +60,10 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) + ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + cocoapods-core (1.12.1) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -82,54 +82,56 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.0) + concurrent-ruby (1.2.2) cork (0.3.0) colored2 (~> 3.1) crack (0.4.5) rexml - danger (9.2.0) + danger (9.3.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) - git (~> 1.7) + git (~> 1.13) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 5.0) + octokit (~> 6.0) terminal-table (>= 1, < 4) diffy (3.4.2) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - faraday (2.7.4) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-http-cache (2.4.1) + faraday-http-cache (2.5.0) faraday (>= 0.8) faraday-net_http (3.0.2) ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.13.1) + git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) hashdiff (1.0.1) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) + language_server-protocol (3.17.0.3) liferaft (0.0.6) - mini_portile2 (2.8.1) - minitest (5.17.0) - mocha (2.0.2) + mini_portile2 (2.8.4) + minitest (5.20.0) + mocha (2.1.0) ruby2_keywords (>= 0.0.5) mocha-on-bacon (0.2.3) mocha (>= 0.13.0) @@ -139,44 +141,48 @@ GEM nap (1.1.0) netrc (0.11.0) no_proxy_fix (0.1.2) - octokit (5.6.1) + octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) - parallel (1.22.1) - parser (3.2.0.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc prettybacon (0.0.2) bacon (~> 1.2) public_suffix (4.0.7) + racc (1.7.1) rainbow (3.1.1) rake (13.0.6) rchardet (1.8.0) redcarpet (3.6.0) - regexp_parser (2.6.2) - rexml (3.2.5) - rouge (4.0.1) - rubocop (1.44.1) + regexp_parser (2.8.1) + rexml (3.2.6) + rouge (4.1.3) + rubocop (1.56.3) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) ruby-macho (2.5.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - sqlite3 (1.6.0) + sqlite3 (1.6.6) mini_portile2 (~> 2.8.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -185,7 +191,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - webmock (3.18.1) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -198,7 +204,6 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) - zeitwerk (2.6.6) PLATFORMS ruby diff --git a/lib/jazzy/gem_version.rb b/lib/jazzy/gem_version.rb index c6aa50d09..90bfa09e8 100644 --- a/lib/jazzy/gem_version.rb +++ b/lib/jazzy/gem_version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jazzy - VERSION = '0.14.3' unless defined? Jazzy::VERSION + VERSION = '0.14.4' unless defined? Jazzy::VERSION end diff --git a/lib/jazzy/search_builder.rb b/lib/jazzy/search_builder.rb index 7f843f598..e0d79d5a3 100644 --- a/lib/jazzy/search_builder.rb +++ b/lib/jazzy/search_builder.rb @@ -10,7 +10,7 @@ def self.build(source_module, output_dir) [d.url, { name: d.name, - abstract: d.abstract && d.abstract.split(/\n/).map(&:strip).first, + abstract: d.abstract && d.abstract.split("\n").map(&:strip).first, parent_name: d.parent_in_code&.name, }.reject { |_, v| v.nil? || v.empty? }] end diff --git a/lib/jazzy/symbol_graph/symbol.rb b/lib/jazzy/symbol_graph/symbol.rb index 125a954b7..bf7002db3 100644 --- a/lib/jazzy/symbol_graph/symbol.rb +++ b/lib/jazzy/symbol_graph/symbol.rb @@ -111,7 +111,7 @@ def adjust_kind_for_declaration(kind, keywords) end return kind unless keywords.member?('static') - kind.gsub(/type/, 'static') + kind.gsub('type', 'static') end def init_kind(kind, keywords) diff --git a/spec/integration_specs b/spec/integration_specs index 684f708b0..351651d88 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit 684f708b0e9c3e5f860bf0a9a6df469f26be7196 +Subproject commit 351651d88f15b1007f4409fe32076ef38be5b18a