origen 0.59.8 → 0.60.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105c715afc0bf9d3fb0133656e2bb9b5072598bee921a83e47ed0974ce75de4c
-  data.tar.gz: e00626fb9e1f477af6884417a9fcc7605ee7a869d4e5cba56c2f456085c93bc1
+  metadata.gz: c9240129e4a28764211fd9a8d52e03105fd1453141aae8993981ffa3c19a7d79
+  data.tar.gz: 824f643a5fbbaa5df88227fa0feee64ccf024aaa19886b263411d156b2bf4746
 SHA512:
-  metadata.gz: a30e6be68bfe2ccbea6159919c285683a3a996c3b82591e748a37f96407e6aed34bc7500a7b0d2c1593ecfa0b55c08d51490334cc3da5cc5e7946a5ca2350dd3
-  data.tar.gz: 01cb78307b372f25c1365ff25270772c2ec6eabe7507167a91c6961b2fb49bb306a6c4277985f45d873d4384326090f4d7945fefcef00770ec8e29fb197dc31d
+  metadata.gz: 6c038200763a2eba085f52b2d03c3cabdae42d6a9e82487095d4c2acafed827228294c74d1a615bb722fcf35d3717c978d15a259c98febdff8fef6680e5fe2bb
+  data.tar.gz: 855e2f2085c61f2e9f32843fc56956c83c020a66ca386712fc3a0000e60feb009d3c2ad8f8476af1d24fa83eca5a9c1047b3475bc97aa3c7a6d0e5ccfb0d0c1d

data/config/commands.rb

@@ -17,7 +17,7 @@ when "tags"
 when "specs"
   Origen.app.session.origen_core[:mode] = 'debug'
   require "rspec"
-  exit RSpec::Core::Runner.run(['spec'])
+  exit RSpec::Core::Runner.run($ARGV.empty? ? ['spec'] : $ARGV)
 
 when "examples", "test"  
   Origen.app.session.origen_core[:mode] = 'debug'

data/config/version.rb

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

data/lib/origen/application/runner.rb

@@ -134,30 +134,40 @@ module Origen
       #
       # @api private
       def record_invocation(options)
-        # record_invocation = false
-        # begin
-        #  # Only record user invocations at this time, also bypass windows since it seems
-        #  # that threads can't be trusted not to block
-        #  unless Origen.running_remotely? # || Origen.running_on_windows?
-        #    record_invocation = Thread.new do
-        #      Origen.client.record_invocation(options[:action]) if options[:action]
-        #    end
-        #  end
-        # rescue
-        #  # Don't allow this to kill an origen command
-        # end
+        if Origen.site_config.record_invocation == true
+          record_invocation = false
+          begin
+            # Only record user invocations at this time, also bypass windows since it seems
+            # that threads can't be trusted not to block
+            unless Origen.running_remotely? # || Origen.running_on_windows?
+              # rubocop:disable Style/RescueModifier
+              record_invocation = Thread.new do
+                Origen.client.record_invocation(options[:action]) if options[:action]
+                rescue Errno::ECONNREFUSED
+                # Dont allow server being down to flood the screen with the stacktrace
+              end
+              # rubocop:enable Style/RescueModifier
+            end
+           rescue
+            # Don't allow this to kill an origen command
+          end
+        end
+        # yield here is really important for the callback tests!!
         yield
-        # begin
-        #  unless Origen.running_remotely?
-        #    # Wait for a server response, ideally would like to not wait here, but it seems if not
-        #    # then invocation postings can be dropped, especially on windows
-        #    Origen.profile 'waiting for recording invocation' do
-        #      record_invocation.value
-        #    end
-        #  end
-        # rescue
-        #  # Don't allow this to kill an origen command
-        # end
+
+        if Origen.site_config.record_invocation == true
+          begin
+            unless Origen.running_remotely?
+              # Wait for a server response, ideally would like to not wait here, but it seems if not
+              # then invocation postings can be dropped, especially on windows
+              Origen.profile 'waiting for recording invocation' do
+                record_invocation.value
+              end
+            end
+           rescue
+            # Don't allow this to kill an origen command
+          end
+        end
       end
 
       # The action to take should be set by the action option, but legacy code will pass

data/lib/origen/client.rb

@@ -5,15 +5,17 @@ module Origen
     #   https://github.com/jnunemaker/httparty/tree/v0.9.0
 
     require 'json'
-    require 'httparty'
-    include HTTParty
+    # require 'httparty'
+    # include HTTParty
 
     USE_DEV_SERVER = false
     DEV_PORT = 3000
 
     def post(path, options = {})
       options[:port] = port
-      self.class.post("#{url}/#{path}", options)
+      invocation_url = URI.parse("#{url}/#{path}")
+      http = Net::HTTP.new(invocation_url.host, invocation_url.port)
+      http.post(invocation_url, JSON.dump(options[:body]), 'Content-type' => 'application/vnd.api+json', 'Accept' => 'text/json, application/vnd.api+json')
     end
 
     def get(path, options = {})
@@ -21,7 +23,11 @@ module Origen
     end
 
     def url
-      'http://hub.origen-sdk.org/api'
+      if Origen.site_config.invocation_url.nil?
+        'http://localhost:3000'
+      else
+        Origen.site_config.invocation_url
+      end
     end
 
     def port
@@ -29,15 +35,20 @@ module Origen
     end
 
     def record_invocation(command)
-      data = {
-        user:           Origen.current_user.core_id,
-        application:    Origen.app.config.initials,
-        app_version:    Origen.app.version,
-        origen_version: Origen.version,
-        command:        command,
-        platform:       Origen.running_on_windows? ? 'windows' : 'linux'
+      content = {
+        data: {
+          type:       'applications',
+          attributes: {
+            user:             Origen.current_user.core_id,
+            application:      Origen.app.config.initials,
+            "app-version":    Origen.app.version,
+            "origen-version": Origen.version,
+            command:          command,
+            platform:         Origen.running_on_windows? ? 'windows' : 'linux'
+          }
+        }
       }
-      post('record_invocation', body: data)
+      post('applications', body: content)
     end
 
     # Returns an array of data packets for all plugins

data/lib/origen/loader.rb

@@ -116,62 +116,75 @@ 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
     # 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 app = options[:app] || model.app
+      if local_app = options[:app] || model.app
         if options[:path]
-          full_paths = Array(options[:path])
+          local_full_paths = Array(options[:path])
         else
-          full_paths = model.class.to_s.split('::')
-          full_paths.shift  # Throw away the app namespace
-          full_paths = [full_paths.join('/')]
+          local_full_paths = model.class.to_s.split('::')
+          local_full_paths.shift  # Throw away the app namespace
+          local_full_paths = [local_full_paths.join('/')]
         end
-        full_paths.each do |full_path|
-          paths = full_path.to_s.split('/')
-          key = ''
-          only = Array(options[:only]) if options[:only]
-          except = Array(options[:except]) if options[:except]
-          path = paths.map(&:underscore).join('/')
-          # If the path refers to a nested sub-block then don't load the full hierarchy since they
-          # don't support inheritance or derivatives, modify the paths array so that only the sub-block
-          # level will be loaded and nothing else.
-          paths = [path] if app.blocks_files[path] && app.blocks_files[path][:_sub_block]
-          # These will be loaded first, followed by the rest in an undefined order.
-          # Attributes and parameters are first so that they may be referenced in the other files.
-          # Sub-blocks was added early due to a corner case issue that could be encountered if the pins or
-          # regs imported an Origen exported file that defined a module with the same name as a sub-block
-          # class, in that case the sub-block class would not be auto-loaded.
-          load_first = [:attributes, :parameters, :sub_blocks]
+        app_paths_map = { local_app => local_full_paths }
+        if options[:inherit]
+          inherit_full_paths = options[:inherit].split('::')
+          inherit_app = Origen.app(inherit_full_paths.shift.underscore.to_sym)
+          inherit_full_paths = [inherit_full_paths.join('/')]
+          # merge to get inherit ordered in the beginning
+          app_paths_map = { inherit_app => inherit_full_paths }.merge(app_paths_map)
+        end
+        # load the inherit files, then the current app's block files
+        app_paths_map.each do |app, full_paths|
+          full_paths.each do |full_path|
+            paths = full_path.to_s.split('/')
+            key = ''
+            only = Array(options[:only]) if options[:only]
+            except = Array(options[:except]) if options[:except]
+            path = paths.map(&:underscore).join('/')
+            # If the path refers to a nested sub-block then don't load the full hierarchy since they
+            # don't support inheritance or derivatives, modify the paths array so that only the sub-block
+            # level will be loaded and nothing else.
+            paths = [path] if app.blocks_files[path] && app.blocks_files[path][:_sub_block]
+            # These will be loaded first, followed by the rest in an undefined order.
+            # Attributes and parameters are first so that they may be referenced in the other files.
+            # Sub-blocks was added early due to a corner case issue that could be encountered if the pins or
+            # regs imported an Origen exported file that defined a module with the same name as a sub-block
+            # class, in that case the sub-block class would not be auto-loaded.
+            load_first = [:attributes, :parameters, :sub_blocks]
 
-          load_first.each do |type|
-            unless (only && !only.include?(type)) || (except && except.include?(type))
-              with_parameters_transaction(type) do
-                paths.each_with_index do |path, i|
-                  key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
-                  if app.blocks_files[key] && app.blocks_files[key][type]
-                    app.blocks_files[key][type].each do |f|
-                      if type == :attributes
-                        success = load_attributes(f, model)
-                      else
-                        success = load_block_file(f, model)
+            load_first.each do |type|
+              unless (only && !only.include?(type)) || (except && except.include?(type))
+                with_parameters_transaction(type) do
+                  paths.each_with_index do |path, i|
+                    key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
+                    if app.blocks_files[key] && app.blocks_files[key][type]
+                      app.blocks_files[key][type].each do |f|
+                        if type == :attributes
+                          success = load_attributes(f, model)
+                        else
+                          success = load_block_file(f, model)
+                        end
+                        loaded ||= success
                       end
-                      loaded ||= success
                     end
                   end
                 end
               end
             end
-          end
 
-          # Now load the rest
-          paths.each_with_index do |path, i|
-            key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
-            if app.blocks_files[key]
-              app.blocks_files[key].each do |type, files|
-                unless type == :_sub_block || load_first.include?(type) || (only && !only.include?(type)) || (except && except.include?(type))
-                  files.each { |f| success = load_block_file(f, model); loaded ||= success }
+            # Now load the rest
+            paths.each_with_index do |path, i|
+              key = i == 0 ? path.underscore : "#{key}/#{path.underscore}"
+              if app.blocks_files[key]
+                app.blocks_files[key].each do |type, files|
+                  unless type == :_sub_block || load_first.include?(type) || (only && !only.include?(type)) || (except && except.include?(type))
+                    files.each { |f| success = load_block_file(f, model); loaded ||= success }
+                  end
                 end
               end
             end

data/lib/origen/model_initializer.rb

@@ -48,7 +48,7 @@ module Origen
         end
         if x.respond_to?(:is_an_origen_model?)
           x.send(:_initialized)
-          Origen::Loader.load_block(x)
+          Origen::Loader.load_block(x, options)
         end
         if x.respond_to?(:register_callback_listener)
           Origen.after_app_loaded do |app|

data/lib/origen/sub_blocks.rb

@@ -317,10 +317,40 @@ module Origen
         # been instantiated yet. This is not supported yet for instantiated sub-blocks since
         # there are probably a lot more corner-cases to consider, and hopefully no one will
         # really need this anyway.
-        if sub_blocks[name] && !sub_blocks[name].is_a?(Placeholder)
-          fail "You have already defined a sub-block named #{name} within class #{self.class}"
+        # Note that override is to recreate an existing sub-block, not adding additional
+        # attributes to an existing one
+        if options[:override]
+          sub_blocks.delete(name)
+          if options[:class_name]
+            begin
+              constantizable = !!options[:class_name].constantize
+            rescue NameError
+              constantizable = false
+            end
+            # this is to handle the case where a previously instantiated subblock wont allow
+            # the current class name to exist
+            # e.g. NamespaceA::B::C
+            # =>  NameSpaceX::Y::Z
+            # After requiring the files, constants become sane again:
+            # e.g. NamespaceA::B::C
+            # =>  NameSpaceA::B::C
+            if constantizable && (options[:class_name] != options[:class_name].constantize.to_s)
+              block_dir = options[:block_file] || _find_block_dir(options)
+              # files that aren't initializing a new namespace and have special loading shouldn't be required
+              # the code they contain may try to call methods that dont exist yet
+              skip_require_files = options[:skip_require_files] || %w(attributes parameters pins registers sub_blocks timesets)
+              Dir.glob("#{block_dir}/*.rb").each do |file|
+                next if skip_require_files.include?(Pathname.new(file).basename('.rb').to_s)
+                require file
+              end
+            end
+          end
+        else
+          if sub_blocks[name] && !sub_blocks[name].is_a?(Placeholder)
+            fail "You have already defined a sub-block named #{name} within class #{self.class}"
+          end
         end
-        if respond_to?(name)
+        if respond_to?(name) && !(singleton_class.instance_methods.include?(name) && options[:override])
           callers = Origen.split_caller_line caller[0]
           Origen.log.warning "The sub_block defined at #{Pathname.new(callers[0]).relative_path_from(Pathname.pwd)}:#{callers[1]} is overriding an existing method called #{name}"
         end
@@ -404,6 +434,33 @@ module Origen
 
     private
 
+    # @api private
+    # find the block directory path containing the namespace of options[:class_name]
+    def _find_block_dir(options, current_path = nil, remaining_namespace = nil)
+      current_path ||= Pathname.new("#{Origen.root}/app/blocks")
+      remaining_namespace ||= options[:class_name].split('::')[1..-1].map(&:underscore)
+      current_namespace = remaining_namespace.shift
+      if current_namespace
+        if current_path.join(current_namespace).exist?
+          return _find_block_dir(options, current_path.join(current_namespace), remaining_namespace)
+        elsif current_path.join("derivatives/#{current_namespace}").exist?
+          return _find_block_dir(options, current_path.join("derivatives/#{current_namespace}"), remaining_namespace)
+        elsif current_path.join("sub_blocks/#{current_namespace}").exist?
+          return _find_block_dir(options, current_path.join("sub_blocks/#{current_namespace}"), remaining_namespace)
+        else
+          Origen.log.error "Could not find block dir for namespace #{options[:class_name]}!"
+          fail
+        end
+      else
+        if current_path.join('model.rb').exist?
+          return current_path.to_s
+        else
+          Origen.log.error "Could not find block dir for namespace #{options[:class_name]}!"
+          fail
+        end
+      end
+    end
+
     def instantiate_sub_block(name, klass, options)
       return sub_blocks[name] unless sub_blocks[name].is_a?(Placeholder)
       sub_blocks[name] = klass.new(options.merge(parent: self, name: name))

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,23 +8,25 @@ 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 = "2021-01-11"
+  s.date = "2021-08-10"
   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 = "3.1.4".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.1.4" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.0.1" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
+    else
+      s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
+    end
   else
     s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
   end

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.59.8
+  version: 0.60.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -749,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit