origen 0.57.1 → 0.59.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/rubocop/strict_enabled.yml +1 -1
- data/config/version.rb +2 -2
- data/lib/origen/pins/pin.rb +18 -0
- data/lib/origen/users/ldap.rb +8 -2
- data/origen_app_generators/origen_app_generators.gemspec +1 -1
- data/spec/format/origen_formatter.rb +20 -8
- data/templates/code_generators/model.rb +9 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 89baf7d80756d514b233a6504c168792ede60723771d6673b8fde4530934da9f
|
4
|
+
data.tar.gz: a611364a5944c4e2180b9221f9ad1faafd57b025717d0f40b3f0d03ee53084c3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0762063e63b7ba5fcfc1cfd9a53454f22b538e7b1aa82d9f80a621e025c8f0a75111d6e49900a1864ccebb98d5efdbc39847546a4cb8293fefbd240b0b3a8cbf
|
7
|
+
data.tar.gz: 826110283c6a70adb0e3470f7a1f720e2175534747a63f13026316293e9e84482ad27d76716fc5556ffc010ae979e31324ae4e96bf3180f12e40fe4b436c0231
|
@@ -240,7 +240,7 @@ Style/InfiniteLoop:
|
|
240
240
|
Style/Lambda:
|
241
241
|
Description: 'Use the new lambda literal syntax for single-line blocks.'
|
242
242
|
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#lambda-multi-line'
|
243
|
-
Enabled:
|
243
|
+
Enabled: false
|
244
244
|
|
245
245
|
Style/LambdaCall:
|
246
246
|
Description: 'Use lambda.call(...) instead of lambda.(...).'
|
data/config/version.rb
CHANGED
data/lib/origen/pins/pin.rb
CHANGED
@@ -443,6 +443,24 @@ module Origen
|
|
443
443
|
end
|
444
444
|
alias_method :add_locn, :add_location
|
445
445
|
|
446
|
+
# Add a way to update packages for the pins after the pins have been added.
|
447
|
+
#
|
448
|
+
# @example Updating a package after the pin has been added
|
449
|
+
# dut.add_pin :p1
|
450
|
+
# dut.add_package: package1
|
451
|
+
# dut.add_package: package2
|
452
|
+
# dut.pin(:p1).packages # => {}
|
453
|
+
# dut.pin(:p1).update_packages :packages # => [:package1, :package2]
|
454
|
+
# dut.pin(:p1).packages # => {:package1=>{}, :package2=>{}}
|
455
|
+
def update_packages(options = {})
|
456
|
+
packages = resolve_packages(options)
|
457
|
+
packages.each do |package_id|
|
458
|
+
package_id = package_id.respond_to?(:id) ? package_id.id : package_id
|
459
|
+
myself.packages[package_id] ||= {}
|
460
|
+
end
|
461
|
+
end
|
462
|
+
alias_method :update_package, :update_packages
|
463
|
+
|
446
464
|
# Add a Device Interface Board (e.g. probecard at wafer probe or loadboard at final package test)
|
447
465
|
# assignment to the pin. Some refer to this as a channel but API name is meant to be generic.
|
448
466
|
def add_dib_assignment(str, options = {})
|
data/lib/origen/users/ldap.rb
CHANGED
@@ -15,9 +15,14 @@ module Origen
|
|
15
15
|
HOST = Origen.site_config.ldap_host
|
16
16
|
PORT = Origen.site_config.ldap_port
|
17
17
|
BASE_DN = Origen.site_config.ldap_base_dn
|
18
|
+
LDAP_ENCRYPTION = Origen.site_config.ldap_encryption
|
19
|
+
|
20
|
+
if LDAP_ENCRYPTION.nil?
|
21
|
+
LDAP_ENCRYPTION = 'simple_tls'
|
22
|
+
end
|
18
23
|
|
19
24
|
def available?
|
20
|
-
!!(SERVICE_ACCOUNT && SERVICE_PASS && HOST && PORT && BASE_DN)
|
25
|
+
!!(SERVICE_ACCOUNT && SERVICE_PASS && HOST && PORT && BASE_DN && LDAP_ENCRYPTION)
|
21
26
|
end
|
22
27
|
|
23
28
|
# Lookup the given user in the core directory and return an object representing the user's entry
|
@@ -57,7 +62,8 @@ module Origen
|
|
57
62
|
def service
|
58
63
|
@service ||= Net::LDAP.new host: HOST,
|
59
64
|
port: PORT,
|
60
|
-
|
65
|
+
base: BASE_DN,
|
66
|
+
encryption: LDAP_ENCRYPTION,
|
61
67
|
auth: { method: :simple, username: SERVICE_ACCOUNT, password: SERVICE_PASS }
|
62
68
|
end
|
63
69
|
end
|
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
|
|
8
8
|
s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
|
9
9
|
s.require_paths = ["lib".freeze]
|
10
10
|
s.authors = ["Stephen McGinty".freeze]
|
11
|
-
s.date = "2020-
|
11
|
+
s.date = "2020-10-08"
|
12
12
|
s.email = ["stephen.f.mcginty@gmail.com".freeze]
|
13
13
|
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]
|
14
14
|
s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
|
@@ -1,14 +1,26 @@
|
|
1
1
|
require 'rspec/core/formatters/base_formatter'
|
2
2
|
|
3
3
|
class OrigenFormatter < RSpec::Core::Formatters::BaseFormatter
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
4
|
+
if Gem::Version.new(RSpec::Version::STRING) < Gem::Version.new('3.0.0')
|
5
|
+
# legacy formatter
|
6
|
+
def dump_summary(duration, example_count, failure_count, pending_count)
|
7
|
+
if failure_count > 0
|
8
|
+
Origen.app.stats.report_fail
|
9
|
+
else
|
10
|
+
Origen.app.stats.report_pass
|
11
|
+
end
|
12
|
+
super(duration, example_count, failure_count, pending_count)
|
13
|
+
end
|
14
|
+
else
|
15
|
+
# RSpec 3 API
|
16
|
+
RSpec::Core::Formatters.register self, :dump_summary
|
17
|
+
def dump_summary(summary)
|
18
|
+
puts
|
19
|
+
if summary.failed_examples.size > 0
|
20
|
+
Origen.app.stats.report_fail
|
21
|
+
else
|
22
|
+
Origen.app.stats.report_pass
|
23
|
+
end
|
10
24
|
end
|
11
|
-
super(duration, example_count, failure_count, pending_count)
|
12
25
|
end
|
13
|
-
|
14
26
|
end
|
@@ -15,7 +15,15 @@ class <%= @namespaces.map { |n| camelcase(n[1]) }.join('::') %>::<%= camelcase(@
|
|
15
15
|
include Origen::Model
|
16
16
|
<% end -%>
|
17
17
|
|
18
|
-
<% end -%>
|
19
18
|
def initialize(options = {})
|
20
19
|
end
|
20
|
+
<% else -%>
|
21
|
+
# super means that the initialize request will get passed onto the parent class's initialize method.
|
22
|
+
# i.e. the one defined in <%= @parent_class %>
|
23
|
+
# If you want to override that and add a specific implementation for this DUT type,
|
24
|
+
# then simply delete the super below and add the code you wish to handle the request.
|
25
|
+
def initialize(options = {})
|
26
|
+
super
|
27
|
+
end
|
28
|
+
<% end -%>
|
21
29
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: origen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.59.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen McGinty
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-10-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|