rubocopness and file renaming

invalidusrname · invalidusrname · commit e39b12c2d7b0 · 2024-12-07T19:52:32.000-05:00
diff --git a/.github/shared/setup/action.yaml b/.github/shared/setup/action.yaml
@@ -0,0 +1,11 @@
+name: "setup ruby"
+description: "setup ruby"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        working-directory: ./2024/ruby
diff --git a/.github/workflows/2018-ruby.yaml b/.github/workflows/2018-ruby.yaml
@@ -26,5 +26,6 @@ jobs:
       with:
         ruby-version: ${{ steps.determine-ruby-version.outputs.VERSION }}
         bundler-cache: true
+        working-directory: ./2018/ruby
     - name: Run tests
       run: bundle exec rspec
diff --git a/.github/workflows/2021-ruby.yaml b/.github/workflows/2021-ruby.yaml
@@ -26,5 +26,6 @@ jobs:
       with:
         ruby-version: ${{ steps.determine-ruby-version.outputs.VERSION }}
         bundler-cache: true
+        working-directory: ./2021/ruby
     - name: Run tests
       run: bundle exec rspec
diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml
@@ -3,7 +3,6 @@ name: 2024-ruby
 on:
   pull_request:
   push:
-    branches: [master]
     paths:
         - 2024/ruby/**
 
@@ -12,14 +11,19 @@ defaults:
     working-directory: ./2024/ruby
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Ruby
+        uses: ./.github/shared/setup
+      - name: Run rubocop
+        run: bundle exec rubocop
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-        working-directory: ./2024/ruby
-    - name: Run tests
-      run: bundle exec rspec
+      - uses: actions/checkout@v3
+      - name: Setup Ruby
+        uses: ./.github/shared/setup
+      - name: Run tests
+        run: bundle exec rspec
diff --git a/2018/ruby/spec/advent_03_spec.rb b/2018/ruby/spec/advent_03_spec.rb
@@ -29,7 +29,7 @@
     expect(rectangle.width).to eq(4)
   end
 
-  it "solves the puzzle", solution: true do
+  it "solves the puzzle", solution: true, slow: true do
     reader = ClaimReader.new(puzzle_input)
     claims = reader.process
 
diff --git a/2018/ruby/spec/advent_05_spec.rb b/2018/ruby/spec/advent_05_spec.rb
@@ -24,7 +24,7 @@
     end
   end
 
-  xit "solves part 1" do
+  it "solves part 1", slow: true do
     reader = AlchemicalReduction.new(puzzle_input)
     reader.process
 
@@ -55,7 +55,7 @@
     expect(lowest[1]).to eq(4)
   end
 
-  xit "solves part 2" do
+  it "solves part 2", slow: true do
     counts = {}
 
     ('a'..'z').each do |letter|
diff --git a/2018/ruby/spec/advent_06_spec.rb b/2018/ruby/spec/advent_06_spec.rb
@@ -30,18 +30,17 @@
     expect(c.largest_area).to eq(17)
   end
 
-  xit "solves part 1" do
+  it "solves part 1", slow: true do
     coordinates = puzzle_input.collect do |item|
       Coordinate.new(item[0], item[1])
     end
 
     c = ChronalCoordinates.new(coordinates)
-    # c.print_grid
 
     expect(c.largest_area).to eq(3401)
   end
 
-  it "solves part 2" do
+  it "solves part 2", slow: true do
     coordinates = puzzle_input.collect do |item|
       Coordinate.new(item[0], item[1])
     end
diff --git a/2018/ruby/spec/advent_07_spec.rb b/2018/ruby/spec/advent_07_spec.rb
@@ -58,7 +58,7 @@ def create_graph(input, weighted = false, seed_weight = 0)
     expect(orderer.compressed_order).to eq("CABDFE")
   end
 
-  xit "figures out the puzzle order" do
+  it "figures out the puzzle order", slow: true do
     graph = create_graph(puzzle_input)
 
     orderer = Orderer.new(graph)
@@ -76,7 +76,7 @@ def create_graph(input, weighted = false, seed_weight = 0)
     expect(seconds).to eq(15)
   end
 
-  xit "figures out part 2 puzzle order" do
+  it "figures out part 2 puzzle order", slow: true do
     graph = create_graph(puzzle_input, true, 60)
 
     orderer = Orderer.new(graph)
diff --git a/2024/ruby/.rubocop_todo.yml b/2024/ruby/.rubocop_todo.yml
@@ -21,30 +21,3 @@ Metrics/BlockLength:
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 120
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, AllowedPatterns.
-# SupportedStyles: snake_case, camelCase
-Naming/MethodName:
-  Exclude:
-    - 'lib/advent_04_ceres_search.rb'
-    - 'test.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
-# SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
-Naming/VariableNumber:
-  Exclude:
-    - 'lib/advent_04_ceres_search.rb'
-
-# Offense count: 4
-# Configuration parameters: AllowedConstants.
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/advent_01_hystorian_hysteria.rb'
-    - 'lib/advent_02_red_nosed_reports.rb'
-    - 'lib/advent_03_mull_it_over.rb'
-    - 'lib/advent_04_ceres_search.rb'
diff --git a/2024/ruby/Gemfile b/2024/ruby/Gemfile
@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-ruby File.open('.ruby-version', 'rb') { |f| f.read.chomp }
+ruby File.open(".ruby-version", "rb") { |f| f.read.chomp }
 
-gem 'awesome_print'
+gem "awesome_print"
 
-gem 'guard'
-gem 'guard-rspec', require: false
+gem "guard"
+gem "guard-rspec", require: false
 
-gem 'pry', '~> 0.15.0'
+gem "pry", "~> 0.15.0"
 
-gem 'rake', '~> 13.2'
-gem 'rspec', '~> 3.13.0'
-gem 'rubocop', '~> 1.69.0'
-gem 'rubocop-rake', '0.6.0', require: false
-gem 'rubocop-rspec', '3.2.0', require: false
+gem "rake", "~> 13.2"
+gem "rspec", "~> 3.13.0"
+gem "rubocop", "~> 1.69.0"
+gem "rubocop-rake", "0.6.0", require: false
+gem "rubocop-rspec", "3.2.0", require: false
diff --git a/2024/ruby/Guardfile b/2024/ruby/Guardfile
@@ -26,8 +26,8 @@
 #  * zeus: 'zeus rspec' (requires the server to be started separately)
 #  * 'just' rspec: 'rspec'
 
-guard :rspec, cmd: 'bundle exec rspec' do
-  require 'guard/rspec/dsl'
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 
   # Feel free to open issues for suggestions and improvements
@@ -67,6 +67,6 @@ guard :rspec, cmd: 'bundle exec rspec' do
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance'
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
   end
 end
diff --git a/2024/ruby/Rakefile b/2024/ruby/Rakefile
@@ -42,10 +42,6 @@ task :new do
     erb = ERB.new(File.read(h[:template]))
     rendered = erb.result_with_hash(require_path: basename, day_number: formatted_day)
 
-    puts "creating #{path}"
-    puts rendered.inspect
-    puts "----------------"
-
     File.write(path, rendered)
   end
 
diff --git a/2024/ruby/lib/advent_01_hystorian_hysteria.rb b/2024/ruby/lib/advent_01_hystorian_hysteria.rb
@@ -1,8 +1,8 @@
-require 'pry'
+require "pry"
 
 class DistanceCalculator
   def initialize(list_one, list_two)
-    raise 'lists must be the same length' if list_one.length != list_two.length
+    raise "lists must be the same length" if list_one.length != list_two.length
 
     @list_one = list_one
     @list_two = list_two
diff --git a/2024/ruby/lib/advent_02_red_nosed_reports.rb b/2024/ruby/lib/advent_02_red_nosed_reports.rb
@@ -6,7 +6,7 @@ def initialize(levels)
   end
 
   def initial_direction(levels)
-    levels.length > 1 && levels[0] < levels[1] ? 'increasing' : 'decreasing'
+    levels.length > 1 && levels[0] < levels[1] ? "increasing" : "decreasing"
   end
 
   def safe_with_dampener?
@@ -44,7 +44,7 @@ def safe?
   end
 
   def valid_direction?(direction, level, prev)
-    (prev < level && direction == 'increasing') || (prev > level && direction == 'decreasing')
+    (prev < level && direction == "increasing") || (prev > level && direction == "decreasing")
   end
 
   def adjacent_safe?(prev, level)
diff --git a/2024/ruby/lib/advent_03_mull_it_over.rb b/2024/ruby/lib/advent_03_mull_it_over.rb
@@ -25,7 +25,7 @@ def uncorrupted_pieces
   end
 
   def process_piece(str)
-    splits = str.tr('^0123456789,', '').split(',')
+    splits = str.tr("^0123456789,", "").split(",")
 
     splits[0].to_i * splits[1].to_i
   end
diff --git a/2024/ruby/lib/advent_04_ceres_search.rb b/2024/ruby/lib/advent_04_ceres_search.rb
@@ -1,7 +1,7 @@
 class WordSearch
   attr_reader :data, :word
 
-  def initialize(data, word = 'XMAS')
+  def initialize(data, word = "XMAS")
     @data = data
     @word = word
   end
@@ -19,16 +19,16 @@ def count_at(row, col)
   end
 
   def letter_at(row, col)
-    in_bounds?(row, col) ? data[row][col] : ''
+    in_bounds?(row, col) ? data[row][col] : ""
   end
 
   def horizontal_word(row, col)
     first = col
     last = col + word.length - 1
 
-    return '' unless in_bounds?(first, last)
+    return "" unless in_bounds?(first, last)
 
-    data[row][first..last] * ''
+    data[row][first..last] * ""
   end
 
   def horizontal?(row, col)
@@ -38,7 +38,7 @@ def horizontal?(row, col)
   def vertical_word(row, col)
     (row..row + word.length - 1).map do |pos|
       letter_at(pos, col)
-    end * ''
+    end * ""
   end
 
   def vertical?(row, col)
@@ -48,41 +48,41 @@ def vertical?(row, col)
   def diagonal_top_left_word(row, col)
     (0..word.length - 1).map do |pos|
       letter_at(row - pos, col - pos)
-    end * ''
+    end * ""
   end
 
   def diagonal_top_right_word(row, col)
     (0..word.length - 1).map do |pos|
       letter_at(row - pos, col + pos)
-    end * ''
+    end * ""
   end
 
   def diagonal_bottom_right_word(row, col)
     (0..word.length - 1).map do |pos|
       letter_at(row + pos, col + pos)
-    end * ''
+    end * ""
   end
 
   def diagonal_bottom_left_word(row, col)
     (0..word.length - 1).map do |pos|
       letter_at(row + pos, col - pos)
-    end * ''
+    end * ""
   end
 
   def match?(str)
     [str, str.reverse].any? { |w| w == word }
   end
 
   def cross_word_at?(row, col)
-    cross_word = 'MAS'
+    cross_word = "MAS"
 
-    diag_1 = letter_at(row - 1, col - 1) + letter_at(row, col) + letter_at(row + 1, col + 1)
-    diag_2 = letter_at(row + 1, col - 1) + letter_at(row, col) + letter_at(row - 1, col + 1)
+    diag1 = letter_at(row - 1, col - 1) + letter_at(row, col) + letter_at(row + 1, col + 1)
+    diag2 = letter_at(row + 1, col - 1) + letter_at(row, col) + letter_at(row - 1, col + 1)
 
-    diag_1_match = [cross_word, cross_word.reverse].any? { |str| str == diag_1 }
-    diag_2_match = [cross_word, cross_word.reverse].any? { |str| str == diag_2 }
+    diag1_match = [cross_word, cross_word.reverse].any? { |str| str == diag1 }
+    diag2_match = [cross_word, cross_word.reverse].any? { |str| str == diag2 }
 
-    diag_1_match && diag_2_match
+    diag1_match && diag2_match
   end
 
   def cross_word_count
@@ -147,9 +147,3 @@ def render
     end
   end
 end
-
-def badName
-  return unless something
-
-  test
-end
diff --git a/2024/ruby/spec/advent_01_hystorian_hysteria_spec.rb b/2024/ruby/spec/advent_01_hystorian_hysteria_spec.rb
diff --git a/2024/ruby/spec/advent_02_red_nosed_reports_spec.rb b/2024/ruby/spec/advent_02_red_nosed_reports_spec.rb
diff --git a/2024/ruby/spec/advent_03_mull_it_over_spec.rb b/2024/ruby/spec/advent_03_mull_it_over_spec.rb
diff --git a/2024/ruby/spec/advent_03_spec.rb b/2024/ruby/spec/advent_03_spec.rb
diff --git a/2024/ruby/spec/advent_04_ceres_search_spec.rb b/2024/ruby/spec/advent_04_ceres_search_spec.rb
diff --git a/2024/ruby/spec/advent_04_spec.rb b/2024/ruby/spec/advent_04_spec.rb
diff --git a/2024/ruby/spec/spec_helper.rb b/2024/ruby/spec/spec_helper.rb
