lmcadm 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a990a6d39e05d589b58671231dfc4f2464dba593
-  data.tar.gz: d1846b40cd26efd2b231e6d086d8ae4d50073ea2
+  metadata.gz: 938d019f4b6505f37a438e3067e6a6e1dcf7fea9
+  data.tar.gz: a95c69c72ba3a0c9a49662bd234cedfaf7b40528
 SHA512:
-  metadata.gz: e70f755c9fc4cde186e8a822fbcad76120e195a35771235af04ac37a310d1c458cadc39f1bf7fd6a7c2f576022784553607c6803a1531aabad4f77327f5db596
-  data.tar.gz: b779db3ee64def14c157619917248a39f62ad778851c1dd209906882a0091e87a63d59ef03f7ae1b7baa97a466bc09bb11d8417db49b540a8996006c2c208b7c
+  metadata.gz: ebdf152550d92de31951c1dc9cd01275bf82463fc483e995804042429a4e0b067396d2c6231e02193fa94644f961c8bb274ae209acce85627dc1848ec506839e
+  data.tar.gz: 7a9a3f51b97d8a6c8396e4ad247880087dcb7f8829c1e9f6ae61599fa2ec810de60d9685a4cc4876c1b681230af9050e57f66d80c4685070736f07139a02b6ae

data/exe/lmcadm

@@ -60,7 +60,7 @@ module LMCAdm
     # chosen command
     # Use skips_pre before a command to skip this block
     # on that command only
-    if global[:password] == ""
+    if command.name != :completion && global[:password] == ""
       global[:password] = Helpers::read_pw "Enter password for #{global[:user]}:"
     end
     ::LMC::Cloud.cloud_host = global[:cloud_host]

data/lib/lmcadm/account_commands.rb

@@ -82,9 +82,9 @@ module LMCAdm
       account_create.action do |global_options, options, args|
         parent = LMC::Account.get_by_uuid_or_name options[:p]
         t = ProgressVisualizer.new "Creating object"
-        a = LMC::Account.new({ "name" => args.first,
-                               "type" => options[GLI::Command::PARENT][:account_type],
-                               "parent" => parent.id })
+        a = LMC::Account.new(LMC::Cloud.instance, {"name" => args.first,
+                                                   "type" => options[GLI::Command::PARENT][:account_type],
+                                                   "parent" => parent.id})
         t.done
         t = ProgressVisualizer.new "Saving #{a.name}"
         result = a.save
@@ -159,126 +159,26 @@ module LMCAdm
       memberlist.action do |global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name args.first
         members = account.members
-        tp members, [{ :id => { :width => 36 } }, :name, :type, :state, :invitationState, :principalState,
-                     :authorities => { :display_method => lambda {|m|
+        tp members, [{:id => {:width => 36}}, :name, :type, :state, :invitationState, :principalState,
+                     :authorities => {:display_method => lambda {|m|
                        m.authorities.map {|a|
                          a['name']
                        }.join(',')
-                     }, :width => 128 }]
+                     }, :width => 128}]
       end
     end
 
-    # Commented out due to bad quality at the moment.
-    # This code is untested after the gem split.
-=begin
-    c.desc 'Modify account members'
-    c.command :memberupdate do |memberupdate|
-      memberupdate.desc 'Account UUID'
-      memberupdate.flag :a, "account-uuid", :required => true
-
-      memberupdate.desc 'Principal UUID'
-      memberupdate.flag :u, :uuid, :required => true
-
-      memberupdate.desc 'Authority'
-      memberupdate.flag :authority
-
-      memberupdate.action do |global_options, options, args|
-        account = LMCAccount.get options[:a]
-
-        account_authorities = account.authorities
-        puts account_authorities.inspect if global_options[:debug]
-        authority = account_authorities.find {|auth| auth["name"] == options[:authority]}
-        puts authority if global_options[:debug]
-        puts "authority id: #{authority["id"]}" if global_options[:debug]
-
-        resp = account.update_member options[:u], {:authorities => [authority["id"]]}
-        puts "response: #{resp.inspect}"
-        if resp.code == 200
-          puts "Updated success"
-
-        else
-          loggerr.error "ERROR: #{resp.code} #{resp.body.message}"
-        end
-
-      end
-    end
-
-    c.arg_name "email address", [:optional, :multiple]
-    c.desc 'Invite members, requires an account type'
-    c.command :invite do |account_invite|
-
-      account_invite.desc "File with email addresses; one address per line"
-      account_invite.flag :file
-      #account_invite.desc "Email address to invite"
-      #account_invite.flag :
-      account_invite.desc 'Account name'
-      account_invite.flag :account_name, :A, :required => true
-
-      account_invite.desc 'Member type'
-      account_invite.default_value "MEMBER"
-      account_invite.flag :member_type
-
-      account_invite.desc 'Authority'
-      account_invite.default_value "PROJECT_VIEWER"
-      account_invite.flag :authority
-
-      account_invite.desc 'Do not make changes'
-      account_invite.switch :n, :dry
-
-      account_invite.desc "Send emails (deprecated)"
-      account_invite.default_value false
-      account_invite.switch :e, "send-mail", "send-email"
-
-      account_invite.default_value false
-      account_invite.switch "show-csv"
-
-      account_invite.action do |global_options, options, args|
-
-        puts "ARGS:" + args.inspect if global_options[:debug]
-        lmcen = Cloud.new(global_options[:cloud_host], global_options[:user], global_options[:password])
-        t = ProgressVisualizer.new "Getting account"
-        account = lmcen.get_account options[:account_name], options[GLI::Command::PARENT][:account_type]
-        t.done
-
-        am = AccountManager.new(options, global_options)
-        if options[:file]
-          t = ProgressVisualizer.new "Inviting from file"
-          File.foreach(options[:file]) do |line|
-            if nil != am.invite(lmcen, account, line, options[:member_type], options[:authority])
-              t.dot
-            else
-              t.X
-            end
-          end
-          t.done
-        end
-        if not args.empty?
-          t = ProgressVisualizer.new "Inviting from arguments"
-          args.each do |line|
-            if nil != am.invite(lmcen, account, line, options[:member_type], options[:authority])
-              t.dot
-            else
-              t.X
-            end
-          end
-          t.done
-        end
-        loggerr.info am.errors unless am.errors.empty?
-
-      end
-    end
-=end
     c.arg_name '"Account name"|UUID', [:required]
     c.desc 'List authorities'
     c.command :authorities do |auth|
-
-      auth.action do |g, o, args|
+      auth.action do |_g, _o, args|
         account = LMC::Account.get_by_uuid_or_name args.first
         authorities = account.authorities
         max = Helpers::longest_in_collection(authorities.map {|a| a.name})
-        tp authorities, [{ :id => { :width => 36 } }, { :name => { :width => max } }, :visibility, :type]
+        tp authorities, [{:id => {:width => 36}}, {:name => {:width => max}}, :visibility, :type]
       end
     end
+
     c.desc 'Manage authorities'
     c.command :authority do |auth|
       auth.arg_name 'Authority name', [:required]
@@ -287,7 +187,7 @@ module LMCAdm
         create.flag :A, :required => true
         create.action do |_global_options, options, _args|
           account = LMC::Account.get_by_uuid_or_name options[:A]
-          auth = LMC::Authority.new({ 'name' => _args.first, 'visibility' => 'PRIVATE' }, account)
+          auth = LMC::Authority.new({'name' => _args.first, 'visibility' => 'PRIVATE'}, account)
           puts auth.save
         end
       end
@@ -307,13 +207,12 @@ module LMCAdm
           cloud.invite_user_to_account email, account.id, options[:type], chosen_authorities
         end
       end
-
     end
 
     c.desc 'Leave account'
     c.arg_name "Account id"
     c.command :leave do |leave|
-      leave.action do |global_options, options, args|
+      leave.action do |_global_options, _options, args|
         account = LMC::Account.get_by_uuid(args[0])
         puts "Leave account \"#{account.name}\""
         puts account.remove_membership_self
@@ -324,7 +223,7 @@ module LMCAdm
     c.desc 'Add Member'
     c.command :memberadd do |ma|
       ma.flag :A, :account, :required => true
-      ma.action do |global_options, options, args|
+      ma.action do |_global_options, options, args|
         target_account = LMC::Account.get_by_uuid_or_name options[:account]
         membership = LMC::Membership.new
         membership.name = args.first
@@ -343,7 +242,7 @@ module LMCAdm
     c.desc 'Remove member from account'
     c.command :memberremove do |memberremove|
       memberremove.flag :A, :account, :required => true
-      memberremove.action do |global_options, options, args|
+      memberremove.action do |_global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name(options[:account])
         membership = account.find_member_by_name args.first
         puts "Leave account \"#{account.name}\""
@@ -357,7 +256,7 @@ module LMCAdm
       update.flag :A, :account, :required => true
       update.desc 'authority id'
       update.flag 'add-authority'
-      update.action do |global_options, options, args|
+      update.action do |_global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name(options[:account])
         membership = account.find_member_by_name args.first
         puts membership
@@ -376,22 +275,13 @@ module LMCAdm
           # POST /accounts/{accountId}/members/{principalId}
           cloud = LMC::Cloud.instance
           cloud.auth_for_account account
-          res = cloud.post ['cloud-service-auth', 'accounts', account.id, 'members', membership.id], { 'authorities' => authority_ids }
+          res = cloud.post ['cloud-service-auth', 'accounts', account.id, 'members', membership.id], {'authorities' => authority_ids}
           puts res
         end
       end
     end
 
 
-    # IF the special flag is set, do weird license magic for ninden
-    # * Für alle unterliegenden Organisationen
-    # -> POST /accounts/{accountId}/conditions/device-operation
-    # -> "templateAllowTestAllocation": true,
-    # -> "templateTestDuration": 30
-    # * Für alle unterliegenden Projekte
-    # -> POST /accounts/{accountId}/conditions/device-operation
-    # -> "allowTestAllocation": true,
-    # -> "testDuration": 30
     c.desc 'List account children'
     c.arg_name 'UUID|Name'
     c.command :children do |children|
@@ -400,31 +290,6 @@ module LMCAdm
         account = LMC::Account.get_by_uuid_or_name args.first
         cloud = LMC::Cloud.instance
 
-        # def recurse_print_children(root_acc, account, options, cloud)
-        #   children = root_acc.children_for_account_id account.id
-        #   children.each do |child|
-        #     puts "\n#{child["name"]} #{child["id"]} #{child["type"]}"
-        #     if options[:special] == "read"
-        #       puts cloud.get ["cloud-service-licenses", "accounts", child["id"], "conditions"]
-        #     end
-        #     if options[:special] == "write"
-        #       if child["type"] == "ORGANIZATION"
-        #         #puts cloud.get ["cloud-service-licenses", "accounts", child["id"], "conditions", "device-operation"]
-        #         puts cloud.post ["cloud-service-licenses", "accounts", child["id"], "conditions", "device-operation"], {"templateAllowTestAllocation" => true, "templateTestDuration": 30}
-        #       end
-        #       if child["type"] == "PROJECT"
-        #         #puts cloud.get ["cloud-service-licenses", "accounts", child["id"], "conditions", "device-operation"]
-        #         puts cloud.post ["cloud-service-licenses", "accounts", child["id"], "conditions", "device-operation"], {"allowTestAllocation" => true, "testDuration": 30}
-        #       end
-        #
-        #     end
-        #   end
-        #   children.each do |child|
-        #     childacc = LMCAccount.new(child)
-        #     recurse_print_children(childacc, childacc, options, cloud)
-        #   end
-        # end
-        #recurse_print_children(account, account, options, cloud)
         def recurse_childen account, indent_level
           children = account.children
           children.each do |child|

data/lib/lmcadm/commands/principal.rb

@@ -10,16 +10,7 @@ module LMCAdm
         cloud.auth_for_account root_account
         pw = Helpers::read_pw "Enter new password for #{args.first}:"
         principal = LMC::Principal.new({ 'name' => args.first, 'password' => pw, 'type' => options[:type] })
-        puts principal.save.inspect
-        begin
-        rescue Exception => e
-          puts e.inspect
-          puts e.message.inspect
-          puts e.response
-          puts e.response.message
-        end
-
-
+        puts principal.save
       end
     end
 
@@ -40,7 +31,6 @@ module LMCAdm
         c = LMC::Cloud.instance
         c.auth_for_account LMC::Account.get LMC::Account::ROOT_ACCOUNT_UUID
         c.delete ['cloud-service-auth', 'principals', args.first]
-
       end
     end
   end

data/lib/lmcadm/device_commands.rb

@@ -33,45 +33,56 @@ module LMCAdm
       end
     end
 
-    c.arg_name "device uuid", [:multiple]
+    c.arg_name "<device uuid|name>", [:multiple, :required]
     c.desc 'Show device config'
     c.command :config do |device_config|
       device_config.desc 'Account UUID|Name'
       device_config.flag :A, :account
 
+      device_config.desc 'Output descriptive identifiers, overrides filter oid and lcf format'
+      device_config.switch :d, :descriptive
+
+      device_config.desc 'Output lcf file, overrides filter oid'
+      device_config.switch :lcf
+
       device_config.desc 'Write to files'
       device_config.switch :w
+
       device_config.desc 'Prefix for files'
       device_config.default_value 'config'
       device_config.flag :p, :prefix
 
-      device_config.desc "Filter OID"
+      device_config.desc "Filter OID, incompatible with descriptive identifiers"
       device_config.flag :filter_oid, "filter-oid"
 
       device_config.action do |global_options, options, args|
+        raise "No devices specified" if args.length < 1
         account = LMC::Account.get_by_uuid_or_name options[:account]
         all_devices = LMC::Device.get_for_account(account)
         devices = all_devices.select do |device|
-          args.include? device.id
+          (args.include? device.id) || (args.include? device.name)
         end
+        file_extension = 'json'
         devices.each do |device|
-          full_config = device.get_config_for_account(account)
-          result_config = full_config
-          if options[:filter_oid]
-            result_config = full_config["items"].select do |item|
-              item == options[:filter_oid]
-            end
+          config = device.config
+          if options[:descriptive]
+            result_config = config.descriptive_confighash
+          elsif options[:lcf]
+            pretty = config.lcf
+            file_extension = 'lcf'
+          elsif options[:filter_oid]
+            puts config.confighash
+            result_config = config.confighash[options[:filter_oid]]
+          else
+            result_config = config.confighash
           end
-          puts "result_config class: " + result_config.class.to_s if global_options[:debug]
-          puts "result_config class: " + result_config.body_object.class.to_s if global_options[:debug]
-          pretty = JSON.pretty_generate(result_config)
+          pretty ||= JSON.pretty_generate(result_config)
           if options[:w]
-            IO.write(options[:prefix] + "-" + device.name + '-' + device.id + ".json", pretty)
+            IO.write("#{options[:prefix]}-#{device.name}-#{device.id}.#{file_extension}", pretty)
           else
             puts pretty
           end
         end
-
       end
 
     end

data/lib/lmcadm/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.9.2'
+  VERSION = '0.10.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.8.0'
+  spec.add_runtime_dependency 'lmc', '~> 0.10.1'
   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.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement