forj 0.0.43 → 0.0.44

data/lib/forj-config.rb

@@ -24,40 +24,180 @@ require 'yaml'
 #require_relative 'log.rb'
 #include Logging
 
+def rhExist?(yVal, *p)
+
+   if p.length() == 0
+      return 0
+   end
+   return 0 if yVal.class != Hash
+   p=p.flatten
+   if p.length() == 1
+      return 1 if yVal.key?(p[0])
+      return 0
+   end
+   return 0 if yVal.nil? or not yVal.key?(p[0])
+   ret = 0
+   ret = rhExist?(yVal[p[0]], p.drop(1)) if yVal[p[0]].class == Hash
+   return 1 + ret
+end
+
+def rhGet(yVal, *p)
+
+   return nil if yVal.class != Hash
+   p=p.flatten
+   if p.length() == 0 or not yVal
+      return yVal
+   end
+   if p.length() == 1
+      return yVal[p[0]] if yVal.key?(p[0])
+      return nil
+   end
+   return nil if not yVal
+   return rhGet(yVal[p[0]], p.drop(1)) if yVal.key?(p[0])
+   nil
+end
+
+def rhSet(yVal, value, *p)
+   if p.length() == 0
+      return yVal
+   end
+   p=p.flatten
+   if p.length() == 1
+      if not yVal.nil?
+         if value
+            yVal[p[0]] = value
+         else
+            yVal.delete(p[0])
+         end
+         return yVal
+      end
+      if value
+         ret = { p[0] => value }
+      else
+         ret = {}
+      end
+      return ret
+   end
+   if not yVal.nil?
+      yVal[p[0]] = {} if not yVal[p[0]] or yVal[p[0]].class != Hash
+      ret=rhSet(yVal[p[0]], value, p.drop(1))
+      return yVal
+   else
+      ret = rhSet(nil, value, p.drop(1))
+      return { p[0] => ret }
+   end
+end
+
+def rhKeyToSymbol(yVal, levels = 1)
+   return nil if yVal.nil? or yVal.class != Hash
+   yRes = {}
+   yVal.each { | key, value |
+   if key.class == String
+      if levels <= 1
+         yRes[key.to_sym] = value
+      else
+         yRes[key.to_sym] = rhKeyToSymbol(value, levels - 1)
+      end
+   else
+      if levels <= 1
+         yRes[key] = value
+      else
+         yRes[key] = rhKeyToSymbol(value, levels - 1)
+      end
+   end
+   }
+   yRes
+end
+
+def rhKeyToSymbol?(yVal, levels = 1)
+   return false if yVal.nil? or yVal.class != Hash
+   yVal.each { | key, value |
+   if key.class == String
+      return true
+   end
+   if levels >1
+      res = rhKeyToSymbol?(value, levels - 1)
+      return true if res
+   end
+   }
+   false
+end
+
 class ForjDefault
 
    # @sDefaultsName='defaults.yaml'
    # @yDefaults = defaults.yaml file data hash
 
-   def initialize()
-      # Load yaml documents (defaults)
-      # If config doesn't exist, it will be created, empty with 'defaults:' only
+   # Load yaml documents (defaults)
+   # If config doesn't exist, it will be created, empty with 'defaults:' only
+
 
-      if not $LIB_PATH
-         Logging.fatal(1, 'Internal $LIB_PATH was not set.')
-      end
+   def self.exist?(key, section = :default)
+      key = key.to_sym if key.class == String
+      (rhExist?(@@yDefaults, section, key) == 2)
+   end
+
+   def self.get(key, section = :default)
+      key = key.to_sym if key.class == String
+      return(rhGet(@@yDefaults, section, key)) if key
+      rhGet(@@yDefaults, section) if not key
+   end
 
-      Logging.info('Reading default configuration...')
+   def self.dump()
+      @@yDefaults
+   end
+      # Loop on Config metadata
+   def self.meta_each
+      rhGet(@@yDefaults, :sections).each { | section, hValue |
+         hValue.each { | key, value |
+            yield section, key, value
+            }
+         }
+   end
 
-      @sDefaultsName=File.join($LIB_PATH,'defaults.yaml')
+   def self.meta_exist?(key)
+      return nil if not key
 
-      @yDefaults=YAML.load_file(@sDefaultsName)
+      key = key.to_sym if key.class == String
+      section = rhGet(@@account_section_mapping, key)
+      rhExist?(@@yDefaults, :sections, section, key) == 3
    end
 
-   def exist?(key, section = :default)
+   def self.get_meta(key)
+      return nil if not key
+
       key = key.to_sym if key.class == String
-      (rhExist?(@yDefaults, section, key) == 2)
+      section = rhGet(@@account_section_mapping, key)
+      rhGet(@@yDefaults, :sections, section, key)
+   end
+
+   def self.build_section_mapping
+      @@account_section_mapping = {}
+      rhGet(@@yDefaults, :sections).each { | section, hValue |
+         next if section == :default
+         hValue.each_key { | map_key |
+            Logging.fatal(1, "defaults.yaml: Duplicate entry between sections. '%s' defined in section '%s' already exists in section '%s'" % [map_key, section, rhGet(@account_section_mapping, map_key) ])if rhExist?(@account_section_mapping, map_key) != 0
+            rhSet(@@account_section_mapping, section, map_key)
+            }
+         }
    end
 
-   def get(key, section = :default)
+   def self.get_meta_section(key)
       key = key.to_sym if key.class == String
-      return(rhGet(@yDefaults, section, key)) if key
-      rhGet(@yDefaults, section) if not key
+      rhGet(@@account_section_mapping, key)
    end
 
-   def dump()
-      @yDefaults
+   if not $LIB_PATH
+      Logging.fatal(1, 'Internal $LIB_PATH was not set.')
    end
+
+   Logging.info('Reading default configuration...')
+
+   @@sDefaultsName=File.join($LIB_PATH,'defaults.yaml')
+
+   @@yDefaults=YAML.load_file(@@sDefaultsName)
+
+   self.build_section_mapping
 end
 
 class ForjConfig
@@ -67,7 +207,7 @@ class ForjConfig
    # @yRuntime   = data in memory.
    # @yLocal     = config.yaml file data hash.
    # @yObjConfig = Extra loaded data
-   # @oDefaults  = Application defaults object
+   # ForjDefault  = Application defaults class
 
    attr_reader :sConfigName
 
@@ -78,7 +218,7 @@ class ForjConfig
       # Build a config hash.
 
       res = {}
