autobuild 1.2.9 → 1.2.10

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.2.10
+* small fix
+  logs are sorted into subdirectories, following the structure of the
+  packages. Up until now, the mailing code was not searching for logfiles in the
+  subdirectories. This commit fixes this.
+
 == Version 1.2.9
 * small usability issue
   - provide the --keep-oldlogs command line option and the

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.9" unless defined? Autobuild::VERSION
+    VERSION = "1.2.10" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/reporting.rb

@@ -9,6 +9,7 @@ end
 require 'net/smtp'
 require 'socket'
 require 'etc'
+require 'find'
 
 require 'autobuild/config'
 require 'autobuild/exceptions'
@@ -53,8 +54,12 @@ module Autobuild
 	end
 
         ## Iterate on all log files
-        def self.each_log(&iter)
-            Dir.glob("#{Autobuild.logdir}/*.log", &iter)
+        def self.each_log
+            Find.find(Autobuild.logdir) do |path|
+                if File.file?(path) && path =~ /\.log$/
+                    yield(path)
+                end
+            end
         end
     end
 
@@ -130,7 +135,8 @@ module Autobuild
 
             # Attach log files
             Reporting.each_log do |file|
-                mail.add_file(file)
+                name = file[Autobuild.logdir.size..-1]
+                mail.add_file(name, file)
             end
 
             # Send the mails
@@ -151,10 +157,10 @@ end
 module RMail
     class Message
         ## Attachs a file to a message
-        def add_file(path, content_type='text/plain')
+        def add_file(name, path, content_type='text/plain')
             part = RMail::Message.new
             part.header.set('Content-Type', content_type)
-            part.header.set('Content-Disposition', 'attachment', 'filename' => File.basename(path))
+            part.header.set('Content-Disposition', 'attachment', 'filename' => name)
             part.body = ''
             File.open(path) do |file|
                 part.body << file.readlines.join("")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-31 00:00:00 +02:00
+date: 2009-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency