autobuild 1.5.58 → 1.5.59.rc1

data/lib/autobuild/packages/orogen.rb

@@ -142,11 +142,28 @@ module Autobuild
             @extended_states || (@extended_states.nil? && Orogen.extended_states)
         end
 
+        attr_writer :orogen_file
+
         # Path to the orogen file used for this package
         #
         # If not set, the class will look for a .orogen file in the package
-        # source directory
-        attr_accessor :orogen_file
+        # source directory. It will return nil if the package is not checked out
+        # yet, and raise ArgumentError if the package is indeed present but no
+        # orogen file can be found
+        #
+        # It can be explicitely set with #orogen_file=
+        def orogen_file
+            if @orogen_file
+                @orogen_file
+            else
+                return if !File.directory?(srcdir)
+                    
+                Dir.glob(File.join(srcdir, '*.orogen')) do |path|
+                    return File.basename(path)
+                end
+                raise ArgumentError, "cannot find an oroGen specification file in #{srcdir}"
+            end
+        end
 
         def initialize(*args, &config)
             super
@@ -202,15 +219,8 @@ module Autobuild
 
             file configurestamp => genstamp
 
-            if !orogen_file
-                Dir.glob(File.join(srcdir, '*.orogen')) do |path|
-                    @orogen_file = File.basename(path)
-                    break
-                end
-                if !orogen_file
-                    raise ArgumentError, "cannot find an oroGen specification file in #{srcdir}"
-                end
-            end
+            # Cache the orogen file name
+            @orogen_file ||= self.orogen_file
 
             file genstamp => File.join(srcdir, orogen_file) do
                 isolate_errors { regen }

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.58" unless defined? Autobuild::VERSION
+    VERSION = "1.5.59.rc1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 119
-  prerelease: 
+  hash: 15424447
+  prerelease: 7
   segments: 
   - 1
   - 5
-  - 58
-  version: 1.5.58
+  - 59
+  - rc
+  - 1
+  version: 1.5.59.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -155,12 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild