autobuild 1.7.4.rc2 → 1.7.4

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 TODO
 bin/autobuild
 lib/autobuild.rb
+lib/autobuild/build_logfile.rb
 lib/autobuild/config.rb
 lib/autobuild/configurable.rb
 lib/autobuild/environment.rb

data/lib/autobuild/build_logfile.rb

@@ -0,0 +1,58 @@
+require 'time'
+
+module Autobuild
+    # Parse and manipulate the information stored in a build log file (usually
+    # in prefix/log/stats.log)
+    class BuildLogfile
+        Entry = Struct.new :package, :phase, :start_time, :duration
+
+        attr_reader :by_package
+        attr_reader :by_phase
+
+        def initialize(entries = Array.new)
+            @entries = entries.dup
+            @by_package = Hash.new
+            entries.each do |e|
+                package = (by_package[e.package] ||= Hash.new(0))
+                package[e.phase] += e.duration
+            end
+
+            @by_phase = Hash.new
+            entries.each do |e|
+                package = (by_phase[e.phase] ||= Hash.new(0))
+                package[e.package] += e.duration
+            end
+        end
+
+        def diff(other)
+            result = []
+            by_package.each do |pkg_name, phases|
+                other_phases = other.by_package[pkg_name]
+                next if !other_phases
+                phases.each do |phase, duration|
+                    next if !other_phases.has_key?(phase)
+                    other_duration = other_phases[phase]
+                    result << Entry.new(pkg_name, phase, nil, other_duration - duration)
+                end
+            end
+            BuildLogfile.new(result)
+        end
+
+        def self.parse(file)
+            entries = File.readlines(file).map do |line|
+                line = line.strip
+                next if line.empty?
+
+                cols = line.split(/\s+/)
+                date, time = cols.shift, cols.shift
+                start_time = Time.parse("#{date} #{time}")
+                duration = Float(cols.pop)
+                phase = cols.pop
+                package = cols.join(" ")
+                Entry.new(package, phase, start_time, duration)
+            end
+            new(entries)
+        end
+    end
+end
+

data/lib/autobuild/import/git.rb

@@ -9,7 +9,7 @@ module Autobuild
         # and branch. +source+ is [repository, branch]
         #
         # This importer uses the 'git' tool to perform the
-        # import. It defaults to 'svn' and can be configured by
+        # import. It defaults to 'git' and can be configured by
         # doing 
 	#   Autobuild.programs['git'] = 'my_git_tool'
         def initialize(repository, branch = nil, options = {})
@@ -469,7 +469,7 @@ module Autobuild
     end
 
     # Creates a git importer which gets the source for the given repository and branch
-    # URL +source+. The allowed values in +options+ are described in SVN.new.
+    # URL +source+.
     def self.git(repository, branch = nil, options = {})
         Git.new(repository, branch, options)
     end

data/lib/autobuild/import/svn.rb

@@ -36,9 +36,24 @@ module Autobuild
         private
 
         def update(package) # :nodoc:
-            Dir.chdir(package.importdir) {
+            Dir.chdir(package.importdir) do
 		old_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
-		svninfo = IO.popen("svn info") { |io| io.readlines }
+                svninfo = []
+                begin
+                    Subprocess.run(package, :import, @program, 'info') do |line|
+                        svninfo << line
+                    end
+                rescue SubcommandFailed => e
+                    if svninfo.find { |l| l =~ /svn upgrade/ }
+                        # Try svn upgrade and info again
+                        Subprocess.run(package, :import, @program, 'upgrade')
+                        svninfo.clear
+                        Subprocess.run(package, :import, @program, 'info') do |line|
+                            svninfo << line
+                        end
+                    else raise
+                    end
+                end
 		ENV['LC_ALL'] = old_lang
 		unless url = svninfo.grep(/^URL: /).first
 		    if svninfo.grep(/is not a working copy/).empty?
@@ -53,7 +68,7 @@ module Autobuild
 		    raise ConfigException.new(package, 'import'), "current checkout found at #{package.importdir} is from #{source}, was expecting #{@source}"
 		end
                 Subprocess.run(package, :import, @program, 'up', "--non-interactive", *@options_up)
-            }
+            end
         end
 
         def checkout(package) # :nodoc:

data/lib/autobuild/packages/cmake.rb

@@ -348,35 +348,40 @@ module Autobuild
         # Do the build in builddir
         def build
             in_dir(builddir) do
-                progress_start "building %s", :done_message => "built %s" do
+                progress_start "building %s" do
                     if always_reconfigure || !File.file?('Makefile')
                         Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.')
                     end
 
+                    current_message = String.new
+                    warning_count = 0
                     Autobuild.make_subcommand(self, 'build') do |line|
-                        if line =~ /\[\s+(\d+)%\]/
+                        needs_display = false
+                        if line =~ /\[\s*(\d+)%\]/
                             progress "building %s (#{Integer($1)}%)"
-                        end
-                    end
-
-                    if show_make_messages?
-                        warning = String.new
-                        Autobuild.make_subcommand(self, 'build') do |line|
-                            iswarning = false
-                            if line =~ /\[\s*(\d+)%\]/
-                                progress "building %s (#{Integer($1)}%)"
-                            elsif (line =~
-    /^(Linking)|^(Scanning)|^(Building)|^(Built)/) == nil
-                                warning += line
-                                iswarning = true
+                        elsif line !~ /^(?:Linking|Scanning|Building|Built)/
+                            if line =~ /warning/
+                                warning_count += 1
                             end
-                            if(!iswarning && !warning.empty?)
-                                warning.split("\n").each do |l|
-                                    message "%s: #{l}", :magenta
-                                end
-                                warning = ""
+                            if show_make_messages?
+                                current_message += line
+                                needs_display = true
                             end
                         end
+                        if !needs_display && !current_message.empty?
+                            current_message.split("\n").each do |l|
+                                message "%s: #{l}", :magenta
+                            end
+                            current_message.clear
+                        end
+                    end
+                    current_message.split("\n").each do |l|
+                        message "%s: #{l}", :magenta
+                    end
+                    if warning_count > 0
+                        progress_done "built %s (#{warning_count} warnings)"
+                    else
+                        progress_done "built %s"
                     end
                 end
             end

data/lib/autobuild/parallel.rb

@@ -42,10 +42,17 @@ module Autobuild
             available_workers << w
             if error
                 if available_workers.size != workers.size
-                    Autobuild.error "got an error doing parallel processing, waiting for pending jobs to end"
+                    if finished_task.respond_to?(:package) && finished_task.package
+                        Autobuild.error "got an error processing #{finished_task.package.name}, waiting for pending jobs to end"
+                    else
+                        Autobuild.error "got an error doing parallel processing, waiting for pending jobs to end"
+                    end
+                end
+                begin
+                    finish_pending_work
+                ensure
+                    raise error
                 end
-                finish_pending_work
-                raise error
             end
 
             state.process_finished_task(finished_task)
@@ -67,29 +74,25 @@ module Autobuild
             attr_reader :started_packages
             attr_reader :active_packages
             attr_reader :queue
+            attr_reader :priorities
 
             def initialize(reverse_dependencies, initial_queue = Array.new)
                 @reverse_dependencies = reverse_dependencies
                 @processed = Set.new
                 @active_packages = Set.new
-                @started_packages = Set.new
-                @queue = initial_queue.to_set
+                @priorities = Hash.new
+                @started_packages = Hash.new
+                @queue = Hash.new
+                initial_queue.each do |t|
+                    queue[t] = 1
+                end
             end
 
             def find_task
-                possible_task = nil
-                queue.each do |task|
-                    if task.respond_to?(:package)
-                        if !active_packages.include?(task.package)
-                            if started_packages.include?(task.package)
-                                return task
-                            end
-                            possible_task ||= task
-                        end
-                    else possible_task ||= task
-                    end
+                if task = queue.sort_by { |t, p| p }.first
+                    priorities[task.first] = task.last
+                    task.first
                 end
