origen 0.60.3 → 0.60.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9240129e4a28764211fd9a8d52e03105fd1453141aae8993981ffa3c19a7d79
-  data.tar.gz: 824f643a5fbbaa5df88227fa0feee64ccf024aaa19886b263411d156b2bf4746
+  metadata.gz: ff8cb5a2c731d92632524eb3e3c946ac02f3c41b78ac8fe80ecad1f69ef45a12
+  data.tar.gz: 2d1a30494e052b4645948fa71f0fcdc8b291f36d6d176586c3b2ae615116b532
 SHA512:
-  metadata.gz: 6c038200763a2eba085f52b2d03c3cabdae42d6a9e82487095d4c2acafed827228294c74d1a615bb722fcf35d3717c978d15a259c98febdff8fef6680e5fe2bb
-  data.tar.gz: 855e2f2085c61f2e9f32843fc56956c83c020a66ca386712fc3a0000e60feb009d3c2ad8f8476af1d24fa83eca5a9c1047b3475bc97aa3c7a6d0e5ccfb0d0c1d
+  metadata.gz: c44b2a16e3266e921da6b1fea2223e1600d2c382851302ac44c07e4191cec175f4b52ede7018ccf463c8bd391dcb737cd47c9f68f624b8b93a7a30842d9afa85
+  data.tar.gz: 79c7c3e8693243ec9dd06a34e5b9dd7e2b6829b4de238cff1be58d83c163dc01bc3f1f179c00e3dbdcdb77fa7e3b680dfe348db7f3dd447fbb14370465e64f12

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 60
-  BUGFIX = 3
+  BUGFIX = 7
   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/generator/comparator.rb

@@ -13,7 +13,7 @@ module Origen
         }.merge(options)
 
         if File.exist?(old)
-          if Utility::Diff.new(file_a: new, file_b: old, ignore_blank_lines: true,
+          if Utility::Diff.new(file_a: new, file_b: old, ignore_blank_lines: options[:ignore_blank_lines],
                                comment_char: options[:comment_char],
                                suspend_string: options[:suspend_string],
                                resume_string: options[:resume_string]).diffs?

data/lib/origen/generator/compiler.rb

@@ -39,9 +39,10 @@ module Origen
       # to the destination un-altered
       def compile(file_or_dir, options = {})
         options = {
-          check_for_changes: true,
-          sub_template:      false,
-          collect_stats:     true
+          check_for_changes:  true,
+          sub_template:       false,
+          collect_stats:      true,
+          ignore_blank_lines: true
         }.merge(options)
         @scope = options[:scope]
         # Doing here so the output_directory (requiring target load) doesn't get hit if
@@ -130,7 +131,7 @@ module Origen
           if @check_for_changes
             check_for_changes(output_file(file, options), reference_file(file, options),
                               comment_char: Origen.app.tester ? Origen.app.tester.program_comment_char : nil,
-                              compile_job:  true)
+                              compile_job:  true, ignore_blank_lines: options[:ignore_blank_lines])
           end
         end
       end

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('/')]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.60.3
+  version: 0.60.7
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2022-02-11 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