origen 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d785350a667cc70a8ef0915fb8ea4f4c0bb0f70dc29159ac09a5112e3e72ec78
-  data.tar.gz: 918ebaae4f7f664904f016a0b150123fb515d1f0e8eb86775eee1db1e2bcfc14
+  metadata.gz: 21b7b219ea6b020ff55496a1c3103e1abb49080162ae22c7e923cf09573b2909
+  data.tar.gz: 2e0fdba7223ee3fa33f272f88ff9ccdea39ba54d630eb8e28c99d5bfc73c6563
 SHA512:
-  metadata.gz: 0f58ff06e30b0c5687c562abfe5c1392b2cdd18b2eb50bb176f35d35764856091f9adaa5472886d51684277eb8b931a75745f487ff63fa62fb3b344338e7173f
-  data.tar.gz: 60e67f10a5c318593d9f842c3e880bfe1301130cba17c6030127bf69dead91951bd59bb79007a34a80adc2da83817333323bb4eda0904687db0b24d6f4e14da6
+  metadata.gz: bb7fcc388d925a782a33120045527f627e5c7c31fcbfe351f0ef32c8368824c2d94c473f818e68a5e1948cd321dd8cd130d288d348ce141875678b03d11ee693
+  data.tar.gz: 187445f738cc7873c920f29e4c55eb480d67d8ab1be5fbc143e592d6cc855ecb8a27f2c835efbb53ce304faa123e432fedd8ba51b3205df1fe414f3f1482ad8c

data/config/version.rb

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

data/lib/origen.rb

@@ -610,6 +610,9 @@ unless defined? RGen::ORIGENTRANSITION
         else
           @interface.reset_globals if @interface.respond_to?(:reset_globals)
         end
+        if @interface.respond_to?(:on_interface_reset)
+          @interface.on_interface_reset
+        end
         @interface
       end
 

data/lib/origen/application/lsf_manager.rb

@@ -252,8 +252,9 @@ module Origen
       end
 
       # Build the log file from the completed jobs
-      def build_log(_options = {})
-        Origen.log.info '*' * 70
+      def build_log(options = {})
+        log_method = options[:log_file] ? options[:log_file] : :info
+        Origen.log.send(log_method, '*' * 70)
         completed_jobs.each do |job|
           File.open(log_file(job[:id])) do |f|
             last_line_blank = false
@@ -291,12 +292,12 @@ module Origen
                   stats.failed_files += Regexp.last_match[1].to_i
                 elsif line =~ /ERROR!/
                   stats.errors += 1
-                  Origen.log.send :relog, line
+                  Origen.log.send :relog, line, options
                 else
                   # Compress multiple blank lines
                   if line =~ /^\s*$/ || line =~ /.*\|\|\s*$/
                     unless last_line_blank
-                      Origen.log.info
+                      Origen.log.send(log_method, nil)
                       last_line_blank = true
                     end
                   else
@@ -305,8 +306,7 @@ module Origen
                            line =~ /Insecure world writable dir/ ||
                            line =~ /To save all of/
                       line.strip!
-                      # line.sub!(/.*\|\| /, '')
-                      Origen.log.send :relog, line
+                      Origen.log.send :relog, line, options
                       last_line_blank = false
                     end
                   end
@@ -319,7 +319,7 @@ module Origen
             end
           end
         end
-        Origen.log.info '*' * 70
+        Origen.log.send(log_method, '*' * 70)
         stats.print_summary
       end
 
@@ -409,7 +409,7 @@ module Origen
         end
 
         str = "#{action} #{cmd}".strip
-        str.sub('origen ', '') if str =~ /^origen /
+        str.sub!('origen ', '') if str =~ /^origen /
 
         # Append the --exec_remote switch to all Origen commands, this allows command
         # processing to be altered based on whether it is running locally or

data/lib/origen/application/workspace_manager.rb

@@ -114,7 +114,7 @@ module Origen
           fail "Sorry but #{path} already exists!"
         end
         FileUtils.rm_rf(path.to_s) if File.exist?(path.to_s)
-        rc = RevisionControl.new remote: options[:rc_url], local: path.to_s
+        rc = RevisionControl.new options.merge(remote: options[:rc_url], local: path.to_s)
         rc.build
       end
 

data/lib/origen/log.rb

@@ -274,6 +274,7 @@ module Origen
       else
         msg = format_msg(method.to_s.upcase, msg)
       end
+      console.info msg if options[:verbose]
       @custom_logs[method.to_sym].info(msg)
     end
 
@@ -364,8 +365,10 @@ module Origen
       end
     end
 
-    def relog(msg)
-      if msg =~ /^\[(\w+)\] .*/
+    def relog(msg, options = {})
+      if options[:log_file]
+        send options[:log_file], msg.sub(/.*\|\|\s*/, ''), options
+      elsif msg =~ /^\[(\w+)\] .*/
         method = Regexp.last_match(1).downcase
         if respond_to?(method)
           send method, msg.sub(/.*\|\|\s*/, '')

data/lib/origen/regression_manager.rb

@@ -27,6 +27,7 @@ module Origen
     # @param [Hash] options Options to customize the run instance
     # @option options [Array]   :target String Array of target names on which to run regression
     # @option options [Boolean] :build_reference (true) Build reference workspace automatically
+    # @option options [Symbol]  :build_method (:init) whether to use a git init or git clone method to build the workspace
     # @option options [Boolean] :send_email (false) Send results email when regression complete
     # @option options [Boolean] :email_all_developers (false) If sending email, whether to email all developers or just user
     # @option options [Boolean] :report_results (false) Whether to report results inline to console
@@ -35,6 +36,7 @@ module Origen
     def run(options = {})
       options = {
         build_reference:      true,
+        build_method:         :init,
         send_email:           false,
         email_all_developers: false,
         report_results:       false,
@@ -46,7 +48,7 @@ module Origen
         Origen.lsf.clear_all
         yield options
         wait_for_completion(options) if options[:uses_lsf]
-        save_and_delete_output
+        save_and_delete_output(options)
       else
         if options[:build_reference]
           @reference_tag = version_to_tag(options[:version] || get_version(options))
@@ -58,7 +60,8 @@ module Origen
             disable_origen_version_check do
               Dir.chdir reference_origen_root do
                 Bundler.with_clean_env do
-                  system 'rm -rf lbin'
+                  # Origen 0.40.0 started using origen-owned binstubs
+                  system 'rm -rf lbin' if Gem::Version.new(Origen.version) < Gem::Version.new('0.40.0')
                   # If regression is run using a service account, we need to setup the path/bundler manually
                   # The regression manager needs to be passed a --service_account option when initiated.
                   if options[:service_account]
@@ -125,7 +128,7 @@ module Origen
     end
 
     def summarize_results(options = {})
-      Origen.lsf.build_log
+      Origen.lsf.build_log(options)
       stats = Origen.app.stats
       if options[:report_results]
         puts "Regression results: \n"
@@ -144,12 +147,16 @@ module Origen
 
     # Saves all generated output (to the reference dir) and then
     # deletes the output directory to save space
-    def save_and_delete_output
-      Origen.lsf.build_log
+    def save_and_delete_output(options = {})
+      Origen.lsf.build_log(options)
       Origen.log.flush
       Dir.chdir reference_origen_root do
         Bundler.with_clean_env do
-          system 'bundle exec origen save all'
+          if options[:log_file]
+            system "bundle exec origen save all -f log/#{options[:log_file]}.txt"
+          else
+            system 'bundle exec origen save all'
+          end
         end
       end
       FileUtils.rm_rf "#{reference_origen_root}/output"
@@ -214,7 +221,7 @@ module Origen
           # Build the new reference workspace now.
           unless File.exist?(@reference_workspace)
             highlight { Origen.log.info 'Building reference workspace...' }
-            ws.build(@reference_workspace)
+            ws.build(@reference_workspace, options)
           end
           ws.set_reference_workspace(@reference_workspace)
         else
@@ -229,7 +236,7 @@ module Origen
         end
         unless File.exist?(@reference_workspace)
           highlight { Origen.log.info 'Building reference workspace...' }
-          ws.build(@reference_workspace)
+          ws.build(@reference_workspace, options)
         end
         ws.set_reference_workspace(@reference_workspace)
       end

data/lib/origen/revision_control/git.rb

@@ -345,6 +345,7 @@ module Origen
       end
 
       def initialize_local_dir(options = {})
+        return if options[:build_method] == :clone
         super
         unless initialized?(options)
           Origen.log.debug "Initializing Git workspace at #{local}"

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2020-05-15"
+  s.date = "2020-05-26"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.7.7".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "2.7.7" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.0.3" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -749,8 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit