autobuild 1.5.12 → 1.5.13

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.5.13
+* fix error messages in the oroGen packages, when the loaded oroGen file has an
+  error
+
 == Version 1.5.12
 * fix exception when git logs contain non-ASCII characters on Ruby 1.9 version
   compiled with another default encoding than UTF-8 (!)

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.12" unless defined? Autobuild::VERSION
+    VERSION = "1.5.13" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/packages/orogen.rb

@@ -68,7 +68,21 @@ module Autobuild
         def load(file)
             @orogen_file = file
             @base_dir = File.dirname(file)
-            Kernel.eval(File.read(file), binding)
+
+            begin
+                Kernel.eval(File.read(file), binding, file, 0)
+            rescue ::Exception => e
+                backtrace = e.backtrace.dup
+                message   = e.message.dup
+
+                backtrace.delete_if { |line| line !~ /(\s|^)#{Regexp.quote(file)}:/ }
+                if message =~ /^(#{Regexp.quote(file)}:\d+): (.*)/m
+                    backtrace.unshift $1
+                    message = $2
+                end
+                raise e, message, backtrace
+            end
+
             self
         end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 12
-  version: 1.5.12
+  - 13
+  version: 1.5.13
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency