lignite 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8074515f5e1914a0a56146c77bd2a6119d225e47
-  data.tar.gz: bdcddbb0e36882d3c6f13b1886d120777fabc301
+  metadata.gz: 69c552fbf1d67d88480d8d1ffd3909ea41eebadf
+  data.tar.gz: c53de990e8d76b4960bfa8157f5aabb14c652fbf
 SHA512:
-  metadata.gz: 021fdf25c04f71348c3a66c88d18d100e7581f649c13e45838f47e282d2c003e1f959876b6fc0c6532f8a0d9d4e12c0b1e9bce3c3c5457356ab8d15409a0a7fc
-  data.tar.gz: c0967937b3ce7af363bc5ee23de719989edc5b3a5f7f957bf3476f52781f2e722497decc0e96d67a1eea5db7058e9ccdcc9222af663df50677fce3dd4e02c977
+  metadata.gz: fb091ed264555daa9ea360e59cd3c27b097710d4d0f33105445a83d2640d8259a19f83e40cdd9625dd52588606a36a47f721384e2511b3ccf92b2dc5202b0fb2
+  data.tar.gz: 865cb7e2dadc5614708fde9aa728f7b9af07b78c5e0de4ac1642480c344026d986356a4500980ed24f15e449fefc534fb6aa69dd5b650c74f1c0da8c469a5aa8

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/ev3tool

@@ -3,6 +3,11 @@ require "lignite"
 require "fileutils"
 include Lignite::Bytes
 
+# The VM current working directory is /home/root/lms2012/sys
+# which is not very useful. A better default is /home/root/lms2012/prjs
+# which is displayed on the 2nd tab of the brick UI.
+EV3TOOL_HOME = "../prjs"
+
 def phandles
   handles = $sc.list_open_handles
   puts "OPEN HANDLES: ", hexdump(handles)
@@ -12,7 +17,7 @@ def upload(local_filename, brick_filename = nil)
   data = File.read(local_filename, encoding: Encoding::BINARY)
   unless brick_filename
     prj = File.basename(local_filename, ".rbf")
-    brick_filename = "../prjs/#{prj}/#{prj}.rbf"
+    brick_filename = "#{EV3TOOL_HOME}/#{prj}/#{prj}.rbf"
   end
   handle = $sc.begin_download(data.bytesize, brick_filename)
   $sc.continue_download(handle, data)
@@ -32,7 +37,11 @@ def download(brick_filename, local_filename = nil)
 end
 
 def list_files(name)
-  name ||= "../prjs"
+  name ||= EV3TOOL_HOME
+  unless name.start_with?("/")
+    name = "#{EV3TOOL_HOME}/#{name}"
+  end
+
   result = ""
   fsize, handle, data = $sc.list_files(4096, name)
   loop do
@@ -42,9 +51,44 @@ def list_files(name)
     handle, data = $sc.continue_list_files(handle, 4096)
   end
   result
+rescue Lignite::VMError
+  nil
+end
+
+def ls(name)
+  raw = list_files(name)
+  return nil if raw.nil?
+
+  raw.lines.map do |l|
+    l = l.chomp
+    next nil if l == "./" || l == "../"
+    next l if l.end_with?("/")
+    # skip checksum + space + size + space
+    l[32 + 1 + 8 + 1 .. -1]
+  end.compact
+end
+
+def file_exist?(name)
+  dirname = File.dirname(name)
+  filename = File.basename(name)
+  files = ls(dirname) || []
+  files.include?(filename)
 end
 
 def run(name)
+  if name.include?("/")
+    unless name.start_with?("/")
+      name = "#{EV3TOOL_HOME}/#{name}"
+    end
+  else
+    name = "#{EV3TOOL_HOME}/#{name}/#{name}.rbf"
+  end
+
+  unless file_exist?(name)
+    $stderr.puts "File #{name.inspect} not found"
+    exit 1
+  end
+
   slot = Lignite::USER_SLOT
   no_debug = 0
   $dc.block do
@@ -56,6 +100,10 @@ def run(name)
   end
 end
 
+def stop
+  $dc.program_stop(Lignite::USER_SLOT)
+end
+
 def assisted_connection
   Lignite::Connection.create
 rescue => e
@@ -86,7 +134,11 @@ when "upload", "ul"
 when "download", "dl"
   download(ARGV[1], ARGV[2])
 when "list", "ls"
-  print list_files(ARGV[1])
+  puts ls(ARGV[1])
+when "ls-l"
+  puts list_files(ARGV[1])
 when "run"
   run(ARGV[1])
+when "stop"
+  stop
 end

data/lib/lignite/connection/bluetooth.rb

@@ -13,9 +13,13 @@ module Lignite
         channel = 1
         sockaddr = [AF_BLUETOOTH, 0, *addr_b.reverse, channel, 0].pack("C*")
         # common exceptions:
-        # "Errno::EHOSTUNREACH: No route to host": BT is disabled;
-        #   use `hciconfig hci0 up`
-        # "Errno::EHOSTDOWN: Host is down": Turn the brick on, enable BT
+        # "Errno::EHOSTUNREACH: No route to host":
+        #   - No BT adapter
+        #   - BT is disabled; use `hciconfig hci0 up`
+        # "Errno::EHOSTDOWN: Host is down":
+        #   - Turn the brick on
+        #   - enable BT on the brick
+        #   - disconnect other programming apps
         @sock.connect(sockaddr)
       end
 

data/lib/lignite/message_sender.rb

@@ -1,4 +1,6 @@
 module Lignite
+  class VMError < RuntimeError
+  end
 
   # FIXME: Possibly merge with Connection (UsbConnection)
   class MessageSender
@@ -26,7 +28,7 @@ module Lignite
       reply = Message.reply_from_bytes(receive)
       assert_match(reply.msgid, cmd.msgid, "Reply id")
       if reply.error?
-        raise "VMError"         # no details?
+        raise VMError # no details?
       end
 
       reply.data
@@ -40,7 +42,7 @@ module Lignite
       assert_match(reply.msgid, cmd.msgid, "Reply id")
       assert_match(reply.command, unpack_u8(instr_bytes[0]), "Command num")
       if reply.error?
-        raise "VMError, %u" % reply.status
+        raise VMError, "Error: %u" % reply.status
       end
 
       reply.data

data/spec/spec_helper.rb

@@ -10,9 +10,10 @@ end
 
 if ENV["COVERAGE"] || ENV["TRAVIS"]
   require "simplecov"
-  lib = File.expand_path("../../lib", __FILE__)
-  # track all ruby files under src
-  SimpleCov.track_files("#{lib}/**/*.rb")
+  top = File.expand_path("../..", __FILE__)
+  # track all ruby files under lib
+  SimpleCov.track_files("#{top}/lib/**/*.rb")
+  SimpleCov.track_files("bin/ev3tool")
 
   # use coveralls for on-line code coverage reporting at Travis CI
   if ENV["TRAVIS"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lignite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Martin Vidner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb