datarockets-style 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16590c13f8a15d26842216bb4c0b411c9431a177b7d81b32b9e7a074257b4cf5
-  data.tar.gz: 440e87351bf3e6900d114650fede11f1ab68b2ba5f1d72fe6e599758fec6f346
+  metadata.gz: d8cf398f37f77c928364df3e33a874052bb6912f909688e881a03b87cc7d53d1
+  data.tar.gz: 7f3e05cf2f7c6dbdff1e5c506131de539f14974400cefb2e30170be0cabec9c9
 SHA512:
-  metadata.gz: be32cf2f4da3c94b9e532bfd0e0a2f0d416200ebc5d2992fdb3ff223b9b9603dd4f78ff198640c4500964cda5f82b93b5484694c909371d53bea2cd185356c0a
-  data.tar.gz: b0120bd764544c9fe6458b981f3b5174d96eaed7980ea29b8ca4b73065b8794225ab832478ee0c7666a1b4ae13908e17d403f30351c80fdd9ec17a4ef6247d49
+  metadata.gz: 4072a041ba599dcad11bfdf6f50c851541f9b77a0a5283989a26d12c121fcc778c11883ccc6eb495fc737674ee5e2c024a9f067150953077bcf2361b45a8425f
+  data.tar.gz: b68cc6a20a6bd27c42071606c27329365fc0e0c400999f66846aa9604b705fccab9d652de8711de69bc4ff25e9c5f121b5a2e11b422ee4b88dbb413ff06adb0b

data/.github/workflows/main.yml

@@ -13,25 +13,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-
-    - uses: actions/cache@v1
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gem-
+    - uses: actions/checkout@v3
 
     - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
-
-    - name: Install and run bundler
-      run: |
-        gem install bundler
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
+        ruby-version: '2.6'
+        bundler-cache: true
 
     - name: Run linter
       run: make lint

data/.rubocop.yml

@@ -7,7 +7,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 # for checking cops with interpolation
 Lint/InterpolationCheck:

data/CHANGELOG.md

@@ -4,7 +4,40 @@ The format is described in [Contributing notes](CONTRIBUTING.md#changelog-entry-
 
 ## master
 
-## 1.2.0
+## 1.4.0 (2023-02-11)
+
+### Changed
+
+* Update rubocop to `1.45.1`. ([@r.dubrovsky][])
+* Update rubocop-rails to `2.17.4`. ([@r.dubrovsky][])
+* Update rubocop-rspec to `2.18.1`. ([@r.dubrovsky][])
+
+## 1.3.0 (2022-12-02)
+
+### Added
+
+* [#261](https://github.com/datarockets/ruby-style/issues/261) Add new config `rails-locales`. ([@r.dubrovsky][])
+
+### Changed
+
+* **(Breaking)** Drop support for Ruby 2.4 and Ruby 2.5. ([@r.dubrovsky][])
+
+* [#260](https://github.com/datarockets/ruby-style/issues/260) Update rubocop to `1.39`. ([@r.dubrovsky][])
+  * Setup `Layout/CaseIndentation` rule. ([@r.dubrovsky][])
+* [#261](https://github.com/datarockets/ruby-style/issues/261) Update rubocop-rails to `2.17.3`. ([@r.dubrovsky][])
+* [#262](https://github.com/datarockets/ruby-style/issues/262) Update rubocop-rspec to `2.15`. ([@r.dubrovsky][])
+* [#32](https://github.com/datarockets/ruby-style/issues/32) Enable back `Style/FrozenStringLiteralComment` cop. ([@r.dubrovsky][])
+* [#176](https://github.com/datarockets/ruby-style/issues/176) Fix hash alignment via changing `Layout/HashAlignment` cop. ([@r.dubrovsky][])
+* [#263](https://github.com/datarockets/ruby-style/issues/263) Setup `EnforcedStyle` for `Layout/LineEndStringConcatenationIndentation` cop. ([@r.dubrovsky][])
+* [#258](https://github.com/datarockets/ruby-style/issues/258) Setup `EnforcedStyle` for `Layout/FirstArrayElementIndentation` cop. ([@r.dubrovsky][])
+* [#179](https://github.com/datarockets/ruby-style/issues/179) Setup `EnforcedStyleAlignWith` rule for `Layout/BlockAlignment` cop. ([@r.dubrovsky][])
+
+### Fixed
+
+* [#196](https://github.com/datarockets/ruby-style/issues/196) Fix `Layout/ArrayAlignmentExtended` cop. ([@r.dubrovsky][])
+* [#258](https://github.com/datarockets/ruby-style/issues/258) Fix conflict between `Layout/ArrayAlignmentExtended` and `Layout/FirstArrayElementIndentation` cops. ([@r.dubrovsky][])
+
+## 1.2.0 (2021-02-24)
 
 ### Added
 

data/Gemfile

@@ -1,5 +1,11 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
+
+gem "pry-byebug"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.10"

data/README.md

@@ -10,14 +10,14 @@ Add this line to your application's Gemfile:
 
 ```ruby
 group :test, :development do
-  gem 'datarockets-style', '~> 1.1.0'
+  gem 'datarockets-style', '~> 1.4.0'
 end
 ```
 
 Or, for a Ruby library, add this to your gemspec:
 
 ```ruby
-spec.add_development_dependency 'datarockets-style', '~> 1.1.0'
+spec.add_development_dependency 'datarockets-style', '~> 1.4.0'
 ```
 
 And then execute:
@@ -51,6 +51,15 @@ inherit_gem:
     - config/rails.yml
 ```
 
+By default, it doesn't include rules for I18n. For enabling them, add the next styles
+
+```yaml
+inherit_gem:
+  datarockets-style:
+    - config/rails.yml
+    - config/rails-locales.yml
+```
+
 ### Rspec config
 
 For Rspec tests, you can add a special rubocop config

data/RELEASING.md

@@ -1,8 +1,8 @@
 # Releasing
 
 * Update `version.rb` file accordingly.
+* Update `README.mb` file.
 * Update `CHANGELOG.md` file.
-* Update `Gemfile.lock` file via running `bundle install`.
 * Build and publish (and verify that everything ok):
 
 ```bash

data/config/base.yml

@@ -25,8 +25,18 @@ Layout/ArrayAlignmentExtended:
     - with_fixed_indentation
   IndentationWidth: ~
 
+Layout/BlockAlignment:
+  EnforcedStyleAlignWith: start_of_block
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
 Layout/HashAlignment:
-  EnforcedLastArgumentHashStyle: always_ignore
+  EnforcedColonStyle: key
+  EnforcedHashRocketStyle: key
 
 Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
@@ -41,6 +51,9 @@ Layout/EndAlignment:
 Layout/IndentationConsistency:
   EnforcedStyle: normal
 
+Layout/LineEndStringConcatenationIndentation:
+  EnforcedStyle: indented
+
 Layout/LineLength:
   Max: 120
 
@@ -152,7 +165,7 @@ Style/HashTransformValues:
   Enabled: true
 
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: true
 
 Style/NestedInterpolation:
   Enabled: true

data/config/rails-locales.yml

@@ -0,0 +1,2 @@
+Rails/I18nLocaleTexts:
+  Enabled: true

data/config/rails.yml

@@ -14,6 +14,9 @@ AllCops:
     - "config.ru"
     - "Rakefile"
 
+Rails/I18nLocaleTexts:
+  Enabled: false
+
 Style/Documentation:
   Enabled: true
   Exclude:

data/datarockets-style.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "datarockets_style/version"
@@ -12,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/datarockets/datarockets-style"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -30,11 +32,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rubocop", "~> 1.10"
-  spec.add_dependency "rubocop-rails", "~> 2.9"
-  spec.add_dependency "rubocop-rspec", "~> 2.0"
+  spec.add_dependency "rubocop", "~> 1.45.1"
+  spec.add_dependency "rubocop-rails", "~> 2.17.4"
+  spec.add_dependency "rubocop-rspec", "~> 2.18.1"
 
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/datarockets_style/cop/layout/array_alignment_extended.rb

@@ -33,13 +33,14 @@ module DatarocketsStyle
       #
       #   array = [1, 2, 3,
       #            4, 5, 6]
-      class ArrayAlignmentExtended < RuboCop::Cop::Cop
+      class ArrayAlignmentExtended < RuboCop::Cop::Base
         include RuboCop::Cop::Alignment
+        extend RuboCop::Cop::AutoCorrector
 
         ALIGN_PARAMS_MSG = "Align the elements of an array literal if they span more than one line."
 
         FIXED_INDENT_MSG = "Use one level of indentation for elements " \
-            "following the first line of a multi-line array."
+          "following the first line of a multi-line array."
 
         def on_array(node)
           return if node.children.size < 2
@@ -47,8 +48,8 @@ module DatarocketsStyle
           check_alignment(node.children, base_column(node, node.children))
         end
 
-        def autocorrect(node)
-          RuboCop::Cop::AlignmentCorrector.correct(processed_source, node, column_delta)
+        def autocorrect(corrector, node)
+          RuboCop::Cop::AlignmentCorrector.correct(corrector, processed_source, node, column_delta)
         end
 
         private

data/lib/datarockets_style/cop/rspec/prefer_before_over_setup.rb

@@ -34,7 +34,7 @@ module DatarocketsStyle
         def autocorrect(node)
           lambda do |corrector|
             block_internals = node.source.split(/ /)
-            corrector.replace node.loc.expression, ["before", *block_internals[1..-1]].join(" ")
+            corrector.replace node.loc.expression, ["before", *block_internals[1..]].join(" ")
           end
         end
       end

data/lib/datarockets_style/cop/style/nested_interpolation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DatarocketsStyle
   module Cop
     module Style
@@ -14,7 +16,7 @@ module DatarocketsStyle
       class NestedInterpolation < RuboCop::Cop::Cop
         include RuboCop::Cop::Interpolation
 
-        MSG = "Redundant nested interpolation.".freeze
+        MSG = "Redundant nested interpolation."
 
         def on_interpolation(node)
           node.each_descendant(:dstr) do |descendant_node|

data/lib/datarockets_style/formatter/todo_list_formatter/report_summary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DatarocketsStyle
   module Formatter
     module TodoListFormatter

data/lib/datarockets_style/formatter/todo_list_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pathname"
 require_relative "./todo_list_formatter/report_summary"
 

data/lib/datarockets_style/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DatarocketsStyle
-  VERSION = "1.2.0".freeze
+  VERSION = "1.4.0"
 end

data/lib/datarockets_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubocop"
 require "datarockets_style/formatter/todo_list_formatter"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datarockets-style
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Roman Dubrovsky
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,84 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.45.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.45.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.17.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.17.4
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 2.18.1
 description:
 email:
 - r.dubrovsky@datarockets.com
@@ -120,6 +78,7 @@ files:
 - bin/console
 - bin/setup
 - config/base.yml
+- config/rails-locales.yml
 - config/rails.yml
 - config/rspec.yml
 - config/ruby.yml
@@ -140,6 +99,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -148,14 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Datarockets style guides and shared style configs