lib/origen/users/user.rb in origen-0.1.3 vs lib/origen/users/user.rb in origen-0.2.0
- old
+ new
@@ -64,17 +64,26 @@
initials = name.split(/\s+/).map { |n| n[0].chr }.join('')
initials.downcase
end
def name
- @name || @id
+ @name || name_from_rc || @id
end
+ def name_from_rc
+ RevisionControl::Git.user_name
+ end
+
def email
- return @email if @email
- if Origen.site_config.email_domain
- "#{id}@#{Origen.site_config.email_domain}"
+ @email || email_from_rc || begin
+ if Origen.site_config.email_domain
+ "#{id}@#{Origen.site_config.email_domain}"
+ end
end
+ end
+
+ def email_from_rc
+ RevisionControl::Git.user_email
end
# Fetch user data from the FSL application directory
#
# @example