lmcadm 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ec85a8b1a7d9fe63c2f27ec1016310c0e029f878ab430063cdf8305d84b56e
-  data.tar.gz: 4538b2bb9b9c212e3e58cf13badc5720b7480622eb3b02006c60e8c5a61d5f65
+  metadata.gz: '0925f20d360b3e8e6740c298a99c12b67474ae9d8d0c1ff6a426109cc9810ef7'
+  data.tar.gz: a3be3188b433d777bce80b5807c497ca41d15c9fa65037eaec5421abd2c6490b
 SHA512:
-  metadata.gz: 81cf76346a7cb4e017f0db92ba785a3805b348bfb9d041d28361a63ba7dffd87a8363c9cc4c937b9e1f62b514780b81227c4e5b2a61f99ed8c2658f66013b77e
-  data.tar.gz: b361f098338b6827a2ef76ba3d3680afade12ea06c8dcb00d3f04f5b86dff10110a59288517b0a829f3859fb4bd8a8b8654ab6bcc316af566e1d67b92e96514f
+  metadata.gz: 1958b20290dcad4adcddfbb87de3e0352f9e6efa8f5ddd8e343bf1bb3ac5b757ec6cffb61081402fdff986a7d454210ad64d1662f4ac8519e3b9c406e53b5a08
+  data.tar.gz: 3398cb285de12bb7a2211a609fea72cd7f421827e45133c751482f072fa370509d860707c94a7ff1042d2a243ebe0553086cb09da316e24b837b4a46e3a80b15

data/dev_lmcadm

@@ -0,0 +1,4 @@
+#!/bin/sh
+#wrapper script
+#set -x
+LMCADM_PATH_DEP=1 GLI_DEBUG=false bundle exec exe/lmcadm "$@"

data/lib/lmcadm/account_commands.rb

@@ -29,9 +29,9 @@ module LMCAdm
         accounts.sort {|a, b| a["name"] <=> b["name"]}.each do |account|
           puts account.inspect if global_options[:v]
           if options[:l]
-            puts account["name"] + " (" + account["type"] + ") ID: " + account["id"]
+            puts account.summary
           else
-            puts account["name"] + " (" + account["type"] + ")"
+            puts "\"#{account}\" (#{account["type"]})"
           end
         end
         puts accounts.length.to_s + " Accounts found"

data/lib/lmcadm/cloud_commands.rb

@@ -27,6 +27,7 @@ module LMCAdm
         }}
         tp backstage_infos
         puts '---'
+        puts "Base URL: #{cloud.build_url}"
         puts "Principal: #{LMC::Principal.get_self(cloud)}"
 
       end

data/lib/lmcadm/commands/preferences.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module LMCAdm #:nodoc:
+  desc 'Manipulate preferences'
+  command :preferences do |preferences|
+    preferences.desc 'Get last account data'
+    preferences.arg_name 'accounts'
+    preferences.command :lastaccounts do |la|
+      la.action do |g, _o, args|
+        cloud = LMC::Cloud.new(g[:cloud_host], g[:user], g[:password])
+        self_ui = cloud.preferences [:principals, :self, :ui]
+        if args.empty?
+          ids = self_ui.get 'lastAccountIds'
+          accounts = ids.map do |id|
+            LMC::Account.get id
+          end
+          accounts.each { |a|
+            puts a.summary
+          }
+        else
+          account_ids = args.map { |arg|
+            LMC::Account.get_by_uuid_or_name(arg).id
+          }
+          puts account_ids
+          puts self_ui.put 'lastAccountIds', account_ids
+        end
+      end
+    end
+  end
+end
+

data/lib/lmcadm/commands/terminal.rb

@@ -50,8 +50,8 @@ module LMCAdm
       begin
         EventMachine.epoll
         EventMachine.run do
-          trap("TERM") { stop g[:debug]}
-          trap("INT") { stop g[:debug]}
+          trap("TERM") { stop g[:debug] }
+          trap("INT") { stop g[:debug] }
           IO.console.raw!
           EventMachine.open_keyboard(LMCAdm::KeyboardHandler)
           @ws = WebSocket::EventMachine::Client.connect({uri: url, headers: headers_hash})
@@ -59,19 +59,27 @@ module LMCAdm
 
           @ws.onopen do
             print "Connected to #{device.name} (#{device.id}):\r\n"
+            remaining_args = args.drop(1)
+            if remaining_args.length > 0
+              @ws.send '1' + remaining_args.join(' ') + "\r", type: 'binary'
+            end
           end
 
           @ws.onmessage do |msg, type|
             print "##{msg.length}##{msg.inspect}#" if g[:debug]
+            # respond to custom keepalive
+            if msg.start_with? '0'
+              @ws.send '0', type: 'binary'
+            end
             if msg.start_with? "1"
-              print msg[1..-1].gsub("\n","\r\n")
+              print msg[1..-1].gsub("\n", "\r\n")
             else
               print msg if g[:debug]
             end
             print DateTime.now.to_s if g[:debug]
             if msg.include? "\n\nGoodbye\n\n"
               stop g[:debug]
-              closing =  true
+              closing = true
             end
           end
 
@@ -93,7 +101,7 @@ module LMCAdm
             puts "Received pong: #{msg}" if g[:verbose]
           end
 
-          def stop(debug=false)
+          def stop(debug = false)
             print DateTime.now.to_s if debug
             print "Terminating connection\r\n"
             EventMachine.stop
@@ -102,9 +110,9 @@ module LMCAdm
       ensure
         IO.console.cooked!
       end
-        # disabled, getting 401 anyways
-        #account.cloud.auth_for_account account
-        #account.cloud.delete ['cloud-service-devicetunnel', 'accounts', account.id, "terminal?ids=#{sessionInfo.body.first['id']}"]
+      # disabled, getting 401 anyways
+      #account.cloud.auth_for_account account
+      #account.cloud.delete ['cloud-service-devicetunnel', 'accounts', account.id, "terminal?ids=#{sessionInfo.body.first['id']}"]
     end
   end
 end

data/lib/lmcadm/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/lmcadm.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry-nav", "0.2.4"
 
-  spec.add_runtime_dependency 'lmc', '~> 0.11.0'
+  spec.add_runtime_dependency 'lmc', '~> 0.12.0'
   spec.add_runtime_dependency 'gli', '~> 2.17'
   spec.add_runtime_dependency 'table_print', '~> 1.5'
   spec.add_runtime_dependency 'colorize', '~> 0.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmcadm
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- dev_lmcadm
 - exe/lmcadm
 - lib/lmcadm.rb
 - lib/lmcadm/ColoredProgressVisualizer.rb
@@ -167,6 +168,7 @@ files:
 - lib/lmcadm/commands/completion.rb
 - lib/lmcadm/commands/maintenance.rb
 - lib/lmcadm/commands/monitor.rb
+- lib/lmcadm/commands/preferences.rb
 - lib/lmcadm/commands/principal.rb
 - lib/lmcadm/commands/privatecloud.rb
 - lib/lmcadm/commands/rights.rb