-      @oDefaults.dump[:default].each_key { |key|
+      ForjDefault.dump[:default].each_key { |key|
          dump_key = exist?(key)
          rhSet(res, get(key), dump_key, key)
          }
@@ -134,12 +274,10 @@ class ForjConfig
          @sConfigName = File.join($FORJ_DATA_PATH,sConfigDefaultName)
       end
 
-      @oDefaults = ForjDefault.new
-
       if File.exists?(@sConfigName)
          @yLocal = YAML.load_file(@sConfigName)
          if rhKeyToSymbol?(@yLocal, 2)
-            @yLocal = rhKeyToSymbol(@yLocal, 2) 
+            @yLocal = rhKeyToSymbol(@yLocal, 2)
             self.SaveConfig()
          end
 
@@ -222,7 +360,7 @@ class ForjConfig
       # Function to set a runtime key/value, but remove it if value is nil.
       # To set in config.yaml, use LocalSet
       # To set on extra data, like account information, use ExtraSet
-      
+
       key = key.to_sym if key.class == String
       return false if key.class != Symbol
 
@@ -234,42 +372,49 @@ class ForjConfig
       true
    end
 
-   def get(key, interms = nil, default = nil)
-   
+   def runtimeExist?(key)
+      (rhExist?(@yRuntime, key) == 1)
+   end
+
+   def runtimeGet(key)
+      rhGet(@yRuntime, key) if runtimeExist?(key)
+   end
+
+   def get(key, default = nil)
       key = key.to_sym if key.class == String
       return nil if key.class != Symbol
       # If key is in runtime
-      return rhGet(@yRuntime, key) if rhExist?(@yRuntime, key) == 1
-      # Check data in intermediate hashes or array of hash. (like account data - key have to be identical)
-      if interms
-         if interms.instance_of? Hash
-            return rhGet(interms, key) if rhExist?(interms, key) == 1
-         elsif interms.instance_of? Array # Array of hashes
-            iCount=0
-            oVal = nil
-            interms.each { | elem |
-               if elem.class == Hash
-                  elem.each { | hashkey, value |
-                     if value.class == Hash and rhExist?(elem, hashkey, key) == 2 # hash of hash
-                        oVal = rhGet(elem, hashkey, key)
-                        break
-                     elsif value.class != Hash and rhExist?(elem, hashkey) == 1 # single hash: key = value.
-                        oVal = rhGet(elem, hashkey)
-                        break
-
-                     end
-                     }
-                  break if oVal
-               end
-               iCount += 1
-               }
-            return oVal
-         end
-      end
+      return runtimeGet(key) if runtimeExist?(key)
+      #~ # Check data in intermediate hashes or array of hash. (like account data - key have to be identical)
+      #~ if interms
+         #~ if interms.instance_of? Hash
+            #~ return rhGet(interms, key) if rhExist?(interms, key) == 1
+         #~ elsif interms.instance_of? Array # Array of hashes
+            #~ iCount=0
+            #~ oVal = nil
+            #~ interms.each { | elem |
+               #~ if elem.class == Hash
+                  #~ elem.each { | hashkey, value |
+                     #~ if value.class == Hash and rhExist?(elem, hashkey, key) == 2 # hash of hash
+                        #~ oVal = rhGet(elem, hashkey, key)
+                        #~ break
+                     #~ elsif value.class != Hash and rhExist?(elem, hashkey) == 1 # single hash: key = value.
+                        #~ oVal = rhGet(elem, hashkey)
+                        #~ break
+#~
+                     #~ end
+                     #~ }
+                  #~ break if oVal
+               #~ end
+               #~ iCount += 1
+               #~ }
+            #~ return oVal
+         #~ end
+      #~ end
       # else key in local default config of default section.
       return LocalGet(key) if LocalDefaultExist?(key)
       # else key in application defaults
-      return @oDefaults.get(key) if @oDefaults.exist?(key)
+      return ForjDefault.get(key) if ForjDefault.exist?(key)
       # else default
       default
    end
@@ -278,7 +423,7 @@ class ForjConfig
 
       key = key.to_sym if key.class == String
 
-      @oDefaults.get(key, section)
+      ForjDefault.get(key, section)
    end
 
    def exist?(key, interms = nil)
@@ -304,7 +449,7 @@ class ForjConfig
       end
       return 'local' if LocalDefaultExist?(key)
       # else key in application defaults
-      return 'default' if @oDefaults.exist?(key)
+      return 'default' if ForjDefault.exist?(key)
       false
    end
 
@@ -358,101 +503,12 @@ class ForjConfig
    def fatal_if_inexistent(key)
       Logging.fatal(1, "Internal error - %s: '%s' is missing" % [caller(), key]) if not self.get(key)
    end
-end
 
-def rhExist?(yVal, *p)
-
-   if p.length() == 0
-      return 0
+   def meta_each
+      ForjDefault.meta_each { |section, key, value|
+         next if rhGet(value, :account_exclusive)
+         yield section, key, value
+      }
    end
-   return 0 if yVal.class != Hash
-   p=p.flatten
-   if p.length() == 1
-      return 1 if yVal[p[0]]
-      return 0
-   end
-   return 0 if not yVal or not yVal[p[0]]
-   ret = rhExist?(yVal[p[0]], p.drop(1)) if yVal[p[0]]
-   return 1 + ret
-end
-
-def rhGet(yVal, *p)
-
-   if p.length() == 0 or not yVal
-      return nil
-   end
-   p=p.flatten
-   if p.length() == 1
-      return yVal[p[0]] if yVal[p[0]]
-      return nil
-   end
-   return nil if not yVal
-   return rhGet(yVal[p[0]], p.drop(1)) if yVal[p[0]]
-   nil
-end
 
-def rhSet(yVal, value, *p)
-   if p.length() == 0
-      return yVal
-   end
-   p=p.flatten
-   if p.length() == 1
-      if yVal
-         if value
-            yVal[p[0]] = value
-         else
-            yVal.delete(p[0])
-         end
-         return yVal
-      end
-      if value
-         ret = { p[0] => value }
-      else
-         ret = {}
-      end
-      return ret
-   end
-   if yVal
-      yVal[p[0]] = {} if not yVal[p[0]] or yVal[p[0]].class != Hash
-      ret=rhSet(yVal[p[0]], value, p.drop(1))
-      return yVal
-   else
-      ret = rhSet(nil, value, p.drop(1))
-      return { p[0] => ret }
-   end
-end
-
-def rhKeyToSymbol(yVal, levels = 1)
-   return nil if not yVal
-   yRes = {}
-   yVal.each { | key, value |
-   if key.class == String
-      if levels <= 1
-         yRes[key.to_sym] = value
-      else
-         yRes[key.to_sym] = rhKeyToSymbol(value, levels - 1)
-      end
-   else
-      if levels <= 1
-         yRes[key] = value
-      else
-         yRes[key] = rhKeyToSymbol(value, levels - 1)
-      end
-   end
-   }
-   yRes
-end
-
-def rhKeyToSymbol?(yVal, levels = 1)
-   return false if not yVal
-   yVal.each { | key, value |
-   if key.class == String
-      return true
-   end
-   if levels >1
-      res = rhKeyToSymbol?(value, levels - 1)
-      return true if res
-   end
-   }
-   false
 end

data/lib/forj-settings.rb

@@ -0,0 +1,209 @@
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module Forj
+   module Settings
+      def Settings.account_show_all(oConfig, account_name)
+         oConfig.set(:account_name, account_name)
+
+         oForjAccount = ForjAccount.new(oConfig)
+         oForjAccount.ac_load()
+         puts "List of account settings for provider '%s': " % [oForjAccount.get(:provider)]
+         puts "%-15s %-12s :\n------------------------------" % ['key', 'section name']
+
+         oForjAccount.metadata_each { |section, found_key, hValue|
+            next if rhGet(hValue, :readonly)            
+            sDesc = rhGet(hValue, :desc)
+            puts "%-15s %-12s : %s" % [found_key, section, sDesc]
+            }
+         puts "\nUse `forj set KeyName=Value -a %s` to set one." % [ account_name]
+         puts "Use `forj get -a %s`               to check current values." % [ account_name]
+      end
+
+      def Settings.config_show_all(oConfig)
+         puts "List of available FORJ default settings:"
+         puts "%-15s %-12s :\n------------------------------" % ['key', 'section name']
+         oConfig.meta_each { |section, found_key, hValue|
+            next if rhGet(hValue, :readonly)            
+            sDesc = rhGet(hValue, :desc)
+            puts "%-15s %-12s : %s" % [found_key, section, sDesc]
+            }
+         puts "\nUse `forj set KeyName=Value` to set one. "
+         puts "Use `forj get`               to get current values. "
+      end
+
+      def Settings.account_set(oConfig, account_name, *p)
+         bDirty = false
+
+         oConfig.set(:account_name, account_name)
+
+         oForjAccount = ForjAccount.new(oConfig)
+         oForjAccount.ac_load()
+
+         p.flatten!
+         p.each { | key_val |
+            mkey_val = key_val.match(/^(.*) *= *(.*)$/)
+            
+            Logging.fatal(1, "Syntax error. Please set your value like: 'key=value' and retry.") if not mkey_val
+
+            key_to_set = mkey_val[1]
+            key_value = mkey_val[2]
+
+            sBef = "unset"
+            sAft = "unset"
+            
+            Logging.fatal(1, "Unable to update protected '%s'. use `forj setup`, to update it." % key_to_set) if oForjAccount.readonly?(key_to_set)
+            if oForjAccount.meta_type?(key_to_set) == :default
+               Logging.fatal(1, "Unable set '%s' value. To update this one, use forj set %s, WITHOUT -a %s" % [key_to_set, key_to_set, account_name])
+            end
+
+            full_key = '%s/%s' % [ForjDefault.get_meta_section(key_to_set), key_to_set]
+
+            old_value = oForjAccount.get(key_to_set)
+            sBef = "'%s' (%s)" % [old_value, oForjAccount.exist?(key_to_set)] if oForjAccount.exist?(key_to_set)
+
+            if old_value == key_value
+               puts "%-25s: No update" % [full_key]
+               next
+            end
+            bDirty = true
+
+            if key_value == ""
+               oForjAccount.del(key_to_set)
+            else
+               oForjAccount.set(key_to_set, key_value)
+            end
+
+            sAft = "'%s' (%s)" % [oForjAccount.get(key_to_set), oForjAccount.exist?(key_to_set)] if oForjAccount.exist?(key_to_set)
+            puts "%-25s: %s => %s" % [full_key, sBef, ANSI.bold+sAft+ANSI.clear]
+            }
+         oForjAccount.ac_save() if bDirty
+      end
+      
+      def Settings.config_set(oConfig, *p)
+         bDirty = false
+
+         p.flatten!
+         p.each { | key_val |
+            mkey_val = key_val.match(/^(.*) *= *(.*)$/)
+            
+            Logging.fatal(1, "Syntax error. Please set your value like: 'key=value' and retry.") if not mkey_val
+
+            key_to_set = mkey_val[1]
+            key_value = mkey_val[2]
+
+            sBef = "unset"
+            sAft = "unset"
+            
+            old_value = oConfig.get(key_to_set)
+            sBef = "%s: '%s'" % [oConfig.exist?(key_to_set), oConfig.get(key_to_set)] if oConfig.exist?(key_to_set)
+            
+            if old_value == key_value
+               puts "%-15s: No update" % [key_to_set]
+               next
+            end
+            
+            bDirty = true
+            
+            if key_value != ""
+               oConfig.LocalSet(key_to_set, key_value)
+            else
+               oConfig.LocalDel(key_to_set)
+            end
+
+            sAft = "%s: '%s'" % [oConfig.exist?(key_to_set), oConfig.get(key_to_set)] if oConfig.exist?(key_to_set)
+            puts "%-15s: %s => %s" % [key_to_set, sBef, ANSI.bold+sAft+ANSI.clear]
+            }
+         oConfig.SaveConfig() if bDirty
+      end
+
+      def Settings.account_get_all(oConfig, account_name)
+         oConfig.set(:account_name, account_name)
+         oForjAccount = ForjAccount.new(oConfig)
+         Logging.fatal(1, "Unable to load account '%s'. Not found." % account_name) if not oForjAccount.ac_load
+         
+         puts "legend: default = Application defaults, local = Local default config, %s = '%s' account config\n\n" % [account_name, account_name]
+         puts "%s %-15s(%-7s) %-12s:\n----------------------------------------" % ['U', 'key', 'origin', 'section name']
+         oForjAccount.metadata_each { | section, mykey, hValue |
+            key_exist = oForjAccount.exist?(mykey)
+
+            sUpdMsg = '+'
+            sUpdMsg = ' ' if rhGet(hValue, :readonly)
+
+            if key_exist
+               highlight = ''
+               highlight = ANSI.bold if key_exist == account_name
+               highlight = ANSI.bold + ANSI.yellow if key_exist == 'local'
+               default_key = nil
+               default_key = " (from default key '%s')" % rhGet(hValue, :default) if rhExist?(hValue, :default) == 1 and key_exist != account_name
+               puts "%s %-15s(%s%-7s%s) %-12s: '%s'%s" % [sUpdMsg, mykey, highlight, key_exist, ANSI.clear, section, oForjAccount.get(mykey), default_key]
+            else
+               puts "%s %-15s(       ) %-12s: unset" % [sUpdMsg, mykey, section]
+            end
+            }
+         puts "\nOn values identified by '+' you can:"
+         puts "Use `forj set <key>=<value> -a %s` to update account data." % account_name
+         puts "Or  `forj set <key>= -a %s`        to restore key default value." % account_name
+      end
+      
+      def Settings.config_get_all(oConfig)
+         puts "legend: default = Application defaults, local = Local default config\n\n"
+         puts "%s %-15s(%-7s) %-12s:\n----------------------------------------" % ['U', '''key', 'origin', 'section name']
+         
+         oConfig.meta_each { |section, found_key, hValue|
+            sUpdMsg = '+'
+            sUpdMsg = ' ' if rhGet(hValue, :readonly)
+            found_key = rhGet(hValue, :default) if rhExist?(hValue, :default) == 1
+            
+            where = oConfig.exist?(found_key)
+            if where
+               highlight = ''
+               highlight = ANSI.bold + ANSI.yellow if where == 'local'
+               puts "%s %-15s(%s%-7s%s) %-12s: '%s'" % [sUpdMsg, found_key, highlight, where, ANSI.clear, section, oConfig.get(found_key) ]
+            else
+               puts "%s %-15s(       ) %-12s: unset" % [sUpdMsg, found_key, section]
+            end
+            }
+         puts "\nUse 'forj set <key>=<value>' to update defaults on values identified with '+'"
+
+      end
+      
+      def Settings.account_get(oConfig, account_name, key)
+
+         oConfig.set(:account_name, account_name)
+         oForjAccount = ForjAccount.new(oConfig)
+
+         Logging.fatal(1, "Unable to load account '%s'. Not found." % account_name) if not oForjAccount.ac_load
+
+         if oForjAccount.exist?(key)
+            puts "%s: '%s'" % [oForjAccount.exist?(key), oForjAccount.get(key)]
+         elsif oForjAccount.exist?(key.parameterize.underscore.to_sym)
+            key_symb = key.parameterize.underscore.to_sym
+            puts "%s: '%s'" % [oForjAccount.exist?(key_symb), oForjAccount.get(key_symb)]
+         else
+            Logging.message("key '%s' not found"% [key])
+         end
+      end
+      
+      def Settings.config_get(oConfig, key)
+         if oConfig.exist?(key)
+            puts "%s:'%s'" % [oConfig.exist?(key), oConfig.get(key)]
+         else
+            Logging.message("key '%s' not found" % [key])
+         end
+      end
+   end
+end

data/lib/helpers.rb

@@ -51,10 +51,6 @@ module Helpers
     false
   end
   
-  def ensure_dir_exists(path)
-    if not dir_exists?(path)
-       FileUtils.mkpath(path) if not File.directory?(path)
-    end
-  end
+
   
 end

data/lib/log.rb

@@ -20,6 +20,7 @@
 
 require 'rubygems'
 require 'logger'
+require 'ansi'
 
 require 'require_relative'
 
@@ -32,31 +33,6 @@ include Helpers
 #
 module Logging
 
-  class SSLErrorMgt
-  
-    def initialize()
-       @iRetry=0
-    end
-    
-    def ErrorDetected(message,backtrace)
-      if message.match('SSLv2/v3 read server hello A: unknown protocol') 
-         if @iRetry <5
-            sleep(2)
-            @iRetry+=1
-            print "%s/5 try...\r" % @iRetry if $FORJ_LOGGER.level == 0
-            return false
-         else   
-            Logging.error('Too many retry. %s' % message)
-            return true
-         end
-      else   
-         Logging.error("%s\n%s" % [message,backtrace.join("\n")])
-         return true
-      end
-    end
-
-  end 
-
   class ForjLog
      # Class used to create 2 log object, in order to keep track of error in a log file and change log output to OUTPUT on needs (option flags).