origen 0.7.10 → 0.7.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen/controller.rb +11 -11
- data/lib/origen/sub_blocks.rb +7 -7
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f2ec6fdb22434ca3fe50b77984965baf6ad0a5ef
|
4
|
+
data.tar.gz: 1b764ec7bd5297203bb77414e00b344dd908be05
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d828f95106ee2c888404422db32ce46caac95438fb9467cac313a34f50441bf59e8d3b38f248965a2d1caf28ffdb70e24c889e1e794fd30334f2113263978207
|
7
|
+
data.tar.gz: 7cda246f8dc901269ea4c7a2b0b7449413e1cce930a34bc1dfc8cd57f426f87bea54d4274db98e739779fc5029ac5cb0ae287adcefbb3d34468fc544b83f5d75
|
data/config/version.rb
CHANGED
data/lib/origen/controller.rb
CHANGED
@@ -20,17 +20,17 @@ module Origen
|
|
20
20
|
def _resolve_model_class(options)
|
21
21
|
class_name = options[:class_name]
|
22
22
|
if class_name
|
23
|
-
|
23
|
+
if eval("defined? #{_namespace}::#{class_name}")
|
24
24
|
klass = eval("#{_namespace}::#{class_name}")
|
25
|
-
|
26
|
-
|
25
|
+
else
|
26
|
+
if eval("defined? #{class_name}")
|
27
27
|
klass = eval(class_name)
|
28
|
-
|
29
|
-
|
28
|
+
else
|
29
|
+
if eval("defined? #{self}::#{class_name}")
|
30
30
|
klass = eval("#{self}::#{class_name}")
|
31
|
-
|
31
|
+
else
|
32
32
|
puts "Could not find class: #{class_name}"
|
33
|
-
|
33
|
+
fail 'Unknown model class!'
|
34
34
|
end
|
35
35
|
end
|
36
36
|
end
|
@@ -67,11 +67,11 @@ module Origen
|
|
67
67
|
if self.class.path_to_model
|
68
68
|
m = eval(self.class.path_to_model)
|
69
69
|
if m
|
70
|
-
|
71
|
-
m.send(
|
72
|
-
rescue
|
73
|
-
# Model is not an Origen::Model
|
70
|
+
if m.respond_to?(:_controller=)
|
71
|
+
m.send(:_controller=, self)
|
74
72
|
end
|
73
|
+
else
|
74
|
+
fail "No model object found at path: #{self.class.path_to_model}"
|
75
75
|
end
|
76
76
|
m
|
77
77
|
end
|
data/lib/origen/sub_blocks.rb
CHANGED
@@ -258,17 +258,17 @@ module Origen
|
|
258
258
|
else
|
259
259
|
class_name = options.delete(:class_name)
|
260
260
|
if class_name
|
261
|
-
|
261
|
+
if eval("defined? ::#{namespace}::#{class_name}")
|
262
262
|
klass = eval("::#{namespace}::#{class_name}")
|
263
|
-
|
264
|
-
|
263
|
+
else
|
264
|
+
if eval("defined? #{class_name}")
|
265
265
|
klass = eval(class_name)
|
266
|
-
|
267
|
-
|
266
|
+
else
|
267
|
+
if eval("defined? #{self.class}::#{class_name}")
|
268
268
|
klass = eval("#{self.class}::#{class_name}")
|
269
|
-
|
269
|
+
else
|
270
270
|
puts "Could not find class: #{class_name}"
|
271
|
-
|
271
|
+
fail 'Unknown sub block class!'
|
272
272
|
end
|
273
273
|
end
|
274
274
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: origen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen McGinty
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-05-
|
11
|
+
date: 2016-05-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
652
652
|
version: 1.8.11
|
653
653
|
requirements: []
|
654
654
|
rubyforge_project:
|
655
|
-
rubygems_version: 2.
|
655
|
+
rubygems_version: 2.6.2
|
656
656
|
signing_key:
|
657
657
|
specification_version: 4
|
658
658
|
summary: The Semiconductor Developer's Kit
|