From 22ab12260428c11048a418940578b81986840557 Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Mon, 14 Dec 2020 16:07:43 -0600 Subject: [PATCH] Added .rubocop.yml, sync. --- .rubocop.yml | 8 ++++++++ lib/dialogs/tacnet_dialog.rb | 4 ++-- lib/states/new_editor.rb | 2 +- lib/tacnet.rb | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 .rubocop.yml diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 0000000..d71fccd --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,8 @@ +Style/StringLiterals: + EnforcedStyle: double_quotes + +Metrics/MethodLength: + Max: 40 + +Style/EmptyMethod: + EnforcedStyle: expanded \ No newline at end of file diff --git a/lib/dialogs/tacnet_dialog.rb b/lib/dialogs/tacnet_dialog.rb index 24b7ae5..60b0b10 100644 --- a/lib/dialogs/tacnet_dialog.rb +++ b/lib/dialogs/tacnet_dialog.rb @@ -6,9 +6,9 @@ module TAC @titlebar.style.background = [ Palette::TACNET_PRIMARY, Palette::TACNET_SECONDARY ] background Gosu::Color::GRAY - label @options[:message] + label @options[:message], width: 1.0 - @sound = Gosu::Sample.new(TAC::ROOT_PATH + "/media/error_alarm.ogg").play(1, 1, true) + @sound = Gosu::Sample.new("#{TAC::ROOT_PATH}/media/error_alarm.ogg").play(1, 1, true) button "Close", width: 1.0, margin_top: THEME_DIALOG_BUTTON_PADDING do close diff --git a/lib/states/new_editor.rb b/lib/states/new_editor.rb index 8533d35..9a4829a 100644 --- a/lib/states/new_editor.rb +++ b/lib/states/new_editor.rb @@ -40,7 +40,7 @@ class NewEditor < CyberarmEngine::GuiState end button get_image("#{TAC::ROOT_PATH}/media/icons/larger.png"), tip: "Maximize", image_height: 1.0 do |btn| - window.maximize + window.maximize if window.respond_to?(:maximize) end button get_image("#{TAC::ROOT_PATH}/media/icons/cross.png"), tip: "Exit", image_height: 1.0, **TAC::THEME_DANGER_BUTTON do diff --git a/lib/tacnet.rb b/lib/tacnet.rb index 2ba615e..c14d210 100644 --- a/lib/tacnet.rb +++ b/lib/tacnet.rb @@ -41,15 +41,15 @@ module TAC net_stats += "Data Received: #{client.data_received} bytes\n" "Status: #{_status}\n\n#{net_stats}" - elsif @connection && @connection.client && @connection.client.socket_error? - "Status: #{_status}\n\n#{@connection.client.last_socket_error.to_s.chars.each_slice(80).to_a.map { |c| c.join }.join("\n")}" + elsif @connection&.client && @connection.client.socket_error? + "Status: #{_status}\n\n#{@connection.client.last_socket_error.to_s}" else "Status: #{_status}" end end def connected? - @connection && @connection.connected? + @connection&.connected? end def close