Change Screen class et al's initializer method signatures

Author: 0x2c7

.rubocop.yml

@@ -83,7 +83,7 @@ Style/NilComparison:
   Enabled: false
 Style/NonNilCheck:
   Enabled: false
-Style/WordArry:
+Style/WordArray:
   Enabled: false
 
 RSpec/MultipleExpectations:

Gemfile

@@ -22,6 +22,5 @@ group :test do
   gem 'parallel_tests'
   gem 'reline', require: false
   gem 'rspec-retry'
-  gem 'simplecov', require: false
   gem 'sqlite3'
 end

lib/ruby_jard/screen.rb

@@ -8,10 +8,10 @@ module RubyJard
   class Screen
     attr_accessor :layout, :rows, :window, :cursor, :selected
 
-    def initialize(layout, session: nil, config: nil)
+    def initialize(layout:, session: nil, config: nil)
+      @layout = layout
       @session = session || RubyJard::Session.instance
       @config = config || RubyJard.config
-      @layout = layout
       @window = []
       @cursor = nil
       @selected = 0

lib/ruby_jard/screen_manager.rb

@@ -124,7 +124,7 @@ def calculate_layouts(width, height)
     def build_screens(layouts)
       screens = layouts.map do |layout|
         screen_class = fetch_screen(layout.template.screen)
-        screen = screen_class.new(layout)
+        screen = screen_class.new(layout: layout)
         RubyJard.benchmark("build_screen #{screen.class}") do
           screen.build
           render_screen(screen)
@@ -134,7 +134,7 @@ def build_screens(layouts)
       RubyJard::ScreenAdjuster.new(screens).adjust
       layouts.map do |layout|
         screen_class = fetch_screen(layout.template.screen)
-        screen = screen_class.new(layout)
+        screen = screen_class.new(layout: layout)
         screen.build
         render_screen(screen)
         screen

lib/ruby_jard/screens/backtrace_screen.rb

@@ -7,8 +7,8 @@ class Screens
     class BacktraceScreen < RubyJard::Screen
       include ::RubyJard::Span::DSL
 
-      def initialize(*args)
-        super(*args)
+      def initialize(**args)
+        super(**args)
         @current_frame = @session.current_frame
         @frames =
           @session

lib/ruby_jard/screens/menu_screen.rb

@@ -7,8 +7,8 @@ class Screens
     class MenuScreen < RubyJard::Screen
       include ::RubyJard::Span::DSL
 
-      def initialize(*args)
-        super(*args)
+      def initialize(**args)
+        super(**args)
         @key_bindings = @config.key_bindings
         @filter = @config.filter
         @filter_included = @config.filter_included

lib/ruby_jard/screens/source_screen.rb

@@ -7,8 +7,8 @@ class Screens
     class SourceScreen < RubyJard::Screen
       include ::RubyJard::Span::DSL
 
-      def initialize(*args)
-        super
+      def initialize(**args)
+        super(**args)
         @frame_file = @session.current_frame&.frame_file
         @frame_line = @session.current_frame&.frame_line
 

lib/ruby_jard/screens/threads_screen.rb

@@ -7,8 +7,8 @@ class Screens
     class ThreadsScreen < RubyJard::Screen
       include ::RubyJard::Span::DSL
 
-      def initialize(*args)
-        super
+      def initialize(**args)
+        super(**args)
         @current_frame_location = @session.current_frame&.frame_location
         @current_thread = @session.current_thread
         @threads = @session.threads

lib/ruby_jard/screens/variables_screen.rb

@@ -40,8 +40,8 @@ class VariablesScreen < RubyJard::Screen
       }.freeze
       TOKEN_KINDS = TOKEN_KIND_MAPS.keys.flatten
 
-      def initialize(*args)
-        super
+      def initialize(**args)
+        super(**args)
 
         @frame_file = @session.current_frame&.frame_file
         @frame_line = @session.current_frame&.frame_line

spec/ruby_jard/screen_adjuster_spec.rb

@@ -36,7 +36,7 @@
   end
 
   context 'when there is only 1 screen' do
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
     let(:adjuster) { described_class.new([screen_1]) }
 
     before do
@@ -80,8 +80,8 @@
       )
     end
 
-    let(:screen_3) { RubyJard::Screen.new(layout_3) }
-    let(:screen_4) { RubyJard::Screen.new(layout_4) }
+    let(:screen_3) { RubyJard::Screen.new(layout: layout_3) }
+    let(:screen_4) { RubyJard::Screen.new(layout: layout_4) }
     let(:adjuster) { described_class.new([screen_3, screen_4]) }
 
     before do
@@ -135,8 +135,8 @@
       )
     end
 
-    let(:screen_3) { RubyJard::Screen.new(layout_3) }
-    let(:screen_4) { RubyJard::Screen.new(layout_4) }
+    let(:screen_3) { RubyJard::Screen.new(layout: layout_3) }
+    let(:screen_4) { RubyJard::Screen.new(layout: layout_4) }
     let(:adjuster) { described_class.new([screen_3, screen_4]) }
 
     before do
@@ -167,8 +167,8 @@
   end
 
   context 'when all of the screens still have spaces left' do
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
     let(:adjuster) { described_class.new([screen_1, screen_2]) }
 
     before do
@@ -199,8 +199,8 @@
   end
 
   context 'when first screen needs to expand and second one is shrinkable' do
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
 
     let(:adjuster) { described_class.new([screen_1, screen_2]) }
 
@@ -232,9 +232,9 @@
   end
 
   context 'when first screen needs to expand and second one has min_height attribute' do
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
     let(:template_2) { RubyJard::ScreenTemplate.new(min_height: 3) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
 
     let(:adjuster) { described_class.new([screen_1, screen_2]) }
 
@@ -276,7 +276,7 @@
         parent_template: parent_template_a
       )
     end
-    let(:screen_3) { RubyJard::Screen.new(layout_3) }
+    let(:screen_3) { RubyJard::Screen.new(layout: layout_3) }
 
     let(:layout_4) do
       RubyJard::Layout.new(
@@ -288,7 +288,7 @@
         parent_template: parent_template_a
       )
     end
-    let(:screen_4) { RubyJard::Screen.new(layout_4) }
+    let(:screen_4) { RubyJard::Screen.new(layout: layout_4) }
 
     let(:adjuster) { described_class.new([screen_3, screen_4]) }
 
@@ -320,8 +320,8 @@
   end
 
   context 'when all of screens are full' do
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
 
     let(:adjuster) { described_class.new([screen_1, screen_2]) }
 
@@ -354,8 +354,8 @@
 
   context 'when both screens have spaces left but the first one has expand mode' do
     let(:template_1) { RubyJard::ScreenTemplate.new(adjust_mode: :expand) }
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
 
     let(:adjuster) { described_class.new([screen_1, screen_2]) }
 
@@ -389,8 +389,8 @@
   context 'when both screens have spaces left and both have expand mode' do
     let(:template_1) { RubyJard::ScreenTemplate.new(adjust_mode: :expand) }
     let(:template_2) { RubyJard::ScreenTemplate.new(adjust_mode: :expand) }
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
 
     let(:adjuster) { described_class.new([screen_1, screen_2]) }
 
@@ -444,10 +444,10 @@
       )
     end
 
-    let(:screen_1) { RubyJard::Screen.new(layout_1) }
-    let(:screen_2) { RubyJard::Screen.new(layout_2) }
-    let(:screen_3) { RubyJard::Screen.new(layout_3) }
-    let(:screen_4) { RubyJard::Screen.new(layout_4) }
+    let(:screen_1) { RubyJard::Screen.new(layout: layout_1) }
+    let(:screen_2) { RubyJard::Screen.new(layout: layout_2) }
+    let(:screen_3) { RubyJard::Screen.new(layout: layout_3) }
+    let(:screen_4) { RubyJard::Screen.new(layout: layout_4) }
 
     let(:adjuster) { described_class.new([screen_1, screen_2, screen_3, screen_4]) }
 

spec/ruby_jard/screens/menu_screen_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe RubyJard::Screens::MenuScreen do
-  subject(:menu_screen) { described_class.new(layout, config: config) }
+  subject(:menu_screen) { described_class.new(layout: layout, config: config) }
 
   let(:config) { RubyJard::Config.new }
   let(:layout) do
@@ -55,12 +55,12 @@
     end
   end
 
-  context ' when an command does not have a corresponding key binding' do
+  context 'when an command does not have a corresponding key binding' do
     it 'displays excludes their labels' do
       config.key_bindings = {
         RubyJard::Keys::META_D        => 'step',
         RubyJard::Keys::META_O        => 'step-out',
-        RubyJard::Keys::CTRL_META_N   => 'next',
+        RubyJard::Keys::CTRL_META_N   => 'next'
       }
 
       menu_screen.build