lorj 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d7eabf0a0bfe1c20a49ea78ad77a37b6b5e521
-  data.tar.gz: 5170b2123e123a05028cd52cad7af4d1288acc09
+  metadata.gz: 36d83ea9cfd8bf5813827bf81787e5d4be58571c
+  data.tar.gz: f78ae355e208f298649ea3cd523fb163553948a7
 SHA512:
-  metadata.gz: 88a9a2866f706cf5183caf65cce95bbeffec6073fc47b2457c233a28bc73d4fe175aade0ae4410e42eb050ac52f5ea1da782c2e1a1404f0a673c575acb2e959e
-  data.tar.gz: 96ec48620a59cc39ea1307fcea13e04eeb2a703d1466338cf18b74ecfac225caabe85e0ef2c1a61b4359fa1f0621bf46b2589c260ec3d2f54da277391806ea7c
+  metadata.gz: e84cd61cdb98437b233c724c56df7dd6bf1b388e6e9e521defc20c6295346c221d75388eeaf3af1963a830736aea13e762bcca313094a860472248f897eddd7c
+  data.tar.gz: 5a4f65aab04941d2107f20ba7f7f0152104f4977ef3203c8418c5ef45e1448d0c1bf4038ca4de7a74bdab3556323176b2349f9f5c10a42d4163e4dc64bb21d38

data/lib/core/core_process_setup.rb

@@ -231,11 +231,15 @@ module Lorj
     # * *Args* :
     #   - +order_array+   : Array of data classified per level/order
     #   - +data_to_check+ : data to check
+    #
+    # * *returns* :
+    #   - true if found. false otherwise.
     def _setup_attr_already_added?(order_array, data_to_check)
       order_array.each_index do |order_index|
         attributes = order_array[order_index]
         return true unless attributes.index(data_to_check).nil?
       end
+      false
     end
 
     # Add the attribute parameter to setup list

data/lib/core/core_setup_ask.rb

@@ -96,15 +96,19 @@ module Lorj
     #
     # * *Raises* :
     #
-    def _setup_choose_list_process(obj_to_load, list_options)
+    def _setup_choose_list_process(obj_to_load, list_options,
+                                   default_value = nil)
       result = { :list => [], :default_value => nil }
       case list_options[:query_type]
       when :controller_call
-        result = _setup_list_from_controller_call(obj_to_load, list_options)
+        result = _setup_list_from_controller_call(obj_to_load, list_options,
+                                                  default_value)
       when :query_call
-        result = _setup_list_from_query_call(obj_to_load, list_options)
+        result = _setup_list_from_query_call(obj_to_load, list_options,
+                                             default_value)
       when :process_call
-        result = _setup_list_from_process_call(obj_to_load, list_options)
+        result = _setup_list_from_process_call(obj_to_load, list_options,
+                                               default_value)
       else
         PrcLib.runtime_fail "%s: '%s' invalid query type. valid is: '%s'.",
                             obj_to_load, list_options[:values_type],
@@ -130,7 +134,8 @@ module Lorj
     def _setup_ask_data_from_list(data, list_options, desc, options)
       obj_to_load = list_options[:object]
 
-      result = _setup_choose_list_process(obj_to_load, list_options)
+      result = _setup_choose_list_process(obj_to_load, list_options,
+                                          options[:default_value])
 
       list = result[:list]
 
@@ -191,6 +196,22 @@ module Lorj
     #   - +options+: list and validation options
     #     - :ask_function: Replace the _ask default call by a process function
     #       This function should return a string or nil, if no value.
+    #   - +default+: Default value.
+    #
+    #     setup will present a default value. This value can come from several
+    #     places, as follow in that order:
+    #     1. if a value is found from config layers => choose it as default
+    #     2. if default parameter is not nil => choose it as default
+    #     3. if data model defines :default_value. => choose it
+    #       In this last case, the :default_value is interpreted by ERB.
+    #       ERB context contains:
+    #       - config : data config layer.
+    #
+    #       Ex: So you can set :default_value like:
+    #
+    #            :default_value: "~/.ssh/<%= config[:keypair_name] %>-id_rsa"
+    #       This may assume that keypair_name is setup before abd would need:
+    #       - :after: <datas>
     #
     # * *Returns*:
     #   - value : value entered by the end user or nil if no value.
@@ -204,7 +225,14 @@ module Lorj
       is_required = (options[:required] == true)
       is_encrypted = options[:encrypted]
 
-      default = options[:default_value] if default.nil?
+      if default.nil? && !options[:default_value].nil?
+        begin
+          default = erb(options[:default_value])
+        rescue => e
+          PrcLib.warning("ERB error with :%s/:default_value '%s'.\n%s",
+                         data, options[:default_value], e.message)
+        end
+      end
       default = @config.get(data, default)
 
       # validate_proc = options[:validate_function]

data/lib/core/core_setup_init.rb

@@ -64,7 +64,7 @@ module Lorj
     #
     def _setup_check_additional(setup_steps)
       setup_steps.each_index do |step|
-        value = setup_steps[step]
+        value = Lorj.data.setup_data(:ask_step)[step]
         next unless value.rh_exist?(:add)
 
         datas_to_add = value.rh_get(:add)

data/lib/core/core_setup_list.rb

@@ -39,7 +39,7 @@ module Lorj
     #
     # * *Raises* :
     #
-    def _setup_list_from_controller_call(obj_to_load, list_options)
+    def _setup_list_from_controller_call(obj_to_load, list_options, default)
       PrcLib.message("Loading #{obj_to_load}.")
 
       object = @object_data[obj_to_load, :ObjectData]
@@ -61,7 +61,7 @@ module Lorj
       rescue => e
         PrcLib.runtime_fail "Error during call of '%s':\n%s", proc, e.message
       end
-      { :list => list, :default_value => nil }
+      { :list => list, :default_value => default }
     end
 
     # Internal setup function to build the list from a query call.
@@ -77,7 +77,7 @@ module Lorj
     #
     # * *Raises* :
     #
-    def _setup_list_from_query_call(obj_to_load, list_options)
+    def _setup_list_from_query_call(obj_to_load, list_options, default)
       PrcLib.message("Querying #{obj_to_load}.")
 
       query_hash = list_options[:query_params]
@@ -88,21 +88,21 @@ module Lorj
       list = []
       object_list.each { |oElem| list << oElem[list_options[:value]] }
 
-      { :list => list.sort!, :default_value => nil }
+      { :list => list.sort!, :default_value => default }
     end
 
     def _setup_build_process_params(option_params, params)
       return if option_params.nil?
 
       option_params.each do |key, value|
-        match_res = value.match(/lorj::config\[(.*)\]/)
-        if match_res
-          extract = match_res[1].split(', ')
-          extract.map! { |v| v[1..-1].to_sym if v[0] == ':' }
-          params << { key => config[extract] }
-        else
-          params << { key => value }
+        next if value.nil?
+        begin
+          value = erb(value)
+        rescue => e
+          Prclib.warning("ERB:process parameter failed to set '%s' with '%s'."\
+                         "\n%s", key, value, e.message)
         end
+        params << { key => value }
       end
     end
 
@@ -119,17 +119,18 @@ module Lorj
     #
     # * *Raises* :
     #
-    def _setup_list_from_process_call(obj_to_load, list_options)
+    def _setup_list_from_process_call(obj_to_load, list_options, default)
       PrcLib.runtime_fail '%s: query_type => :process_call'\
                    ' requires missing :query_call declaration'\
                    ' (Provider function)',
                           data if list_options[:query_call].nil?
       proc = list_options[:query_call]
       obj_to_load = list_options[:object]
-      PrcLib.debug(2, "Running process '#{proc}' on '#{obj_to_load}'.")
+      Lorj.debug(2, "Running process '#{proc}' on '#{obj_to_load}'.")
 
       # Building Process function attr_params parameter
       params = ObjectData.new
+
       params << { :default_value => default }
 
       _setup_build_process_params(list_options[:query_params], params)

data/lib/lorj/version.rb

@@ -16,5 +16,5 @@
 
 # Lorj version
 module Lorj
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/providers/openstack/openstack.rb

@@ -131,19 +131,27 @@ class Openstack
 
   define_data(:compute,
               :account => true,
+              :default_value => '<%= config[:network] %>',
               :explanation => 'Depending on your installation, you may need to'\
-                ' provide a Region name. This information shown under your '\
+                ' provide a Region name. This information is shown under your '\
                 'horizon UI - close right to the project name (top left).'\
+                "\nYou can also get it from Project-Compute-Access & Security-"\
+                'API, then download the Openstack RC file. The Region name is '\
+                'set as OS_REGION_NAME.'\
                 "\nIf there is no region shown, you can ignore it.",
-              :desc => 'Openstack Compute Region (Ex: regionOne)'
+              :desc => 'Openstack Compute Region (Ex: RegionOne)'
   )
 
   define_data(:network,
               :account => true,
-              :desc => 'Openstack Network Region (Ex: regionOne)',
+              :default_value => '<%= config[:compute] %>',
+              :desc => 'Openstack Network Region (Ex: RegionOne)',
               :explanation => 'Depending on your installation, you may need to'\
-                ' provide a Region name. This information shown under your '\
+                ' provide a Region name. This information is shown under your '\
                 'horizon UI - close right to the project name (top left).'\
+                "\nYou can also get it from Project-Compute-Access & Security-"\
+                'API, then download the Openstack RC file. The Region name is '\
+                'set as OS_REGION_NAME.'\
                 "\nIf there is no region shown, you can ignore it."
   )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lorj
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - forj team