origen 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5351ecf83d751f998bd4d0a533dd7bb741a08a
-  data.tar.gz: ea50032d8fbcf618062720ee47e40b8d0416cf0f
+  metadata.gz: 24fa93bb3395c5d472af5111b4cf2c7424ddb8fb
+  data.tar.gz: 2115fdaa3ad10e8c5bad07e0693c1aea2f9484d6
 SHA512:
-  metadata.gz: 117326d05b4e9c7a7adc06d6ca8c16025eb31bae81db228922c965358e5898e6cd039f9fa8d6d8e38f61c63450850c60a1e408e87de86e3235847700d42ed761
-  data.tar.gz: 66b8a64e922594ada9b81c7369cbe8a468033aa6f4ac98452ed05716a346686229ff49b9ef55896378825c64a6614d834b7d2b7b1274c0cdc5e67b8fac500e45
+  metadata.gz: 8e2ced12f38f092dfbcc1ff1da469aca527de65decc950050d9b482b4059d1c5613ed8fb627c509519f6275f0c43db4c21d9c20c34012345654ef1006a45d2df
+  data.tar.gz: 36270d0d55c0f772399a9afbf8380bdc535aa8ad0c047734ab032df1913101c82bb48845e2c56129e757b99c5782e31eca15f7583269a062ff9cc4fa9e8187b0

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 29
+  MINOR = 30
   BUGFIX = 0
   DEV = nil
 

data/lib/origen/site_config.rb

@@ -54,8 +54,11 @@ module Origen
       append = find_val('append_dot_origen')
       append = '.origen' if append == true || append.nil?
 
+      gem_append = find_val('append_gems')
+      gem_append = 'gems' if gem_append == true || gem_append.nil?
+
       if append
-        unless path.end_with?(append)
+        unless path.end_with?(append) || (path.end_with?(File.join(append, gem_append)) if gem_append)
           path = File.join(path, append)
         end
       end
@@ -182,6 +185,8 @@ module Origen
     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
@@ -200,6 +205,7 @@ module Origen
           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?
@@ -207,21 +213,23 @@ module Origen
           configs << YAML.load_file(file) if File.exist?(file) && YAML.load_file(file)
           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__))
-        # 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."
-        install_path = configs.find { |c| c.key?('home_dir') }
-        install_path = install_path ? install_path['home_dir'] : nil
-        install_path.nil? ? user_config = nil : user_config =  File.join(File.expand_path(install_path), 'origen_site_config.yml')
-        if user_config && File.exist?(user_config)
-          configs.unshift(YAML.load_file(user_config)) if YAML.load_file(user_config)
-        end
         configs
       end
+
+      # 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)
+      end
+
+      @configs
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -637,7 +637,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit