lmcadm 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0925f20d360b3e8e6740c298a99c12b67474ae9d8d0c1ff6a426109cc9810ef7'
-  data.tar.gz: a3be3188b433d777bce80b5807c497ca41d15c9fa65037eaec5421abd2c6490b
+  metadata.gz: 44c6d0a6cd45c6c772311396c13646899f7db20675004254fc70cb1821620d3c
+  data.tar.gz: 93484873efe2767cb5c7911d00e72be3937cc7fbed2e29dfd3cbaeeb4d634d1d
 SHA512:
-  metadata.gz: 1958b20290dcad4adcddfbb87de3e0352f9e6efa8f5ddd8e343bf1bb3ac5b757ec6cffb61081402fdff986a7d454210ad64d1662f4ac8519e3b9c406e53b5a08
-  data.tar.gz: 3398cb285de12bb7a2211a609fea72cd7f421827e45133c751482f072fa370509d860707c94a7ff1042d2a243ebe0553086cb09da316e24b837b4a46e3a80b15
+  metadata.gz: d9790f5e3e28fcd2fc3b4a8633b47019b3190e166bc15e9e926ee552620a6ad9a1edb4364f2355c9c4a0cc523db6997f042bccbcdf8f07d781611d1fdf4759ee
+  data.tar.gz: 92ed71b779d0bb817035a51965f4c308ce76cff89c4ddc86f8b06faf940766242e513260164eec6fb62b9c198fbb1e722072a8dc9c65e1be2f475070221d01f8

data/README.md

@@ -8,6 +8,12 @@ Install via rubygems:
 
     $ gem install lmcadm
 
+### Requirements
+Building native extensions for certain dependencies require ruby headers or source code to be present.
+These can usually be installed the same way ruby was installed.
+
+On Ubuntu for example, installing the `ruby-dev` via the package manager is sufficient.
+
 ## Usage
 
 The primary usage documentation is in the help output of lmcadm:

data/exe/lmcadm

@@ -25,7 +25,7 @@ module LMCAdm
   commands_from "lmcadm/commands"
 
   desc 'Be verbose'
-  switch [:v, :verbose]
+  switch :verbose, :v
 
   desc 'debug'
   switch [:debug]
@@ -33,9 +33,9 @@ module LMCAdm
   desc 'Measure time taken for operations'
   switch "take-time"
 
-  desc 'cloud host'
+  desc 'LMC host, may include a port number'
   default_value "cloud.lancom.de"
-  flag :C, :cloud_host
+  flag :cloud_host, :C
 
   desc 'Use encrypted connection'
   default_value true
@@ -46,13 +46,16 @@ module LMCAdm
   switch "verify-tls"
 
   desc 'username'
-  default_value "admin"
-  flag :U, :user
+  default_value ""
+  flag :user, :U
 
   desc 'password'
   default_value ""
-  flag [:P, :password], :mask => true
+  flag [:password, :P], :mask => true
 
+  desc 'Use 2FA code'
+  default_value false
+  switch [:code, 'F']
 
   pre do |global, command, options, args|
     # Pre logic here
@@ -60,12 +63,23 @@ module LMCAdm
     # chosen command
     # Use skips_pre before a command to skip this block
     # on that command only
-    if command.name != :completion && global[:password] == ""
-      global[:password] = Helpers::read_pw "Enter password for #{global[:user]}:"
+    if command.name != :completion
+      if global[:user] == ""
+        print "Enter user:"
+        global[:user] = STDIN.gets.chomp
+      end
+      if global[:password] == ""
+        global[:password] = Helpers::read_pw "Enter password for #{global[:user]}:"
+      end
+      twofactor_code = nil
+      if global[:code]
+        twofactor_code = Helpers::read_pw "Enter 2FA code:"
+      end
     end
     ::LMC::Cloud.cloud_host = global[:cloud_host]
     ::LMC::Cloud.user = global[:user]
     ::LMC::Cloud.password = global[:password]
+    ::LMC::Cloud.code = twofactor_code
     ::LMC::Cloud.verbose = global[:verbose]
     ::LMC::Cloud.debug = global[:debug]
     ::LMC::Cloud.verify_tls = global["verify-tls"]

data/lib/lmcadm/account_commands.rb

@@ -16,7 +16,7 @@ module LMCAdm
       account_list.switch :l, :long
       account_list.action do |global_options, options, args|
         t = ProgressVisualizer.new "Cloud login"
-        lmcen = LMC::Cloud.new(global_options[:cloud_host], global_options[:user], global_options[:password])
+        lmcen = LMC::Cloud.instance
         t.done
         t = ProgressVisualizer.new "Getting accounts"
         accounts = lmcen.get_accounts_objects

data/lib/lmcadm/cloud_commands.rb

@@ -8,13 +8,15 @@ module LMCAdm
   command :cloud do |c|
     c.desc 'Check cloud connectivity'
     c.action do |global_options|
-      lmcen = LMC::Cloud.new(global_options[:cloud_host], global_options[:user], global_options[:password])
+      lmcen = LMC::Cloud.instance
       puts "Base URL: #{lmcen.build_url}"
       puts "Cloud connection OK" if lmcen.auth_ok
       if global_options[:v]
         puts "authentication token: " + lmcen.session_token
       end
     end
+
+    c.desc 'Display cloud version information'
     c.command :about do |cloud_about|
       cloud_about.action do |global_options|
         cloud = LMC::Cloud.instance

data/lib/lmcadm/commands/preferences.rb

@@ -7,7 +7,7 @@ module LMCAdm #:nodoc:
     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])
+        cloud = LMC::Cloud.instance
         self_ui = cloud.preferences [:principals, :self, :ui]
         if args.empty?
           ids = self_ui.get 'lastAccountIds'

data/lib/lmcadm/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.14.0'
+  VERSION = '0.15.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.12.0'
+  spec.add_runtime_dependency 'lmc', '~> 0.13.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.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - erpel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-description: 
+description:
 email:
 - philipp@copythat.de
 executables:
@@ -182,11 +182,11 @@ files:
 - lib/lmcadm/version.rb
 - lmcadm
 - lmcadm.gemspec
-homepage: 
+homepage:
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: lmcadm is a command line client for LMC
 test_files: []