lignite 0.2.0 → 0.3.0

data/spec/direct_commands_spec.rb

@@ -0,0 +1,25 @@
+require_relative "spec_helper"
+require "lignite"
+
+require "fileutils"
+
+describe Lignite::DirectCommands do
+  shared_examples "example runner" do |base|
+    let(:example_dir) { File.expand_path("../../examples", __FILE__) }
+
+    let(:script) { "#{example_dir}/#{base}.rb" }
+    let(:replay_yml) { "#{example_dir}/#{base}.yml" }
+
+    before(:each) { Lignite::Message.reset_msgid }
+
+    it "correctly runs #{base}.rb" do
+      allow_any_instance_of(Lignite::DirectCommands).to receive(:sleep)
+      ENV["LIGNITE_REPLAY"] = replay_yml
+      expect { load(script) }.not_to raise_error
+    end
+  end
+
+  it_behaves_like "example runner", "hello"
+  it_behaves_like "example runner", "lights"
+  it_behaves_like "example runner", "light-sensor"
+end

data/spec/system_commands_spec.rb

@@ -0,0 +1,22 @@
+require_relative "spec_helper"
+require "lignite"
+
+require "fileutils"
+
+describe Lignite::SystemCommands do
+  shared_examples "example runner" do |base|
+    let(:example_dir) { File.expand_path("../../examples", __FILE__) }
+
+    let(:script) { "#{example_dir}/#{base}.rb" }
+    let(:replay_yml) { "#{example_dir}/#{base}.yml" }
+
+    before(:each) { Lignite::Message.reset_msgid }
+
+    it "correctly runs #{base}.rb" do
+      ENV["LIGNITE_REPLAY"] = replay_yml
+      expect { load(script) }.not_to raise_error
+    end
+  end
+
+  it_behaves_like "example runner", "sys_list_files"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lignite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin Vidner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +125,8 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - COPYING
@@ -125,22 +141,27 @@ files:
 - data/sysops.yml
 - examples/bobbee.rb
 - examples/hello.rb
+- examples/hello.yml
 - examples/light-sensor.rb
+- examples/light-sensor.yml
 - examples/lights.rb
+- examples/lights.yml
 - examples/motors.rb
 - examples/sound.rb
 - examples/sys_list_files.rb
+- examples/sys_list_files.yml
 - lib/lignite.rb
 - lib/lignite/assembler.rb
 - lib/lignite/body_compiler.rb
 - lib/lignite/bytes.rb
 - lib/lignite/connection.rb
 - lib/lignite/connection/bluetooth.rb
+- lib/lignite/connection/replay.rb
+- lib/lignite/connection/tap.rb
 - lib/lignite/connection/usb.rb
 - lib/lignite/direct_commands.rb
 - lib/lignite/logger.rb
 - lib/lignite/message.rb
-- lib/lignite/message_sender.rb
 - lib/lignite/motors.rb
 - lib/lignite/op_compiler.rb
 - lib/lignite/rbf_object.rb
@@ -148,7 +169,9 @@ files:
 - lib/lignite/variables.rb
 - lib/lignite/version.rb
 - lignite.gemspec
+- rubocop-suse.yml
 - spec/assembler_spec.rb
+- spec/connection_usb_spec.rb
 - spec/data/ColorReadout.lms
 - spec/data/ColorReadout.rb
 - spec/data/ColorReadout.rbf
@@ -163,7 +186,9 @@ files:
 - spec/data/VernierReadout.lms
 - spec/data/VernierReadout.rb
 - spec/data/VernierReadout.rbf
+- spec/direct_commands_spec.rb
 - spec/spec_helper.rb
+- spec/system_commands_spec.rb
 homepage: https://github.com/mvidner/lignite
 licenses:
 - GPL-3.0-only

data/lib/lignite/message_sender.rb

@@ -1,94 +0,0 @@
-module Lignite
-  class VMError < RuntimeError
-  end
-
-  # FIXME: Possibly merge with Connection (UsbConnection)
-  class MessageSender
-    include Bytes
-    include Logger
-
-    def initialize(connection)
-      @c = connection
-      @buf = ""
-    end
-
-    def direct_command(instr_bytes, global_size: 0, local_size: 0)
-      body = u16(var_alloc(global_size: global_size, local_size: local_size)) +
-             instr_bytes
-      cmd = Message.direct_command_no_reply(body)
-      send(cmd.bytes)
-    end
-
-    def direct_command_with_reply(instr_bytes, global_size: 0, local_size: 0)
-      body = u16(var_alloc(global_size: global_size, local_size: local_size)) +
-             instr_bytes
-      cmd = Message.direct_command_with_reply(body)
-      send(cmd.bytes)
-
-      reply = Message.reply_from_bytes(receive)
-      assert_match(reply.msgid, cmd.msgid, "Reply id")
-      if reply.error?
-        raise VMError # no details?
-      end
-
-      reply.globals
-    end
-
-    def system_command_with_reply(instr_bytes)
-      cmd = Message.system_command_with_reply(instr_bytes)
-      send(cmd.bytes)
-
-      reply = Message.reply_from_bytes(receive)
-      assert_match(reply.msgid, cmd.msgid, "Reply id")
-      assert_match(reply.command, unpack_u8(instr_bytes[0]), "Command num")
-      if reply.error?
-        raise VMError, "Error: %u" % reply.status
-      end
-
-      reply.data
-    end
-
-    private
-
-    def send(payload)
-      packet = u16(payload.bytesize) + payload
-      logger.debug "-> #{packet.inspect}"
-      @c.write(packet)
-    end
-
-    # read must not be called with a too low value :-/
-    def bufread(n)
-      while n > @buf.bytesize
-        @buf += @c.read(10000)
-      end
-      ret = @buf[0, n]
-      @buf = @buf[n..-1]
-      logger.debug "R<-(#{ret.bytesize})#{ret.inspect}"
-      ret
-    end
-
-    def receive
-      size = nil
-      loop do
-        lenbuf = bufread(2)
-        size = unpack_u16(lenbuf)
-        break unless size.zero?
-        # leftover data?
-        @buf = ""
-      end
-
-      res = bufread(size)
-      res
-    end
-
-    def var_alloc(global_size:, local_size:)
-      var_alloc = global_size & 0x3ff
-      var_alloc |= (local_size & 0x3f) << 10
-    end
-
-    def assert_match(actual, expected, description)
-      return if actual == expected
-      raise "#{description} does not match, expected #{expected}, actual #{actual}"
-    end
-  end
-end