autobuild 1.5.32 → 1.5.33

data/Changes.txt

@@ -1,3 +1,8 @@
+== Version 1.5.33
+* fix autobuild failing if the generated documentation
+  is not in the doc_dir, as expected. It now reports
+  a warning, as it should
+
 == Version 1.5.32
 * autobuild importers delete the source directory when
   initial checkouts fail. They now display a message

data/lib/autobuild/importer.rb

@@ -88,7 +88,7 @@ class Importer
                         update(package)
                         patch(package)
                         package.updated = true
-                    rescue Exception => e
+                    rescue ::Exception => e
                         fallback(e, package, :import, package)
                     end
                 else
@@ -110,7 +110,7 @@ class Importer
             rescue Autobuild::Exception => e
                 FileUtils.rm_rf package.srcdir
                 fallback(e, package, :import, package)
-            rescue Exception
+            rescue ::Exception
                 package.progress "checkout of %s failed, deleting the source directory #{package.srcdir}"
                 FileUtils.rm_rf package.srcdir
                 raise
@@ -141,7 +141,7 @@ class Importer
     def call_patch(package, reverse, file)
         patch = Autobuild.tool('patch')
         Dir.chdir(package.srcdir) do
-            Subprocess.run(package, :patch, patch, '-p0', (reverse ? '-R' : nil), "<#{file}")
+            Subprocess.run(package, :patch, patch, '-p0', (reverse ? '-R' : nil), :input => file)
         end
     end
 

data/lib/autobuild/package.rb

@@ -194,7 +194,7 @@ module Autobuild
             return if failed?
 
             begin yield
-            rescue Exception => e
+            rescue ::Exception => e
                 @failures << e
                 if mark_as_failed
                     @failed = true
@@ -343,13 +343,15 @@ module Autobuild
                             install_doc
                         end
 
-                    rescue Exception => e
+                    rescue ::Exception => e
                         if Autobuild.doc_errors
                             raise
                         else
                             STDERR.puts "W: failed to generate documentation for #{name}"
                             if e.kind_of?(SubcommandFailed)
                                 STDERR.puts "W: see #{e.logfile} for more details"
+                            else
+                                STDERR.puts "W: #{e.message}"
                             end
                         end
                     end
@@ -360,6 +362,10 @@ module Autobuild
         end
 
         def install_doc
+            if !File.directory?(self.doc_dir)
+                raise "#{self.doc_dir} was expected to be a directory, but it is not. Check the package's documentation generation, the generated documentation should be in #{self.doc_dir}"
+            end
+
             doc_target_dir  = self.doc_target_dir
             doc_dir         = self.doc_dir
             FileUtils.rm_rf   doc_target_dir

data/lib/autobuild/subcommand.rb

@@ -103,6 +103,14 @@ module Autobuild::Subprocess
     def self.run(target, phase, *command)
         STDOUT.sync = true
 
+        input_streams = []
+        if command.last.kind_of?(Hash)
+            options = command.pop
+            if options[:input]
+                input_streams = [options[:input]]
+            end
+        end
+
         start_time = Time.now
 
         # Filter nil and empty? in command
@@ -127,9 +135,6 @@ module Autobuild::Subprocess
 	    puts "#{target_name}: running #{command.join(" ")}\n    (output goes to #{logname})"
 	end
 
-        input_streams = command.collect { |o| $1 if o =~ /^\<(.+)/ }.compact
-        command.reject! { |o| o =~ /^\<(.+)/ }
-
         open_flag = if Autobuild.keep_oldlogs then 'a'
                     elsif Autobuild.registered_logfile?(logname) then 'a'
                     else 'w'
@@ -184,7 +189,7 @@ module Autobuild::Subprocess
                 rescue Errno::ENOENT
                     cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
                     raise
-                rescue Exception
+                rescue ::Exception
                     cwrite.write([CONTROL_UNEXPECTED].pack('I'))
                     raise
                 end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.32" unless defined? Autobuild::VERSION
+    VERSION = "1.5.33" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: false
   segments: 
   - 1
   - 5
-  - 32
-  version: 1.5.32
+  - 33
+  version: 1.5.33
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency