origen 0.58.0 → 0.59.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e328347b1a702ec37c86bbf6dbc0d65c9bf9376479fca31e4adc5208043f749
-  data.tar.gz: c72f5d3bbddbe4d4374450a828db82b14c3af5ea1177366e3cb62b2051037115
+  metadata.gz: 16b5e4aa6124b67155547b10129eab41ef8c875bdaff3699bb14e404bd92d9f5
+  data.tar.gz: aafc5587e6a436d9e2418ca2fee24a5a8733b7fb63e8ffe082c4dd37d8f250b8
 SHA512:
-  metadata.gz: 441978473ed06d1df7f8ba36cd6734e5057de398846b7be6856c14e1d8a4973cc8d896958ab70dc69dccb44dea85012264006069afb50ec5406324c016841554
-  data.tar.gz: 21a81041aa01df9774cb94303e016460b070c7c9f296a5297148018c9d314a995ade0aa3432b959232bb70c524fe4249eb7912ecdf7798f273f46cfe3f493a4f
+  metadata.gz: a728c16c96cd708cdd9cab9125ee83a2613105b47485b3345d036e6cb6050839563530890edf0550cbcd941812edfa2b5685514aaccd96804f248b4abc1f1683
+  data.tar.gz: 856a497042c8fedce4e3977fd45661b4a758331eca93642842fb2b8b47c9a336ec2c71bc30b234c8a6d6e5327da2a93d9ef081143f4e8abcec75b159146e0710

data/config/version.rb

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

data/lib/origen/controller.rb

@@ -2,6 +2,18 @@ module Origen
   module Controller
     extend ActiveSupport::Concern
 
+    # Workaround due to reserved keywords in Ruby, Display in the case below.
+    def display
+      # If the DUT responds to a sub_block "display" return the sub_block
+      if model.sub_blocks.include? 'display'
+        Origen.log.debug "Found a sub_block \'display\', passing control to the #{model.class}..."
+        model.sub_blocks['display']
+      else
+        # Else, pass control to the ruby core.
+        super
+      end
+    end
+
     module ClassMethods
       def model(options = {})
         options[:controller_class] = self

data/lib/origen/pins/pin.rb

@@ -22,8 +22,8 @@ module Origen
       # before falling back to a default
       PACKAGE_SCOPED_ATTRIBUTES = [:location, :dib_assignment, :dib_meta]
 
-      # Pin Types
-      TYPES = [:analog, :digital]
+      # Pin Types, 'digital' and 'analog' are legacy types kept for backwards compatibility
+      TYPES = [:digital, :analog, :signal, :ground, :power, :virtual]
 
       attr_accessor :order
       # Inverts pin states for drive and compare, can be useful if a timing set change requires clocks to drive low for example when all pattern logic has been set up to drive them high.
@@ -90,7 +90,7 @@ module Origen
         @open_drain = options[:open_drain]
         @ext_pullup = options[:ext_pullup]
         @ext_pulldown = options[:ext_pulldown]
-        @type = options[:type]
+        @type = options[:type].nil? ? determine_type : options[:type]
         @dib_assignment = [] # Array to handle multi-site testing
         @size = 1
         @value = 0
@@ -1183,6 +1183,17 @@ module Origen
 
       private
 
+      def determine_type
+        class_type = self.class.to_s.split('::').last.downcase
+        if class_type == 'pin'
+          return :signal
+        else
+          pin_type_match = class_type.match(/^(\S+)pin$/)
+          return if pin_type_match.nil?
+          pin_type_match[1].to_sym
+        end
+      end
+
       def primary_group=(group)
         @primary_group = group
       end

data/lib/origen/site_config.rb

@@ -416,9 +416,10 @@ module Origen
       # Load any centralized site configs now.
       centralized_site_config = find_val('centralized_site_config')
       if centralized_site_config
-        # We know the last two site configs will exists (they are in Origen core) and that they contain the default
-        # values. We want the centralized config to load right after those.
-        @configs.insert(-3, Config.new(path: centralized_site_config, parent: self))
+        # The first site configs found will exist in Origen core, and they contain the default values.
+        # We want the centralized config to load right after those.
+        centralized_index = -(@configs.select { |c| c.path.start_with?(Origen.top.to_s) }.size + 1)
+        @configs.insert(centralized_index, Config.new(path: centralized_site_config, parent: self))
       end
 
       # After all configs have been populated, see if the centralized needs refreshing

data/lib/origen/users/ldap.rb

@@ -15,9 +15,14 @@ module Origen
       HOST = Origen.site_config.ldap_host
       PORT = Origen.site_config.ldap_port
       BASE_DN = Origen.site_config.ldap_base_dn
