origen 0.36.0 → 0.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf61c021058415fdb5fe0aa76a1e66ed3c142803e1ebf29b4f3905ce4bbb1384
-  data.tar.gz: dcc822d38c0fcdeea4686729c285d50f1d4a6ed9d5a9e2065f2ac5423a66bf88
+  metadata.gz: 2b7cd6e1fd31d6cf1cdcc85ced3c00da93d86b47b0bcdff4b882a88bac79ac45
+  data.tar.gz: d395df3f3faba1ed8c4a5d7d4e34e7193de1a75a62a116fcea80047727a1f99c
 SHA512:
-  metadata.gz: 5b68ce80e155cec23d5b6639f3037126eebf7da4bb9d19b4ce80616a48884f6f2fe7ada074c2e9080d21341e95b801f2b439886d00cf69afd6a58e3ffbb9345d
-  data.tar.gz: d6544cd0270caa0e71161a1a12e0231409fc60a7395387dac05811c1ca602b686ceb688d40d4b43cab00c990a70f6c7bdf71cf756c802aed2d27b54c21492c9d
+  metadata.gz: 928fa5eea49de2b7f75d1f023c2808f7bb9af6c4a7fd1d79c82cd0cfb83ecb2fdb93405fdd5e55fc959fffd4671e2383be47d1fa89b7c297107e98172972be1c
+  data.tar.gz: 12dc00e6e0557da57afb690ae34cada31ae633688c071ec26b91cef7e261ad234623635077a20b38add1058507b921763d7cc8f969ee83c0d9643e12a9d20281

data/bin/origen

@@ -170,7 +170,8 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
     end
   end
   require 'bundler/setup'
-  if Origen.site_config.use_bootsnap && !Origen.os.windows?
+  _exec_remote = ARGV.include?('--exec_remote') ? true : false  
+  if Origen.site_config.use_bootsnap && !Origen.os.windows? && !_exec_remote
     ENV["BOOTSNAP_CACHE_DIR"] ||= "#{origen_root}/tmp/cache"
     require 'bootsnap/setup'
   end

data/config/version.rb

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

data/lib/origen.rb

@@ -28,6 +28,7 @@ unless defined? RGen::ORIGENTRANSITION
   require 'bundler'
   require 'origen/undefined'
   require 'origen/componentable'
+  require 'socket'
 
   module Origen
     autoload :Features,          'origen/features'
@@ -670,6 +671,11 @@ unless defined? RGen::ORIGENTRANSITION
       end
       alias_method :interactive?, :running_interactively?
 
+      # Platform independent way of retrieving the hostname
+      def hostname
+        Socket.gethostbyname(Socket.gethostname).first.downcase
+      end
+
       # Returns true if Origen is running with the -d or --debug switches enabled
       def debug?
         @debug || false

data/lib/origen/commands.rb

@@ -244,6 +244,10 @@ when 'version'
   require 'origen/commands/version'
   exit 0
 
+when 'site'
+  require 'origen/commands/site'
+  exit 0
+
 else
   if ['-h', '--help'].include?(@command)
     status = 0
@@ -273,6 +277,7 @@ The core origen commands are:
  web          Web page tools, see -h for details
  time         Tools for test time analysis and forecasting
  lint         Lint and style check (and correct) your application code
+ site         Monitor and manage the Origen site configuration
   EOT
   cmds.split(/\n/).each do |line|
     puts Origen.clean_help_line(line)

data/lib/origen/commands/site.rb

@@ -0,0 +1,52 @@
+require 'optparse'
+require 'pathname'
+require 'origen/commands/helpers'
+
+module Origen
+  options = {}
+
+  # App options are options that the application can supply to extend this command
+  app_options = @application_options || []
+  opt_parser = OptionParser.new do |opts|
+    opts.banner = <<-END
+  env [filters...] Shows the current site environment configuration. Analogous to 'env' for shell environment.
+                  In other words, lists all the site config variables and their values.
+                  Aliased to 'environment'.
+
+  configs         Shows the current config files used and their indexes.
+
+  inspect_config [config_indexes...] Inspects the configuration(s) at each index given.
+                                     Indexes can be found from 'origen site configs'
+                                     If no indexes are given, all configs are printed.
+
+  inspect_variable [variable_names...] Inspects and traces the variable(s) through the various sites configs.
+
+  refresh         Forces a refresh of the centralized site config. This will reset the timer for the next automatc refresh.
+    END
+
+    # Apply any application option extensions to the OptionParser
+    Origen::CommandHelpers.extend_options(opts, app_options, options)
+    opts.separator ''
+    opts.on('-h', '--help', 'Show this message') { puts opts; exit }
+  end
+  opt_parser.parse! ARGV
+
+  if ARGV[0]
+    case ARGV.shift
+    when 'env', 'environment'
+      Origen.site_config.pretty_print_env(*ARGV)
+    when 'configs'
+      Origen.site_config.pretty_print_configs
+    when 'inspect_config', 'inspect_configs'
+      Origen.site_config.inspect_config(*ARGV)
+    when 'inspect_variable', 'inspect_variables'
+      Origen.site_config.inspect_variable(*ARGV)
+    when 'refresh'
+      Origen.site_config.refresh
+    else
+      puts "Unknown command, see 'origen site -h' for a list of commands"
+    end
+  else
+    puts "You must supply a command, see 'origen site -h' for a list of commands"
+  end
+end

data/lib/origen/commands_global.rb

@@ -96,6 +96,10 @@ when '--version', '-v'
   require 'origen/commands/version'
   exit 0
 
+when 'site'
+  require 'origen/commands/site'
+  exit 0
+
 # when 'fetch', 'f'
 #  require 'origen/commands/fetch'
 #  exit 0
@@ -115,6 +119,7 @@ The following commands are available:
               new origen application workspace in "./my_app"
  interactive  Start an interactive Origen console (short-cut alias: "i"), this is just
               IRB with the 'origen' lib loaded automatically
+ site         Monitor and manage the Origen site configuration
   EOT
   cmds.split(/\n/).each do |line|
     puts Origen.clean_help_line(line)

data/lib/origen/site_config.rb

@@ -3,15 +3,20 @@ module Origen
     require 'pathname'
     require 'yaml'
     require 'etc'
+    require 'erb'
+    require 'colored'
+    require 'httparty'
+    require_relative 'site_config/config'
+
+    # require this version of Origen
+    require_relative '../origen'
 
     TRUE_VALUES = ['true', 'TRUE', '1', 1]
     FALSE_VALUES = ['false', 'FALSE', '0', 0]
 
     # Adding parameters to this array will prevent them from being converted to booleans if
     # they are assigned one of the values in the TRUE_VALUES/FALSE_VALUES arrays
-    NON_BOOLEAN_PARAMETERS = [:lsf_cores]
-
-    # Define a couple of site configs variables that need a bit of processing
+    NON_BOOLEAN_PARAMETERS = [:lsf_cores, :centralized_site_config_refresh]
 
     # Gets the gem_intall_dir. This is either site_config.home_dir/gems or the site configs gem_install_dir
     def gem_install_dir
@@ -76,11 +81,15 @@ module Origen
       path
     end
 
+    def centralized_site_config_cache_dir
+      File.expand_path(find_val('centralized_site_config_cache_dir'))
+    end
+
     # Dynamically remove the highest instance of :var
     def remove_highest(var)
       @configs.each do |c|
-        if c.key?(var)
-          return c.delete(var)
+        if c.has_var?(var)
+          return c.remove_var(var)
         end
       end
 
@@ -96,8 +105,8 @@ module Origen
       # If [] is returned, it implies that there was no instancs of :var to be removed.
       ret = []
       @configs.each do |c|
-        if c.key?(var)
-          ret << c.delete(var)
+        if c.has_var?(var)
+          ret << c.remove_var(var)
         end
       end
       ret
@@ -108,7 +117,8 @@ module Origen
     def add_as_highest(var, value)
       # Don't want to override anything, so just shift in a dummy site config instance at the highest level and
       # set the value there.
-      configs.prepend(var.to_s => value)
+      c = Config.new(path: :runtime, parent: self, values: { var.to_s => value })
+      configs.prepend(Config.new(path: :runtime, parent: self, values: { var.to_s => value }))
     end
     alias_method :[]=, :add_as_highest
 
@@ -117,17 +127,19 @@ module Origen
     def add_as_lowest(var, value)
       # Don't want to override anything, so just shift in a dummy site config at the lowest level and
       # set the value there.
-      configs.append(var.to_s => value)
+      configs.append(Config.new(path: :runtime, parent: self, values: { var.to_s => value }))
     end
 
     # Adds a new site config file as the highest priority
     def add_site_config_as_highest(site_config_file)
-      configs.prepend YAML.load_file(File.expand_path('../../../origen_site_config.yml', __FILE__))
+      # configs.prepend YAML.load_file(File.expand_path('../../../origen_site_config.yml', __FILE__))
+      configs.prepend(Config.new(path: site_config_file, parent: self))
     end
 
     # Adds a new site config file as the highest priority
     def add_site_config_as_lowest(site_config_file)
-      configs.append YAML.load_file(File.expand_path('../../../origen_site_config.yml', __FILE__))
+      # configs.append YAML.load_file(File.expand_path('../../../origen_site_config.yml', __FILE__))
+      configs.append(Config.new(path: site_config_file, parent: self))
     end
 
     def method_missing(method, *args, &block)
@@ -148,15 +160,10 @@ module Origen
       val
     end
 
-    def get(val)
-      find_val(val)
-    end
-    alias_method :[], :get
-
     def get_all(val)
       ret = []
       @configs.each do |c|
-        if c.key?(val)
+        if c.has_var?(val)
           ret << c[val]
         end
       end
@@ -171,16 +178,162 @@ module Origen
       configs!
     end
 
-    private
+    def refresh
+      @configs.each(&:refresh)
+    end
+
+    def pretty_print_configs
+      puts 'The following config files are ordered from last-encountered (highest priority) first-encountered (lowest priority)'
+      puts
+      configs.each_with_index do |config, i|
+        puts "#{i}: #{config.path} (#{config.type})"
+      end
+    end
+    alias_method :pp_configs, :pretty_print_configs
+
+    def all_vars
+      vars = {}
+      configs.each do |c|
+        vars = c.values.merge(vars)
+      end
+      vars
+    end
+    alias_method :env, :all_vars
+
+    # Gets all config variables as a hash, but the hash's values are the Config instances which defines the highest
+    # priority of each var, instead of the var's value itself.
+    def vars_by_configs
+      vars = {}
+      configs.each do |c|
+        vars = c.values.map { |k, v| [k, c] }.to_h.merge(vars)
+      end
+      vars
+    end
+    alias_method :vars_by_config, :vars_by_configs
+
+    def pretty_print_env(*vars)
+      puts
+      spacing = ' ' * 2
+      r = vars.empty? ? nil : Regexp.union(vars.map { |v| Regexp.new(v) })
+      all_vars.each do |var, val|
+        if !r.nil? && !(var.match r)
+          next
+        end
+
+        if val.is_a?(Array)
+          puts "#{var}: ["
+          val.each { |v| puts "#{spacing} #{v}" }
+          puts ']'
+        elsif val.is_a?(Hash)
+          puts "#{var}: {"
+          val.each { |v| puts "#{spacing} #{v}" }
+          puts '}'
+        else
+          puts "#{var}: #{val}"
+        end
+      end
+      puts
+    end
+    alias_method :pp_env, :pretty_print_env
+
+    def to_env(val)
+      "ORIGEN_#{val.upcase}"
+    end
+
+    def env_contains?(val)
+      ENV.key?(val)
+    end
+
+    def env(val)
+      if env_contains?(val)
+        ENV[val]
+      end
+    end
+
+    def inspect_variable(*vars)
+      vars.each do |var|
+        puts "Inspecting Variable: #{var}"
+        if env_contains?(to_env(var))
+          puts "Environment Variable (#{to_env(var)}): #{env(to_env(var))}"
+        else
+          puts "(No enviornment variable #{to_env(var)} defined)"
+        end
+        @configs.each do |c|
+          if c.has_var?(var)
+            puts "#{c.path} (#{c.type}): #{c[var]}"
+          end
+        end
+        puts
+      end
+    end
+    alias_method :inspect_var, :inspect_variable
+    alias_method :inspect_variables, :inspect_variable
+    alias_method :inspect_vars, :inspect_variable
+
+    # Inspects the config(s) at the incex given.
+    def inspect_configs(*config_indexes)
+      config_indexes.each do |i|
+        if i.to_i > @configs.size
+          puts "Origen::SiteConfig: index #{i} is out of range of the available configs! Total configs: #{@configs.size}.".red
+        elsif i.to_i < 0
+          puts "Origen::SiteConfig: index #{i} is less than 0. This index is ignored.".red
+        else
+          c = @configs[i.to_i]
+          puts "Inspecting config \##{i}"
+          puts "Type: #{c.type}"
+          puts "Path: #{c.path}"
+          if c.centralized?
+            # Add a safeguard in case something happened being bootup and now and the cache is no longer present
+            puts "Cached At: #{c.cache_file}" if c.cache_file
+            puts "Cached On: #{c.cache_file.ctime}" if c.cache_file
+          end
+
+          puts
+          puts 'Values from this config:'
+          spacing = ' ' * 2
+          c.values.each do |var, val|
+            if val.is_a?(Array)
+              puts "#{var}: ["
+              val.each { |v| puts "#{spacing} #{v}" }
+              puts ']'
+            elsif val.is_a?(Hash)
+              puts "#{var}: {"
+              val.each { |v| puts "#{spacing} #{v}" }
+              puts '}'
+            else
+              puts "#{var}: #{val}"
+            end
+          end
+
+          puts
+          puts 'Active (highest-level) values from this config:'
+          spacing = ' ' * 2
+          vars_by_config.select { |k, v| v == c }.map { |k, v| [k, v[k]] }.to_h.each do |var, val|
+            if val.is_a?(Array)
+              puts "#{var}: ["
+              val.each { |v| puts "#{spacing} #{v}" }
+              puts ']'
+            elsif val.is_a?(Hash)
+              puts "#{var}: {"
+              val.each { |v| puts "#{spacing} #{v}" }
+              puts '}'
+            else
+              puts "#{var}: #{val}"
+            end
+          end
+          puts
+        end
+      end
+    end
+    alias_method :inspect_config, :inspect_configs
 
     def find_val(val, options = {})
       env = "ORIGEN_#{val.upcase}"
       if ENV.key?(env)
         value = ENV[env]
-        value
       else
-        config = configs.find { |c| c.key?(val) }
-        value = config ? config[val] : nil
+        config = configs.find { |c| c.has_var?(val) }
+        value = config ? config.find_val(val) : nil
       end
 
       unless NON_BOOLEAN_PARAMETERS.include?(val.to_s.downcase.to_sym)
@@ -192,56 +345,82 @@ module Origen
       end
       value
     end
+    alias_method :get, :find_val
+    alias_method :[], :find_val
+
+    private
 
     def configs
       @configs ||= configs!
     end
 
+    # Searches a directory and returns an array of config objects (from lowest to highest priority) that were found
+    # @note This includes searching for <code>./config/</code> in <code>dir</code>. In other words, this searches both
+    #  <code>dir</code> and <code>dir/config</code>.
+    def load_directory(dir, prepend: false)
+      [
+        File.join(dir, 'config', 'origen_site_config.yml'),
+        File.join(dir, 'config', 'origen_site_config.yml.erb'),
+        File.join(dir, 'origen_site_config.yml'),
+        File.join(dir, 'origen_site_config.yml.erb')
+      ].each do |f|
+        if File.exist?(f)
+          if prepend
+            configs.unshift(Config.new(path: f, parent: self))
+          else
+            configs << Config.new(path: f, parent: self)
+          end
+        end
+      end
+    end
+
     # Forces a reparse of the site configs.
     # This will set the @configs along the current path first,
     # then, using those values, will add a site config at the home directory.
     def configs!
-      @configs = begin
-        # This global is set when Origen is first required, it generally means that what is considered
-        # to be the pwd for the purposes of looking for a site_config file is the place from where the
-        # user invoked Origen. Otherwise if the running app switches the PWD it can lead to confusing
-        # behavior - this was a particular problem when testing the new app generator which switches the
-        # pwd to /tmp to build the new app
-        path = $_origen_invocation_pwd
-        configs = []
-        # Add any site_configs from where we are currently running from, i.e. the application
-        # directory area
-        until path.root?
-          file = File.join(path, 'config', 'origen_site_config.yml')
-          configs << YAML.load_file(file) if File.exist?(file) && YAML.load_file(file)
-          file = File.join(path, 'origen_site_config.yml')
-          configs << YAML.load_file(file) if File.exist?(file) && YAML.load_file(file)
-          path = path.parent
-        end
-
-        # Add and any site_configs from the directory hierarchy where Ruby is installed
-        path = Pathname.new($LOAD_PATH.last)
-        until path.root?
-          file = File.join(path, 'origen_site_config.yml')
-          configs << YAML.load_file(file) if File.exist?(file) && YAML.load_file(file)
-          path = path.parent
-        end
+      # This global is set when Origen is first required, it generally means that what is considered
+      # to be the pwd for the purposes of looking for a site_config file is the place from where the
+      # user invoked Origen. Otherwise if the running app switches the PWD it can lead to confusing
+      # behavior - this was a particular problem when testing the new app generator which switches the
+      # pwd to /tmp to build the new app
+      path = $_origen_invocation_pwd
+      @configs = []
+
+      # Add any site_configs from where we are currently running from, i.e. the application
+      # directory area
+      until path.root?
+        load_directory(path)
+        path = path.parent
+      end
 
-        # Add the one from the Origen core as the lowest priority, this one defines
-        # the default values
-        configs << YAML.load_file(File.expand_path('../../../origen_site_config.yml', __FILE__))
-        configs
+      # Add and any site_configs from the directory hierarchy where Ruby is installed
+      path = Pathname.new($LOAD_PATH.last)
+      until path.root?
+        load_directory(path)
+        path = path.parent
       end
 
+      # Add the one from the Origen core as the lowest priority, this one defines
+      # the default values
+      load_directory(File.expand_path('../../../', __FILE__))
+
       # Add the site_config from the user's home directory as highest priority, if it exists
       # But, make sure we take the site installation's setup into account.
       # That is, if user's home directories are somewhere else, make sure we use that directory to the find
       # the user's overwrite file. The user can then override that if they want."
-      user_config = File.join(File.expand_path(user_install_dir), 'origen_site_config.yml')
-      if File.exist?(user_config)
-        @configs.unshift(YAML.load_file(user_config)) if YAML.load_file(user_config)
+      load_directory(File.expand_path(user_install_dir), prepend: true)
+
+      # Load any centralized site configs now.
+      centralized_site_config = find_val('centralized_site_config')
+      if centralized_site_config
+        # We know the last two site configs will exists (they are in Origen core) and that they contain the default
+        # values. We want the centralized config to load right after those.
+        @configs.insert(-3, Config.new(path: centralized_site_config, parent: self))
       end
 
+      # After all configs have been populated, see if the centralized needs refreshing
+      @configs.each { |c| c.refresh if c.needs_refresh? }
+
       @configs
     end
   end

data/lib/origen/site_config/config.rb

@@ -0,0 +1,205 @@
+module Origen
+  class SiteConfig
+    class Config
+      attr_reader :path
+      attr_reader :parent
+      attr_reader :type
+      attr_reader :values
+
+      RESTRICTED_FROM_CENTRALIZED_VARIABLES = %w(centralized_site_config centralized_site_config_cache_dir centralized_site_config_verify_ssl)
+
+      def initialize(path:, parent:, values: nil)
+        @parent = parent
+        if path == :runtime
+          path = "runtime_#{object_id}"
+          @type = :runtime
+        elsif path.start_with?('http')
+          @path = path
+          @type = :centralized
+        else
+          @path = path
+          @type = :local
+        end
+        @contains_centralized = false
+        @loaded = false
+
+        if values
+          @values = values
+          @loaded = true
+        else
+          @values = nil
+          load
+        end
+      end
+
+      def needs_refresh?
+        if centralized?
+          if refresh_time < 0
+            false
+          elsif cached?
+            # If the refresh time is 0, this will always be true
+            # Note the difference of time objects below will give the difference in seconds.
+            (Time.now - cached_file.ctime) / 3600.0 > refresh_time
+          else
+            # If the cached file cannot be found, force a new fetch
+            true
+          end
+        else
+          false
+        end
+      end
+
+      def refresh_time
+        parent.find_val('centralized_site_config_refresh')
+      end
+
+      def cached_file
+        @cached_file ||= Pathname(parent.centralized_site_config_cache_dir).join('cached_config')
+      end
+
+      def cached?
+        File.exist?(cached_file)
+      end
+
+      def fetch
+        def inform_user_of_cached_file
+          if cached?
+            puts 'Origen: Site Config: Found previously cached site config. Using the older site config.'.yellow
+          else
+            puts 'Origen: Site Config: No cached file found. An empty site config will be used in its place.'.yellow
+          end
+          puts
+        end
+
+        if centralized?
+          puts "Pulling centralized site config from: #{path}"
+
+          begin
+            text = HTTParty.get(path, verify: parent.find_val('centralized_site_config_verify_ssl'))
+            puts "Caching centralized site config to: #{cached_file}"
+
+            unless Dir.exist?(cached_file.dirname)
+              FileUtils.mkdir_p(cached_file.dirname)
+            end
+            File.open(cached_file, 'w').write(text)
+
+          rescue SocketError => e
+            puts "Origen: Site Config: Unable to connect to #{path}".red
+            puts 'Origen: Site Config: Failed to retrieve centralized site config!'.red
+            puts "Error from exception: #{e.message}".red
+
+            inform_user_of_cached_file
+          rescue OpenSSL::SSL::SSLError => e
+            puts "Origen: Site Config: Unable to connect to #{path}".red
+            puts 'Origen: Site Config: Failed to retrieve centralized site config!'.red
+            puts "Error from exception: #{e.message}".red
+            puts 'It looks like the error is related to SSL certification. If this is a trusted server, you can use ' \
+                 "the site config setting 'centralized_site_config_verify_ssl' to disable verifying the SSL certificate.".red
+
+            inform_user_of_cached_file
+          rescue Exception => e
+            # Rescue anything else to avoid any un-caught exceptions causing Origen not to boot.
+            # Print lots of red so that the users are aware that there's a problem, but don't ultimately want this
+            # to render Origen un-bootable
+            puts "Origen: Site Config: Unexpected exception ocurred trying to either retrieve or cache the site config at #{path}".red
+            puts 'Origen: Site Config: Failed to retrieve centralized site config!'.red
+            puts "Class of exception:   #{e.class}".red
+            puts "Error from exception: #{e.message}".red
+
+            inform_user_of_cached_file
+          end
+          text
+        end
+      end
+      alias_method :refresh, :fetch
+
+      # Loads the site config into memory.
+      # Process the site config as an ERB, if indicated to do so (.erb file extension)
+      # After the initial load, any centralized site configs will be retreived (if needed), cached, and loaded.
+      def load
+        def read_erb(erb)
+          ERB.new(File.read(erb), 0, '%<>')
+        end
+
+        if centralized?
+          if !cached?
+            if fetch
+              # erb = ERB.new(File.read(cached_file), 0, '%<>')
+              erb = read_erb(cached_file)
+            else
+              # There was a problem fetching the cnofig. Just use an empty string.
+              # Warning message will come from #fetch
+              erb = ERB.new('')
+            end
+          else
+            # erb = ERB.new(File.read(cached_file), 0, '%<>')
+            erb = read_erb(cached_file)
+          end
+
+          @values = (YAML.load(erb.result) || {})
+        else
+          if File.extname(path) == '.erb'
+            # erb = ERB.new(File.read(path), 0, '%<>')
+            erb = read_erb(path)
+            @values = (YAML.load(erb.result) || {})
+          else
+            @values = (YAML.load_file(path) || {})
+          end
+        end
+
+        unless @values.is_a?(Hash)
+          puts "Origen: Site Config: The config at #{path} was not parsed as a Hash, but as a #{@values.class}".red
+          puts '                     Please review the format of the this file.'.red
+          puts '                     This config will not be loaded and will be replaced with an empty config.'.red
+          puts
+          @values = {}
+        end
+
+        if centralized?
+          # check for restricted centralized config values
+          RESTRICTED_FROM_CENTRALIZED_VARIABLES.each do |var|
+            if @values.key?(var)
+              val = @values.delete(var)
+              puts 'Origen: Site Config: ' \
+                   "config variable #{var} is not allowed in the centralized site config and will be removed. " \
+                   "Value #{val} will not be applied!".red
+            end
+          end
+        end
+
+        @loaded = true
+        @values
+      end
+
+      def remove_var(var)
+        @values.delete(var)
+      end
+
+      def has_var?(var)
+        @values.key?(var)
+      end
+
+      # Finds the value from this config, or from one of its centralized configs (if applicable)
+      def find_val(val)
+        @values[val]
+      end
+      alias_method :[], :find_val
+
+      def loaded?
+        @loaded
+      end
+
+      def local?
+        type == :local
+      end
+
+      def centralized?
+        type == :centralized
+      end
+
+      def runtime?
+        type == :runtime
+      end
+    end
+  end
+end

data/lib/origen/users/user.rb

@@ -44,10 +44,11 @@ module Origen
         Origen.mailer.send_email(options)
       end
 
-      def id
+      def id(options = {})
         @id.to_s.downcase
       end
       alias_method :core_id, :id
+      alias_method :username, :id
 
       # Returns true if the user is an admin for the current application
       def admin?
@@ -73,7 +74,7 @@ module Origen
         RevisionControl::Git.user_name
       end
 
-      def email
+      def email(options = {})
         if current?
           @email ||= ENV['ORIGEN_EMAIL'] || email_from_rc || begin
             if Origen.site_config.email_domain

data/lib/origen/utility/mailer.rb

@@ -7,13 +7,18 @@ module Origen
       # Generic method to send an email, alternatively use one of the
       # pre-defined mail types using the other methods.
       def send_email(options = {})
-        options = { server:     Origen.site_config.email_server,
-                    port:       Origen.site_config.email_port,
-                    from:       current_user.email,
-                    from_alias: current_user.name,
-                    subject:    'Hello',
-                    body:       'Hello from Origen!',
-                    to:         'Stephen McGinty <stephen.mcginty@freescale.com>'
+        options = { server:         Origen.site_config.email_server,
+                    port:           Origen.site_config.email_port,
+                    from:           current_user.email,
+                    from_alias:     current_user.name,
+                    subject:        'Hello',
+                    body:           'Hello from Origen!',
+                    to:             current_user.email,
+                    authentication: (Origen.site_config.email_authentication || :none).to_sym,
+                    domain:         (Origen.site_config.email_domain || ''),
+
+                    auth_user:      (Origen.site_config.email_auth_user || current_user.email),
+                    auth_password:  (Origen.site_config.email_auth_password || current_user.password)
                   }.merge(options)
 
         # Force to an array
@@ -32,10 +37,38 @@ Subject: #{options[:subject]}
 END_OF_MESSAGE
 
           begin
+            Origen.log.debug('Origen::Utility::Mailer Setup:')
+            options.each { |k, v| Origen.log.debug("  #{k}: #{v}") }
+
+            # Net::SMTP.start(options[:server], options[:port]) do |smtp|
+            #  smtp.send_message msg, options[:from], addr
+            # end
+
             # Exceptions raised here will be caught by rescue clause
-            Net::SMTP.start(options[:server], options[:port]) do |smtp|
-              smtp.send_message msg, options[:from], addr
+            smtp = Net::SMTP.new(options[:server], options[:port])
+            smtp.enable_starttls if options[:authentication] != :none
+
+            opts = begin
+              if options[:authentication] == :none
+                # Trying to add username and password if there's no authentication will actually be rejected by
+                # the server.
+                [options[:domain]]
+              else
+                [options[:domain], options[:auth_user], options[:auth_password], options[:authentication]]
+              end
+            end
+
+            smtp.start(*opts) do |m|
+              m.send_message(msg, options[:from], addr)
             end
+
+            # Exceptions raised here will be caught by rescue clause
+            # smtp = Net::SMTP.new(options[:server], options[:port])
+            # smtp.enable_starttls
+
+            # smtp.start (options[:domain], options[:auth_user], options[:auth_password], options[:authentication]) do |smtp|
+            #  smtp.send_message(msg, options[:from], addr)
+            # end
           rescue
             warn "Email not able to be sent to address '#{addr}'"
           end

data/origen_site_config.yml

@@ -12,6 +12,23 @@
 #  # Or a reference to a plugin's Git repository can be used
 #  - "http://bitbucket.mycompany.net/origen/my_app_generators.git"
 
+# Centralized Site Config
+# Origen +0.36 (versions after 36.0) supports a centralized site config. This site config will be implicitly read and 
+# injected into the site config following the default site configs from Origen.
+# To surpress the number of requests and possible load time delays, the site config can be cached and read on each
+# startup for :centralized_site_config_refresh number of hours.
+centralized_site_config_cache_dir: '~/.origen/cache/site_config'
+
+# Indicates how many hours should pass before the cached site config is refreshed (refetched, redownloaded)
+# The default is to refresh once per day (every 24 hours). Decimal values can be used here to get more granularity
+# if needed.
+# 0 indidcates 'always refresh' (cache will still occur though)
+# -1 indicates never refresh.
+centralized_site_config_refresh: 24
+
+# Indicates whether the SSL certificate should be verified when pulling the centralized site config
+centralized_site_config_verify_ssl: true
+
 # GEM SETUP
 
 # If your company has an internal gem server enter it here
@@ -88,10 +105,16 @@ gem_use_from_system:
 #   User.new("ax1234").email  # => "ax1234@company.com"  
 #
 #   # Without email_domain specified
-#   User.new("ax1234@company.com").email  # => "ax1234@company.com"  
+#   User.new("ax1234@company.com").email  # => "ax1234@company.com"
+# If authentication is needed to use the given server, email_authentication can be set to login.
+# If a service user is used to access this account on behalf of the sending users, email_auth_user and email_auth_password
+# can be set. If authentication is indicated but no auth user is given, the current user's email and password are used instead.
 #email_domain: company.com
 #email_server: smtp.company.net
 #email_port: 25
+#email_authentication: login
+#email_auth_user: service_email
+#email_auth_password: service_password
 
 # Required parameters to connect to your company's LDAP system
 #ldap_username: cn=manager,dc=example,dc=com

data/vendor/lib/models/origen/export1.rb

@@ -69,7 +69,7 @@ module Origen
       model.add_virtual_pin :relay1
       model.add_virtual_pin :relay2, packages: { bga: {} }
 
-      model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true
+      model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/proj/imxrt1170_test/users/nxa20023/origen/dev/trash/origen/vendor/lib/models', lazy: true
 
     end
   end

data/vendor/lib/models/origen/export1/block1.rb

@@ -4,7 +4,7 @@ module Origen
   module Export1
     module Block1
       def self.extended(model)
-        model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true, base_address: 0x40000000
+        model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/proj/imxrt1170_test/users/nxa20023/origen/dev/trash/origen/vendor/lib/models', lazy: true, base_address: 0x40000000
 
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.36.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -457,6 +457,7 @@ files:
 - lib/origen/commands/program.rb
 - lib/origen/commands/rc.rb
 - lib/origen/commands/save.rb
+- lib/origen/commands/site.rb
 - lib/origen/commands/target.rb
 - lib/origen/commands/time.rb
 - lib/origen/commands/version.rb
@@ -568,6 +569,7 @@ files:
 - lib/origen/revision_control/subversion.rb
 - lib/origen/ruby_version_check.rb
 - lib/origen/site_config.rb
+- lib/origen/site_config/config.rb
 - lib/origen/specs.rb
 - lib/origen/specs/checkers.rb
 - lib/origen/specs/creation_info.rb
@@ -652,7 +654,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit