advent_of_ruby 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7157738053e4ec2024b29f3e309d1b8629bf82a72b5478cba1391bb581770ba4
-  data.tar.gz: 47fcaf827ea7994744420bcb300739eba636396d7c0510391e2baa517b3b7e3f
+  metadata.gz: ef827ae7d7d476a5cf69ba40c6c437225c413fddf45a619315e82b5b4afeef5b
+  data.tar.gz: 0dc97c1311bd52c88912fbd00d23f54166f9fb5c76f01cde07cc49d02f1ae2f9
 SHA512:
-  metadata.gz: c6210bc305da01a6b3ada2b2394e162e3c57762f2a6fac902b787be3d117a3857fc8889d3c1428d32ae455a7fe96f02778461517018d4dede39418468591ab4c
-  data.tar.gz: 77b145c6665bff896e9816c3930f53e06878c6b90fbe5fee05fe28e326e91c3e78e1d3922599472dc2f2901bc28f49fd7d8ea78cd88daa5d5b6809fc3376e62e
+  metadata.gz: 12bf51e1a30e704ff8799d0e69d86c623acecd1aeb17d260842c936f0a3e899dae2bae52df7b6e6709c4af3bf48f4258d883aad7eced150e3259838b9cdf8d33
+  data.tar.gz: 2eec5db6f2e168adc267385021d3fa130972c360a682b15d16d4b6c6deec9d7c25db37f77f71c95d6d289a18e097a16f7416498c1ff534c04731a204129283d0

data/lib/arb/files/solution.rb

@@ -13,7 +13,7 @@ module Arb
           File.write(file_path, template(year:, day:))
         end
 
-        Formatter.format(file_path)
+        Formatters::RuboCop.format(file_path)
 
         file_path
       end

data/lib/arb/files/spec.rb

@@ -13,7 +13,7 @@ module Arb
           File.write(file_path, template(year:, day:))
         end
 
-        Formatter.format(file_path)
+        Formatters::RuboCop.format(file_path)
 
         file_path
       end

data/lib/arb/formatters/rubocop.rb

@@ -0,0 +1,31 @@
+module Formatters
+  module RuboCop
+    # Formats newly created files using RuboCop if it is bundled at the top
+    # level (i.e. as `gem "rubocop"` in the Gemfile) or if a RuboCop config file
+    # is present. Does nothing if RuboCop isn't bundled or is just a dependency
+    # (e.g. of Standard), and if there is no RuboCop config file.
+    def self.format(file_path)
+      require "bundler"
+      require "rubocop"
+      return unless rubocop_bundled_at_top_level? || rubocop_config_exists?
+
+      ::RuboCop::CLI.new.run(["-A", file_path, "--out", File::NULL])
+    rescue LoadError
+      # Do nothing if Bundler is not installed, or if RuboCop is bundled but not
+      # actually installed.
+    end
+
+    private_class_method def self.rubocop_bundled_at_top_level?
+      Bundler.definition.dependencies.any? { it.name == "rubocop" }
+    rescue Bundler::GemfileNotFound
+      false
+    end
+
+    # A shorter approach would be simply `File.exist?(".rubocop.yml")`, but
+    # the approach below avoids directly reading a file.
+    private_class_method def self.rubocop_config_exists?
+      config_path = ::RuboCop::ConfigFinder.find_config_path(Dir.pwd)
+      config_path && !config_path.end_with?("config/default.yml")
+    end
+  end
+end

data/lib/arb/version.rb

@@ -1,3 +1,3 @@
 module Arb
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advent_of_ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Felipe Vogel
@@ -2705,7 +2705,7 @@ files:
 - lib/arb/files/other_solutions.rb
 - lib/arb/files/solution.rb
 - lib/arb/files/spec.rb
-- lib/arb/formatter.rb
+- lib/arb/formatters/rubocop.rb
 - lib/arb/version.rb
 - lib/download_solutions/api/github.rb
 - lib/download_solutions/api/github/repos.rb

data/lib/arb/formatter.rb

@@ -1,22 +0,0 @@
-begin
-  gem "rubocop"
-  require "rubocop"
-rescue LoadError
-  # If RuboCop isn't available, no formatting will be done
-end
-
-module Formatter
-  class << self
-    def format(file_path)
-      return unless rubocop_loaded?
-
-      RuboCop::CLI.new.run(["-A", file_path, "--out", File::NULL])
-    end
-
-    private
-
-    def rubocop_loaded?
-      defined?(RuboCop)
-    end
-  end
-end