farmbot-serial 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52762a06bad21afddef2fa922e24b444961b8409
-  data.tar.gz: 2229dc5fa90ce682ce14910c3acf55d95afff12e
+  metadata.gz: 3f4002b462441175c6e02aa8f0cf3da3a1b5bb83
+  data.tar.gz: 2c9aca479eb11acf3285ea40c0bf4b051f260b3f
 SHA512:
-  metadata.gz: ff41ce048316615c745a2946f7709c63339a0cc7b825d91eccd90f5bf0ec2bfc98751cdfff2409d599d0560aea600e7eb834f7cdebb5c7dd5ee11a8509d3da5c
-  data.tar.gz: 4a4c5e4af533e65809435d98cec2be8241c1fe16f10d6335fe3ce4865fcde936435a8516209689e08f6eb093d92a947b0375a92e68f6d62ff3ac6d0fe4a9e3c2
+  metadata.gz: f90a94e0e72c70cd0d5728e184e3f5438ea6ae7be9ac5c06bae6fe2eb65c908762c50a5c398d3b78f561362514e7004aa76837e18065907ecb323342a8e46bfc
+  data.tar.gz: efde1a728ade01a0be1ded75c3826e27dee3a5fe03fb6f246d316601eb695de8dfea3bc93ac52c9fdae765fd783a2d6ab9ff563b543117e9288cc11d78085ecb

data/lib/arduino/status.rb

@@ -28,6 +28,10 @@ module FB
       @info[value.upcase.to_sym]
     end
 
+    def to_h
+      @info.to_h
+    end
+
     def gcode_update(gcode)
       transaction do
         gcode.params.each do |p|

data/spec/fakes/fake_gcode.rb

@@ -0,0 +1,7 @@
+class FakeGcode
+  attr_reader :name, :gcode
+
+  def initialize(name, gcode)
+    @name, @gcode = name, gcode
+  end
+end

data/spec/lib/arduino/event_machine_spec.rb

@@ -41,4 +41,50 @@ describe FB::ArduinoEventMachine do
     em.clear_buffer
     expect(em.buffer).to eq('')
   end
+
+  it 'receives data (normal end of chunk)' do
+    allow(em).to receive(:add_to_buffer).ordered
+    allow(em).to receive(:send_buffer).ordered
+    allow(em).to receive(:clear_buffer).ordered
+    allow(em.q).to receive(:clear_buffer)
+    em.receive_data("\r\n")
+    expect(em).to have_received(:add_to_buffer)
+    expect(em).to have_received(:send_buffer)
+    expect(em).to have_received(:clear_buffer)
+  end
+
+  it 'receives data (incomplete end of chunk)' do
+    allow(em).to receive(:add_to_buffer).ordered
+    allow(em).to receive(:send_buffer).ordered
+    allow(em).to receive(:clear_buffer).ordered
+    msg = "R00\n"
+    em.receive_data(msg)
+    expect(em).to have_received(:add_to_buffer).with(msg)
+    expect(em).to have_received(:send_buffer)
+    expect(em).to have_received(:clear_buffer)
+  end
+
+  it 'receives data (middle of chunk)' do
+    allow(em).to receive(:add_to_buffer)
+    allow(em).to receive(:send_buffer).ordered
+    allow(em).to receive(:clear_buffer).ordered
+    msg = "R01\n"
+    em.receive_data(msg)
+    expect(em).to have_received(:add_to_buffer).with(msg)
+    expect(em).to_not have_received(:send_buffer)
+    expect(em).to_not have_received(:clear_buffer)
+  end
+
+  it 'unbinds' do
+    allow(EM).to receive(:stop)#.ordered
+    em.unbind
+    expect(EM).to have_received(:stop)
+  end
+
+  it 'connects a bot' do
+    allow(EM).to receive(:attach)
+    em.class.connect(bot)
+    expect(EM).to have_received(:attach).with(bot.serial_port, em.class)
+    expect(em.class.arduino).to be(bot)
+  end
 end

data/spec/lib/arduino/incoming_handler_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+
+describe FB::IncomingHandler do
+  let(:bot) { FakeArduino.new }
+  let(:handler) { FB::IncomingHandler.new(bot) }
+
+  it 'handles unknowns' do
+    handler.execute(FakeGcode.new('hello', 'abc'))
+    expectation = "hello is a valid GCode, but no input handler method exists"
+    expect(bot.logger.message).to eq(expectation)
+  end
+
+  # def report_parameter_value(gcode)
+  #   bot.status.set_pin(gcode.value_of(:P), gcode.value_of(:V))
+  # end
+
+  it 'reports the value of a parameter' do
+    handler.report_parameter_value(FB::Gcode.new { "A1 P1 V0" })
+    expect(bot.status.pin(1)).to eq(:off)
+    handler.report_parameter_value(FB::Gcode.new { "A1 P1 V1" })
+    expect(bot.status.pin(1)).to eq(:on)
+  end
+
+  it 'reports end stops' do
+    gcode = FB::Gcode.new { "LOL1 S99" }
+    handler.reporting_end_stops(gcode)
+    expect(bot.status[:S]).to eq(99)
+  end
+
+  it 'reports current position' do
+    gcode = FB::Gcode.new { "LOL1 X99" }
+    handler.report_current_position(gcode)
+    expect(bot.status[:X]).to eq(99)
+  end
+
+  it 'reports the value of a status' do
+    handler.report_status_value(FB::Gcode.new { "A1 P1 V0" })
+    expect(bot.status.pin(1)).to eq(:off)
+    handler.report_status_value(FB::Gcode.new { "A1 P1 V1" })
+    expect(bot.status.pin(1)).to eq(:on)
+  end
+
+  it 'responds to message received' do
+    handler.received(FakeGcode.new('doesnt', 'matter'))
+    expect(bot.status[:busy]).to eq(1)
+  end
+  it 'responds to idle message' do
+    handler.idle(FakeGcode.new('doesnt', 'matter'))
+    expect(bot.status[:busy]).to eq(0)
+  end
+  it 'responds to done message' do
+    handler.done(FakeGcode.new('doesnt', 'matter'))
+    expect(bot.status[:busy]).to eq(0)
+  end
+  it 'responds to busy message' do
+    handler.busy(FakeGcode.new('doesnt', 'matter'))
+    expect(bot.status[:busy]).to eq(1)
+  end
+
+  it 'has not implemented report_software_version' do
+    expectation = handler.report_software_version("Does not matter")
+    expect(expectation).to be_nil
+  end
+end

data/spec/lib/arduino/outgoing_handler_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FB::ArduinoEventMachine do
+describe FB::OutgoingHandler do
 
   let(:handler) { FB::OutgoingHandler.new(FakeArduino.new) }
   let(:bot) { handler.bot }

data/spec/lib/arduino/status_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FB::IncomingHandler do
+describe FB::Status do
 
   let(:status) { FB::Status.new }
 
@@ -51,5 +51,11 @@ describe FB::IncomingHandler do
     expect(status.pin(2)).to eq(:unknown)
   end
 
+  it 'serializes into a hash' do
+    reality = status.instance_variable_get("@info").to_h
+    perception = status.to_h
+    expect(perception).to eq(reality)
+  end
+
 end
 

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require 'farmbot-serial'
 require_relative 'fakes/fake_serial_port'
 require_relative 'fakes/fake_logger'
 require_relative 'fakes/fake_arduino'
+require_relative 'fakes/fake_gcode'
 
 require 'ruby-prof'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farmbot-serial
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tim Evers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,9 +145,11 @@ files:
 - lib/gcode.rb
 - lib/gcode.yml
 - spec/fakes/fake_arduino.rb
+- spec/fakes/fake_gcode.rb
 - spec/fakes/fake_logger.rb
 - spec/fakes/fake_serial_port.rb
 - spec/lib/arduino/event_machine_spec.rb
+- spec/lib/arduino/incoming_handler_spec.rb
 - spec/lib/arduino/outgoing_handler_spec.rb
 - spec/lib/arduino/status_spec.rb
 - spec/lib/arduino_spec.rb
@@ -179,9 +181,11 @@ specification_version: 4
 summary: Serial library for Farmbot
 test_files:
 - spec/fakes/fake_arduino.rb
+- spec/fakes/fake_gcode.rb
 - spec/fakes/fake_logger.rb
 - spec/fakes/fake_serial_port.rb
 - spec/lib/arduino/event_machine_spec.rb
+- spec/lib/arduino/incoming_handler_spec.rb
 - spec/lib/arduino/outgoing_handler_spec.rb
 - spec/lib/arduino/status_spec.rb
 - spec/lib/arduino_spec.rb