Merge pull request #127 from dafyddcrosby/main

[rubocop] bump to 1.3.1

.github/workflows/ci.yml

@@ -23,18 +23,6 @@ jobs:
       run: bundle exec rspec
     - name: Run rubocop
       run: bundle exec rubocop --display-cop-names
-# This doesn't work on PRs from forks due to GITHUB_TOKEN, which makes
-# it kinda useless for now
-# https://github.com/andrewmcodes/rubocop-linter-action/issues/68
-#  rubocop:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - name: Checkout repository
-#      uses: actions/checkout@v2
-#    - name: Run Rubocop Linter
-#      uses: andrewmcodes/rubocop-linter-action@v3.2.0
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   markdown:
     runs-on: ubuntu-latest
     steps:

.rubocop.yml

@@ -1,2 +1,6 @@
 inherit_from:
-  - https://raw.githubusercontent.com/facebook/chef-cookbooks/main/.rubocop_55.yml
+  - https://raw.githubusercontent.com/facebook/chef-cookbooks/main/.rubocop.yml
+
+# TODO: This will require some testing before enabling
+Style/GlobalStdStream:
+  Enabled: false

Gemfile

@@ -6,6 +6,6 @@ group :development do
   gem 'rspec-core', '~> 3.0'
   gem 'rspec-expectations', '~> 3.0'
   gem 'rspec-mocks', '~> 3.0'
-  gem 'rubocop', '~> 0.55.0'
+  gem 'rubocop', '= 1.3.1'
   gem 'simplecov'
 end

between_meals.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.files = %w{README.md LICENSE} +
     Dir.glob('lib/**/*', File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 
+  s.required_ruby_version = '>= 2.4.0'
   s.add_dependency 'colorize'
   s.add_dependency 'mixlib-shellout'
   s.add_dependency 'rugged'

lib/between_meals/changes/change.rb

@@ -26,6 +26,7 @@ module Changes
     class Change
       @@logger = nil
       attr_accessor :name, :status
+
       def to_s
         @name
       end

lib/between_meals/changes/databag.rb

@@ -19,6 +19,7 @@ module Changes
     # Changeset aware databag
     class Databag < Change
       attr_accessor :item
+
       def self.name_from_path(path, databag_dir)
         re = %r{^#{databag_dir}/([^/]+)/([^/]+)\.json}
         debug("[databag] Matching #{path} against #{re}")