origen 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87809e538dcf2721908d734489bfe13da0bc78a3
-  data.tar.gz: 0cc358c614cc1f578109e445e3140e904faace24
+  metadata.gz: f2ec6fdb22434ca3fe50b77984965baf6ad0a5ef
+  data.tar.gz: 1b764ec7bd5297203bb77414e00b344dd908be05
 SHA512:
-  metadata.gz: c5b18e66721e95666f8d2cfd7640fc2a04b48257481e968e4bceeb842f2bd0c386544c9471308bed78e1b4c9b640927737daf26b3aaa822bbcc98a0270c898b0
-  data.tar.gz: 31c1d1861123138dd94c840adb6033e981c149bac6629fc93341768ddbae04a6f0a42e7499c00debd3a4837ceb40524e3eecad7d5ca66a2544d1c6278515aec5
+  metadata.gz: d828f95106ee2c888404422db32ce46caac95438fb9467cac313a34f50441bf59e8d3b38f248965a2d1caf28ffdb70e24c889e1e794fd30334f2113263978207
+  data.tar.gz: 7cda246f8dc901269ea4c7a2b0b7449413e1cce930a34bc1dfc8cd57f426f87bea54d4274db98e739779fc5029ac5cb0ae287adcefbb3d34468fc544b83f5d75

data/config/version.rb

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

data/lib/origen/controller.rb

@@ -20,17 +20,17 @@ module Origen
       def _resolve_model_class(options)
         class_name = options[:class_name]
         if class_name
-          begin
+          if eval("defined? #{_namespace}::#{class_name}")
             klass = eval("#{_namespace}::#{class_name}")
-          rescue
-            begin
+          else
+            if eval("defined? #{class_name}")
               klass = eval(class_name)
-            rescue
-              begin
+            else
+              if eval("defined? #{self}::#{class_name}")
                 klass = eval("#{self}::#{class_name}")
-              rescue
+              else
                 puts "Could not find class: #{class_name}"
-                raise 'Unknown model class!'
+                fail 'Unknown model class!'
               end
             end
           end
@@ -67,11 +67,11 @@ module Origen
         if self.class.path_to_model
           m = eval(self.class.path_to_model)
           if m
-            begin
-              m.send('_controller=', self)
-            rescue
-              # Model is not an Origen::Model
+            if m.respond_to?(:_controller=)
+              m.send(:_controller=, self)
             end
+          else
+            fail "No model object found at path: #{self.class.path_to_model}"
           end
           m
         end

data/lib/origen/sub_blocks.rb

@@ -258,17 +258,17 @@ module Origen
       else
         class_name = options.delete(:class_name)
         if class_name
-          begin
+          if eval("defined? ::#{namespace}::#{class_name}")
             klass = eval("::#{namespace}::#{class_name}")
-          rescue
-            begin
+          else
+            if eval("defined? #{class_name}")
               klass = eval(class_name)
-            rescue
-              begin
+            else
+              if eval("defined? #{self.class}::#{class_name}")
                 klass = eval("#{self.class}::#{class_name}")
-              rescue
+              else
                 puts "Could not find class: #{class_name}"
-                raise 'Unknown sub block class!'
+                fail 'Unknown sub block class!'
               end
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit