origen 0.41.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b5ba8eda5e72800d451d575b48242c7483bc07260b41b2a6325e87296c512ac
-  data.tar.gz: 873f0bbcb08ccd34c50b549f30d9932c800cc5b432584e618be5589673f7ad0e
+  metadata.gz: a40d2b6086ccca2701117312a47241298c9349e5edf4836264d6e76ff69a3860
+  data.tar.gz: 485bf7d58c55cb450aa1bd645b94a75319175c42a24063e987cba93f5996dedf
 SHA512:
-  metadata.gz: 1cea1d1879bacccf077275bf1c04aba477d39fba1188b2806166baedbf5436e1a0bda85212c4572838b1a4dae22f92bbf7199a91a3c36056a867bf67bc46f0c0
-  data.tar.gz: 1fba58ea8bd16b85c81b154fc4ede78257b355327cf540b802bfd2caf3fd11c98d5f40c6142b3ce3a205b57889c1fb05561b020f0d4e3bdac0b38fd25e6b6876
+  metadata.gz: f81f104099fbea282402b3574157a5b70d29c85b0087c29df76ae8a2c4d617e5da76b31c0b890d09b0aa9b857b2ec0aea8fe40293a051884c59f892cdd671d2c
+  data.tar.gz: c7e34c972a74f97b3e5a127524c54e394e526399958118bb964a78d5d79acc47892e6d4602dbb3cdb90a04c18cd0c45be33fd6b362340a4f4131e4990d9723df

data/config/application.rb

@@ -38,7 +38,8 @@ class OrigenCoreApplication < Origen::Application
 
   #config.lsf.project = "origen core"
   
-  config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/origen"
+  config.web_directory = "https://github.com/Origen-SDK/Origen-SDK.github.io.git/origen"
+  #config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/origen"
   config.web_domain = "http://origen-sdk.org/origen"
   
   config.pattern_prefix = "nvm"

data/config/version.rb

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

data/lib/origen/model/exporter.rb

@@ -234,7 +234,7 @@ module Origen
           elsif value.is_a?(String)
             line << ", #{key}: '#{value}'"
           else
-            line << ", #{key}: #{value}"
+            line << ", #{key}: #{value}" unless value.nil?
           end
         end
         block.export(id, options.merge(file_path: file_path, dir_path: dir_path))
@@ -247,7 +247,7 @@ module Origen
         unless reg.description.empty?
           reg.description.each { |l| lines << indent + "# #{l}" }
         end
-        lines << indent + "model.add_reg :#{id}, #{reg.offset.to_hex}, size: #{reg.size} #{reg.bit_order == :msb0 ? ', bit_order: :msb0' : ''} do |reg|"
+        lines << indent + "model.add_reg :#{id}, #{reg.offset.to_hex}, size: #{reg.size} #{reg.bit_order == :msb0 ? ', bit_order: :msb0' : ''}#{build_reg_meta(reg)} do |reg|"
         indent = ' ' * ((options[:indent] || 0) + 2)
         reg.named_bits.each do |name, bits|
           unless bits.description.empty?
@@ -277,6 +277,20 @@ module Origen
         lines << indent + 'end'
         lines.join("\n")
       end
+
+      def build_reg_meta(reg)
+        ret_str = ''
+        reg.meta.each do |key, value|
+          if value.is_a?(Symbol)
+            ret_str += ", #{key}: :#{value}"
+          elsif value.is_a?(String)
+            ret_str += ", #{key}: '#{value}'"
+          else
+            ret_str += ", #{key}: #{value}" unless value.nil?
+          end
+        end
+        ret_str
+      end
     end
   end
 end

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

@@ -22,7 +22,7 @@ module Origen
           # ** A MSB0 Test Case **
           # Blah-ba-bi-blah
           # just following the comment pattern above
-          model.add_reg :msb0_test, 0x28, size: 16 , bit_order: :msb0 do |reg|
+          model.add_reg :msb0_test, 0x28, size: 16 , bit_order: :msb0, some_attr: true, another_attr: :testing, fourth_attr: 'string_attr' do |reg|
             reg.bit 8, :ale
             reg.bit 9, :xsfg
             reg.bit 10, :yml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.41.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport