From 12278f72e9ffad73e48e0790b48e683e348a031e Mon Sep 17 00:00:00 2001 From: Guillaume ARM Date: Mon, 18 Jul 2022 02:25:30 +0200 Subject: [PATCH] feat: cube ls --- .cuberc | 0 .gitignore | 2 ++ cube.lua | 23 +++++++++++++++++++---- servers/cube-startup.lua | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) delete mode 100644 .cuberc create mode 100644 .gitignore diff --git a/.cuberc b/.cuberc deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2f23470 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.cuberc +.cubestartup diff --git a/cube.lua b/cube.lua index 7b02b31..5403b2d 100644 --- a/cube.lua +++ b/cube.lua @@ -1,4 +1,4 @@ -local _VERSION = '1.1.0'; +local _VERSION = '1.2.0'; local CUBE_CHANNEL = 64; local net = require('/apis/net')(); @@ -132,14 +132,29 @@ local COMMANDS = { end end, ls = function() - print('TODO: ls'); + local ok, results, packets = net.sendMultipleRequests(CUBE_CHANNEL, 'ping', 'ping'); + + if not ok then + error(results); + end + + for k in ipairs(results) do + local result = results[k]; + local packet = packets[k]; + + print("=> " .. tostring(packet.sourceId) + .. + ( + packet.sourceLabel and " (label=" .. tostring(packet.sourceLabel) .. ")" or + "") .. ": startup='" .. result.startup .. "'"); + end end, configure = function() if not isConfigFileExists() then print('Error: unable to configure because \'.cuberc\' file is missing\nTry: \'cube init\' command') return; end - print('TODO: configure'); + print('not implemented yet.'); end, ["set-startup"] = function(machineId, shellCommand) if not isConfigFileExists() then @@ -174,7 +189,7 @@ local COMMANDS = { return; end - print('TODO: deploy.'); + print('not implemented yet.'); end, version = function() print('cube client v' .. _VERSION); diff --git a/servers/cube-startup.lua b/servers/cube-startup.lua index bb27261..b9569ab 100644 --- a/servers/cube-startup.lua +++ b/servers/cube-startup.lua @@ -1,4 +1,4 @@ -local _VERSION = '1.0.0'; +local _VERSION = '1.1.0'; local function trim(s) return (string.gsub(s, "^%s*(.-)%s*$", "%1")) @@ -17,7 +17,7 @@ local function readFile(path) return contents end -local startupCommand = trim(readFile('.cubestartup') or ""); +local startupCommand = trim(readFile('.cubestartup') or readFile('.cubestart') or ""); if startupCommand ~= "" then