origen 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00de9cfd35bf3b781f46b122cdba834cc4e463e
-  data.tar.gz: b7bd2adf089d4ed70c76ed834fbcbf1a2afba6bb
+  metadata.gz: c9a41c5ead7ae18b4a7fb8267ffb3681b1fa7cf9
+  data.tar.gz: 4ab640fdfc1efa46b57b9d621ecd6ea67bb2cb37
 SHA512:
-  metadata.gz: 9714b2e319c3aaef19d537801f97969d2852e7b843a91f88fe7a9cd19786e58a28b79a7a0036defacfe2bb292f522ef13053c90ab14c189dcc8d16ccd36cf6c8
-  data.tar.gz: ad47dec90e2fa07fe5c9c19840681d715716c8913b1871bca2e30685471240902bff5761ec789a29adcdf06067e5da68b041d1e6a6db3f9edb890939742e8259
+  metadata.gz: 990b6fe8c4421b856bf5daf534864cf2b4c4be57283b7eefa0092456559b6519318265af34bdf3a8fb5fa3a4b4285afa877dc2e3d064d3f6d510410e286221b3
+  data.tar.gz: 6da8b2276531a6a33254f17ef372ce31879951091ab4c93a858d8e31520efa16cc400b403bd0ef838285be6776c3e4c1e7759b1b2509f51b158d754be900e00f

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 25
+  BUGFIX = 26
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/application.rb

@@ -36,7 +36,10 @@ module Origen
           app = base.instance
           app.root = root.to_s
           if Origen.plugins_loaded? && !Origen.loading_top_level?
-            Origen.log.warning "The #{app.name} plugin is using a non-standard loading mechanism, upgrade to a newer version of it to get rid of this warning (please report a bug to its owner if this warning persists)"
+            # This situation of a plugin being loaded after the top-level app could occur if the app
+            # doesn't require the plugin until later, in that case there is nothing the plugin owner
+            # can do and we just need to accept that this can happen.
+            # Origen.log.warning "The #{app.name} plugin is using a non-standard loading mechanism, upgrade to a newer version of it to get rid of this warning (please report a bug to its owner if this warning persists)"
             Origen.app.plugins << app
           else
             Origen.register_application(app)

data/lib/origen/log.rb

@@ -12,11 +12,26 @@ module Origen
     require 'log4r'
     require 'log4r/outputter/fileoutputter'
 
+    attr_accessor :msg_hash
+    alias_method :messages, :msg_hash
+
     LEVELS = [:normal, :verbose, :silent]
 
     def initialize
       @log_time_0 = @t0 = Time.new
       self.level = :normal
+      @msg_hash = init_msg_hash
+    end
+
+    def init_msg_hash
+      msg_types = [:info, :warn, :error, :deprecate, :debug, :success]
+      msg_hash = {}
+      msg_types.each do |m|
+        msg_hash[m] = Hash.new do |h, k|
+          h[k] = []
+        end
+      end
+      msg_hash
     end
 
     def console_only?
@@ -74,50 +89,67 @@ module Origen
       @level
     end
 
-    def debug(string = '')
+    def validate_args(string, msg_type)
+      return string, msg_type unless string.is_a? Symbol
+      ['', string]
+    end
+
+    def debug(string = '', msg_type = nil)
+      string, msg_type = validate_args(string, msg_type)
       msg = format_msg('DEBUG', string)
       log_files.debug msg unless console_only?
       console.debug msg
+      @msg_hash[:debug][msg_type] << msg
       nil
     end
 
-    def info(string = '')
+    def info(string = '', msg_type = nil)
+      string, msg_type = validate_args(string, msg_type)
       msg = format_msg('INFO', string)
       log_files.info msg unless console_only?
       console.info msg
+      @msg_hash[:info][msg_type] << msg
       nil
     end
     # Legacy methods
     alias_method :lputs, :info
     alias_method :lprint, :info
 
-    def success(string = '')
+    def success(string = '', msg_type = nil)
+      string, msg_type = validate_args(string, msg_type)
       msg = format_msg('SUCCESS', string)
       log_files.info msg unless console_only?
       console.info msg.green
+      @msg_hash[:success][msg_type] << msg
       nil
     end
 
-    def deprecate(string = '')
+    def deprecate(string = '', msg_type = nil)
+      string, msg_type = validate_args(string, msg_type)
       msg = format_msg('DEPRECATED', string)
       log_files.warn msg unless console_only?
       console.warn msg.yellow
+      @msg_hash[:deprecate][msg_type] << msg
       nil
     end
     alias_method :deprecated, :deprecate
 
-    def warn(string = '')
+    def warn(string = '', msg_type = nil)
+      string, msg_type = validate_args(string, msg_type)
       msg = format_msg('WARNING', string)
       log_files.warn msg unless console_only?
       console.warn msg.yellow
+      @msg_hash[:warn][msg_type] << msg
       nil
     end
     alias_method :warning, :warn
 
-    def error(string = '')
+    def error(string = '', msg_type = nil)
+      string, msg_type = validate_args(string, msg_type)
       msg = format_msg('ERROR', string)
       log_files.error msg unless console_only?
       console.error msg.red
+      @msg_hash[:error][msg_type] << msg
       nil
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -567,7 +567,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit