origen 0.33.2 → 0.33.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15df9e0e9b7827f5f28275103a4214a7a71e20e7
-  data.tar.gz: 4d1412c20073a4cb6c44599c57a631e22d049eda
+  metadata.gz: df84c7214237f807371534766be022afc95ba8fe
+  data.tar.gz: 98751baf8dc8fa699ed55fada8c0b347a9b5a07d
 SHA512:
-  metadata.gz: 866cb4e9a95ff7cb59e134e8ab45de0a7ef3c6da15170bd7081f71a53f9d687ff60037e0da9837f968f700772a39d879aac27e19172bb5f715f7ac96c9075e30
-  data.tar.gz: 9e9084dd4e500602a2a5f9c00f509f21f322ab35a64cb28b7d90b273e4c0522accc1a4b100f0b70284aebda0d2866e269edc1ffbb4e71b32cb4d0fe0c9bb5c37
+  metadata.gz: dc012d1ca8883e85b04019b3e09355864169da0eb166049053b708abc758c3fab872eeb205aa53d492c36cbd05cc875753b641d5828ebfe21e488e89646aae31
+  data.tar.gz: a206be55eab62f8babecfb3394e0871db316addea6549c4a5d32a7e1743358f5c4bc76f7d54b119e6a531880c142cc96bd186a1aadf2fef4e5b8b23d8fb80c89

data/config/version.rb

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

data/lib/origen.rb

@@ -94,7 +94,7 @@ unless defined? RGen::ORIGENTRANSITION
         if str =~ /^\s\s\s\s\s\s\s*(.*)/
           (' ' * 20) + Regexp.last_match(1)
         # http://rubular.com/r/MKmU4xZgO2
-        elsif str =~ /^\s*([^\s]+)\s+*(.*)/
+        elsif str =~ /^\s*([^\s]+)\s+(.*)/
           ' ' + Regexp.last_match(1).ljust(19) + Regexp.last_match(2)
         else
           str

data/lib/origen/generator/flow.rb

@@ -4,7 +4,7 @@ module Origen
       attr_accessor :top_level
 
       def create(options = {}, &block)
-        Origen.deprecated 'Origen core will no longer support program generation in v1, add the origen_testers plugin to your application to fix this warning'
+        # Origen.deprecated 'Origen core will no longer support program generation in v1, add the origen_testers plugin to your application to fix this warning'
         # Refresh the target to start all settings from scratch each time
         # This is an easy way to reset all registered values
         Origen.app.reload_target!

data/lib/origen/version_string.rb

@@ -29,25 +29,37 @@ module Origen
       !production?
     end
 
+    alias_method :orig_equal?, :==
+
+    def equal?(version)
+      condition_met?("== #{version}")
+    end
+    alias_method :eq?, :equal?
+    alias_method :==, :equal?
+
     def less_than?(version)
       condition_met?("< #{version}")
     end
     alias_method :lt?, :less_than?
+    alias_method :<, :less_than?
 
     def less_than_or_equal_to?(version)
       condition_met?("<= #{version}")
     end
     alias_method :lte?, :less_than_or_equal_to?
+    alias_method :<=, :less_than_or_equal_to?
 
     def greater_than?(version)
       condition_met?("> #{version}")
     end
     alias_method :gt?, :greater_than?
+    alias_method :>, :greater_than?
 
     def greater_than_or_equal_to?(version)
       condition_met?(">= #{version}")
     end
     alias_method :gte?, :greater_than_or_equal_to?
+    alias_method :>=, :greater_than_or_equal_to?
 
     # Returns true if the version is a correctly formatted semantic
     # or timestamp version number
@@ -169,7 +181,7 @@ module Origen
     alias_method :dev, :pre
 
     def latest?
-      downcase == 'trunk' || downcase == 'latest'
+      downcase.orig_equal?('trunk') || downcase.orig_equal?('latest')
     end
 
     # Returns true if the version is a timestamp format version number
@@ -225,11 +237,11 @@ module Origen
 
       elsif condition =~ /^==?\s*(.*)/
         tag = validate_condition!(condition, Regexp.last_match[1])
-        self == tag
+        self.orig_equal?(tag)
 
       else
         tag = validate_condition!(condition, condition)
-        self == tag
+        self.orig_equal?(tag)
       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/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/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.33.2
+  version: 0.33.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -644,7 +644,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit