origen 0.60.2 → 0.60.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f10a2c8c7cf5abff32c00fece98aa0e4cc190c88866d20213fa6b269ee4d925
-  data.tar.gz: d57c008c8af34d344cf2355a05e536299c482aca8d638669719d2f9bc46abd47
+  metadata.gz: 7a8de77b7e1b7c8c36dbfbe4c09cfed6abf1fd1d508d915f2b06af3c62595fac
+  data.tar.gz: 13f365bc2529ba358d79bc281442190f4f41c723fa10d533badd4b349f476ea7
 SHA512:
-  metadata.gz: f1ebeae4bbf56385a85ffbc2d7f2801059403b2aac4fa29475600639e38a88ff52c328b3f668094a08f90d7b1e246c9c481f2bc9b0c60475d3e1b12de8c3321f
-  data.tar.gz: 8b38ef3948bd4d384b76d0db2ca0099122d47a6a95aff262fb34ab812f2d1b7f18169517c3c11bdd16f727be023095c3b45a2956dfb8d4501687fd8f4838f779
+  metadata.gz: fec7b03350e86093b6733a2f870df766110489fa54bae7868d0d761b6a61811945f5483e4f57be963a0a3f4832dfef58abb924b85050da460e1b853ea5887192
+  data.tar.gz: 7cc42194880ba198e6e5dfa0b14321a96a6fcc83ad87c83b25fc0d5a0c759c90bfd20135fcebbf4362ebd785905d19da1deb532df9a4aac22badbb9f5918cb15

data/config/version.rb

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

data/lib/origen/application/lsf_manager.rb

@@ -253,6 +253,16 @@ module Origen
 
       # Build the log file from the completed jobs
       def build_log(options = {})
+        @completed_patterns = 0
+        @total_vectors = 0
+        @total_duration = 0
+        @completed_files = 0
+        @changed_patterns = 0
+        @changed_files = 0
+        @new_patterns = 0
+        @new_files = 0
+        @failed_patterns = 0
+        @failed_files = 0
         log_method = options[:log_file] ? options[:log_file] : :info
         Origen.log.send(log_method, '*' * 70)
         completed_jobs.each do |job|
@@ -271,25 +281,25 @@ module Origen
               begin
                 line.gsub!(/\e\[\d+m/, '')  # Remove any coloring
                 if line =~ /Total patterns:\s+(\d+)/
-                  stats.completed_patterns += Regexp.last_match[1].to_i
+                  @completed_patterns = Regexp.last_match[1].to_i
                 elsif line =~ /Total vectors:\s+(\d+)/
-                  stats.total_vectors += Regexp.last_match[1].to_i
+                  @total_vectors = Regexp.last_match[1].to_i
                 elsif line =~ /Total duration:\s+(\d+\.\d+)/
-                  stats.total_duration += Regexp.last_match[1].to_f
+                  @total_duration = Regexp.last_match[1].to_f
                 elsif line =~ /Total files:\s+(\d+)/
-                  stats.completed_files += Regexp.last_match[1].to_i
+                  @completed_files = Regexp.last_match[1].to_i
                 elsif line =~ /Changed patterns:\s+(\d+)/
-                  stats.changed_patterns += Regexp.last_match[1].to_i
+                  @changed_patterns = Regexp.last_match[1].to_i
                 elsif line =~ /Changed files:\s+(\d+)/
-                  stats.changed_files += Regexp.last_match[1].to_i
+                  @changed_files = Regexp.last_match[1].to_i
                 elsif line =~ /New patterns:\s+(\d+)/
-                  stats.new_patterns += Regexp.last_match[1].to_i
+                  @new_patterns = Regexp.last_match[1].to_i
                 elsif line =~ /New files:\s+(\d+)/
-                  stats.new_files += Regexp.last_match[1].to_i
+                  @new_files = Regexp.last_match[1].to_i
                 elsif line =~ /FAILED patterns:\s+(\d+)/
-                  stats.failed_patterns += Regexp.last_match[1].to_i
+                  @failed_patterns = Regexp.last_match[1].to_i
                 elsif line =~ /FAILED files:\s+(\d+)/
-                  stats.failed_files += Regexp.last_match[1].to_i
+                  @failed_files = Regexp.last_match[1].to_i
                 elsif line =~ /ERROR!/
                   stats.errors += 1
                   Origen.log.send :relog, line, options
@@ -318,6 +328,16 @@ module Origen
               end
             end
           end
+          stats.completed_patterns += @completed_patterns
+          stats.total_vectors += @total_vectors
+          stats.total_duration += @total_duration
+          stats.completed_files += @completed_files
+          stats.changed_patterns += @changed_patterns
+          stats.changed_files += @changed_files
+          stats.new_patterns += @new_patterns
+          stats.new_files += @new_files
+          stats.failed_patterns += @failed_patterns
+          stats.failed_files += @failed_files
         end
         Origen.log.send(log_method, '*' * 70)
         stats.print_summary

data/lib/origen/application/runner.rb

@@ -143,7 +143,7 @@ module Origen
               # rubocop:disable Style/RescueModifier
               record_invocation = Thread.new do
                 Origen.client.record_invocation(options[:action]) if options[:action]
-                rescue Errno::ECONNREFUSED
+                rescue
                 # Dont allow server being down to flood the screen with the stacktrace
               end
               # rubocop:enable Style/RescueModifier

data/lib/origen/client.rb

@@ -5,7 +5,7 @@ module Origen
     #   https://github.com/jnunemaker/httparty/tree/v0.9.0
 
     require 'json'
-    # require 'httparty'
+    require 'net/http'
     # include HTTParty
 
     USE_DEV_SERVER = false

data/lib/origen/loader.rb

@@ -117,11 +117,23 @@ module Origen
     # If a block definition exists for the given model, then this will load it and apply it to
     # the model.
     # if options[:inherit] is passed, it will first try to load the files for the class name contained
-    # in that option, even if its from a plugin app
+    # in that option, even if its from a plugin app. Additionally, any bugs/features will be inherited
+    # as well unless disable_bug_inheritance or disable_feature_inheritance options are passed
     # Returns true if a model is found and loaded, otherwise nil.
     def self.load_block(model, options = {})
       model = model.model  # Ensure we have a handle on the model and not its controller
       loaded = nil
+
+      if options[:inherit]
+        # pass down any bugs/features from the inherited block class
+        unless options[:disable_bug_inheritance]
+          model.class.instance_variable_set(:@bugs, options[:inherit].constantize.bugs.merge(model.class.bugs))
+        end
+        unless options[:disable_feature_inheritance]
+          model.class.instance_variable_set(:@features, options[:inherit].constantize.features.merge(model.class.features))
+        end
+      end
+
       if local_app = options[:app] || model.app
         if options[:path]
           local_full_paths = Array(options[:path])
@@ -132,6 +144,7 @@ module Origen
         end
         app_paths_map = { local_app => local_full_paths }
         if options[:inherit]
+          # update app_paths_map with the relevant inherited files
           inherit_full_paths = options[:inherit].split('::')
           inherit_app = Origen.app(inherit_full_paths.shift.underscore.to_sym)
           inherit_full_paths = [inherit_full_paths.join('/')]

data/origen_site_config.yml

@@ -146,9 +146,11 @@ gem_use_from_system:
 #ldap_user_id_attribute: uid
 
 # LSF Configuration
-lsf_queue: 'batchq'
-lsf_group: 'nil'
-lsf_project: 'msg.te'
-lsf_resource: 'rhel6'
-lsf_cores: '1'
+# lsf_queue: 'batchq'
+# lsf_group: 'nil'
+# lsf_project: 'msg.te'
+# lsf_resource: 'rhel6'
+# lsf_cores: '1'
+
+# lsf_debug is needed for spec tests on the core.
 lsf_debug: 'false'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.2
+  version: 0.60.6
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -749,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.31
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit