thanx-style 0.0.22 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11c70ef2dc47d090b5edc4dc3834a9d8672e44257ae00357da099835bce566f5
-  data.tar.gz: 1b8a169597129918bf0c001d480513db7b14c75393cba61d51fa55fccd43141d
+  metadata.gz: c505e9aba2da7daa103731b72d05b3434da51429d2b49c0409f4224692e72a8f
+  data.tar.gz: f55a20599f5bf2dd89d8796089e076faccd2bd412d5c2f70fcfcf568df339fdd
 SHA512:
-  metadata.gz: 36b03eb20ac30016e2213f27b00c820c022d91bb9debec787e3d75cac72709833bfda7ec2e1f0324ac5c02bcc1e5987b1d8965390a44beb6f3ec2d36d514d7f0
-  data.tar.gz: 304abec880be26f4e44b5d3bc386a636ef979d24b8106c9123e7782a8da42bd500ec1216f220feaf70267b778ecfc81578d9a958a8a270f332673274c8d3d666
+  metadata.gz: f9c2c3bad3de30da39034dea9487696bd711e1fbcfd6f8e477d60ed6c07149100b9e9d967688c3f653da10ae6a5f22986e9b4837faff3469463edf7be0b35ebf
+  data.tar.gz: 8c90a68b33a1e3889a68911d914aafcb778a520e2a938cb770b0a424a388a701b9d81e2dac3aa8b3c4289b6e390945d2e128c7886c370419edea212184596a02

data/bin/thanx-report-rspec

@@ -1,5 +1,12 @@
 #!/usr/bin/env ruby
 
+begin
+  require 'danger'
+rescue LoadError
+  puts 'danger is not installed'
+  exit(-1)
+end
+
 system <<~CMD
   bundle exec danger --dangerfile=$(bundle show thanx-style)/.danger/rspec
 CMD

data/bin/thanx-report-rubocop

@@ -1,5 +1,12 @@
 #!/usr/bin/env ruby
 
+begin
+  require 'danger'
+rescue LoadError
+  puts 'danger is not installed'
+  exit(-1)
+end
+
 system <<~CMD
   bundle exec danger --dangerfile=$(bundle show thanx-style)/.danger/rubocop
 CMD

data/bin/thanx-rspec

@@ -1,5 +1,12 @@
 #!/usr/bin/env ruby
 
+begin
+  require 'rspec'
+rescue LoadError
+  puts 'rspec is not installed'
+  exit(-1)
+end
+
 exit system <<~COMMAND
   bundle exec rspec \
     --color \

data/bin/thanx-rubocop

@@ -1,11 +1,17 @@
 #!/usr/bin/env ruby
 
-formatter = '$(bundle show rubocop-junit-formatter)'
-formatter += '/lib/rubocop/formatter/junit_formatter.rb'
+begin
+  require 'rubocop'
+rescue LoadError
+  puts 'rubocop is not installed'
+  exit(-1)
+end
+
+has_formatter = Gem::Specification.find_all_by_name('rubocop-junit-formatter').any?
 
 exit system <<~COMMAND
   bundle exec rubocop \
-    --require #{formatter} \
+    #{has_formatter ? '--require $(bundle show rubocop-junit-formatter)/lib/rubocop/formatter/junit_formatter.rb' : ''} \
     --format RuboCop::Formatter::JUnitFormatter \
     --out test-results/rubocop/results.xml \
     --format progress \

data/lib/thanx/style/version.rb

@@ -2,6 +2,6 @@
 
 module Thanx # rubocop:disable Style/ClassAndModuleChildren
   module Style
-    VERSION = '0.0.22'
+    VERSION = '0.0.29'
   end
 end

data/rubocop-rails.yml

@@ -1,6 +1,6 @@
 Rails/SafeNavigation:
   Description: Converts usages of try! or try to &..
-  ConvertTry: true
+  ConvertTry: false
 
 Rails/SkipsModelValidations:
   Exclude:
@@ -12,4 +12,5 @@ Rails/UnknownEnv:
     - test
     - production
     - staging
+    - sandbox
     - demo

data/rubocop-ruby.yml

@@ -10,61 +10,11 @@ Layout/AccessModifierIndentation:
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
-# Align the elements of a hash literal if they span more than one line.
-Layout/AlignHash:
-  # Alignment of entries using hash rocket as separator. Valid values are:
-  #
-  # key - left alignment of keys
-  #   'a' => 2
-  #   'bb' => 3
-  # separator - alignment of hash rockets, keys are right aligned
-  #    'a' => 2
-  #   'bb' => 3
-  # table - left alignment of keys, hash rockets, and values
-  #   'a'  => 2
-  #   'bb' => 3
-  EnforcedHashRocketStyle: table
-  SupportedHashRocketStyles:
-    - key
-    - separator
-    - table
-  # Alignment of entries using colon as separator. Valid values are:
-  #
-  # key - left alignment of keys
-  #   a: 0
-  #   bb: 1
-  # separator - alignment of colons, keys are right aligned
-  #    a: 0
-  #   bb: 1
-  # table - left alignment of keys and values
-  #   a:  0
-  #   bb: 1
-  EnforcedColonStyle: table
-  SupportedColonStyles:
-    - key
-    - separator
-    - table
-
-Layout/AlignParameters:
-  # Alignment of parameters in multi-line method calls.
-  #
-  # The `with_first_parameter` style aligns the following lines along the same
-  # column as the first parameter.
-  #
-  #     method_call(a,
-  #                 b)
-  #
-  # The `with_fixed_indentation` style aligns the following lines with one
-  # level of indentation relative to the start of the line with the method call.
-  #
-  #     method_call(a,
-  #       b)
+Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
   SupportedStyles:
     - with_first_parameter
     - with_fixed_indentation
-  # By default, the indentation width from Layout/IndentationWidth is used
-  # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
 # Indentation of `when`.
@@ -79,6 +29,11 @@ Layout/CaseIndentation:
   # This only matters if `IndentOneStep` is `true`
   IndentationWidth: ~
 
+# This is generally a good idea, but it breaks a lot of our existing code
+# and isn't worth enforcing in all cases.
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
 # Align ends correctly.
 Layout/EndAlignment:
   # The value `keyword` means that `end` should be aligned with the matching
@@ -97,7 +52,7 @@ Layout/EndAlignment:
   Severity: warning
 
 # Checks the indentation of the first element in an array literal.
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   # The value `special_inside_parentheses` means that array literals with
   # brackets that have their opening bracket on the same line as a surrounding
   # opening round parenthesis, shall have their first element indented relative
@@ -119,7 +74,7 @@ Layout/IndentArray:
   IndentationWidth: ~
 
 # Checks the indentation of the first key in a hash literal.
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   # The value `special_inside_parentheses` means that hash literals with braces
   # that have their opening brace on the same line as a surrounding opening
   # round parenthesis, shall have their first key indented relative to the
@@ -140,6 +95,62 @@ Layout/IndentHash:
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
+# Align the elements of a hash literal if they span more than one line.
+Layout/HashAlignment:
+  # Alignment of entries using hash rocket as separator. Valid values are:
+  #
+  # key - left alignment of keys
+  #   'a' => 2
+  #   'bb' => 3
+  # separator - alignment of hash rockets, keys are right aligned
+  #    'a' => 2
+  #   'bb' => 3
+  # table - left alignment of keys, hash rockets, and values
+  #   'a'  => 2
+  #   'bb' => 3
+  EnforcedHashRocketStyle: table
+  SupportedHashRocketStyles:
+    - key
+    - separator
+    - table
+  # Alignment of entries using colon as separator. Valid values are:
+  #
+  # key - left alignment of keys
+  #   a: 0
+  #   bb: 1
+  # separator - alignment of colons, keys are right aligned
+  #    a: 0
+  #   bb: 1
+  # table - left alignment of keys and values
+  #   a:  0
+  #   bb: 1
+  EnforcedColonStyle: table
+  SupportedColonStyles:
+    - key
+    - separator
+    - table
+
+Layout/LineLength:
+  Max: 80
+  # To make it possible to copy or click on URIs in the code, we allow lines
+  # containing a URI to be longer than Max.
+  AllowHeredoc: true
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
+  # directives like '# rubocop: enable ...' when calculating a line's length.
+  IgnoreCopDirectives: false
+  # The IgnoredPatterns option is a list of !ruby/regexp and/or string
+  # elements. Strings will be converted to Regexp objects. A line that matches
+  # any regular expression listed in this option will be ignored by LineLength.
+  IgnoredPatterns: []
+  Exclude:
+    - 'db/migrate/*'
+    - '**/config/**/*'
+    - 'spec/factories.rb'
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
   SupportedStyles:
@@ -150,6 +161,28 @@ Layout/MultilineMethodCallIndentation:
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
+Layout/ParameterAlignment:
+  # Alignment of parameters in multi-line method calls.
+  #
+  # The `with_first_parameter` style aligns the following lines along the same
+  # column as the first parameter.
+  #
+  #     method_call(a,
+  #                 b)
+  #
+  # The `with_fixed_indentation` style aligns the following lines with one
+  # level of indentation relative to the start of the line with the method call.
+  #
+  #     method_call(a,
+  #       b)
+  EnforcedStyle: with_fixed_indentation
+  SupportedStyles:
+    - with_first_parameter
+    - with_fixed_indentation
+  # By default, the indentation width from Layout/IndentationWidth is used
+  # But it can be overridden by setting this parameter
+  IndentationWidth: ~
+
 # Checks that the equals signs in parameter default assignments have or don't
 # have surrounding space depending on configuration.
 Layout/SpaceAroundEqualsInParameterDefault:
@@ -160,7 +193,7 @@ Layout/SpaceAroundEqualsInParameterDefault:
 
 #################### Naming ##########################
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   # Parameter names may be equal to or greater than this value
   MinNameLength: 3
   AllowNamesEndingInNumbers: true
@@ -262,20 +295,10 @@ Style/BlockDelimiters:
     - expect
   Exclude:
     - 'spec/factories.rb'
-
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-  SupportedStyles:
-    # The `braces` style enforces braces around all method parameters that are
-    # hashes.
-    - braces
-    # The `no_braces` style checks that the last parameter doesn't have braces
-    # around it.
-    - no_braces
-    # The `context_dependent` style checks that the last parameter doesn't have
-    # braces around it, but requires braces if the second to last parameter is
-    # also a hash literal.
-    - context_dependent
+  BracesRequiredMethods:
+    # Require braces for sorbet sigs to reduce noise.
+    # See https://github.com/rubocop-hq/rubocop/pull/7660
+    - 'sig'
 
 Style/ClassAndModuleChildren:
   # Checks the style of children definitions at classes and modules.
@@ -322,8 +345,6 @@ Style/Lambda:
   Description: 'Use the new lambda literal syntax for single-line blocks.'
   StyleGuide: '#lambda-multi-line'
   Enabled: true
-  VersionAdded: '0.9'
-  VersionChanged: '0.40'
   EnforcedStyle: literal
   SupportedStyles:
     - line_count_dependent
@@ -418,27 +439,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 10
 
-Metrics/LineLength:
-  Max: 80
-  # To make it possible to copy or click on URIs in the code, we allow lines
-  # containing a URI to be longer than Max.
-  AllowHeredoc: true
-  AllowURI: true
-  URISchemes:
-    - http
-    - https
-  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
-  # directives like '# rubocop: enable ...' when calculating a line's length.
-  IgnoreCopDirectives: false
-  # The IgnoredPatterns option is a list of !ruby/regexp and/or string
-  # elements. Strings will be converted to Regexp objects. A line that matches
-  # any regular expression listed in this option will be ignored by LineLength.
-  IgnoredPatterns: []
-  Exclude:
-    - 'db/migrate/*'
-    - '**/config/**/*'
-    - 'spec/factories.rb'
-
 Metrics/MethodLength:
   CountComments: false  # count full line comments?
   Max: 20

data/rubocop.yml

@@ -12,16 +12,21 @@ AllCops:
   DefaultFormatter: progress
   DisplayCopNames: true
   ExtraDetails: true
+  # Disable new cops by default since they'll cause noise on version upgrades.
+  # We can always enable them later.
+  NewCops: disable
 
 Rails:
   Enabled: true
 
-require: rubocop-rspec
+require:
+  - rubocop-rspec
+  - rubocop-rails
 
 inherit_from:
   - rubocop-ruby.yml
   - rubocop-rspec.yml
   - rubocop-rails.yml
 
-Documentation:
+Style/Documentation:
   Enabled: false

metadata

@@ -1,183 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: thanx-style
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.29
 platform: ruby
 authors:
 - Eng @ Thanx
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: danger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.6.2
-- !ruby/object:Gem::Dependency
-  name: danger-junit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-- !ruby/object:Gem::Dependency
-  name: danger-rubocop_junit_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: danger-simplecov_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.58.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.58.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-junit-formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.27.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.27.0
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-- !ruby/object:Gem::Dependency
-  name: simplecov-json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: simplecov-lcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
+date: 2021-04-03 00:00:00.000000000 Z
+dependencies: []
 description: |
   Provides Ruby, Rails, and RSpec rubocop rules. Also provides helpers for
   properly formatting CI output.
@@ -223,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Quick install of ruby Thanx code style rules