From 3e5588383ef3c00ecde95361f55497f1cfa2f95b Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:27:01 -0600 Subject: [PATCH 01/18] Add rubocop and rubocop-github gems. --- Gemfile.lock | 35 +++++++++++++++++++++++++++++++++++ timex_datalink_client.gemspec | 2 ++ 2 files changed, 37 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 6353451..a55cef6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,6 +17,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) + ast (2.4.2) backports (3.23.0) concurrent-ruby (1.1.10) crc (0.4.2) @@ -24,9 +25,16 @@ GEM ffi (1.15.5) i18n (1.12.0) concurrent-ruby (~> 1.0) + json (2.6.3) mdb (0.5.0) minitest (5.16.3) + parallel (1.22.1) + parser (3.1.3.0) + ast (~> 2.4.1) + rack (3.0.2) rainbow (3.1.1) + regexp_parser (2.6.1) + rexml (3.2.5) rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) @@ -40,10 +48,35 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) + rubocop (1.41.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.1.2.1) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.23.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.24.0) + parser (>= 3.1.1.0) + rubocop-github (0.20.0) + rubocop (>= 1.37) + rubocop-performance (>= 1.15) + rubocop-rails (>= 2.17) + rubocop-performance (1.15.2) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.17.4) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + ruby-progressbar (1.11.0) rubyserial (0.6.0) ffi (~> 1.9, >= 1.9.3) tzinfo (2.0.5) concurrent-ruby (~> 1.0) + unicode-display_width (2.3.0) webrick (1.7.0) yard (0.9.28) webrick (~> 1.7.0) @@ -57,6 +90,8 @@ PLATFORMS DEPENDENCIES rspec (~> 3.11.0) + rubocop (~> 1.41.1) + rubocop-github (~> 0.20.0) timex_datalink_client! tzinfo (~> 2.0.5) yard-junk (~> 0.0.9) diff --git a/timex_datalink_client.gemspec b/timex_datalink_client.gemspec index 39a7cc4..d7ac35e 100644 --- a/timex_datalink_client.gemspec +++ b/timex_datalink_client.gemspec @@ -94,6 +94,8 @@ Gem::Specification.new do |s| s.add_dependency "rubyserial", "~> 0.6.0" s.add_development_dependency "rspec", "~> 3.11.0" + s.add_development_dependency "rubocop", "~> 1.41.1" + s.add_development_dependency "rubocop-github", "~> 0.20.0" s.add_development_dependency "tzinfo", "~> 2.0.5" s.add_development_dependency "yard-junk", "~> 0.0.9" end From 6d6b8a39dc0accd0fc08fb8bb6c499b7de0827ed Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:27:22 -0600 Subject: [PATCH 02/18] Add .rubocop.yml. --- .rubocop.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .rubocop.yml diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 0000000..c212170 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,6 @@ +inherit_gem: + rubocop-github: + - config/default.yml + +AllCops: + NewCops: enable From d5944b90dc362f80165e29db7eee9674dac95376 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:28:23 -0600 Subject: [PATCH 03/18] Add rubocop CI job. --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a34c35c..dcf244a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,15 @@ jobs: bundler-cache: true - run: bundle exec rspec --format=documentation + rubocop: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + - run: bundle exec rubocop + yard_junk: runs-on: ubuntu-latest steps: From 1cbe20e3c1845a15865ccd172ceb91669ead0971 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:34:43 -0600 Subject: [PATCH 04/18] Use flat_map in TimexDatalinkClient. --- lib/timex_datalink_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/timex_datalink_client.rb b/lib/timex_datalink_client.rb index 1c67dde..0abd661 100644 --- a/lib/timex_datalink_client.rb +++ b/lib/timex_datalink_client.rb @@ -104,7 +104,7 @@ def write # # @return [Array>] Two-dimensional array of integers that represent bytes. def packets - models.map(&:packets).flatten(1) + models.flat_map(&:packets) end private From 1efcbbdbe81ce6d42fd0507c7b58efe8489545a6 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:37:32 -0600 Subject: [PATCH 05/18] Omit hash values in TimexDatalinkClient. --- lib/timex_datalink_client.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/timex_datalink_client.rb b/lib/timex_datalink_client.rb index 0abd661..2b74c95 100644 --- a/lib/timex_datalink_client.rb +++ b/lib/timex_datalink_client.rb @@ -111,10 +111,10 @@ def packets def notebook_adapter @notebook_adapter ||= NotebookAdapter.new( - serial_device: serial_device, - byte_sleep: byte_sleep, - packet_sleep: packet_sleep, - verbose: verbose + serial_device:, + byte_sleep:, + packet_sleep:, + verbose: ) end end From 9776499b62144ccef8b715311bc544d5e90caec1 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:39:27 -0600 Subject: [PATCH 06/18] Omit hash value in CharEncoders#eeprom_chars_for. --- lib/timex_datalink_client/helpers/char_encoders.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/timex_datalink_client/helpers/char_encoders.rb b/lib/timex_datalink_client/helpers/char_encoders.rb index f015ccf..ed974ab 100644 --- a/lib/timex_datalink_client/helpers/char_encoders.rb +++ b/lib/timex_datalink_client/helpers/char_encoders.rb @@ -20,7 +20,7 @@ def chars_for(string_chars, char_map: CHARS, length: nil, pad: false) end def eeprom_chars_for(string_chars, length: 31) - chars = chars_for(string_chars, char_map: EEPROM_CHARS, length: length).append(EEPROM_TERMINATOR) + chars = chars_for(string_chars, char_map: EEPROM_CHARS, length:).append(EEPROM_TERMINATOR) packed_int = chars.each_with_index.sum do |char, index| char << (6 * index) From b1bc5ccdf846e850b0a9236540f47eafeea2169b Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:41:04 -0600 Subject: [PATCH 07/18] Omit hash values in NotebookAdapter specs. --- spec/lib/timex_datalink_client/notebook_adapter_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/lib/timex_datalink_client/notebook_adapter_spec.rb b/spec/lib/timex_datalink_client/notebook_adapter_spec.rb index aa83c73..ea1f430 100644 --- a/spec/lib/timex_datalink_client/notebook_adapter_spec.rb +++ b/spec/lib/timex_datalink_client/notebook_adapter_spec.rb @@ -10,10 +10,10 @@ subject(:notebook_adapter) do described_class.new( - serial_device: serial_device, - byte_sleep: byte_sleep, - packet_sleep: packet_sleep, - verbose: verbose + serial_device:, + byte_sleep:, + packet_sleep:, + verbose: ) end From f5563b2ad0133ffe64c48c79f7c502e766a63d89 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:43:05 -0600 Subject: [PATCH 08/18] Omit has values in TimexDatalinkClient specs. --- spec/lib/timex_datalink_client_spec.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/lib/timex_datalink_client_spec.rb b/spec/lib/timex_datalink_client_spec.rb index 9658e8f..b11a516 100644 --- a/spec/lib/timex_datalink_client_spec.rb +++ b/spec/lib/timex_datalink_client_spec.rb @@ -35,11 +35,11 @@ let(:timex_datalink_client) do described_class.new( - serial_device: serial_device, - models: models, - byte_sleep: byte_sleep, - packet_sleep: packet_sleep, - verbose: verbose + serial_device:, + models:, + byte_sleep:, + packet_sleep:, + verbose: ) end @@ -83,10 +83,10 @@ allow(notebook_adapter_double).to receive(:write) expect(TimexDatalinkClient::NotebookAdapter).to receive(:new).with( - serial_device: serial_device, - byte_sleep: byte_sleep, - packet_sleep: packet_sleep, - verbose: verbose + serial_device:, + byte_sleep:, + packet_sleep:, + verbose: ).and_return(notebook_adapter_double) write From 5a6cf54439b0f006e1e4ecc3254d1450709fe2df Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:44:13 -0600 Subject: [PATCH 09/18] Omit hash values in Protocol9::Timer specs. --- spec/lib/timex_datalink_client/protocol_9/timer_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_9/timer_spec.rb b/spec/lib/timex_datalink_client/protocol_9/timer_spec.rb index 13b7b61..14ca564 100644 --- a/spec/lib/timex_datalink_client/protocol_9/timer_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/timer_spec.rb @@ -10,10 +10,10 @@ let(:timer) do described_class.new( - number: number, - label: label, - time: time, - action_at_end: action_at_end + number:, + label:, + time:, + action_at_end: ) end From 7054da8de6e8ba9ba677e237b418e171d8a6a85b Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:45:17 -0600 Subject: [PATCH 10/18] Omit hash values in Protocol9::Time specs. --- spec/lib/timex_datalink_client/protocol_9/time_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_9/time_spec.rb b/spec/lib/timex_datalink_client/protocol_9/time_spec.rb index 0c2d14b..9903bc9 100644 --- a/spec/lib/timex_datalink_client/protocol_9/time_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/time_spec.rb @@ -9,9 +9,9 @@ let(:time_instance) do described_class.new( - zone: zone, - is_24h: is_24h, - time: time + zone:, + is_24h:, + time: ) end From ddb0d68f25a2d31fc494d3ddcb08b8ef817e22b7 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:46:07 -0600 Subject: [PATCH 11/18] Omit hash values in Protocol9::TimeName specs. --- spec/lib/timex_datalink_client/protocol_9/time_name_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_9/time_name_spec.rb b/spec/lib/timex_datalink_client/protocol_9/time_name_spec.rb index 6997ee1..5306957 100644 --- a/spec/lib/timex_datalink_client/protocol_9/time_name_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/time_name_spec.rb @@ -8,8 +8,8 @@ let(:time_instance) do described_class.new( - zone: zone, - name: name + zone:, + name: ) end From 06b685e8b29b6a7e6344b29bdcbe4332f53eed0f Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:47:31 -0600 Subject: [PATCH 12/18] Omit hash values in Sync specs. --- spec/lib/timex_datalink_client/protocol_1/sync_spec.rb | 2 +- spec/lib/timex_datalink_client/protocol_3/sync_spec.rb | 2 +- spec/lib/timex_datalink_client/protocol_4/sync_spec.rb | 2 +- spec/lib/timex_datalink_client/protocol_7/sync_spec.rb | 2 +- spec/lib/timex_datalink_client/protocol_9/sync_spec.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_1/sync_spec.rb b/spec/lib/timex_datalink_client/protocol_1/sync_spec.rb index bcc3768..1268479 100644 --- a/spec/lib/timex_datalink_client/protocol_1/sync_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/sync_spec.rb @@ -4,7 +4,7 @@ describe TimexDatalinkClient::Protocol1::Sync do let(:length) { 200 } - let(:sync) { described_class.new(length: length) } + let(:sync) { described_class.new(length:) } describe "#packets" do subject(:packets) { sync.packets } diff --git a/spec/lib/timex_datalink_client/protocol_3/sync_spec.rb b/spec/lib/timex_datalink_client/protocol_3/sync_spec.rb index 392c5e6..530edd8 100644 --- a/spec/lib/timex_datalink_client/protocol_3/sync_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/sync_spec.rb @@ -4,7 +4,7 @@ describe TimexDatalinkClient::Protocol3::Sync do let(:length) { 200 } - let(:sync) { described_class.new(length: length) } + let(:sync) { described_class.new(length:) } describe "#packets" do subject(:packets) { sync.packets } diff --git a/spec/lib/timex_datalink_client/protocol_4/sync_spec.rb b/spec/lib/timex_datalink_client/protocol_4/sync_spec.rb index 0d9b405..6db7eba 100644 --- a/spec/lib/timex_datalink_client/protocol_4/sync_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/sync_spec.rb @@ -4,7 +4,7 @@ describe TimexDatalinkClient::Protocol4::Sync do let(:length) { 200 } - let(:sync) { described_class.new(length: length) } + let(:sync) { described_class.new(length:) } describe "#packets" do subject(:packets) { sync.packets } diff --git a/spec/lib/timex_datalink_client/protocol_7/sync_spec.rb b/spec/lib/timex_datalink_client/protocol_7/sync_spec.rb index 4b2408e..89e472b 100644 --- a/spec/lib/timex_datalink_client/protocol_7/sync_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/sync_spec.rb @@ -4,7 +4,7 @@ describe TimexDatalinkClient::Protocol7::Sync do let(:length) { 200 } - let(:sync) { described_class.new(length: length) } + let(:sync) { described_class.new(length:) } describe "#packets" do subject(:packets) { sync.packets } diff --git a/spec/lib/timex_datalink_client/protocol_9/sync_spec.rb b/spec/lib/timex_datalink_client/protocol_9/sync_spec.rb index 332d1cd..1d6d836 100644 --- a/spec/lib/timex_datalink_client/protocol_9/sync_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/sync_spec.rb @@ -4,7 +4,7 @@ describe TimexDatalinkClient::Protocol9::Sync do let(:length) { 200 } - let(:sync) { described_class.new(length: length) } + let(:sync) { described_class.new(length:) } describe "#packets" do subject(:packets) { sync.packets } From 5dc0df7854fb54dba9930e73dfb3a09e28355510 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:48:49 -0600 Subject: [PATCH 13/18] Omit hash values for protocol 9 specs. --- .../timex_datalink_client/protocol_9/alarm_spec.rb | 12 ++++++------ .../protocol_9/eeprom/chrono_spec.rb | 4 ++-- .../protocol_9/eeprom/phone_number_spec.rb | 6 +++--- .../timex_datalink_client/protocol_9/eeprom_spec.rb | 4 ++-- .../protocol_9/sound_options_spec.rb | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_9/alarm_spec.rb b/spec/lib/timex_datalink_client/protocol_9/alarm_spec.rb index e644790..78eb3e3 100644 --- a/spec/lib/timex_datalink_client/protocol_9/alarm_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/alarm_spec.rb @@ -12,12 +12,12 @@ let(:alarm) do described_class.new( - number: number, - audible: audible, - time: time, - message: message, - month: month, - day: day + number:, + audible:, + time:, + message:, + month:, + day: ) end diff --git a/spec/lib/timex_datalink_client/protocol_9/eeprom/chrono_spec.rb b/spec/lib/timex_datalink_client/protocol_9/eeprom/chrono_spec.rb index 9656dc7..a5043d4 100644 --- a/spec/lib/timex_datalink_client/protocol_9/eeprom/chrono_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/eeprom/chrono_spec.rb @@ -8,8 +8,8 @@ let(:timer) do described_class.new( - label: label, - laps: laps + label:, + laps: ) end diff --git a/spec/lib/timex_datalink_client/protocol_9/eeprom/phone_number_spec.rb b/spec/lib/timex_datalink_client/protocol_9/eeprom/phone_number_spec.rb index 1847472..dac3783 100644 --- a/spec/lib/timex_datalink_client/protocol_9/eeprom/phone_number_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/eeprom/phone_number_spec.rb @@ -9,9 +9,9 @@ let(:phone_number) do described_class.new( - name: name, - number: number, - type: type + name:, + number:, + type: ) end diff --git a/spec/lib/timex_datalink_client/protocol_9/eeprom_spec.rb b/spec/lib/timex_datalink_client/protocol_9/eeprom_spec.rb index c6d1685..901b062 100644 --- a/spec/lib/timex_datalink_client/protocol_9/eeprom_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/eeprom_spec.rb @@ -27,8 +27,8 @@ let(:eeprom) do described_class.new( - chrono: chrono, - phone_numbers: phone_numbers + chrono:, + phone_numbers: ) end diff --git a/spec/lib/timex_datalink_client/protocol_9/sound_options_spec.rb b/spec/lib/timex_datalink_client/protocol_9/sound_options_spec.rb index 084e6cb..eef1d56 100644 --- a/spec/lib/timex_datalink_client/protocol_9/sound_options_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_9/sound_options_spec.rb @@ -8,8 +8,8 @@ let(:sound_options) do described_class.new( - hourly_chime: hourly_chime, - button_beep: button_beep + hourly_chime:, + button_beep: ) end From 16fd3f1366f67c498806725b526381f534cb0a47 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:49:21 -0600 Subject: [PATCH 14/18] Omit hash values for protocol 1 specs. --- .../timex_datalink_client/protocol_1/alarm_spec.rb | 12 ++++++------ .../protocol_1/eeprom/anniversary_spec.rb | 4 ++-- .../protocol_1/eeprom/appointment_spec.rb | 4 ++-- .../protocol_1/eeprom/list_spec.rb | 4 ++-- .../protocol_1/eeprom/phone_number_spec.rb | 6 +++--- .../timex_datalink_client/protocol_1/eeprom_spec.rb | 10 +++++----- .../protocol_1/time_name_spec.rb | 4 ++-- .../timex_datalink_client/protocol_1/time_spec.rb | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_1/alarm_spec.rb b/spec/lib/timex_datalink_client/protocol_1/alarm_spec.rb index 4d79c63..368e0ee 100644 --- a/spec/lib/timex_datalink_client/protocol_1/alarm_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/alarm_spec.rb @@ -12,12 +12,12 @@ let(:alarm) do described_class.new( - number: number, - audible: audible, - time: time, - message: message, - month: month, - day: day + number:, + audible:, + time:, + message:, + month:, + day: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/eeprom/anniversary_spec.rb b/spec/lib/timex_datalink_client/protocol_1/eeprom/anniversary_spec.rb index 90ced8b..4d4006f 100644 --- a/spec/lib/timex_datalink_client/protocol_1/eeprom/anniversary_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/eeprom/anniversary_spec.rb @@ -8,8 +8,8 @@ let(:anniversary_instance) do described_class.new( - time: time, - anniversary: anniversary + time:, + anniversary: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/eeprom/appointment_spec.rb b/spec/lib/timex_datalink_client/protocol_1/eeprom/appointment_spec.rb index bd34fbf..d65dcfd 100644 --- a/spec/lib/timex_datalink_client/protocol_1/eeprom/appointment_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/eeprom/appointment_spec.rb @@ -8,8 +8,8 @@ let(:appointment) do described_class.new( - time: time, - message: message + time:, + message: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/eeprom/list_spec.rb b/spec/lib/timex_datalink_client/protocol_1/eeprom/list_spec.rb index 64f1a0e..a7f6699 100644 --- a/spec/lib/timex_datalink_client/protocol_1/eeprom/list_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/eeprom/list_spec.rb @@ -8,8 +8,8 @@ let(:list) do described_class.new( - list_entry: list_entry, - priority: priority + list_entry:, + priority: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/eeprom/phone_number_spec.rb b/spec/lib/timex_datalink_client/protocol_1/eeprom/phone_number_spec.rb index ddcdcb9..5847e60 100644 --- a/spec/lib/timex_datalink_client/protocol_1/eeprom/phone_number_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/eeprom/phone_number_spec.rb @@ -9,9 +9,9 @@ let(:phone_number) do described_class.new( - name: name, - number: number, - type: type + name:, + number:, + type: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/eeprom_spec.rb b/spec/lib/timex_datalink_client/protocol_1/eeprom_spec.rb index 6d2366a..bea26cf 100644 --- a/spec/lib/timex_datalink_client/protocol_1/eeprom_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/eeprom_spec.rb @@ -61,11 +61,11 @@ let(:eeprom) do described_class.new( - appointments: appointments, - anniversaries: anniversaries, - phone_numbers: phone_numbers, - lists: lists, - appointment_notification: appointment_notification + appointments:, + anniversaries:, + phone_numbers:, + lists:, + appointment_notification: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/time_name_spec.rb b/spec/lib/timex_datalink_client/protocol_1/time_name_spec.rb index e17a384..0dc900b 100644 --- a/spec/lib/timex_datalink_client/protocol_1/time_name_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/time_name_spec.rb @@ -8,8 +8,8 @@ let(:time_instance) do described_class.new( - zone: zone, - name: name + zone:, + name: ) end diff --git a/spec/lib/timex_datalink_client/protocol_1/time_spec.rb b/spec/lib/timex_datalink_client/protocol_1/time_spec.rb index 96fdf62..9eb6c1c 100644 --- a/spec/lib/timex_datalink_client/protocol_1/time_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_1/time_spec.rb @@ -9,9 +9,9 @@ let(:time_instance) do described_class.new( - zone: zone, - is_24h: is_24h, - time: time + zone:, + is_24h:, + time: ) end From 0fae4c7397c9058f83cae0fa634d86c2efa8080b Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:49:58 -0600 Subject: [PATCH 15/18] Omit hash values for protocol 3 specs. --- .../lib/timex_datalink_client/protocol_3/alarm_spec.rb | 8 ++++---- .../protocol_3/eeprom/anniversary_spec.rb | 4 ++-- .../protocol_3/eeprom/appointment_spec.rb | 4 ++-- .../protocol_3/eeprom/list_spec.rb | 4 ++-- .../protocol_3/eeprom/phone_number_spec.rb | 6 +++--- .../timex_datalink_client/protocol_3/eeprom_spec.rb | 10 +++++----- .../protocol_3/sound_options_spec.rb | 4 ++-- .../protocol_3/sound_theme_spec.rb | 4 ++-- spec/lib/timex_datalink_client/protocol_3/time_spec.rb | 10 +++++----- .../timex_datalink_client/protocol_3/wrist_app_spec.rb | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_3/alarm_spec.rb b/spec/lib/timex_datalink_client/protocol_3/alarm_spec.rb index 29929e3..0eef9f4 100644 --- a/spec/lib/timex_datalink_client/protocol_3/alarm_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/alarm_spec.rb @@ -10,10 +10,10 @@ let(:alarm) do described_class.new( - number: number, - audible: audible, - time: time, - message: message + number:, + audible:, + time:, + message: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/eeprom/anniversary_spec.rb b/spec/lib/timex_datalink_client/protocol_3/eeprom/anniversary_spec.rb index 2a6908b..b87dbc3 100644 --- a/spec/lib/timex_datalink_client/protocol_3/eeprom/anniversary_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/eeprom/anniversary_spec.rb @@ -8,8 +8,8 @@ let(:anniversary_instance) do described_class.new( - time: time, - anniversary: anniversary + time:, + anniversary: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/eeprom/appointment_spec.rb b/spec/lib/timex_datalink_client/protocol_3/eeprom/appointment_spec.rb index be29ee3..69f7c4f 100644 --- a/spec/lib/timex_datalink_client/protocol_3/eeprom/appointment_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/eeprom/appointment_spec.rb @@ -8,8 +8,8 @@ let(:appointment) do described_class.new( - time: time, - message: message + time:, + message: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/eeprom/list_spec.rb b/spec/lib/timex_datalink_client/protocol_3/eeprom/list_spec.rb index 94a5859..725c19e 100644 --- a/spec/lib/timex_datalink_client/protocol_3/eeprom/list_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/eeprom/list_spec.rb @@ -8,8 +8,8 @@ let(:list) do described_class.new( - list_entry: list_entry, - priority: priority + list_entry:, + priority: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/eeprom/phone_number_spec.rb b/spec/lib/timex_datalink_client/protocol_3/eeprom/phone_number_spec.rb index 1eef739..87e7f42 100644 --- a/spec/lib/timex_datalink_client/protocol_3/eeprom/phone_number_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/eeprom/phone_number_spec.rb @@ -9,9 +9,9 @@ let(:phone_number) do described_class.new( - name: name, - number: number, - type: type + name:, + number:, + type: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/eeprom_spec.rb b/spec/lib/timex_datalink_client/protocol_3/eeprom_spec.rb index e3e49cd..435dc3a 100644 --- a/spec/lib/timex_datalink_client/protocol_3/eeprom_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/eeprom_spec.rb @@ -61,11 +61,11 @@ let(:eeprom) do described_class.new( - appointments: appointments, - anniversaries: anniversaries, - phone_numbers: phone_numbers, - lists: lists, - appointment_notification: appointment_notification + appointments:, + anniversaries:, + phone_numbers:, + lists:, + appointment_notification: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/sound_options_spec.rb b/spec/lib/timex_datalink_client/protocol_3/sound_options_spec.rb index 5611e49..5f0bfb7 100644 --- a/spec/lib/timex_datalink_client/protocol_3/sound_options_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/sound_options_spec.rb @@ -8,8 +8,8 @@ let(:sound_options) do described_class.new( - hourly_chime: hourly_chime, - button_beep: button_beep + hourly_chime:, + button_beep: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/sound_theme_spec.rb b/spec/lib/timex_datalink_client/protocol_3/sound_theme_spec.rb index 82a2135..a621585 100644 --- a/spec/lib/timex_datalink_client/protocol_3/sound_theme_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/sound_theme_spec.rb @@ -5,8 +5,8 @@ describe TimexDatalinkClient::Protocol3::SoundTheme do let(:sound_theme) do described_class.new( - sound_theme_data: sound_theme_data, - spc_file: spc_file + sound_theme_data:, + spc_file: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/time_spec.rb b/spec/lib/timex_datalink_client/protocol_3/time_spec.rb index 2ee42bd..14103f3 100644 --- a/spec/lib/timex_datalink_client/protocol_3/time_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/time_spec.rb @@ -14,11 +14,11 @@ let(:time_instance) do described_class.new( - zone: zone, - is_24h: is_24h, - date_format: date_format, - time: time, - name: name + zone:, + is_24h:, + date_format:, + time:, + name: ) end diff --git a/spec/lib/timex_datalink_client/protocol_3/wrist_app_spec.rb b/spec/lib/timex_datalink_client/protocol_3/wrist_app_spec.rb index 1f01489..86eb03f 100644 --- a/spec/lib/timex_datalink_client/protocol_3/wrist_app_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_3/wrist_app_spec.rb @@ -5,8 +5,8 @@ describe TimexDatalinkClient::Protocol3::WristApp do let(:wrist_app) do described_class.new( - wrist_app_data: wrist_app_data, - zap_file: zap_file + wrist_app_data:, + zap_file: ) end From 73cf8c5bf4dff97f1065cb8b87dd5bb853ed38f2 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:50:30 -0600 Subject: [PATCH 16/18] Omit hash values for protocol 4 specs. --- .../lib/timex_datalink_client/protocol_4/alarm_spec.rb | 8 ++++---- .../protocol_4/eeprom/anniversary_spec.rb | 4 ++-- .../protocol_4/eeprom/appointment_spec.rb | 4 ++-- .../protocol_4/eeprom/list_spec.rb | 4 ++-- .../protocol_4/eeprom/phone_number_spec.rb | 6 +++--- .../timex_datalink_client/protocol_4/eeprom_spec.rb | 10 +++++----- .../protocol_4/sound_options_spec.rb | 4 ++-- .../protocol_4/sound_theme_spec.rb | 4 ++-- spec/lib/timex_datalink_client/protocol_4/time_spec.rb | 10 +++++----- .../timex_datalink_client/protocol_4/wrist_app_spec.rb | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_4/alarm_spec.rb b/spec/lib/timex_datalink_client/protocol_4/alarm_spec.rb index abacc26..d6cce11 100644 --- a/spec/lib/timex_datalink_client/protocol_4/alarm_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/alarm_spec.rb @@ -10,10 +10,10 @@ let(:alarm) do described_class.new( - number: number, - audible: audible, - time: time, - message: message + number:, + audible:, + time:, + message: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/eeprom/anniversary_spec.rb b/spec/lib/timex_datalink_client/protocol_4/eeprom/anniversary_spec.rb index 599ca54..bd0136c 100644 --- a/spec/lib/timex_datalink_client/protocol_4/eeprom/anniversary_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/eeprom/anniversary_spec.rb @@ -8,8 +8,8 @@ let(:anniversary_instance) do described_class.new( - time: time, - anniversary: anniversary + time:, + anniversary: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/eeprom/appointment_spec.rb b/spec/lib/timex_datalink_client/protocol_4/eeprom/appointment_spec.rb index dcf0f3d..6e7c032 100644 --- a/spec/lib/timex_datalink_client/protocol_4/eeprom/appointment_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/eeprom/appointment_spec.rb @@ -8,8 +8,8 @@ let(:appointment) do described_class.new( - time: time, - message: message + time:, + message: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/eeprom/list_spec.rb b/spec/lib/timex_datalink_client/protocol_4/eeprom/list_spec.rb index 93877f0..ece5ee2 100644 --- a/spec/lib/timex_datalink_client/protocol_4/eeprom/list_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/eeprom/list_spec.rb @@ -8,8 +8,8 @@ let(:list) do described_class.new( - list_entry: list_entry, - priority: priority + list_entry:, + priority: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/eeprom/phone_number_spec.rb b/spec/lib/timex_datalink_client/protocol_4/eeprom/phone_number_spec.rb index d914e9f..48ba69e 100644 --- a/spec/lib/timex_datalink_client/protocol_4/eeprom/phone_number_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/eeprom/phone_number_spec.rb @@ -9,9 +9,9 @@ let(:phone_number) do described_class.new( - name: name, - number: number, - type: type + name:, + number:, + type: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/eeprom_spec.rb b/spec/lib/timex_datalink_client/protocol_4/eeprom_spec.rb index 61315a4..1241a8f 100644 --- a/spec/lib/timex_datalink_client/protocol_4/eeprom_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/eeprom_spec.rb @@ -61,11 +61,11 @@ let(:eeprom) do described_class.new( - appointments: appointments, - anniversaries: anniversaries, - phone_numbers: phone_numbers, - lists: lists, - appointment_notification: appointment_notification + appointments:, + anniversaries:, + phone_numbers:, + lists:, + appointment_notification: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/sound_options_spec.rb b/spec/lib/timex_datalink_client/protocol_4/sound_options_spec.rb index b64252b..ca29a12 100644 --- a/spec/lib/timex_datalink_client/protocol_4/sound_options_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/sound_options_spec.rb @@ -10,8 +10,8 @@ let(:sound_options) do described_class.new( - hourly_chime: hourly_chime, - button_beep: button_beep + hourly_chime:, + button_beep: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/sound_theme_spec.rb b/spec/lib/timex_datalink_client/protocol_4/sound_theme_spec.rb index 89a951c..d3bd1c0 100644 --- a/spec/lib/timex_datalink_client/protocol_4/sound_theme_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/sound_theme_spec.rb @@ -5,8 +5,8 @@ describe TimexDatalinkClient::Protocol4::SoundTheme do let(:sound_theme) do described_class.new( - sound_theme_data: sound_theme_data, - spc_file: spc_file + sound_theme_data:, + spc_file: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/time_spec.rb b/spec/lib/timex_datalink_client/protocol_4/time_spec.rb index 545debf..de9509b 100644 --- a/spec/lib/timex_datalink_client/protocol_4/time_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/time_spec.rb @@ -14,11 +14,11 @@ let(:time_instance) do described_class.new( - zone: zone, - is_24h: is_24h, - date_format: date_format, - time: time, - name: name + zone:, + is_24h:, + date_format:, + time:, + name: ) end diff --git a/spec/lib/timex_datalink_client/protocol_4/wrist_app_spec.rb b/spec/lib/timex_datalink_client/protocol_4/wrist_app_spec.rb index 926dfc6..aaf3718 100644 --- a/spec/lib/timex_datalink_client/protocol_4/wrist_app_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_4/wrist_app_spec.rb @@ -5,8 +5,8 @@ describe TimexDatalinkClient::Protocol4::WristApp do let(:wrist_app) do described_class.new( - wrist_app_data: wrist_app_data, - zap_file: zap_file + wrist_app_data:, + zap_file: ) end From dc0edfb405150852aa093aee5b29f7c00141e99f Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:51:51 -0600 Subject: [PATCH 17/18] Use 1.9 hash syntax in Protocol7::PhraseBuilder specs. --- .../protocol_7/phrase_builder_spec.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_7/phrase_builder_spec.rb b/spec/lib/timex_datalink_client/protocol_7/phrase_builder_spec.rb index 7e7b707..17851cd 100644 --- a/spec/lib/timex_datalink_client/protocol_7/phrase_builder_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/phrase_builder_spec.rb @@ -7,21 +7,21 @@ let(:vocab_results) do [ - { :"PC Index" => "292", :Label => "Cool" }, - { :"PC Index" => "1021", :Label => "" }, - { :"PC Index" => "74", :Label => "'est" }, - { :"PC Index" => "1233", :Label => "Coolest" }, - { :"PC Index" => "285", :Label => "Club" } + { "PC Index": "292", Label: "Cool" }, + { "PC Index": "1021", Label: "" }, + { "PC Index": "74", Label: "'est" }, + { "PC Index": "1233", Label: "Coolest" }, + { "PC Index": "285", Label: "Club" } ] end let(:vocab_links_results) do [ - { :"PC Index" => "292", :Sequence => "1", :"eBrain Index" => "292" }, - { :"PC Index" => "285", :Sequence => "1", :"eBrain Index" => "285" }, - { :"PC Index" => "1233", :Sequence => "1", :"eBrain Index" => "292" }, - { :"PC Index" => "1233", :Sequence => "2", :"eBrain Index" => "1021" }, - { :"PC Index" => "1233", :Sequence => "3", :"eBrain Index" => "74" } + { "PC Index": "292", Sequence: "1", "eBrain Index": "292" }, + { "PC Index": "285", Sequence: "1", "eBrain Index": "285" }, + { "PC Index": "1233", Sequence: "1", "eBrain Index": "292" }, + { "PC Index": "1233", Sequence: "2", "eBrain Index": "1021" }, + { "PC Index": "1233", Sequence: "3", "eBrain Index": "74" } ] end From 080e6b8aa74d0f13dd6e77345b44882556287661 Mon Sep 17 00:00:00 2001 From: Maxwell Pray Date: Sun, 25 Dec 2022 15:52:51 -0600 Subject: [PATCH 18/18] Omit hash values in protocol 7 specs. --- .../protocol_7/eeprom/activity_spec.rb | 8 +++--- .../protocol_7/eeprom/calendar/event_spec.rb | 4 +-- .../protocol_7/eeprom/calendar_spec.rb | 4 +-- .../protocol_7/eeprom/games_spec.rb | 26 +++++++++---------- .../protocol_7/eeprom/phone_number_spec.rb | 4 +-- .../protocol_7/eeprom/speech_spec.rb | 6 ++--- .../protocol_7/eeprom_spec.rb | 12 ++++----- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom/activity_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom/activity_spec.rb index dd41715..20a0f66 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom/activity_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom/activity_spec.rb @@ -9,9 +9,9 @@ let(:activity) do described_class.new( - time: time, - messages: messages, - random_speech: random_speech + time:, + messages:, + random_speech: ) end @@ -28,7 +28,7 @@ let(:activity_2) do described_class.new( time: Time.new(0, 1, 1, 2, 30, 0), - messages: messages, + messages:, random_speech: true ) end diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar/event_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar/event_spec.rb index 1094831..d303214 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar/event_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar/event_spec.rb @@ -8,8 +8,8 @@ let(:event) do described_class.new( - time: time, - phrase: phrase + time:, + phrase: ) end diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar_spec.rb index aae84ba..f21f7e0 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom/calendar_spec.rb @@ -8,8 +8,8 @@ let(:calendar) do described_class.new( - time: time, - events: events + time:, + events: ) end diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom/games_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom/games_spec.rb index 611f687..ab24a6e 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom/games_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom/games_spec.rb @@ -19,19 +19,19 @@ let(:sounds) do described_class.new( - memory_game_enabled: memory_game_enabled, - fortune_teller_enabled: fortune_teller_enabled, - countdown_timer_enabled: countdown_timer_enabled, - countdown_timer_seconds: countdown_timer_seconds, - countdown_timer_sound: countdown_timer_sound, - mind_reader_enabled: mind_reader_enabled, - music_time_keeper_enabled: music_time_keeper_enabled, - music_time_keeper_sound: music_time_keeper_sound, - morse_code_practice_enabled: morse_code_practice_enabled, - treasure_hunter_enabled: treasure_hunter_enabled, - rhythm_rhyme_buster_enabled: rhythm_rhyme_buster_enabled, - stop_watch_enabled: stop_watch_enabled, - red_light_green_light_enabled: red_light_green_light_enabled + memory_game_enabled:, + fortune_teller_enabled:, + countdown_timer_enabled:, + countdown_timer_seconds:, + countdown_timer_sound:, + mind_reader_enabled:, + music_time_keeper_enabled:, + music_time_keeper_sound:, + morse_code_practice_enabled:, + treasure_hunter_enabled:, + rhythm_rhyme_buster_enabled:, + stop_watch_enabled:, + red_light_green_light_enabled: ) end diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom/phone_number_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom/phone_number_spec.rb index 6c5d9e6..3ca3bd9 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom/phone_number_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom/phone_number_spec.rb @@ -8,8 +8,8 @@ let(:phone_number) do described_class.new( - name: name, - number: number + name:, + number: ) end diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom/speech_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom/speech_spec.rb index 50bb7eb..12d3dd4 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom/speech_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom/speech_spec.rb @@ -9,9 +9,9 @@ let(:speech) do described_class.new( - device_nickname: device_nickname, - user_nickname: user_nickname, - phrases: phrases + device_nickname:, + user_nickname:, + phrases: ) end diff --git a/spec/lib/timex_datalink_client/protocol_7/eeprom_spec.rb b/spec/lib/timex_datalink_client/protocol_7/eeprom_spec.rb index 766ed2f..82d55e8 100644 --- a/spec/lib/timex_datalink_client/protocol_7/eeprom_spec.rb +++ b/spec/lib/timex_datalink_client/protocol_7/eeprom_spec.rb @@ -11,11 +11,11 @@ let(:eeprom) do described_class.new( - activities: activities, - games: games, - calendar: calendar, - phone_numbers: phone_numbers, - speech: speech + activities:, + games:, + calendar:, + phone_numbers:, + speech: ) end @@ -91,7 +91,7 @@ let(:calendar) do TimexDatalinkClient::Protocol7::Eeprom::Calendar.new( time: Time.new(2022, 12, 10, 1, 30, 0), - events: events + events: ) end