opennebula-cli 5.6.1 → 5.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7898ac99cecd152ea743a52a93477038ee82ba80
-  data.tar.gz: 51743bf968d7d071faf589feaf5ebab16fef8b39
+  metadata.gz: 4d1313a09ad69bd8995ea3d0f18e3d2c14fab328
+  data.tar.gz: a473397450005c9ece8ac0c828112fa283771a27
 SHA512:
-  metadata.gz: 7c7d8725c0fd499f613584bd1b04985049196a6d132bde5257c861f3e3166808849f9be4de8323a5be7f094756373b307691ed1159a787708679070026b442da
-  data.tar.gz: 747442104db1ef7dfbfd0c8adf19f9a9deab687fec3f9fe5c09f16f24dbad18a563c74b3199e5f0c7127dbd0025f72bb82e07b05ada3fb3b90d7754a183662b6
+  metadata.gz: 4881c31920ba49fe702a331342edb631b0583d998ed698f39d88ebe2ed4f1cc5d40ef586314c62e24acd4a570cae6dd1c58025720079666619b2a6a0ec42e2e1
+  data.tar.gz: 962c7bda318cf8597f26af880d292a9f7524fad71198785c040c1b4a4e38e2152ef5e3912b5bb8c63095b9409a9c9392a83a4429c63265ddc8856ba3ae079be4

data/NOTICE

@@ -6,21 +6,6 @@ Copyright 2002-2018, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
 You can find  more information about the project, release notes and
 documentation at www.OpenNebula.org
 
-AUTHORS
-
-- Ruben Santiago Montero (rsmontero@opennebula.org)
-- Ignacio Martin Llorente (imllorente@opennebula.org)
-
-ACKNOWLEDGEMENTS
-
-The following people have contributed to the development of the technology
-- Javier Fontan Muiños (jfontan@opennebula.org)
-- Constantino Vazquez Blanco (tinova@opennebula.org)
-- Jaime Melis Bayo (jmelis@opennebula.org)
-- Carlos Martin Sanchez (cmartin@opennebula.org)
-- Daniel Molina Aranda (dmolina@opennebula.org)
-- Hector Sanjuan Redondo (hsanjuan@opennebula.org)
-
 LICENSE
 
 OpenNebula is licensed under the Apache License, Version 2.0 (the

data/lib/cli_helper.rb

@@ -110,9 +110,11 @@ module CLIHelper
     ANSI_RED="\33[31m"
     ANSI_GREEN="\33[32m"
     ANSI_RESET="\33[0m"
+    ANSI_YELLOW="\33[33m"
 
-    OK_STATES=%w{runn rdy on}
-    BAD_STATES=%w{fail err err}
+    OK_STATES=%w{runn rdy on configured}
+    BAD_STATES=%w{fail err err error}
+    REGULAR_STATES=%w{pending}
 
     def CLIHelper.color_state(stat)
         if $stdout.tty?
@@ -121,6 +123,8 @@ module CLIHelper
                 ANSI_GREEN+stat+ANSI_RESET
             when *BAD_STATES
                 ANSI_RED+stat+ANSI_RESET
+            when *REGULAR_STATES
+                ANSI_YELLOW+stat+ANSI_RESET
             else
                 stat
             end
@@ -270,7 +274,7 @@ module CLIHelper
 
         def print_table(data, options)
             if !options[:csv] && !options[:noheader]
-                CLIHelper.print_header(header_str) 
+                CLIHelper.print_header(header_str)
             end
 
             data ? print_data(data, options) : puts

data/lib/command_parser.rb

@@ -74,7 +74,7 @@ module CommandParser
             instance_eval(&block)
 
             addons = Dir["#{OpenNebulaHelper::CLI_ADDONS_LOCATION}/#{File.basename($0)}/*"]
-            if defined?(addons) and !addons.nil? 
+            if defined?(addons) and !addons.nil?
                     addons.each do |addon_path|
                         addon_code = File.read(addon_path)
                         instance_eval(addon_code)
@@ -280,6 +280,10 @@ module CommandParser
         #   end
         #
         def command(name, desc, *args_format, &block)
+            if name.is_a? (Array)
+                name = name.join(" ").to_sym
+            end
+
             cmd = Hash.new
             cmd[:desc] = desc
             cmd[:arity] = 0
@@ -432,8 +436,17 @@ module CommandParser
                 comm      = @main
             elsif
                 if @args[0] && !@args[0].match(/^-/)
-                    @comm_name = comm_name = @args.shift.to_sym
-                    comm      = @commands[comm_name]
+                    while comm.nil? and @args.size > 0 do
+                        current = @args.shift
+
+                        if comm_name.empty?
+                            @comm_name = comm_name = "#{current}".to_sym
+                        else
+                            @comm_name = comm_name = "#{comm_name} #{current}".to_sym
+                        end
+
+                        comm      = @commands[comm_name]
+                    end
                 end
             end
 

data/lib/one_helper.rb

@@ -581,7 +581,7 @@ EOT
         # output
         #-----------------------------------------------------------------------
         def list_pool_table(table, pool, options, filter_flag)
-            if $stdout.isatty 
+            if $stdout.isatty and (!options.key?:no_pager) 
                 size = $stdout.winsize[0] - 1 
 
                 # ----------- First page, check if pager is needed -------------

data/lib/one_helper/onehost_helper.rb

@@ -533,7 +533,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         onevm_helper=OneVMHelper.new
         onevm_helper.client=@client
-        onevm_helper.list_pool({:filter=>["HOST=#{host.name}"]}, false)
+        onevm_helper.list_pool({:filter=>["HOST=#{host.name}"], :no_pager => true}, false)
     end
 
     def print_pcis(pcis)

data/lib/one_helper/oneimage_helper.rb

@@ -320,7 +320,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             vms.map!{|e| e.to_i }
             onevm_helper=OneVMHelper.new
             onevm_helper.client=@client
-            onevm_helper.list_pool({:ids=>vms}, false)
+            onevm_helper.list_pool({:ids=>vms, :no_pager => true}, false)
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.6.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.1
+        version: 5.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.1
+        version: 5.6.2
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables: