Fix rubocop and rspec issues

Author: jeremycole

Gemfile.lock

@@ -2,14 +2,16 @@ PATH
   remote: .
   specs:
     avruby (0.5.1)
+      benchmark (~> 0.4.0)
       intel_hex (~> 0.6.0)
-      rdoc
+      rdoc (~> 6.13.1)
       sorbet-runtime (~> 0.5.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.3)
+    benchmark (0.4.0)
     byebug (12.0.0)
     date (3.4.1)
     diff-lcs (1.6.1)

avruby.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.executables = ["avruby_shell"]
   s.require_path = "lib"
 
+  s.add_dependency("benchmark", "~> 0.4.0")
   s.add_dependency("intel_hex", "~> 0.6.0")
-  s.add_dependency("rdoc")
+  s.add_dependency("rdoc", "~> 6.13.1")
   s.add_dependency("sorbet-runtime", "~> 0.5.3")
   s.metadata["rubygems_mfa_required"] = "true"
 end

spec/avr/opcode/branch/brbc_spec.rb

@@ -4,18 +4,18 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "brbc" do
-    it_behaves_like "opcode", :brbc
+    it_behaves_like "opcode", :brbc do
+      it "branches if the bit is set" do
+        cpu.sreg.Z = true
+        cpu.instruction(:brbc, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
+        expect(cpu.pc).to(eq(1))
+        cpu.sreg.Z = false # we're not supposed to have changed Z
+      end
 
-    it "branches if the bit is set" do
-      cpu.sreg.Z = true
-      cpu.instruction(:brbc, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
-      expect(cpu.pc).to(eq(1))
-      cpu.sreg.Z = false # we're not supposed to have changed Z
-    end
-
-    it "does not branch if the bit is clear" do
-      cpu.instruction(:brbc, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
-      expect(cpu.pc).to(eq(21))
+      it "does not branch if the bit is clear" do
+        cpu.instruction(:brbc, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
+        expect(cpu.pc).to(eq(21))
+      end
     end
   end
 end

spec/avr/opcode/branch/brbs_spec.rb

@@ -4,18 +4,18 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "brbs" do
-    it_behaves_like "opcode", :brbs
+    it_behaves_like "opcode", :brbs do
+      it "branches if the bit is set" do
+        cpu.sreg.Z = true
+        cpu.instruction(:brbs, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
+        expect(cpu.pc).to(eq(21))
+        cpu.sreg.Z = false # we're not supposed to have changed Z
+      end
 
-    it "branches if the bit is set" do
-      cpu.sreg.Z = true
-      cpu.instruction(:brbs, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
-      expect(cpu.pc).to(eq(21))
-      cpu.sreg.Z = false # we're not supposed to have changed Z
-    end
-
-    it "does not branch if the bit is clear" do
-      cpu.instruction(:brbs, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
-      expect(cpu.pc).to(eq(1))
+      it "does not branch if the bit is clear" do
+        cpu.instruction(:brbs, AVR::Value.new(cpu.sreg.fetch_bit(:Z)), AVR::Value.new(+20)).execute
+        expect(cpu.pc).to(eq(1))
+      end
     end
   end
 end

spec/avr/opcode/branch/call_spec.rb

@@ -4,20 +4,20 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "call" do
-    it_behaves_like "opcode", :call
+    it_behaves_like "opcode", :call do
+      it "pushes the current PC onto the stack" do
+        previous_sp = cpu.sp.value
+        cpu.pc = 0x1122
+        cpu.instruction(:call, AVR::Value.new(0x1234)).execute
+        expect(cpu.sp.value).to(eq(previous_sp - 2))
+        expect(cpu.sram.memory[cpu.sp.value + 1].value).to(eq(0x22 + 2))
+        expect(cpu.sram.memory[cpu.sp.value + 2].value).to(eq(0x11))
+      end
 
-    it "pushes the current PC onto the stack" do
-      previous_sp = cpu.sp.value
-      cpu.pc = 0x1122
-      cpu.instruction(:call, AVR::Value.new(0x1234)).execute
-      expect(cpu.sp.value).to(eq(previous_sp - 2))
-      expect(cpu.sram.memory[cpu.sp.value + 1].value).to(eq(0x22 + 2))
-      expect(cpu.sram.memory[cpu.sp.value + 2].value).to(eq(0x11))
-    end
-
-    it "sets PC to the specified constant" do
-      cpu.instruction(:call, AVR::Value.new(0x1234)).execute
-      expect(cpu.pc).to(eq(0x1234))
+      it "sets PC to the specified constant" do
+        cpu.instruction(:call, AVR::Value.new(0x1234)).execute
+        expect(cpu.pc).to(eq(0x1234))
+      end
     end
   end
 end

spec/avr/opcode/branch/cpse_spec.rb

@@ -4,35 +4,35 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "cpse" do
-    it_behaves_like "opcode", :cpse
+    it_behaves_like "opcode", :cpse do
+      it "compares r0 == r1, with 1-word instruction" do
+        cpu.r0 = 5
+        cpu.r1 = 5
+        cpu.device.flash.set_word(0, 0b0001_0000_0000_0001) # cpse r0, r1
+        cpu.device.flash.set_word(1, 0b0000_0000_0000_0000) # nop
+        cpu.step
+        expect(cpu.next_pc).to(eq(2))
+      end
 
-    it "compares r0 == r1, with 1-word instruction" do
-      cpu.r0 = 5
-      cpu.r1 = 5
-      cpu.device.flash.set_word(0, 0b0001_0000_0000_0001) # cpse r0, r1
-      cpu.device.flash.set_word(1, 0b0000_0000_0000_0000) # nop
-      cpu.step
-      expect(cpu.next_pc).to(eq(2))
-    end
-
-    it "compares r0 == r1, with 2-word instruction" do
-      cpu.r0 = 5
-      cpu.r1 = 5
-      cpu.device.flash.set_word(0, 0b0001_0000_0000_0001) # cpse r0, r1
-      cpu.device.flash.set_word(1, 0b1001_0100_0000_1100) # jmp ...
-      cpu.device.flash.set_word(2, 0b1010_1010_1010_1010) # ... 0xaaaa
-      cpu.device.flash.set_word(3, 0b0000_0000_0000_0000) # nop
-      cpu.step
-      expect(cpu.next_pc).to(eq(3))
-    end
+      it "compares r0 == r1, with 2-word instruction" do
+        cpu.r0 = 5
+        cpu.r1 = 5
+        cpu.device.flash.set_word(0, 0b0001_0000_0000_0001) # cpse r0, r1
+        cpu.device.flash.set_word(1, 0b1001_0100_0000_1100) # jmp ...
+        cpu.device.flash.set_word(2, 0b1010_1010_1010_1010) # ... 0xaaaa
+        cpu.device.flash.set_word(3, 0b0000_0000_0000_0000) # nop
+        cpu.step
+        expect(cpu.next_pc).to(eq(3))
+      end
 
-    it "compares r0 != r1" do
-      cpu.r0 = 3
-      cpu.r1 = 5
-      cpu.device.flash.set_word(0, 0b0001_0000_0000_0001) # cpse r0, r1
-      cpu.device.flash.set_word(1, 0b0000_0000_0000_0000) # nop
-      cpu.step
-      expect(cpu.next_pc).to(eq(1))
+      it "compares r0 != r1" do
+        cpu.r0 = 3
+        cpu.r1 = 5
+        cpu.device.flash.set_word(0, 0b0001_0000_0000_0001) # cpse r0, r1
+        cpu.device.flash.set_word(1, 0b0000_0000_0000_0000) # nop
+        cpu.step
+        expect(cpu.next_pc).to(eq(1))
+      end
     end
   end
 end

spec/avr/opcode/branch/eicall_spec.rb

@@ -4,12 +4,12 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "eicall" do
-    it_behaves_like "opcode", :eicall
-
-    it "is not implemented" do
-      expect do
-        cpu.instruction(:eicall).execute
-      end.to(raise_error(AVR::Opcode::OpcodeNotImplementedError))
+    it_behaves_like "opcode", :eicall do
+      it "is not implemented" do
+        expect do
+          cpu.instruction(:eicall).execute
+        end.to(raise_error(AVR::Opcode::OpcodeNotImplementedError))
+      end
     end
   end
 end

spec/avr/opcode/branch/eijmp_spec.rb

@@ -4,12 +4,12 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "eijmp" do
-    it_behaves_like "opcode", :eijmp
-
-    it "is not implemented" do
-      expect do
-        cpu.instruction(:eijmp).execute
-      end.to(raise_error(AVR::Opcode::OpcodeNotImplementedError))
+    it_behaves_like "opcode", :eijmp do
+      it "is not implemented" do
+        expect do
+          cpu.instruction(:eijmp).execute
+        end.to(raise_error(AVR::Opcode::OpcodeNotImplementedError))
+      end
     end
   end
 end

spec/avr/opcode/branch/icall_spec.rb

@@ -4,22 +4,22 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "icall" do
-    it_behaves_like "opcode", :icall
+    it_behaves_like "opcode", :icall do
+      it "pushes the current PC onto the stack" do
+        previous_sp = cpu.sp.value
+        cpu.pc = 0x1122
+        cpu.Z = 0x1234
+        cpu.instruction(:icall).execute
+        expect(cpu.sp.value).to(eq(previous_sp - 2))
+        expect(cpu.sram.memory[cpu.sp.value + 1].value).to(eq(0x22 + 1))
+        expect(cpu.sram.memory[cpu.sp.value + 2].value).to(eq(0x11))
+      end
 
-    it "pushes the current PC onto the stack" do
-      previous_sp = cpu.sp.value
-      cpu.pc = 0x1122
-      cpu.Z = 0x1234
-      cpu.instruction(:icall).execute
-      expect(cpu.sp.value).to(eq(previous_sp - 2))
-      expect(cpu.sram.memory[cpu.sp.value + 1].value).to(eq(0x22 + 1))
-      expect(cpu.sram.memory[cpu.sp.value + 2].value).to(eq(0x11))
-    end
-
-    it "sets PC to the specified constant" do
-      cpu.Z = 0x1234
-      cpu.instruction(:icall).execute
-      expect(cpu.pc).to(eq(0x1234))
+      it "sets PC to the specified constant" do
+        cpu.Z = 0x1234
+        cpu.instruction(:icall).execute
+        expect(cpu.pc).to(eq(0x1234))
+      end
     end
   end
 end

spec/avr/opcode/branch/ijmp_spec.rb

@@ -4,12 +4,12 @@
 
 RSpec.describe(AVR::Opcode) do
   describe "ijmp" do
-    it_behaves_like "opcode", :ijmp
-
-    it "sets PC to the specified constant" do
-      cpu.Z = 0x0500
-      cpu.instruction(:ijmp).execute
-      expect(cpu.pc).to(eq(0x0500))
+    it_behaves_like "opcode", :ijmp do
+      it "sets PC to the specified constant" do
+        cpu.Z = 0x0500
+        cpu.instruction(:ijmp).execute
+        expect(cpu.pc).to(eq(0x0500))
+      end
     end
   end
 end