origen 0.57.2 → 0.59.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9607bd6ebb09f96af0baae6c3f7a87fde9bba8706b75cb8eb5ccdbea5acc8849
-  data.tar.gz: 3827507a3d7a92b75baf19ecb60ad4723b70b7a6bf99301fa892215c94095542
+  metadata.gz: c1fc57782e99a1d16b12376e79e535f2722bd98f82f31e2598a7c0c8a5bc26bb
+  data.tar.gz: 7547030f36db02db638794320c4b1679eef86b06de2471df0dc5164dc23b1498
 SHA512:
-  metadata.gz: 2e54fb02d412629a3346e21cd2f4dbc4d4fbb3ebdf20e5b01c00411edad3874e62f1e48299ef83c461c1afef21eddce438b379c9712f028cd4caeaa5c0031c74
-  data.tar.gz: bf7038729a7eb5d11da8d191cd555d06e2c06caa00119ded03c273ecfd232e27bf98bfe000f9e47d20828105b69c648214e7baca956299af0b487116cefaf5fa
+  metadata.gz: a71ca51af97b345415c8038ed8aa62eaa76c2a2fbc5a10d0c50e4d9185a0aaebb30882a8069b4d80ab42782c48a187b803ce9c8a702854eab9bfbf61e895f02f
+  data.tar.gz: 0fcfa708b056221e6fb34e1fe45a1f2cb1aae71858dd80c4ff5a2627c24ed6bae128d7fbca3049501cd64f3818b73890e0d86edf25e8b510e4d25067bedd0ba7

data/config/version.rb

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

data/lib/origen/pins/pin.rb

@@ -443,6 +443,24 @@ module Origen
       end
       alias_method :add_locn, :add_location
 
+      # Add a way to update packages for the pins after the pins have been added.
+      #
+      # @example Updating a package after the pin has been added
+      # dut.add_pin :p1
+      # dut.add_package: package1
+      # dut.add_package: package2
+      # dut.pin(:p1).packages # => {}
+      # dut.pin(:p1).update_packages :packages # => [:package1, :package2]
+      # dut.pin(:p1).packages # => {:package1=>{}, :package2=>{}}
+      def update_packages(options = {})
+        packages = resolve_packages(options)
+        packages.each do |package_id|
+          package_id = package_id.respond_to?(:id) ? package_id.id : package_id
+          myself.packages[package_id] ||= {}
+        end
+      end
+      alias_method :update_package, :update_packages
+
       # Add a Device Interface Board (e.g. probecard at wafer probe or loadboard at final package test)
       # assignment to the pin.  Some refer to this as a channel but API name is meant to be generic.
       def add_dib_assignment(str, options = {})

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-06-28"
+  s.date = "2020-10-08"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.57.2
+  version: 0.59.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport