boxt_ruby_style_guide 7.7.3 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb14b8f791b4feded3f27f40c3bb50de7087c97f6c68177831a0d480e52e3860
-  data.tar.gz: db0f26c2a9cd3f5dc8137a74c03819f0744a09c64be7cdad45eb250994dd2ee3
+  metadata.gz: 7e8f3ee70573d3493385981a232a6b08389bdf815827b097aa7a24478f7e5a80
+  data.tar.gz: 7a7fede5a038a4e0b764b3ad629d83bafeeed03d9b980c4b851baefbf777c45a
 SHA512:
-  metadata.gz: 07e967593138ce3ac4fe0aea5f6eca2a53c46611e2a3694a3a582abd0d5e52fcbb1a461d8e3917d2fecdae8529f70be656bc849bdaed13391695cfa6f2c027ca
-  data.tar.gz: 301463c3158cc8f859b408fbf8a0fc8a4c4cb8bcb102d64d7af2ab0a53d606753c1b61e574b6cea6eaa8d4ce1b44b44358ad8b59a349e21886889737b5725155
+  metadata.gz: ffe098e6a1fa3323b8897fbf5cdbff05b0e4e37d66988fdecb15a0f866b7e110c430f6ce427bc15c7ce82fa9a4165029ee514788046c451ea271b6fa65a78bdd
+  data.tar.gz: 3a090c5cd4ce2bd4055866e9587842a759800b580c4cc196bc936c5005da60052789e117153bb3bb38175d6197176c6a5fba54ab193c5daea931f16dde00ae63

data/README.md

@@ -24,13 +24,6 @@ And then execute:
 bundle
 ```
 
-To make the lint rake tasks available to non Rails apps and gems, add the following to the project's `Rakefile`:
-
-```ruby
-require "boxt_ruby_style_guide"
-BoxtRubyStyleGuide.install_tasks
-```
-
 Rails apps should have access to the lint tasks by default.
 
 ## Usage
@@ -75,14 +68,14 @@ Lint tasks to run against files listed as changed by Git.
 To run `rubocop` against any changed files use:
 
 ```sh
-rake lint:rubocop RUBOCOP_LINT_BASE=your-base-branch
+RUBOCOP_LINT_BASE=your-base-branch rake lint:rubocop 
 ```
 
 To run `rubocop` with autofix, use one of the following:
 
 ```sh
-rake lint:rubocop_a RUBOCOP_LINT_BASE=your-base-branch
-rake lint:rubocop_A RUBOCOP_LINT_BASE=your-base-branch
+RUBOCOP_LINT_BASE=your-base-branch rake lint:rubocop -a 
+RUBOCOP_LINT_BASE=your-base-branch rake lint:rubocop -A
 ```
 
 

data/VERSION

@@ -1 +1 @@
-7.7.3
+7.8.0

data/lib/boxt_ruby_style_guide/git_diff.rb

@@ -15,7 +15,7 @@ module BoxtRubyStyleGuide
 
     attr_reader :base
 
-    def initialize(base = "master")
+    def initialize(base:)
       @base = base
     end
 

data/lib/tasks/lint.rake

@@ -1,55 +1,30 @@
 # frozen_string_literal: true
 
 require "boxt_ruby_style_guide"
-require "rubocop"
-
-require "boxt_ruby_style_guide/git_diff"
 require "boxt_ruby_style_guide/filepath_matcher"
-
-##
-# The base branch to compare HEAD with for changes
-BASE_BRANCH = "develop"
-
-##
-# Name of the master Rubocop lint task to run
-RUBOCOP_TASK_NAME = :"lint:execute_rubocop"
-
-##
-# Pattern for matching autofix options
-AUTO_REGEX = /\A-a\Z/i.freeze
+require "boxt_ruby_style_guide/git_diff"
+require "rubocop"
 
 namespace :lint do
   desc "Runs rubocop against all files with committed changes different from base branch"
   task :rubocop do
-    Rake::Task[RUBOCOP_TASK_NAME].invoke
-  end
-
-  desc "Runs rubocop against all files using -a (soft autofix) option"
-  task :rubocop_a do
-    Rake::Task[RUBOCOP_TASK_NAME].invoke("-a")
-  end
-
-  desc "Runs rubocop against all files using -A (hard autofix) option"
-  task :rubocop_A do
-    Rake::Task[RUBOCOP_TASK_NAME].invoke("-A")
-  end
+    file_paths = sanitized_file_paths
+    puts "File paths: #{file_paths.join(', ')}"
 
-  task :execute_rubocop, [:auto_flag] do |_t, args|
-    if sanitized_file_paths.any?
-      # Sanitize args to make sure only a single "a" or "A" is accepted
-      auto_flag = AUTO_REGEX.match(args[:auto_flag])
-      exec("bundle exec rubocop #{sanitized_file_paths.join(" ")} #{auto_flag}".strip)
+    if file_paths.any?
+      auto_flag_opt = ARGV.select { |a| ["-a", "-A"].include?(a) }.first
+      exec("bundle exec rubocop #{file_paths.join(' ')} #{auto_flag_opt}".strip)
     else
-      puts "No matching Ruby files changed"
+      puts "No Ruby files changed"
     end
   end
 end
 
 private
 
-# Returns Array
+# Returns an array of files
 def sanitized_file_paths
-  base = ENV.fetch("RUBOCOP_LINT_BASE", BASE_BRANCH)
-  changed_files = BoxtRubyStyleGuide::GitDiff.new(base).all
+  base = ENV.fetch("RUBOCOP_LINT_BASE", "main")
+  changed_files = BoxtRubyStyleGuide::GitDiff.new(base: base).all
   BoxtRubyStyleGuide::FilepathMatcher.new(*changed_files).all_matches
 end

metadata

@@ -1,63 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: boxt_ruby_style_guide
 version: !ruby/object:Gem::Version
-  version: 7.7.3
+  version: 7.8.0
 platform: ruby
 authors:
 - Boxt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.92.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rubocop-faker
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +122,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement