origen 0.60.0 → 0.60.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b89041bc7a6067a7945d3b9cae3415771f2a270c3f6496a217d8b27916c2211
-  data.tar.gz: a6c3ac53db78a810b77c0cb23c99fdb1d35fd05ec451c658f710c2501822bd03
+  metadata.gz: 148dec5c8f45022812ba91024776a9ef96523248ce80192eb41cde7fa15de0bd
+  data.tar.gz: 3a4d381a11282e37c008a321c45e24e85c0bf8dc1c62d62c646542a679badb2c
 SHA512:
-  metadata.gz: c2d17382ac902d0391e7d2f748e5166ff6264ba2c10529b72dc5074bbb33aab30e4558e495082221a29e7365e483e2cc8f7e2517d229200519a5bef9cf1b27e8
-  data.tar.gz: 66b8c763603a908bab112da936042f6e6e127b961acc52ba06d2d1e2b2d783d28480dda944d9dfd7fdadb24f3a98aa30a1f065fff069d37ea6d9213f4d64ff9e
+  metadata.gz: da91b6b19ff01e77e4cc6a43ed882204933ca913b418e86477a5a45c1182459ff38cc80525d6340951f5f582c06745d0c4db3094a365eab487f3d02e9ade9e6b
+  data.tar.gz: e802f0c36cfca5aa46339adebd2ef36ca79d99aa72f271970c5428f87e57ad1b0f8cc57cd6d0b5a2e9efd8dd39723f90c0f8201a537fefcfa12f91672bd7a671

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 60
-  BUGFIX = 0
+  BUGFIX = 4
   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
+                # 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 'net/http'
+    # 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/sub_blocks.rb

@@ -336,7 +336,11 @@ module Origen
             # =>  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

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-04-27"
+  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.2.16".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.2.16" 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.60.0
+  version: 0.60.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-08-17 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.2.16
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit