origen 0.36.1 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7cd6e1fd31d6cf1cdcc85ced3c00da93d86b47b0bcdff4b882a88bac79ac45
-  data.tar.gz: d395df3f3faba1ed8c4a5d7d4e34e7193de1a75a62a116fcea80047727a1f99c
+  metadata.gz: 8f5dc0a0e894edf7f948dabf34643520bc2bf29862a484016888130663f55290
+  data.tar.gz: ccfe5cb101ac8cfb894e3f29a8edd4c81fb2d4f67765481af09bb8ffb22e09a3
 SHA512:
-  metadata.gz: 928fa5eea49de2b7f75d1f023c2808f7bb9af6c4a7fd1d79c82cd0cfb83ecb2fdb93405fdd5e55fc959fffd4671e2383be47d1fa89b7c297107e98172972be1c
-  data.tar.gz: 12dc00e6e0557da57afb690ae34cada31ae633688c071ec26b91cef7e261ad234623635077a20b38add1058507b921763d7cc8f969ee83c0d9643e12a9d20281
+  metadata.gz: 72c8537554c0aa1045d3a390b84a364caf87ed28c1f6c3c500a158cee29866d51f1247c197693171ed14343c4031b07f9de5c8b6426c09848ec0698db1ad4e55
+  data.tar.gz: ccc58c03e5fad80a93afbb8ff507252cb7202e0f7f1aadcc45adcedeeaff613259d4ecbe3f82249c8c7d25932377f417ea807ed2e442df1afe142fe98dc7e80a

data/config/version.rb

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

data/lib/origen.rb

@@ -28,7 +28,6 @@ unless defined? RGen::ORIGENTRANSITION
   require 'bundler'
   require 'origen/undefined'
   require 'origen/componentable'
-  require 'socket'
 
   module Origen
     autoload :Features,          'origen/features'
@@ -671,11 +670,6 @@ 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/boot_api.rb

@@ -0,0 +1,13 @@
+# Helper methods here and in the required files can be used by Origen during the bootup process.
+# (e.g., in site config ERB files)
+# This can be expanded as needed to provide more helpers.
+
+module Origen
+  require 'socket'
+  require_relative './operating_systems'
+
+  # Platform independent means of retrieving the hostname
+  def self.hostname
+    Socket.gethostbyname(Socket.gethostname).first.downcase
+  end
+end

data/lib/origen/site_config.rb

@@ -1,15 +1,14 @@
 module Origen
   class SiteConfig
+    # NOTE: Gems are not allowed to be required here, only Ruby stlibs
     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'
+    # Require some useful methods from Origen without requiring the entire module
+    require_relative './boot_api'
 
     TRUE_VALUES = ['true', 'TRUE', '1', 1]
     FALSE_VALUES = ['false', 'FALSE', '0', 0]
@@ -87,7 +86,7 @@ module Origen
 
     # Dynamically remove the highest instance of :var
     def remove_highest(var)
-      @configs.each do |c|
+      configs.each do |c|
         if c.has_var?(var)
           return c.remove_var(var)
         end
@@ -104,7 +103,7 @@ module Origen
       # from lowest priority to highest.
       # If [] is returned, it implies that there was no instancs of :var to be removed.
       ret = []
-      @configs.each do |c|
+      configs.each do |c|
         if c.has_var?(var)
           ret << c.remove_var(var)
         end
@@ -162,7 +161,7 @@ module Origen
 
     def get_all(val)
       ret = []
-      @configs.each do |c|
+      configs.each do |c|
         if c.has_var?(val)
           ret << c[val]
         end
@@ -171,7 +170,7 @@ module Origen
     end
 
     def clear
-      @configs.clear
+      configs.clear
     end
 
     def rebuild!
@@ -179,7 +178,7 @@ module Origen
     end
 
     def refresh
-      @configs.each(&:refresh)
+      configs.each(&:refresh)
     end
 
     def pretty_print_configs
@@ -258,7 +257,7 @@ module Origen
         else
           puts "(No enviornment variable #{to_env(var)} defined)"
         end
-        @configs.each do |c|
+        configs.each do |c|
           if c.has_var?(var)
             puts "#{c.path} (#{c.type}): #{c[var]}"
           end
@@ -273,12 +272,12 @@ module Origen
     # 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
+        if i.to_i > configs.size
+          puts red("Origen::SiteConfig: index #{i} is out of range of the available configs! Total configs: #{configs.size}.")
         elsif i.to_i < 0
-          puts "Origen::SiteConfig: index #{i} is less than 0. This index is ignored.".red
+          puts red("Origen::SiteConfig: index #{i} is less than 0. This index is ignored.")
         else
-          c = @configs[i.to_i]
+          c = configs[i.to_i]
           puts "Inspecting config \##{i}"
           puts "Type: #{c.type}"
           puts "Path: #{c.path}"
@@ -350,6 +349,10 @@ module Origen
 
     private
 
+    def red(message)
+      "\e[0;31;49m#{message}\e[0m"
+    end
+
     def configs
       @configs ||= configs!
     end
@@ -375,7 +378,7 @@ module Origen
     end
 
     # Forces a reparse of the site configs.
-    # This will set the @configs along the current path first,
+    # 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!
       # This global is set when Origen is first required, it generally means that what is considered

data/lib/origen/site_config/config.rb

@@ -64,9 +64,9 @@ module Origen
       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
+            puts yellow('Origen: Site Config: Found previously cached site config. Using the older site config.')
           else
-            puts 'Origen: Site Config: No cached file found. An empty site config will be used in its place.'.yellow
+            puts yellow('Origen: Site Config: No cached file found. An empty site config will be used in its place.')
           end
           puts
         end
@@ -75,36 +75,40 @@ module Origen
           puts "Pulling centralized site config from: #{path}"
 
           begin
+            # TODO: needs to be replaced with a net/http equivalent, can't use gems here. The reference
+            # to HTTParty will raise an error until that is done, but it will be handled gracefully below.
             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)
+            File.open(cached_file, 'w+') do |f|
+              f.write(text)
+            end
 
           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
+            puts red("Origen: Site Config: Unable to connect to #{path}")
+            puts red('Origen: Site Config: Failed to retrieve centralized site config!')
+            puts red("Error from exception: #{e.message}")
 
             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
+            puts red("Origen: Site Config: Unable to connect to #{path}")
+            puts red('Origen: Site Config: Failed to retrieve centralized site config!')
+            puts red("Error from exception: #{e.message}")
+            puts red('It looks like the error is related to SSL certification. If this is a trusted server, you can use')
+            puts red("the site config setting 'centralized_site_config_verify_ssl' to disable verifying the SSL certificate.")
 
             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
+            puts red("Origen: Site Config: Unexpected exception ocurred trying to either retrieve or cache the site config at #{path}")
+            puts red('Origen: Site Config: Failed to retrieve centralized site config!')
+            puts red("Class of exception:   #{e.class}")
+            puts red("Error from exception: #{e.message}")
 
             inform_user_of_cached_file
           end
@@ -124,22 +128,19 @@ module Origen
         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.
+              # There was a problem fetching the config. 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
@@ -148,9 +149,11 @@ module Origen
         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 red("Origen: Site Config: The config at #{path} was not parsed as a Hash, but as a #{@values.class}")
+          puts red('                     Please review the format of the this file.')
+          puts red('                     Alternatively, an error condition may have been received from the server.')
+          puts red("                     This site config is available at: #{cached_file}")
+          puts red('                     This config will not be loaded and will be replaced with an empty config.')
           puts
           @values = {}
         end
@@ -160,9 +163,8 @@ module Origen
           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
+              puts red("Origen: Site Config: config variable #{var} is not allowed in the centralized site config and will be removed.")
+              puts red("                     Value #{val} will not be applied!")
             end
           end
         end
@@ -200,6 +202,16 @@ module Origen
       def runtime?
         type == :runtime
       end
+
+      private
+
+      def red(message)
+        "\e[0;31;49m#{message}\e[0m"
+      end
+
+      def yellow(message)
+        "\e[0;33;49m#{message}\e[0m"
+      end
     end
   end
 end

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: '/proj/imxrt1170_test/users/nxa20023/origen/dev/trash/origen/vendor/lib/models', lazy: true
+      model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/home/stephen/Code/github/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: '/proj/imxrt1170_test/users/nxa20023/origen/dev/trash/origen/vendor/lib/models', lazy: true, base_address: 0x40000000
+        model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/home/stephen/Code/github/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.1
+  version: 0.37.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -418,6 +418,7 @@ files:
 - lib/origen/application/target.rb
 - lib/origen/application/version_tracker.rb
 - lib/origen/application/workspace_manager.rb
+- lib/origen/boot_api.rb
 - lib/origen/bugs.rb
 - lib/origen/bugs/bug.rb
 - lib/origen/callbacks.rb
@@ -654,7 +655,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit