autobuild 1.2.15 → 1.3.0

data/lib/autobuild/reporting.rb

@@ -15,6 +15,10 @@ require 'autobuild/config'
 require 'autobuild/exceptions'
 
 module Autobuild
+    def self.progress(msg)
+	puts "  #{msg}"
+    end
+
     ## The reporting module provides the framework
     # to run commands in autobuild and report errors 
     # to the user

data/lib/autobuild/subcommand.rb

@@ -4,7 +4,7 @@ require 'autobuild/reporting'
 module Autobuild::Subprocess
     class Failed < Exception
         attr_reader :status
-        def initialize(status = 0)
+        def initialize(status = nil)
             @status = status
         end
     end
@@ -22,7 +22,9 @@ module Autobuild::Subprocess
             FileUtils.mkdir_p File.dirname(logname)
         end
 
-        puts "#{target}: running #{command.join(" ")}\n    (output goes to #{logname})"
+	if Autobuild.verbose
+	    puts "#{target}: running #{command.join(" ")}\n    (output goes to #{logname})"
+	end
 
         input_streams = command.collect { |o| $1 if o =~ /^\<(.+)/ }.compact
         command.reject! { |o| o =~ /^\<(.+)/ }
@@ -43,7 +45,7 @@ module Autobuild::Subprocess
             pread, pwrite = IO.pipe # to feed subprocess stdin 
             cread, cwrite = IO.pipe # to control that exec goes well
 
-            pid = fork { 
+            pid = fork do
                 cwrite.sync = true
                 begin
                     Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
@@ -68,7 +70,7 @@ module Autobuild::Subprocess
                     cwrite.write([CONTROL_UNEXPECTED].pack('I'))
                     raise
                 end
-            }
+            end
 
             # Feed the input
             pread.close
@@ -90,7 +92,7 @@ module Autobuild::Subprocess
                 # An error occured
                 value = value.unpack('I').first
                 if value == CONTROL_COMMAND_NOT_FOUND
-                    raise Failed.new, "file not found"
+                    raise Failed.new, "command '#{command.first}' not found"
                 else
                     raise Failed.new, "something unexpected happened"
                 end
@@ -101,7 +103,7 @@ module Autobuild::Subprocess
         end
 
         if status.exitstatus > 0
-            raise Failed.new(status.exitstatus), "command returned with status #{status.exitstatus}"
+            raise Failed.new(status.exitstatus), "'#{command.join(' ')}' returned status #{status.exitstatus}"
         end
 
     rescue Failed => e

data/lib/autobuild/timestamps.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 STAMPFILE = "autobuild-stamp"
 
 module Autobuild
-    def tree_timestamp(path, *exclude)
+    def self.tree_timestamp(path, *exclude)
         # Exclude autobuild timestamps
 	exclude.each { |rx| raise unless Regexp === rx }
         exclude << (/#{Regexp.quote(STAMPFILE)}$/)
@@ -44,23 +44,27 @@ module Autobuild
 	end
 	    
         def timestamp
-            tree_timestamp(name, %r#(?:^|/)(?:CVS|_darcs|\.svn)$#, *@exclude)
+            Autobuild.tree_timestamp(name, %r#(?:^|/)(?:CVS|_darcs|\.svn)$#, *@exclude)
         end
     end
-    def source_tree(path, &block)
+    def self.source_tree(path, &block)
         task = SourceTreeTask.define_task(path)
         block.call(task) unless !block
         task
     end
             
-    def get_stamp(stampfile)
+    def self.get_stamp(stampfile)
         return Time.at(0) if !File.exists?(stampfile)
         return File.mtime(stampfile)
     end
 
-    def touch_stamp(stampfile)
+    def self.touch_stamp(stampfile)
         puts "Touching #{stampfile}" if Autobuild.debug
         FileUtils.touch(stampfile)
+
+        # File modification times on most Unix filesystems have a granularity of
+        # one second, so we (unfortunately) have to sleep 1s to make sure that
+        # time comparisons will work as expected.
         sleep(1)
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.15
+  version: 1.3.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 +02:00
+date: 2009-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -70,7 +70,8 @@ description: |-
   It takes the dependencies between packages into account in its build process,
   updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+,
   +LD_LIBRARY_PATH+, ...)
-email: sylvain.joyeux@m4x.org
+email: 
+- sylvain.joyeux@m4x.org
 executables: 
 - autobuild
 extensions: []
@@ -148,6 +149,6 @@ specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies
 test_files: 
 - test/test_import_tar.rb
-- test/test_subcommand.rb
-- test/test_import_svn.rb
 - test/test_import_cvs.rb
+- test/test_import_svn.rb
+- test/test_subcommand.rb