checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
---
2
2
SHA256:
3
- metadata.gz: 362bd9d1d072e897d987c106ffb1f6e7543ac3ef19e72506c1d981abe9dd2689
4
- data.tar.gz: 78af8b2e1f9db6a37e2eb46cf3da044f90b1586524a039dd700afc3a3f1f6d1a
3
+ metadata.gz: 7d603663235ae26d0c6fba0822ca9c9576501fe541c67f297bb3a80e2482fb96
4
+ data.tar.gz: a14ad36e2a97a10135d0e3caacc8dbc1f1f0d35c5fe3c9ba4c4616fc77778f58
5
5
SHA512:
6
- metadata.gz: e34cb2c03b23cf7ed7014b95acd8c6a147ea0600a0a71b85de5191095135b896c313f5559714513d422e84d151d7eb57eae77bee76d24573b15036a9f16bf0a9
7
- data.tar.gz: 1672b98f23c1beb62b4e392bf855d053a6b26520cbd5c5e742ef7883d6398b48ac17df0c18d611b71d440630af3b9a3f0c680cf48f4e58380e53b0de7704d452
6
+ metadata.gz: 2cbba1ed23f15f9c00d31cddbd9190d25c0c25add9ef48cdd8165467e0a5d5bd90b2ed6d20202d4914ff19520eba810d680ed72f1507dd0134cc27fd6a3dfc93
7
+ data.tar.gz: 3810548860a6b00572efc5b7d9cff8ff4ec7ee56996718d7a399c4574cc45e3cd06f2d57bc4db332504e4c7981b73c21e5c6a82490b30a3485339d6e7d785f66
data/config/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
module Origen
2
2
MAJOR = 0
3
- MINOR = 52
4
- BUGFIX = 4
3
+ MINOR = 53
4
+ BUGFIX = 0
5
5
DEV = nil
6
6
VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
7
7
end
data/lib/origen/users/user.rb CHANGED
@@ -3,6 +3,9 @@ module Origen
3
3
class User
4
4
require 'openssl'
5
5
require 'digest/sha1'
6
+ # Required for STDIN.noecho to work
7
+ # https://stackoverflow.com/questions/9324697/why-cannot-use-instance-method-noecho-of-class-io
8
+ require 'io/console'
6
9
7
10
attr_reader :role
8
11
attr_writer :name, :email
@@ -45,7 +48,9 @@ module Origen
45
48
end
46
49
47
50
def id(options = {})
48
- @id.to_s.downcase
51
+ # Way to force Origen to use the new user ID in case of WSL where the core ID might not match the WSL login name
52
+ # User needs to setup the environment variable in their .bashrc or .tcshrc file
53
+ ENV['ORIGEN_USER_ID'] || @id.to_s.downcase
49
54
end
50
55
alias_method :core_id, :id
51
56
alias_method :username, :id
@@ -67,7 +72,7 @@ module Origen
67
72
end
68
73
69
74
def name
70
- @name ||= ENV['ORIGEN_NAME'] || name_from_rc || @id
75
+ @name ||= ENV['ORIGEN_NAME'] || ENV['ORIGEN_USER_NAME'] || name_from_rc || @id
71
76
end
72
77
73
78
def name_from_rc
@@ -76,7 +81,7 @@ module Origen
76
81
77
82
def email(options = {})
78
83
if current?
79
- @email ||= ENV['ORIGEN_EMAIL'] || email_from_rc || begin
84
+ @email ||= ENV['ORIGEN_EMAIL'] || ENV['ORIGEN_USER_EMAIL'] || email_from_rc || begin
80
85
if Origen.site_config.email_domain
81
86
"#{id}@#{Origen.site_config.email_domain}"
82
87
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.52.4
4
+ version: 0.53.0
5
5
platform: ruby
6
6
authors:
7
7
- Stephen McGinty
8
8
autorequire:
9
9
bindir: bin
10
10
cert_chain: []
11
- date: 2019-08-16 00:00:00.000000000 Z
11
+ date: 2019-08-21 00:00:00.000000000 Z
12
12
dependencies:
13
13
- !ruby/object:Gem::Dependency
14
14
name: activesupport