-                possible_task
             end
 
             def pop
@@ -99,9 +102,9 @@ module Autobuild
             end
 
             def mark_as_active(pending_task)
-                if pending_task.respond_to?(:package)
+                if pending_task.respond_to?(:package) && !pending_task.kind_of?(Autobuild::SourceTreeTask)
                     active_packages << pending_task.package
-                    started_packages << pending_task.package
+                    started_packages[pending_task.package] ||= -started_packages.size
                 end
             end
 
@@ -111,11 +114,18 @@ module Autobuild
                 end
                 processed << task
                 reverse_dependencies[task].each do |candidate|
-                    if candidate.prerequisite_tasks.all? { |t| processed.include?(t) }
-                        queue << candidate
+                    if !processed.include?(candidate) && candidate.prerequisite_tasks.all? { |t| processed.include?(t) }
+                        if candidate.respond_to?(:package)
+                            queue[candidate] = started_packages[candidate.package] || priorities[task]
+                        else queue[candidate] = priorities[task]
+                        end
                     end
                 end
             end
+
+            def trivial_task?(task)
+                (task.kind_of?(Autobuild::SourceTreeTask) || task.kind_of?(Rake::FileTask)) && task.actions.empty?
+            end
         end
 
         # Invokes the provided tasks. Unlike the rake code, this is a toplevel
@@ -155,7 +165,11 @@ module Autobuild
                     end
                 end
 
-                if pending_task.instance_variable_get(:@already_invoked) || !pending_task.needed?
+                if state.trivial_task?(pending_task)
+                    Worker.execute_task(pending_task)
+                    state.process_finished_task(pending_task)
+                    next
+                elsif pending_task.instance_variable_get(:@already_invoked) || !pending_task.needed?
                     state.process_finished_task(pending_task)
                     next
                 end
@@ -201,11 +215,15 @@ module Autobuild
                 end
             end
 
-            def do_task(task)
-                @last_error = nil
+            def self.execute_task(task)
                 task_args = Rake::TaskArguments.new(task.arg_names, [])
                 task.instance_variable_set(:@already_invoked, true)
                 task.send(:execute, task_args)
+            end
+
+            def do_task(task)
+                @last_error = nil
+                Worker.execute_task(task)
                 @last_finished_task = task
             rescue ::Exception => e
                 @last_finished_task = task

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.4.rc2" unless defined? Autobuild::VERSION
+    VERSION = "1.7.4" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,111 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autobuild
-version: !ruby/object:Gem::Version 
-  hash: 165251369
-  prerelease: 6
-  segments: 
-  - 1
-  - 7
-  - 4
-  - rc
-  - 2
-  version: 1.7.4.rc2
+version: !ruby/object:Gem::Version
+  version: 1.7.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 7
-        version: "3.7"
+      - !ruby/object:Gem::Version
+        version: '3.7'
   type: :development
-  version_requirements: *id005
-description: Collection of classes to handle build systems (CMake, autotools, ...) and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj) integrated software project management tool.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
+description: Collection of classes to handle build systems (CMake, autotools, ...)
+  and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
+  to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
+  integrated software project management tool.
 email: rock-dev@dfki.de
-executables: 
+executables:
 - autobuild
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Changes.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -113,6 +111,7 @@ files:
 - TODO
 - bin/autobuild
 - lib/autobuild.rb
+- lib/autobuild/build_logfile.rb
 - lib/autobuild/config.rb
 - lib/autobuild/configurable.rb
 - lib/autobuild/environment.rb
@@ -151,44 +150,35 @@ files:
 - test/tools.rb
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: autobuild
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
-test_files: 
-- test/test_reporting.rb
+test_files:
+- test/test_import_tar.rb
 - test/test_subcommand.rb
+- test/test_reporting.rb
 - test/test_import_svn.rb
 - test/test_import_cvs.rb
-- test/test_import_tar.rb