fhlow 1.91.0 → 1.91.1

data/bin/fhlow

@@ -54,6 +54,8 @@ module Fhlow
     # Initialization of some options and switches
     opt_askexit = false
 
+    rn = nil
+
     begin
         ####################################################################################################
 
@@ -65,7 +67,7 @@ module Fhlow
 
         # create the logger
         log = Log.new(RootNode.detectFhlowRootDir+"flw/var/log.flw", 1, pen)
-        log.info(self, "created logfile: "+RootNode.detectFhlowRootDir+"flw/var/log.flw")
+        log.info(self, "created logfile: "+RootNode.detectFhlowRootDir+"flw/var/fhlow.log")
 
         ####################################################################################################
 
@@ -73,7 +75,7 @@ module Fhlow
         # create a CmdParser
         cmd = CmdParse::CommandParser.new(false, true)
         cmd.program_name = "fhlow"
-        cmd.program_version = [0, 2, 0]
+        cmd.program_version = [1, 91, 1]
 
         # define the global options
         cmd.options = CmdParse::OptionParserWrapper.new do |opt|
@@ -82,7 +84,6 @@ module Fhlow
             opt.on("-c", "--nocolor",       "Disable colorful output.")  {       pen.noColor }
 
             opt.on("-a", "--askexit",       "Asks to hit a key before exiting.")  { opt_askexit = true }
-            # TODO: alternative actual child
         end
 
         # add two default cmds
@@ -108,7 +109,6 @@ module Fhlow
                 
                 # print the header
                 pen.header 
-
                 
                 # tell the cmd-er to use our pen
                 cmd.pen = pen
@@ -116,17 +116,63 @@ module Fhlow
                 
                 # fetch the default configurations
                 defaultconf = Config::Config.new(RootNode.detectFhlowRootDir+"flw/defaults.flw")
-        
+                log.info(self, "Loaded settings from: "+RootNode.detectFhlowRootDir+"flw/defaults.flw.")
+
+               
+                case RUBY_PLATFORM
+                    when /ix/i, /ux/i, /gnu/i, /sysv/i, /solaris/i, /sunos/i, /bsd/i 
+                        if File.exist?("/etc/fhlow/system.flw")
+                            defaultconf.merge(Config::Config.new("/etc/fhlow/system.flw")) 
+                            log.info(self, "Loaded settings from: /etc/fhlow/system.flw.")
+                        end
+                                 
+                        if File.exist?("#{ENV['HOME']}/.fhlow/user.flw")
+                            defaultconf.merge(Config::Config.new("#{ENV['HOME']}/.fhlow/user.flw")) 
+                            log.info(self, "Loaded settings from: #{ENV['HOME']}/.fhlow/user.flw.")
+                        end
+                    
+                    when /win/i, /ming/i                     
+                        file = File.join(ENV['ALLUSERSPROFILE'], "Applicatoion Data", "fhlow", "user.flw") 
+                        if File.exist?(file)
+                            defaultconf.merge(Config::Config.new(file)) 
+                            log.info(self, "Loaded settings from: #{file}.")
+                        end
+ 
+                        file = File.join(ENV['APPDATA'], "fhlow", "user.flw")
+                        if File.exist?(file)
+                            defaultconf.merge(Config::Config.new(file)) 
+                            log.info(self, "Loaded settings from: #{file}.")
+                        end
+                        
+                    else
+                        raise Fhlow::FhlowException.new("fhlow"), "Your operating system (#{RUBY_PLATFORM}) is not supported!" 
+                end
+
+                test = `gem contents fhlow`
+                pluginPath = ""
+                test.each do |s|
+                	if s =~ /^.*plugins$/
+                		pluginPath = s.chop + File::SEPARATOR
+                	end
+                end
+                
+                if pluginPath == ""
+                	pluginPath = File.join(RootNode.detectFhlowRootDir, "flw", "plugins").chop + File::SEPARATOR
+                end
+ 
+                PluginPool.each_configfile(pluginPath) do |file|
+                    defaultconf.merge(Config::Config.new(file))
+                    log.info(self, "Loaded settings from: #{file}.")
+                end
                 
                 # create the root node which initializes the whole tree structure
                 rn = RootNode.new(defaultconf, log, pen)
                 log.info(self, "successfully initialized the root object")
 
                 log.info(self, "sucessfully detected the actual child -> "+rn.getActualLeaf(Dir.pwd).name)
-                
-
+               
                 # create the plugin pool
-                pp = Pluginpool.new(RootNode.detectFhlowRootDir+"flw/plugins/", rn.getActualLeaf(Dir.pwd), pen, log)
+                pp = PluginPool.new(pluginPath, rn.getActualLeaf(Dir.pwd), pen, log)
                 log.info(self, "successfully included the plugins")
 
                 # register the plugins as cmds
@@ -148,8 +194,10 @@ module Fhlow
     rescue FhlowException => e
         pen.seperator
         pen.puts "#{pen.lightred}Error:#{pen.clear} #{e.caller}\n       #{e.message}"
-        log.error(e.caller, e.message)
-        pen.print e.backtrace.join("\n") if $DEBUG
+        log.error(e.caller, e.message) if log
+        pen.puts e.backtrace.join("\n") if $DEBUG
+        rn.getActualLeaf(Dir.pwd).conf.print if $DEBUG
+
 
     rescue CmdParse::ParseError, OptionParser::ParseError => e
         pen.puts "#{pen.lightred}Error while parsing command line:#{pen.clear}"

data/lib/module_config/complexitem.rb

@@ -0,0 +1,57 @@
+require 'item'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexItem < Item
+        attr_reader :name
+        attr_reader :value
+        attr_reader :overwrite
+
+        protected
+
+            def initialize(_str, _regex)
+                if _str =~ _regex
+                    @name  = $1
+                    @overwrite = $2=="!"
+                    @value = $3.split(/\s*;\s*/)
+                else
+                    raise ConfigWrongFormatException.new(self.class), "Configuration item <#{_str}> has wrong format."
+                end
+            end
+
+       public
+            
+            def merge(_complexitem)
+                raise ConfigMergeException.new(self.class), "Merge: Configuration items do not fit! <#{_complexitem}> is not of type #{self.class.to_s}." unless _complexitem.instance_of?(self.class)
+                raise ConfigMergeException.new(self.class), "Merge: Configuration items do not have the same name! <#{_complexitem.name}> vs. <#{@name}>" unless _complexitem.name == @name
+                
+                puts "------------------------"
+                $stdout.print "_complexitem: "
+                p _complexitem
+                $stdout.print "self:         "
+                p self
+                puts "------------------------"
+                
+                @value = _complexitem.value | @value unless @overwrite
+            end
+
+            def each(&block)
+                @value.each(&block)
+            end
+            
+            def print
+                puts "    #{@name} = {      # #{@self.class.to_s}"
+                $stdout.print "        "
+                puts @value.join(";\n        ")
+                puts "    }"
+            end
+
+            def ComplexItem.getRegex(_nameregex, _valueregex)
+                /\s*(#{_nameregex})([!]?)\s*=\s*\{\s*(#{_valueregex})\s*\}/
+            end
+    end        
+
+end
+

data/lib/module_config/config.rb

@@ -7,9 +7,11 @@ module Config
 
         @@factoriesloaded = false
 
+        attr_reader :filename
+
         def initialize(_filename)
             unless @@factoriesloaded
-                ItemFactory.load(File.join(File.dirname(__FILE__), "configitems"))
+                ItemFactory.load(File.join(File.dirname(__FILE__), "items"))
                 @@factoriesloaded = true
             end
             
@@ -22,8 +24,8 @@ module Config
             while !file.strip.empty?
                 file = file.sub(Section.getRegex) do |match|
                     begin
-                        @sections.push(Section.new(match))
-                        ""  # delete the proceded string (mached string will be sub'ed with the return value of this block)
+                        @sections.push(Section.new(match, @filename))
+                        ""  # delete the proceded string (matched string will be sub'ed with the return value of this block)
                     rescue ConfigException => e
                         raise ConfigException.new(self.class), "  File:    #{_filename}\n#{e.message}"
                     end

data/lib/module_config/item.rb

@@ -25,10 +25,6 @@ module Config
                 raise NotImplementedError, "You have to implement value() in sublcasses inherited from Config::Item!"
             end
 
-            def Item.getRegex()
-                raise NotImplementedError, "You have to implement getRegex() in sublcasses inherited from Config::Item!"
-            end
-        
     end 
 
 end

data/lib/module_config/items/complex.rb

@@ -0,0 +1,44 @@
+require 'complexitem'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexFactory < ItemFactory
+        @@nameregex  = /\w+/
+        @@valueregex = /(\s*.+[;][\s\n]*)*(\s*.+[;]*[\s\n]*)/
+
+        def ComplexFactory.match(_str)
+            _str.sub!(ComplexItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def ComplexFactory.create(_str)
+            Complex.new(_str, ComplexItem.getRegex(@@nameregex, @@valueregex))
+        end
+
+        def ComplexFactory.priority
+            11
+        end
+    end
+
+    class Complex < ComplexItem
+        @@subitemregex = /\A.*\Z/
+
+        def initialize(_str, _regex)        
+            super(_str, _regex)
+            @value.each do |item| 
+                item.strip!
+                raise ConfigWrongFormatException.new(self.class), "Configuration subitem <#{item}> of item <#{name}> has wrong format." unless item =~ @@subitemregex
+            end
+        end
+        
+        def print
+            puts "    #{@name} = {      ##{self.class.to_s}"
+            $stdout.print "        "
+            puts @value.join(";\n        ")
+            puts "    }"
+        end
+    end        
+
+end

data/lib/module_config/items/complexfreqencies.rb

@@ -0,0 +1,59 @@
+require 'complexitem'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexFreqenciesFactory < ItemFactory
+        @@nameregex  = /Frequencies/
+        @@valueregex = /(\s*.*[;]\s*)*(\s*.*[;]*\s*)?/
+
+        def ComplexFreqenciesFactory.match(_str)
+            _str.sub!(ComplexItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def ComplexFreqenciesFactory.create(_str)
+            ComplexFreqencies.new(_str, ComplexItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+    class ComplexFreqencies < ComplexItem
+        @@subitemregex = /\A([\w\(\)]+)\s*->\s*(\w+)\s*,\s*(\w+)\s*\Z/
+
+        def initialize(_str, _regex)
+            super(_str, _regex)
+            
+            tmp = @value
+            @value = []
+            tmp.each do |item| 
+                item.strip!    
+                if item =~ @@subitemregex
+                    item = Hash.new
+                    item["signalname"]  = $1
+                    item["freqency"]    = $2
+                    item["clockname"]   = $3
+                    @value.push(item)
+                else
+                    raise ConfigWrongFormatException.new(self.class), "Configuration subitem <#{item}> of item <#{name}> has wrong format."
+                end
+                
+            end
+        end
+
+        def each(&_block)
+            @value.each do |subitem|
+                _block.call(subitem["signalname"], subitem["freqency"], subitem["clockname"])
+            end
+        end
+
+        def print
+            puts "    #{@name} = {      ##{self.class.to_s}"
+            @value.each { |v| puts "        #{v["signalname"]} -> #{v["freqency"]}, #{v["clockname"]};" }
+            puts "    }"
+        end
+        
+    end        
+
+end
+

data/lib/module_config/items/complexlibrary.rb

@@ -0,0 +1,46 @@
+require 'item'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexLibraryFactory < ItemFactory
+        @@nameregex  = /\w*Librar\w*/
+        @@valueregex = /(\s*.*[;]\s*)*(\s*.*[;]?\s*)?/
+
+        def ComplexLibraryFactory.match(_str)
+            _str.sub!(ComplexItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def ComplexLibraryFactory.create(_str)
+            ComplexLibrary.new(_str, ComplexItem.getRegex(@@nameregex, @@valueregex))
+        end
+
+    end
+
+    class ComplexLibrary < ComplexItem
+        @@subitemregex = /\A.+\Z/
+
+        def initialize(_str, _regex)
+            super(_str, _regex)
+
+            tmp = @value
+            @value = []
+            
+            tmp.each do |item|
+                item.strip!
+                raise ConfigWrongFormatException.new(self.class), "Configuration subitem \n -----\n #{item} \n -----\n of item <#{name}> has wrong format." unless item =~ @@subitemregex
+                @value.push(item.split(/,\s/))
+            end
+        end
+
+        def print
+            puts "    #{@name} = {      ##{self.class.to_s}"
+            @value.each { |v| puts "        #{v};" }
+            puts "    }"
+        end
+        
+    end
+end
+

data/lib/module_config/items/complexpackage.rb

@@ -0,0 +1,47 @@
+require 'complexitem'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexPackageFactory < ItemFactory
+        @@nameregex  = /\w*Package\w*/
+        @@valueregex = /((\s*[^\(\)]*[;]\s*)*(\s*[^\(\)\{]*[;]?\s*)?)/ 
+
+        def ComplexPackageFactory.match(_str)
+            _str.sub!(ComplexItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def ComplexPackageFactory.create(_str)
+            ComplexPackage.new(_str, ComplexItem.getRegex(@@nameregex, @@valueregex))
+        end
+
+    end
+
+    class ComplexPackage < ComplexItem
+        @@subitemregex = /\A.+\Z/
+
+        def initialize(_str, _regex)
+            super(_str, _regex)
+
+            tmp = @value
+            @value = []
+            
+            tmp.each do |item|
+                item.strip!
+                raise ConfigWrongFormatException.new(self.class), "Configuration subitem \n -----\n #{item} \n -----\n of item <#{name}> has wrong format." unless item =~ @@subitemregex
+                @value.push(item.split(/,\s/))
+            end
+        end
+
+        def print
+            puts "    #{@name} = {      ##{self.class.to_s}"
+            @value.each { |v| puts "        #{v.join(", ")};" }
+            puts "    }"
+        end
+
+    end        
+
+end
+

data/lib/module_config/items/complexpins.rb

@@ -0,0 +1,59 @@
+require 'complexitem'
+require 'itemfactory'
+require 'configexception'
+
+module Config 
+
+    class ComplexPinsFactory < ItemFactory
+        @@nameregex  = /Pins/
+        @@valueregex = /(\s*.*[;]\s*)*(\s*.*[;]*\s*)?/
+
+        def ComplexPinsFactory.match(_str)
+            _str.sub!(ComplexItem.getRegex(@@nameregex, @@valueregex), '')
+            return $&
+        end
+
+        def ComplexPinsFactory.create(_str)
+            ComplexPins.new(_str, ComplexItem.getRegex(@@nameregex, @@valueregex))
+        end
+    end
+
+    class ComplexPins < ComplexItem
+        @@subitemregex = /\A([\w\(\)]+)\s*->\s*(\w+)\s*,\s*(true|false)\s*\Z/
+
+        def initialize(_str, _regex)
+            super(_str, _regex)
+            
+            tmp = @value
+            @value = []
+            tmp.each do |item| 
+                item.strip!    
+                if item =~ @@subitemregex
+                    item = Hash.new
+                    item["signalname"]  = $1
+                    item["pinname"] = $2
+                    item["pullup"]  = $3
+                    @value.push(item)
+                else
+                    raise ConfigWrongFormatException.new(self.class), "Configuration subitem <#{item}> of item <#{name}> has wrong format."
+                end
+                
+            end
+        end
+
+        def each(&_block)
+            @value.each do |subitem|
+                _block.call(subitem["signalname"], subitem["pinname"], subitem["pullup"])
+            end
+        end
+
+        def print
+            puts "    #{@name} = {      ##{self.class.to_s}"
+            @value.each { |v| puts "        #{v["signalname"]} -> #{v["pinname"]}, #{v["pinnname"]};" }
+            puts "    }"
+        end
+        
+    end        
+
+end
+