lorj 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585c6c4b0aa26950efa49b136783616c2beb4f9b
-  data.tar.gz: abab8d4bf4bbf1fdb4c20c91138e6581945e66b5
+  metadata.gz: c3ea57c85015a879c6ae4a17ae32cc568d7c1559
+  data.tar.gz: 88617061e04fc13f17454c770dc41ad87a19c2b5
 SHA512:
-  metadata.gz: 1c1cd5afda8dd06b00b51416e59fd0e9bf1d380037a39a9b20430dc3288328843a653e73668be6f44a0d0e04df27a637c4974979081c81d0ba0f6a72b8b8323d
-  data.tar.gz: 525fcd57165a83dc6100b60dabba0be2b3b2753bab245468e7f7b223b2b1fae4e9c9222e5e7c4442f14cb393a7278c5ad2d2ea44bb7e778fb1e4a9df53819905
+  metadata.gz: 8d8214f417ae51f763015aa0836d30365ca34b3313c0bafd002cbae137e8a75478261aeb80d9d2d6ccc3575dfc13483501a5fb80aefb11e4ec6d1da2369958d3
+  data.tar.gz: 4262c71516afea78b39dc03482e972d4465347bec1062d9198648c0dfd7c934b3957c48f46c2b61bcac2e68477433efc9359737143f8b0dfd92962b8a3b1cf67

data/Gemfile.lock

@@ -1,15 +1,18 @@
 PATH
   remote: .
   specs:
-    lorj (0.1.0)
+    lorj (0.2.0)
       ansi (>= 1.4.3)
-      bundler
+      encryptor (= 1.3.0)
+      highline (~> 1.6.21)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.4.3)
     diff-lcs (1.2.5)
+    encryptor (1.3.0)
+    highline (1.6.21)
     rake (10.4.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
@@ -28,7 +31,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
+  bundler
   lorj!
   rake (~> 10.0)
   rspec (~> 3.1.0)

data/lib/core/core.rb

@@ -142,8 +142,6 @@ module Lorj
          # Loading ProcessClass
          # Create Process derived from respectively BaseProcess
 
-         # TODO: Replace Global variables by equivalent to PrcLib.<var>
-
          PrcLib.core_level = 0 if PrcLib.core_level.nil?
 
          if oForjConfig.nil?
@@ -172,8 +170,9 @@ module Lorj
             # And load the content from the <sProcessClass>.rb
             if sProcessClass.is_a?(Symbol)
                # Ensure file and processName is capitalized
-               sProcessClass = sProcessClass.to_s.capitalize if (/[A-Z]/ =~ sProcessClass.to_s) != 0
-               sFile = File.join($CORE_PROCESS_PATH, sProcessClass + '.rb')
+               sProcessClass = sProcessClass.to_s
+               sProcessClass = sProcessClass.capitalize if (/[A-Z]/ =~ sProcessClass.to_s) != 0
+               sFile = File.join(PrcLib.process_path, sProcessClass + '.rb')
             else
                if sProcessClass.include?('/')
                   # Consider a path to the process file. File name is the name of the class.
@@ -191,7 +190,7 @@ module Lorj
                      }
                   end
                else
-                  sPath = $CORE_PROCESS_PATH
+                  sPath = PrcLib.process_path
                   sProcessClass = sProcessClass.capitalize if (/[A-Z]/ =~ sProcessClass) != 0
                   sFile = sProcessClass + '.rb'
                end
@@ -215,7 +214,7 @@ module Lorj
             Lorj.debug(1, "Loading Controller/definition '%s'" % sControllerClass)
             # Add Provider Object -------------
             if sControllerClass.is_a?(Symbol)
-               sPath = File.join($PROVIDERS_PATH, sControllerClass.to_s)
+               sPath = File.join(PrcLib.controller_path, sControllerClass.to_s)
                sControllerClass = sControllerClass.to_s.capitalize if (/[A-Z]/ =~ sControllerClass.to_s) != 0
                sFile = sControllerClass.to_s + '.rb'
             else
@@ -235,7 +234,7 @@ module Lorj
                      }
                   end
                else
-                  sPath = File.join($PROVIDERS_PATH, sControllerClass)
+                  sPath = File.join(PrcLib.controller_path, sControllerClass)
                   sControllerClass = sControllerClass.capitalize if (/[A-Z]/ =~ sControllerClass) != 0
                   sFile = sControllerClass + '.rb'
                end
@@ -487,7 +486,7 @@ module Lorj
    class CloudCore < Core
       def initialize(oConfig, sAccount = nil, aProcesses = [])
 
-         unless oConfig.is_a?(ForjAccount)
+         unless oConfig.is_a?(Lorj::Account)
             oForjAccount = Lorj::Account.new(oConfig)
             unless sAccount.nil?
                oForjAccount.ac_load(sAccount)
@@ -500,7 +499,7 @@ module Lorj
          sControllerMod = oForjAccount.get(:provider_name)
          raise Lorj::PrcError.new(), "Provider_name not set. Unable to create instance CloudCore." if sControllerMod.nil?
 
-         sControllerProcessMod = File.join($PROVIDERS_PATH, sControllerMod, sControllerMod.capitalize + "Process.rb")
+         sControllerProcessMod = File.join(PrcLib.controller_path, sControllerMod, sControllerMod.capitalize + "Process.rb")
          if File.exist?(sControllerProcessMod)
             aProcessList << sControllerProcessMod
          else
@@ -662,7 +661,7 @@ module Lorj
       # * *Raises* :
       #   nothing
       def << (hHash)
-         @hParams.merge!(hHash)
+         @hParams.merge!(hHash) unless hHash.nil?
       end
 
       # check Lorj::Data attributes or object exists. Or check key/value pair existence.

data/lib/core/definition.rb

@@ -67,6 +67,8 @@ module Lorj
       #                         => Data name. This symbol must be unique, across sections.
       #     :desc:              Required. String. default: nil
       #                         => Description
+      #     :explanation:  |-   Print a multiline explanation before ask the key value.
+      #                         ERB template enable. To get config data, type <%= config[...] %>
       #     :readonly:          Optional. true/false. Default: false
       #                         => oForjConfig.set() will fail if readonly is true.
       #                            Can be set, only thanks to oForjConfig.setup()
@@ -105,8 +107,9 @@ module Lorj
       #
       # :setup:                  This section describes group of fields to ask, step by step.
       #     :ask_step:           Define an Array of setup steps to ask to the end user. The step order is respected, and start at 0
-      #     -  :desc:            Define the step description
+      #     -  :desc:            Define the step description. ERB template enable. To get config data, type config[...]
       #        :explanation:  |- Define a multiline explanation. This is printed out in brown color.
+      #                          ERB template enable. To get config data, type <%= config[...] %>
       #        :add:             Define a list of additionnal fields to ask.
       #        - <Data>          Data to ask.
       #
@@ -500,6 +503,10 @@ module Lorj
          Lorj::rhSet(@@predefine_data_value, value, oKeyPath.sFullPath, :values)
       end
 
-
+      # function to interpret a template data, and use ERBConfig as data context.
+      # ERBConfig contains config object only.
+      def erb(str)
+         ERB.new(str).result(@oERBConfig.get_binding())
+      end
    end
 end

data/lib/core/lorj-basedefinition.rb

@@ -22,7 +22,24 @@
 # - definition(BaseDefinition): Functions to declare objects, query/data mapping and setup
 # this task to make it to work.
 
+require 'highline/import'
+require 'erb'
+
 module Lorj
+   # This class limits ERC template to access only to config object data.
+   class ERBConfig
+      attr_reader :config
+
+      def initialize(config)
+          @config = config
+      end
+
+      # Bind this limited class with ERB templates
+      def get_binding()
+         binding()
+      end
+   end
+     
    # Following class defines class levels function to
    # declare framework objects.
    # As each process needs to define new object to deal with
@@ -229,7 +246,7 @@ module Lorj
 
          return nil if not sCloudObj
 
-         raise Lorj::PrcError.new(), "$s.Get: '%s' is not a known object type." % [self.class, sCloudObj] if Lorj::rhExist?(@@meta_obj, sCloudObj) != 1
+         raise Lorj::PrcError.new(), "%s.Get: '%s' is not a known object type." % [self.class, sCloudObj] if Lorj::rhExist?(@@meta_obj, sCloudObj) != 1
 
          if hConfig.length > 0
             # cleanup runtime data to avoid conflicts between multiple calls
@@ -585,7 +602,11 @@ module Lorj
          aSetup.each_index { | iStep |
             Lorj.debug(2, "Ask step %s:" % iStep)
             puts "%s%s%s" % [ANSI.bold, aSetup[iStep][:desc], ANSI.clear] unless aSetup[iStep][:desc].nil?
-            puts "%s\n\n" % ANSI.yellow(aSetup[iStep][:explanation]) unless aSetup[iStep][:explanation].nil?
+            begin
+              puts "%s\n\n" % ANSI.yellow(erb(aSetup[iStep][:explanation])) unless aSetup[iStep][:explanation].nil?
+            rescue => e
+               PrcLib.Error "setup step '%d/:explanation' : %s" % [iStep, e.message]
+            end
             aOrder = aSetup[iStep][:order]
             aOrder.each_index { | iIndex |
             Lorj.debug(2, "Ask order %s:" % iIndex)
@@ -602,8 +623,16 @@ module Lorj
 
 
                   sDesc = "'%s' value" % sKey
-                  puts "#{sKey}: %s" % [hParam[:explanation]] unless Lorj::rhGet(hParam, :explanation).nil?
-                  sDesc = hParam[:desc] unless hParam[:desc].nil?
+                  begin
+                     puts "#{sKey}: %s" % [erb(hParam[:explanation])] unless hParam[:explanation].nil?
+                  rescue => e
+                     PrcLib.Error "setup key '%s/:explanation' : %s" % [sKey, e.message]
+                  end
+                  begin
+                     sDesc = erb(hParam[:desc]) unless hParam[:desc].nil?
+                  rescue => e
+                     PrcLib.Error "setup key '%s/:desc' : %s" % [sKey, e.message]
+                  end
                   sDefault = @oForjConfig.get(sKey, hParam[:default_value])
                   rValidate = nil
 
@@ -647,14 +676,40 @@ module Lorj
                               raise Lorj::PrcError.new(), "#{sKey}: query_type => :process_call requires missing :query_call declaration (Provider function)" if hValues[:query_call].nil?
                               pProc = hValues[:query_call]
                               sObjectToLoad = hValues[:object]
+
+                              # Building Process function hParams parameter
                               oParams = ObjectData.new
-                              oParams.add(oObject)
-                              oParams << hValues[:query_params]
+                              oParams << { default_value: sDefault }
+
+                              unless hValues[:query_params].nil?
+                                 hValues[:query_params].each { | key, value |
+                                   if mRes = value.match(/lorj::config\[(.*)\]/)
+                                      aExtract = mRes[1].split(', ')
+                                      aExtract.map! { | v | v = v[1..-1].to_sym if v[0] == ':' }
+                                      oParams << { key => config[aExtract] }
+                                   else
+                                      oParams << { key => value }
+                                   end
+                                 }
+                              end
+
                               begin
-                                 aList = @oForjProcess.method(pProc).call(sObjectToLoad, oParams)
+                                 hProcResult = @oForjProcess.method(pProc).call(sObjectToLoad, oParams)
                               rescue => e
                                  raise Lorj::PrcError.new(), "Error during call of '%s':\n%s" % [pProc, e.message]
                               end
+
+                              if hProcResult.is_a?(Hash)
+                                 sDefault = hProcResult[:default_value].nil? ? sDefault : hProcResult[:default_value]
+                                 if hProcResult[:list].nil? or ! hProcResult[:list].is_a?(Array)
+                                    PrcLib.debug("Process function '%s' did not return an :list => Array of values." % [ hValues[:query_call] ])
+                                 else
+                                    aList = hProcResult[:list]
+                                 end
+                              else
+                                 PrcLib.debug("Process function '%s' did not return an Hash with :list and :default_value")
+                                 aList = []
+                              end
                            else
                               raise Lorj::PrcError.new, "'%s' invalid. %s/list_values/values_type supports %s. " % [hValues[:values_type], sKey, [:provider_function]]
                         end
@@ -699,7 +754,12 @@ module Lorj
                      @oForjConfig.set(sKey, value)
                      if hParam[:post_step_function]
                         pProc = hParam[:post_step_function]
-                        bOk = @oForjProcess.method(pProc).call()
+                        bResult = @oForjProcess.method(pProc).call()
+                        if bResult.boolean?
+                           bOk = bResult
+                        else
+                           PrcLib.debug("Warning: '%s' did not return any boolean value. Ignored" % [pProc])
+                        end
                      end
                   end
                }
@@ -719,6 +779,7 @@ module Lorj
          }
 
          @oForjConfig = oForjConfig
+         @oERBConfig = ERBConfig.new(oForjConfig)
          raise Lorj::PrcError.new(), "'%s' is not a valid ForjAccount or ForjConfig Object." % [oForjConfig.class] if not oForjConfig.is_a?(Lorj::Account) and not oForjConfig.is_a?(Lorj::Config)
 
          @oProvider = oForjProvider
@@ -1014,7 +1075,6 @@ module Lorj
          bDone
       end
 
-
       private
 
       # -------------------------------------------------------------------------

data/lib/core/lorj-baseprocess.rb

@@ -35,6 +35,11 @@ module Lorj
          @oDefinition = oDefinition
       end
 
+      def controller_connect(sObjectType, hParams = {})
+         raise Lorj::PrcError.new(), "No Controler object loaded." if not @oDefinition
+         @oDefinition.connect(sObjectType)
+      end
+
       def controller_create(sObjectType, hParams = {})
          raise Lorj::PrcError.new(), "No Controler object loaded." if not @oDefinition
          @oDefinition.create(sObjectType)
@@ -146,7 +151,7 @@ module Lorj
       end
 
       def query_single(sCloudObj, oList, sQuery, name, sInfoMsg = {})
-         oList = controler.query(sCloudObj, sQuery)
+         oList = controller_query(sCloudObj, sQuery)
          sInfo = {
             :notfound   => "No %s '%s' found",
             :checkmatch => "Found 1 %s. checking exact match for '%s'.",

data/lib/core_process/CloudProcess.rb

@@ -17,11 +17,11 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
-require File.join($CORE_PROCESS_PATH, "global_process.rb")
-require File.join($CORE_PROCESS_PATH, "network_process.rb")
+require File.join(PrcLib.process_path, "global_process.rb")
+require File.join(PrcLib.process_path, "network_process.rb")
 
 # Define framework object on BaseDefinition
-class BaseDefinition
+class Lorj::BaseDefinition
 
    # All objects used by this process are built from a Controller
    process_default :use_controller => true
@@ -197,7 +197,8 @@ class BaseDefinition
    define_obj(:keypairs,
       {
          :create_e   => :forj_get_or_create_keypair,
-         :query_e    => :forj_query_keypair
+         :query_e    => :forj_query_keypair,
+         :get_e      => :forj_get_keypair
 #         :delete_e   => :forj_delete_keypair
       })
 
@@ -267,9 +268,9 @@ class BaseDefinition
       {
          :create_e   => :forj_get_or_create_server,
          :query_e    => :forj_query_server,
-         :get_e      => :forj_get_server
+         :get_e      => :forj_get_server,
 #         :update_e   => :forj_update_server,
-#         :delete_e   => :forj_delete_server
+         :delete_e   => :forj_delete_server
       })
 
    obj_needs   :CloudObject,  :compute_connection
@@ -291,6 +292,8 @@ class BaseDefinition
    def_attribute  :private_ip_address
    def_attribute  :public_ip_address
 
+   def_attribute  :image_id
+   def_attribute  :key_name
    # ************************************ SERVER Addresses Object
    # Object representing the list of IP addresses attached to a server.
    define_obj(:public_ip,