origen 0.2.4 → 0.2.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/origen +11 -2
- data/config/version.rb +1 -1
- data/lib/origen/commands/lint.rb +0 -15
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 34175eaa19e94919e00157128ce1875e61b8e105
|
4
|
+
data.tar.gz: 18ca9f6c79f0d3de7896830e695956111ce4b2e6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4e6343655c86b9f9a326c05df084eaae136a883cf9fe09cc949051de9b5856a32123b294f8161ce0c99a1739bf76105f5000ba7206b02748badd9c9794b6ff4c
|
7
|
+
data.tar.gz: 476933ca8901cef3184d1b61b9d82f4ad9cf55309095bb352039c6e36c1c83bacfb594544202b2643005adb9be0917014c603c2549f881386d9ac52cfab2dff7
|
data/bin/origen
CHANGED
@@ -200,17 +200,26 @@ begin
|
|
200
200
|
rescue Exception => e
|
201
201
|
unless e.is_a?(SystemExit) && e.status == 0
|
202
202
|
puts
|
203
|
-
puts e.message
|
203
|
+
puts e.message unless e.is_a?(SystemExit)
|
204
204
|
if Origen.app_loaded?
|
205
205
|
# Only print out the application stack trace by default, if verbose logging is
|
206
206
|
# enabled then output the full thing
|
207
207
|
e.backtrace.each do |line|
|
208
208
|
path = Pathname.new(line)
|
209
|
-
|
209
|
+
if path.absolute?
|
210
|
+
puts line if Origen.log.level == :verbose
|
211
|
+
else
|
212
|
+
if Origen.log.level == :verbose
|
213
|
+
puts line
|
214
|
+
else
|
215
|
+
puts line unless line =~ /^.\/lbin/
|
216
|
+
end
|
217
|
+
end
|
210
218
|
end
|
211
219
|
else
|
212
220
|
puts e.backtrace
|
213
221
|
end
|
222
|
+
exit 1
|
214
223
|
end
|
215
224
|
ensure
|
216
225
|
if Origen.app_loaded?
|
data/config/version.rb
CHANGED
data/lib/origen/commands/lint.rb
CHANGED
@@ -63,20 +63,5 @@ if result == true
|
|
63
63
|
elsif result == false
|
64
64
|
exit 1
|
65
65
|
else
|
66
|
-
begin
|
67
|
-
if gem 'rubocop'
|
68
|
-
if Origen.running_on_linux? && !File.exist?("#{Origen.top}/.bin/rubocop")
|
69
|
-
puts ''
|
70
|
-
puts 'It looks like you need to update your toolset to fix the above error, try running these commands before trying again:'
|
71
|
-
puts ''
|
72
|
-
puts " pushd #{Origen.top}"
|
73
|
-
puts ' source source_setup update'
|
74
|
-
puts ' popd'
|
75
|
-
puts ''
|
76
|
-
end
|
77
|
-
end
|
78
|
-
rescue Gem::LoadError
|
79
|
-
require_gem 'rubocop', version: '0.20.1'
|
80
|
-
end
|
81
66
|
exit 1
|
82
67
|
end
|