opennebula-cli 6.3.90.pre → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f3fc9a8c3825e9063b10901a749e086a10d4025c1f1742f4954db927832ee2e
-  data.tar.gz: 2f77621f9e521f6f02f63b5d39486157004cba81c9d6ab76923720b0b4d2c9f2
+  metadata.gz: 56b346315b2634a821c776148d1e7e01aa05adfcdb3b4a2e367cae4a29b26857
+  data.tar.gz: 7046877fa9eb556c11b1dc21bcb27576ed801cb0e8ed6f55c50c3a6b72579ee2
 SHA512:
-  metadata.gz: e9dfbab37a9aa42558431c6c03386944b2bfd904256b636dbf2d5746142b5b7ecd0a4f6c7895bde791969286f5e8ba9d24caeb8d82003fd484dc3df056f0ceec
-  data.tar.gz: bb2fa551de041f71aac6b6acd38f755c65dc92ed514eb4eab54ff00df03adf905031ab487b10e03058b10fa219a47e168a028fa673025b1f5e6930ae1a53a570
+  metadata.gz: 3fc21ffc004d6e90f856f49b58164318b365653839009225b77d6074004f24da92d495d6f71669130c47b75648f744e31ae7ff412634198990ff7ec537856203
+  data.tar.gz: 1dc9aef9254b2ef752a9adea4c98f55aec7537842cd62f6fe88f3c8b09a89d0c38f6c2218af2d582e800fe7cc920672316d656e9543ab6d29b77a38c65704d95

data/bin/oneuser

@@ -443,7 +443,7 @@ CommandParser::CmdParser.new(ARGV) do
     command :key, key_desc, :options => [KEY] do
         require 'opennebula/ssh_auth'
 
-        options[:key] ||= ENV['HOME'] + '/.ssh/id_rsa'
+        options[:key] ||= Dir.home + '/.ssh/id_rsa'
 
         begin
             sshauth = SshAuth.new(:private_key => options[:key])

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -221,16 +221,14 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 exit(-1)
             end
 
-            mandatory, _type, description, _params, initial = input_cfg
-
-            vnet = {}
+            vnet                                  = {}
+            mandatory, _, description, _, initial = input_cfg
 
             if initial && !initial.empty?
                 type, resource_id, extra = initial.split(':', -1)
             end
 
-            if (type.nil? || resource_id.nil?) &&
-               (initial && !initial.empty?)
+            if (!type || !resource_id) && (initial && !initial.empty?)
                 STDERR.puts 'Wrong type for user input default value:'
                 STDERR.puts "  #{key}: #{val}"
                 exit(-1)
@@ -239,7 +237,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
             vnet[key] = {}
 
             if get_defaults
-                vnet[key][type] = resource_id
+                vnet[key][type]    = resource_id
                 vnet[key]['extra'] = extra
 
                 answers << vnet unless mandatory == 'M'
@@ -248,22 +246,25 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
             puts "  * (#{key}) #{description}"
 
-            #######################################
-            # Asks for type
-            #######################################
-
-            header = '    '
+            ####################################################################
+            # Ask for type
+            ####################################################################
+            header  = '    '
             header += 'TYPE Existing(1), Create(2), Reserve(3). '
-
-            if !type.nil? && type != ''
-                header += 'Press enter for default. '
-            end
+            header += 'Press enter for default. ' if type && !type.empty?
 
             print header
 
             answer = STDIN.readline.chop
 
-            type_a = type
+            if type && !type.empty? && ![1, 2, 3].include?(answer.to_i)
+                type_a = type
+            else
+                until [1, 2, 3].include?(answer.to_i)
+                    print header
+                    answer = STDIN.readline.chop
+                end
+            end
 
             case answer.to_i
             when 1
@@ -274,18 +275,18 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
                 type_a = 'reserve_from'
             end
 
-            #######################################
-            # Asks for resource id
-            #######################################
-
+            ####################################################################
+            # Ask for resource id
+            ####################################################################
             header = '    '
+
             if type_a == 'template_id'
                 header += 'VN Template ID. '
             else
                 header += 'VN ID. '
             end
 
-            if !resource_id.nil? && resource_id != ''
+            if resource_id && !resource_id.empty?
                 header += "Press enter for default (#{resource_id}). "
             end
 
@@ -293,17 +294,23 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
             resource_id_a = STDIN.readline.chop
 
-            resource_id_a = resource_id if resource_id_a.empty?
+            if resource_id && !resource_id.empty?
+                resource_id_a = resource_id
+            else
+                while resource_id_a.empty?
+                    print header
+                    resource_id_a = STDIN.readline.chop
+                end
+            end
 
-            #######################################
+            ####################################################################
             # Asks for extra
-            #######################################
-
+            ####################################################################
             if type_a != 'id'
-                header = '    '
+                header  = '    '
                 header += 'EXTRA (Type EMPTY for leaving empty). '
 
-                if !extra.nil? && extra != ''
+                if extra && !extra.empty?
                     header += " Press enter for default (#{extra}). "
                 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.3.90.pre
+  version: 6.4.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.90.pre
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.90.pre
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: