origen 0.32.1 → 0.33.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +2 -2
- data/lib/origen/users/user.rb +47 -1
- data/vendor/lib/models/origen/export1.rb +1 -1
- data/vendor/lib/models/origen/export1/block1.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4bbe04ff06fc71620ec53701cfda0b4ea651b44a
|
4
|
+
data.tar.gz: 3515abaaad4c9e9779dd3064182d17b62abb9990
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fe7b6df198be766746adfdd12d9c2fb2c49d7808f20c595785adf03816929376bbbd5252efaec7edd5d8db70905187fdc79229ab76c4eb4ea8a37606edf8e436
|
7
|
+
data.tar.gz: 1d27cf5f647ab632461e78c45ab91fb572d06ac80a6cdccb066f34e5b7136355fb77b76163526212cd98c4f28e782045ed2c9dfc7b0c7335086594d77c0bf9e2
|
data/config/version.rb
CHANGED
data/lib/origen/users/user.rb
CHANGED
@@ -157,10 +157,56 @@ module Origen
|
|
157
157
|
end
|
158
158
|
end
|
159
159
|
|
160
|
-
# Returns a string like "Stephen McGinty <
|
160
|
+
# Returns a string like "Stephen McGinty <stephen.mcginty@nxp.com>"
|
161
161
|
def name_and_email
|
162
162
|
"#{name} <#{email}>"
|
163
163
|
end
|
164
|
+
|
165
|
+
# Returns a private global Origen session store (stored in the user's home directory and only readable
|
166
|
+
# by them).
|
167
|
+
# See - http://origen-sdk.org/origen/guides/misc/session/#Global_Sessions
|
168
|
+
def auth_session
|
169
|
+
@session ||= begin
|
170
|
+
@session = Origen.session.user
|
171
|
+
@session.private = true
|
172
|
+
@session
|
173
|
+
end
|
174
|
+
end
|
175
|
+
|
176
|
+
# Returns the password for the current user.
|
177
|
+
# If the user hasn't supplied it yet they will be prompted to enter it, it will then be stored
|
178
|
+
#
|
179
|
+
# First, try in the global session, if its not defined, ask for it.
|
180
|
+
def password(options = {})
|
181
|
+
unless current?
|
182
|
+
fail "You can only reference the password for the current user (#{self.class.current_user_id})!"
|
183
|
+
end
|
184
|
+
|
185
|
+
if options[:refresh]
|
186
|
+
auth_session[:password] = nil
|
187
|
+
end
|
188
|
+
|
189
|
+
if auth_session[:password]
|
190
|
+
password = decrypt(auth_session[:password])
|
191
|
+
else
|
192
|
+
puts 'Please enter your password:'
|
193
|
+
password = (STDIN.noecho(&:gets) || '').chomp
|
194
|
+
|
195
|
+
# TODO: Need some kind of callback here to optionally verify password correctness via LDAP or similar
|
196
|
+
|
197
|
+
auth_session[:password] = encrypt(password)
|
198
|
+
end
|
199
|
+
|
200
|
+
password
|
201
|
+
end
|
202
|
+
|
203
|
+
def decrypt(text)
|
204
|
+
text
|
205
|
+
end
|
206
|
+
|
207
|
+
def encrypt(text)
|
208
|
+
text
|
209
|
+
end
|
164
210
|
end
|
165
211
|
end
|
166
212
|
end
|
@@ -69,7 +69,7 @@ module Origen
|
|
69
69
|
model.add_virtual_pin :relay1
|
70
70
|
model.add_virtual_pin :relay2, packages: { bga: {} }
|
71
71
|
|
72
|
-
model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/
|
72
|
+
model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/proj/.tec_k3s/users/cengelken_b50956/origen_blocks/master/vendor/lib/models', lazy: true
|
73
73
|
|
74
74
|
end
|
75
75
|
end
|
@@ -4,7 +4,7 @@ module Origen
|
|
4
4
|
module Export1
|
5
5
|
module Block1
|
6
6
|
def self.extended(model)
|
7
|
-
model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/
|
7
|
+
model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/proj/.tec_k3s/users/cengelken_b50956/origen_blocks/master/vendor/lib/models', lazy: true, base_address: 0x40000000
|
8
8
|
|
9
9
|
end
|
10
10
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: origen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.33.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen McGinty
|
@@ -630,7 +630,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
630
630
|
version: 1.8.11
|
631
631
|
requirements: []
|
632
632
|
rubyforge_project:
|
633
|
-
rubygems_version: 2.6.
|
633
|
+
rubygems_version: 2.6.7
|
634
634
|
signing_key:
|
635
635
|
specification_version: 4
|
636
636
|
summary: The Semiconductor Developer's Kit
|