+      LDAP_ENCRYPTION = Origen.site_config.ldap_encryption
+
+      if LDAP_ENCRYPTION.nil?
+        LDAP_ENCRYPTION = 'simple_tls'
+      end
 
       def available?
-        !!(SERVICE_ACCOUNT && SERVICE_PASS && HOST && PORT && BASE_DN)
+        !!(SERVICE_ACCOUNT && SERVICE_PASS && HOST && PORT && BASE_DN && LDAP_ENCRYPTION)
       end
 
       # Lookup the given user in the core directory and return an object representing the user's entry
@@ -57,7 +62,8 @@ module Origen
       def service
         @service ||= Net::LDAP.new host:       HOST,
                                    port:       PORT,
-                                   encryption: { method: :simple_tls },
+                                   base:       BASE_DN,
+                                   encryption: LDAP_ENCRYPTION,
                                    auth:       { method: :simple, username: SERVICE_ACCOUNT, password: SERVICE_PASS }
       end
     end

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,7 +8,7 @@ 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-09-01"
+  s.date = "2020-11-19"
   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

data/spec/format/origen_formatter.rb

@@ -1,14 +1,27 @@
 require 'rspec/core/formatters/base_formatter'
 
 class OrigenFormatter < RSpec::Core::Formatters::BaseFormatter
-
-  def dump_summary(duration, example_count, failure_count, pending_count)
-    if failure_count > 0
-      Origen.app.stats.report_fail
-    else
-      Origen.app.stats.report_pass
+  rspec_version = RSpec.constants.include?(:Version) ? RSpec::Version::STRING : RSpec::Core::Version::STRING 
+  if Gem::Version.new(rspec_version) < Gem::Version.new('3.0.0')
+    # legacy formatter
+    def dump_summary(duration, example_count, failure_count, pending_count)
+      if failure_count > 0
+        Origen.app.stats.report_fail
+      else
+        Origen.app.stats.report_pass
+      end
+      super(duration, example_count, failure_count, pending_count)
+    end
+  else
+    # RSpec 3 API
+    RSpec::Core::Formatters.register self, :dump_summary
+    def dump_summary(summary)
+      puts
+      if summary.failed_examples.size > 0
+        Origen.app.stats.report_fail
+      else
+        Origen.app.stats.report_pass
+      end
     end
-    super(duration, example_count, failure_count, pending_count)
   end
-
 end

data/templates/code_generators/model.rb

@@ -15,7 +15,15 @@ class <%= @namespaces.map { |n| camelcase(n[1]) }.join('::') %>::<%= camelcase(@
   include Origen::Model
 <% end -%>
 
-<% end -%>
   def initialize(options = {})
   end
+<% else -%>
+# super means that the initialize request will get passed onto the parent class's initialize method. 
+# i.e. the one defined in <%= @parent_class %>
+# If you want to override that and add a specific implementation for this DUT type,
+# then simply delete the super below and add the code you wish to handle the request.
+  def initialize(options = {})
+    super
+  end
+<% end -%>
 end

data/vendor/lib/models/origen/export1.rb

@@ -5,69 +5,69 @@ module Origen
     def self.extended(model)
       model.add_package :bga
       model.add_package :pcs
-      model.add_pin :pinx
-      model.add_pin :piny, reset: :drive_hi, direction: :output, meta: { a: '1', b: 2 }
-      model.add_pin :tdo, packages: { bga: { location: "BF32", dib_assignment: [10104] }, pcs: { location: "BF30", dib_assignment: [31808] } }
-      model.add_pin :porta31
-      model.add_pin :porta30
-      model.add_pin :porta29
-      model.add_pin :porta28
-      model.add_pin :porta27
-      model.add_pin :porta26
-      model.add_pin :porta25
-      model.add_pin :porta24
-      model.add_pin :porta23
-      model.add_pin :porta22
-      model.add_pin :porta21
-      model.add_pin :porta20
-      model.add_pin :porta19
-      model.add_pin :porta18
-      model.add_pin :porta17
-      model.add_pin :porta16
-      model.add_pin :porta15
-      model.add_pin :porta14
-      model.add_pin :porta13
-      model.add_pin :porta12
-      model.add_pin :porta11
-      model.add_pin :porta10
-      model.add_pin :porta9
-      model.add_pin :porta8
-      model.add_pin :porta7
-      model.add_pin :porta6
-      model.add_pin :porta5
-      model.add_pin :porta4
-      model.add_pin :porta3
-      model.add_pin :porta2
-      model.add_pin :porta1
-      model.add_pin :porta0
-      model.add_pin :portb0
-      model.add_pin :portb1
-      model.add_pin :portb2
-      model.add_pin :portb3
-      model.add_pin :portb4
-      model.add_pin :portb5
-      model.add_pin :portb6
-      model.add_pin :portb7
-      model.add_pin :portb8
-      model.add_pin :portb9
-      model.add_pin :portb10
-      model.add_pin :portb11
-      model.add_pin :portb12
-      model.add_pin :portb13
-      model.add_pin :portb14
-      model.add_pin :portb15
+      model.add_pin :pinx, type: :signal
+      model.add_pin :piny, reset: :drive_hi, direction: :output, type: :signal, meta: { a: '1', b: 2 }
+      model.add_pin :tdo, type: :signal, packages: { bga: { location: "BF32", dib_assignment: [10104] }, pcs: { location: "BF30", dib_assignment: [31808] } }
+      model.add_pin :porta31, type: :signal
+      model.add_pin :porta30, type: :signal
+      model.add_pin :porta29, type: :signal
+      model.add_pin :porta28, type: :signal
+      model.add_pin :porta27, type: :signal
+      model.add_pin :porta26, type: :signal
+      model.add_pin :porta25, type: :signal
+      model.add_pin :porta24, type: :signal
+      model.add_pin :porta23, type: :signal
+      model.add_pin :porta22, type: :signal
+      model.add_pin :porta21, type: :signal
+      model.add_pin :porta20, type: :signal
+      model.add_pin :porta19, type: :signal
+      model.add_pin :porta18, type: :signal
+      model.add_pin :porta17, type: :signal
+      model.add_pin :porta16, type: :signal
+      model.add_pin :porta15, type: :signal
+      model.add_pin :porta14, type: :signal
+      model.add_pin :porta13, type: :signal
+      model.add_pin :porta12, type: :signal
+      model.add_pin :porta11, type: :signal
+      model.add_pin :porta10, type: :signal
+      model.add_pin :porta9, type: :signal
+      model.add_pin :porta8, type: :signal
+      model.add_pin :porta7, type: :signal
+      model.add_pin :porta6, type: :signal
+      model.add_pin :porta5, type: :signal
+      model.add_pin :porta4, type: :signal
+      model.add_pin :porta3, type: :signal
+      model.add_pin :porta2, type: :signal
+      model.add_pin :porta1, type: :signal
+      model.add_pin :porta0, type: :signal
+      model.add_pin :portb0, type: :signal
+      model.add_pin :portb1, type: :signal
+      model.add_pin :portb2, type: :signal
+      model.add_pin :portb3, type: :signal
+      model.add_pin :portb4, type: :signal
+      model.add_pin :portb5, type: :signal
+      model.add_pin :portb6, type: :signal
+      model.add_pin :portb7, type: :signal
+      model.add_pin :portb8, type: :signal
+      model.add_pin :portb9, type: :signal
+      model.add_pin :portb10, type: :signal
+      model.add_pin :portb11, type: :signal
+      model.add_pin :portb12, type: :signal
+      model.add_pin :portb13, type: :signal
+      model.add_pin :portb14, type: :signal
+      model.add_pin :portb15, type: :signal
       model.add_pin_group :porta, :porta31, :porta30, :porta29, :porta28, :porta27, :porta26, :porta25, :porta24, :porta23, :porta22, :porta21, :porta20, :porta19, :porta18, :porta17, :porta16, :porta15, :porta14, :porta13, :porta12, :porta11, :porta10, :porta9, :porta8, :porta7, :porta6, :porta5, :porta4, :porta3, :porta2, :porta1, :porta0
       model.add_pin_group :portb, :portb15, :portb14, :portb13, :portb12, :portb11, :portb10, :portb9, :portb8, :portb7, :portb6, :portb5, :portb4, :portb3, :portb2, :portb1, :portb0
       model.pins(:portb).endian = :little
-      model.add_power_pin :vdd1, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
-      model.add_power_pin :vdd2
+      model.add_power_pin :vdd1, type: :power, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
+      model.add_power_pin :vdd2, type: :power
       model.add_power_pin_group :vdd, :vdd1, :vdd2
-      model.add_ground_pin :gnd1
-      model.add_ground_pin :gnd2
-      model.add_ground_pin :gnd3
+      model.add_ground_pin :gnd1, type: :ground
+      model.add_ground_pin :gnd2, type: :ground
+      model.add_ground_pin :gnd3, type: :ground
       model.add_ground_pin_group :gnd, :gnd1, :gnd2, :gnd3
-      model.add_virtual_pin :relay1
-      model.add_virtual_pin :relay2, packages: { bga: {} }
+      model.add_virtual_pin :relay1, type: :virtual
+      model.add_virtual_pin :relay2, type: :virtual, packages: { bga: {} }
 
       model.sub_block :block1, file: 'origen/export1/block1.rb', dir: "#{Origen.root!}/vendor/lib/models", lazy: true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.59.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport