style: fixes

Author: gildesmarais

Gemfile

@@ -7,7 +7,6 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gem 'html2rss', github: 'html2rss/html2rss', branch: :master
 
 group :development do
-  # gem 'html2rss-generator', path: '../generator'
   gem 'html2rss-generator', github: 'html2rss/generator', branch: :main
 
   gem 'nokogiri'

Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: https://github.com/html2rss/html2rss
-  revision: 762a09c15e5def5897b2d08f0e3c11c023cc9b35
+  revision: e0dca5bf74b17c1e2a0618fc0a4af27c16da1883
   branch: master
   specs:
     html2rss (0.17.0)
@@ -224,7 +224,7 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-performance (1.26.1)

bin/validate_configs

@@ -14,27 +14,25 @@ files = Dir['lib/html2rss/configs/**/*.yml']
 failed = []
 
 files.each do |file|
-  begin
-    result = Html2rss::Config.validate_yaml(file)
+  result = Html2rss::Config.validate_yaml(file)
 
-    if result.success?
-      puts "ok   #{file}"
-    else
-      puts "FAIL #{file}"
-      result.errors.to_h.each do |key, messages|
-        Array(messages).each { |msg| warn "       #{key}: #{msg}" }
-      end
-      failed << file
-    end
-  rescue Psych::Exception => error
-    puts "FAIL #{file}"
-    warn "       parse: #{error.message}"
-    failed << file
-  rescue StandardError => error
+  if result.success?
+    puts "ok   #{file}"
+  else
     puts "FAIL #{file}"
-    warn "       validation: #{error.class}: #{error.message}"
+    result.errors.to_h.each do |key, messages|
+      Array(messages).each { |msg| warn "       #{key}: #{msg}" }
+    end
     failed << file
   end
+rescue Psych::Exception => error
+  puts "FAIL #{file}"
+  warn "       parse: #{error.message}"
+  failed << file
+rescue StandardError => error
+  puts "FAIL #{file}"
+  warn "       validation: #{error.class}: #{error.message}"
+  failed << file
 end
 
 puts

spec/bin/validate_configs_spec.rb

@@ -1,14 +1,43 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require 'stringio'
 require 'tmpdir'
 
-RSpec.describe 'bin/validate_configs' do
+RSpec.describe 'bin/validate_configs' do # rubocop:disable RSpec/DescribeClass
   let(:script_path) { File.expand_path('../../bin/validate_configs', __dir__) }
+  let(:config_path) { File.join('lib', 'html2rss', 'configs', 'example.com', 'search.yml') }
+  let(:success_output) do
+    a_string_including(
+      "ok   #{config_path}",
+      '1 configs validated successfully.'
+    )
+  end
 
   it 'passes validation for parameterized configs when defaults are present' do
-    config = <<~YAML
+    with_temp_config do |dir|
+      expect { run_script(dir) }.to output(success_output).to_stdout
+                                                          .and output('').to_stderr
+    end
+  end
+
+  def with_temp_config
+    Dir.mktmpdir do |dir|
+      write_config(dir)
+      yield dir
+    end
+  end
+
+  def write_config(dir)
+    FileUtils.mkdir_p(File.join(dir, File.dirname(config_path)))
+    File.write(File.join(dir, config_path), valid_config)
+  end
+
+  def run_script(dir)
+    Dir.chdir(dir) { load script_path }
+  end
+
+  def valid_config
+    <<~YAML
       parameters:
         query:
           type: string
@@ -23,26 +52,5 @@
         title:
           selector: "h2"
     YAML
-
-    Dir.mktmpdir do |dir|
-      FileUtils.mkdir_p(File.join(dir, 'lib', 'html2rss', 'configs', 'example.com'))
-      File.write(File.join(dir, 'lib', 'html2rss', 'configs', 'example.com', 'search.yml'), config)
-
-      stdout = StringIO.new
-      stderr = StringIO.new
-      original_stdout = $stdout
-      original_stderr = $stderr
-      $stdout = stdout
-      $stderr = stderr
-
-      Dir.chdir(dir) { load script_path }
-
-      expect(stdout.string).to include('ok   lib/html2rss/configs/example.com/search.yml')
-      expect(stdout.string).to include('1 configs validated successfully.')
-      expect(stderr.string).to be_empty
-    ensure
-      $stdout = original_stdout
-      $stderr = original_stderr
-    end
   end
 end

spec/spec_helper.rb

@@ -3,9 +3,6 @@
 require 'bundler/setup'
 require 'tzinfo'
 
-local_html2rss_lib = File.expand_path('../../html2rss/lib', __dir__)
-$LOAD_PATH.unshift(local_html2rss_lib) if File.directory?(local_html2rss_lib)
-
 require 'html2rss'
 require 'html2rss/configs'