build-tool 0.5.2 → 0.5.3

data/.gitignore

@@ -4,7 +4,7 @@ tags
 config/website.yml
 pkg/*
 *~
-*.sw[p-z]
+*.sw[a-z]
 .yardoc
 lib/build-tool/cfg/parser.output
 lib/build-tool/cfg/parser.rb

data/History.txt

@@ -1,3 +1,20 @@
+== 0.5.3
+- Feature
+  - Errors during a make call are both printed to the logfile and stdout even without verbose
+    mode. Currently lines with "error:" and "ld:" are considered as errors. Report more. If the
+    progressbar was active it is stopped.
+  - Git: Check for a dirty index if asked for rebase. No automatic stashing (Yet?). Build-tool
+    will bail out with an error message if you have uncommited changes. This step will be done
+    before asking for the ssh key.
+- Enhancements
+  - Do not print the classname for BuildTool Error classes. Only the message.
+  - First fetch and rebase, then clean out the build-dir. If the fetch rebase fails you still have
+    your old build to sort out the problems.
+  - Improve the error message if --resume-from is given an invalid/ambiguous module name.
+- Bugfix
+  - Fix ssh key handling. Now build-tool will stop if ssh-add fails.
+  - Fix the progressbar for build-system not giving progress information(like qmake)
+
 == 0.5.2
 - Bugfix
   - Be less verbose about adding ssh-key to the agent. One time is enough.

data/KNOWN_PROBLEMS

@@ -0,0 +1,5 @@
+cmd files <doesnotexist>
+    > Unhandled exception
+
+cmd recipes info kde
+    > Unhandled exception

data/Manifest.txt

@@ -1,6 +1,7 @@
 .gitattributes
 .gitignore
 History.txt
+KNOWN_PROBLEMS
 Manifest.txt
 README.txt
 Rakefile
@@ -16,6 +17,7 @@ lib/build-tool/build-system/base.rb
 lib/build-tool/build-system/cmake.rb
 lib/build-tool/build-system/custom.rb
 lib/build-tool/build-system/kdel10n.rb
+lib/build-tool/build-system/make.rb
 lib/build-tool/build-system/none.rb
 lib/build-tool/build-system/qmake.rb
 lib/build-tool/build-system/qt.rb

data/Rakefile

@@ -1,5 +1,12 @@
 # -*- ruby -*-
 require 'rubygems'
+
+# http://rubyforge.org/tracker/index.php?func=detail&aid=28920&group_id=1513&atid=5921
+begin
+    require 'psych'
+rescue ::LoadError
+end
+
 require 'hoe'
 require 'fileutils'
 require './lib/build-tool'
@@ -9,6 +16,7 @@ Hoe.plugin :doofus
 Hoe.plugin :debugging
 Hoe.plugin :racc
 
+
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 Hoe.spec( 'build-tool' ) do

data/lib/build-tool.rb

@@ -2,6 +2,6 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BuildTool
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end
 

data/lib/build-tool/application.rb

@@ -25,6 +25,8 @@ module BuildTool
     #
     class Application < Singleton
 
+        attr_writer :configuration
+
         attr_reader :application_root
         attr_reader :cli
         attr_reader :database

data/lib/build-tool/build-system/autoconf.rb

@@ -1,3 +1,5 @@
+require 'build-tool/build-system/make'
+
 module BuildTool; module BuildSystem
 
     #
@@ -7,7 +9,6 @@ class AutoConf < Base
 
         include MJ::Tools::SubProcess
 
-        class MakeError < BuildTool::Error; end
         class AutoConfError < BuildTool::Error; end
 
         def intitialize( *args )
@@ -90,14 +91,6 @@ def configure
             rc
         end
 
-        def do_make( target = nil )
-            rc = self.class.execute( "make #{target ? target : "" }", build_directory, self.module.environment.values )
-            if rc != 0
-                raise MakeError, "make #{target || "" } failed with error code #{rc}";
-            end
-            rc
-        end
-
         def install( fast )
             make( "install" )
         end
@@ -107,7 +100,7 @@ def install_fast_supported?
         end
 
         def make( target = nil )
-            do_make( target )
+            Make.make( "#{target ? target : "" }", build_directory, self.module.environment.values )
         end
 
         def option_string

data/lib/build-tool/build-system/base.rb

@@ -167,6 +167,11 @@ def source_directory
         def after_rebase
         end
 
+        def progressbar( title, &block )
+            logger.info title
+            yield
+        end
+
         #
         ### METHODS
         #
@@ -229,4 +234,64 @@ def remove_build_directory
 
     end # class Base
 
+    class ProgressbarBase < Logging::Appender
+
+        def initialize( title, &block )
+            super( 'Progressbar', :level => :DEBUG )
+            @pbar = nil
+            @oldlogger = nil
+            if Logging.appenders['stdout'].level >= ::Logging::level_num(:INFO)
+                # We only do the progressbar thing if there is no verbose output active.
+                begin
+                    # Remove the old stdout logger.
+                    @oldlogger = Logging.appenders[ 'stdout' ]
+                    Logging.logger[ 'root' ].remove_appenders( 'stdout' )
+                    Logging.logger[ 'root' ].add_appenders( self )
+                    # Add the progressbar logger
+                    @pbar = ANSI::Progressbar.new( title, 100 )
+                    yield
+                ensure
+                    @pbar.finish unless @pbar.nil?
+                    # Reset the logger
+                    Logging.logger[ 'root' ].remove_appenders( 'Progressbar' )
+                    Logging.logger[ 'root' ].add_appenders( @oldlogger )
+                end
+            else
+                # If there is verbose output just print the text
+                logger.info( title )
+                yield
+            end
+
+        end
+
+        def write( event )
+            message = event.data
+            return if message.empty?
+
+            case event.level
+            when ::Logging::level_num( :ERROR ), ::Logging::level_num( :WARN )
+                begin
+                    # if we get an error we finish the pbar and print out the error waiting for
+                    # the end
+                    @pbar.finish unless @pbar.nil?
+                    @pbar = nil
+                    @oldlogger.append( event )
+                rescue Exception => e
+                    puts e
+                end
+            else
+                begin
+                    grep_progress( message )
+                rescue Exception => e
+                    puts e
+                    puts e.backtrace
+                end
+            end
+            self
+        end
+
+    end # class Progressbar
+
+
+
 end; end # module BuildTool::BuildSystem

data/lib/build-tool/build-system/cmake.rb

@@ -1,8 +1,24 @@
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
+require 'build-tool/build-system/make'
 
 module BuildTool; module BuildSystem
 
+    class Progressbar < ProgressbarBase
+
+        def grep_progress( message )
+
+            match = /^\[ *(\d+)%\]/.match( message )
+            if match and not @pbar.nil?
+                # puts match[ 1 ]
+                @pbar.set( match[ 1 ].to_i )
+            end
+
+        end
+
+    end # class ProgressLayout
+
+
 
     #
     # 
@@ -11,7 +27,6 @@ class CMake < Base
 
         include MJ::Tools::SubProcess
 
-        class MakeError < BuildTool::Error; end
         class CMakeError < BuildTool::Error; end
 
         def initialize( *args )
@@ -65,14 +80,6 @@ def configure
             rc
         end
 
-        def do_make( target = nil )
-            rc = self.class.execute( "make #{target ? target : "" }", build_directory, self.module.environment.values )
-            if rc != 0
-                raise MakeError, "make #{target || "" } failed with error code #{rc}";
-            end
-            rc
-        end
-
         def install( fast )
             if fast
                 make( "install/fast" )
@@ -86,7 +93,7 @@ def install_fast_supported?
         end
 
         def make( target = nil )
-            do_make( target )
+            Make.make( "#{target ? target : "" }", build_directory, self.module.environment.values )
         end
 
         def option_string
@@ -98,6 +105,12 @@ def option_string
             arr.join(" ")
         end
 
+        def progressbar( title, &block )
+            Progressbar.new( title ) do
+                yield
+            end
+        end
+
     end # class CMake
 
 

data/lib/build-tool/build-system/make.rb

@@ -0,0 +1,43 @@
+require 'mj/tools/subprocess'
+
+
+module BuildTool; module BuildSystem
+
+
+    # The make buildsystem.
+    #
+    # Provides helper methods for other build-system currently.
+    class Make
+
+        include MJ::Tools::SubProcess
+
+        class MakeError < BuildTool::Error; end
+
+        # Class Methods
+        class << self
+
+            def make( target, build_directory, environment )
+                rc = self.execute( "make #{target ? target : "" }", build_directory, environment ) do |line|
+                    line.chomp
+                    if line.index( /[^\w]error:/ )
+                        logger.error( line )
+                    elsif line.index( /\/ld:/ )
+                        logger.error( line )
+                    else
+                        logger.verbose( line )
+                    end
+                end
+
+                if rc != 0
+                    raise MakeError, "make #{ target || "" } failed with error code #{rc}";
+                end
+                rc
+            end
+
+        end
+
+
+    end
+
+
+end; end

data/lib/build-tool/build-system/qmake.rb

@@ -1,5 +1,6 @@
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
+require 'build-tool/build-system/make'
 
 module BuildTool; module BuildSystem
 
@@ -10,7 +11,6 @@ class QMake < Base
 
         include MJ::Tools::SubProcess
 
-        class MakeError < BuildTool::Error; end
         class QMakeError < BuildTool::Error; end
 
         def initialize( *args )
@@ -56,14 +56,6 @@ def configure
             rc
         end
 
-        def do_make( target = nil )
-            rc = self.class.execute( "make #{target ? target : "" }", build_directory, self.module.environment.values )
-            if rc != 0
-                raise MakeError, "make #{target || "" } failed with error code #{rc}";
-            end
-            rc
-        end
-
         def install( fast )
             make( "install" )
         end
@@ -73,7 +65,7 @@ def install_fast_supported?
         end
 
         def make( target = nil )
-            do_make( target )
+            Make.make( "#{target ? target : "" }", build_directory, self.module.environment.values )
         end
 
         def option_string

data/lib/build-tool/build-system/qt.rb

@@ -1,3 +1,5 @@
+require 'build-tool/build-system/make'
+
 module BuildTool; module BuildSystem
 
 
@@ -8,7 +10,6 @@ class Qt < Base
 
         include MJ::Tools::SubProcess
 
-        class MakeError < BuildTool::Error; end
         class QMakeError < BuildTool::Error; end
 
         def intitialize( *args )
@@ -57,14 +58,6 @@ def configure
             rc
         end
 
-        def do_make( target = nil )
-            rc = self.class.execute( "make #{target ? target : "" }", build_directory, self.module.environment.values )
-            if rc != 0
-                raise MakeError, "make #{target || "" } failed with error code #{rc}";
-            end
-            rc
-        end
-
         def install( fast )
             make( "install" )
         end
@@ -74,7 +67,7 @@ def install_fast_supported?
         end
 
         def make( target = nil )
-            do_make( target )
+            Make.make( "#{target ? target : "" }", build_directory, self.module.environment.values )
         end
 
         # Configure the module

data/lib/build-tool/command_actions.rb

@@ -4,60 +4,6 @@
 
 module BuildTool
 
-    class Progressbar < Logging::Appender
-
-        def initialize( title, &block )
-            super( 'Progressbar', :level => :DEBUG )
-            @pbar = nil
-            @oldlogger = nil
-            if Logging.appenders['stdout'].level >= ::Logging::level_num(:INFO)
-                # We only do the progressbar thing if there is no verbose output active.
-                begin
-                    # Remove the old stdout logger.
-                    @oldlogger = Logging.appenders[ 'stdout' ]
-                    Logging.logger[ 'root' ].remove_appenders( 'stdout' )
-                    Logging.logger[ 'root' ].add_appenders( self )
-                    # Add the progressbar logger
-                    @pbar = ANSI::Progressbar.new( title, 100 )
-                    yield
-                ensure
-                    @pbar.finish
-                    # Reset the logger
-                    Logging.logger[ 'root' ].remove_appenders( 'Progressbar' )
-                    Logging.logger[ 'root' ].add_appenders( @oldlogger )
-                end
-            else
-                # If there is verbose output just print the text
-                logger.info( title )
-                yield
-            end
-
-        end
-
-        def write( event )
-            message = event.data
-            return if message.empty?
-
-            case event.level
-            when ::Logging::level_num( :ERROR )
-            when ::Logging::level_num( :WARN )
-                # This should never happen. In case of errors an exception is thrown which should
-                # be catched in the initialize() method above. And this logger is removed there.
-                raise NotImplementedError
-
-            else
-                match = /^\[ *(\d+)%\]/.match( message )
-                if match
-                    # puts match[ 1 ]
-                    @pbar.set( match[ 1 ].to_i )
-                end
-            end
-            self
-        end
-
-    end # class ProgressLayout
-
-
 
     module ModuleActions
 
@@ -124,11 +70,9 @@ def while_logging( level = :trace, &block )
                     yield
                 rescue Interrupt => e
                     state = History::ModuleLog::CANCELED_BY_USER
-                    logger.error "User Interrupt!"
                     raise e
                 rescue Exception => e
                     state = History::ModuleLog::FINISHED_WITH_ERRORS
-                    logger.error   "#{e.class}:#{e.message}"
                     got_exception = true
                     raise e
                 ensure
@@ -160,6 +104,7 @@ def execute()
         class Clone < Base
 
             def initialize( command, mod )
+                logger.info "Cleaning build directory"
                 super( command, 20, :fetch, mod )
             end
 
@@ -203,6 +148,19 @@ def execute()
 
         end
 
+        class RemoveBuildDirectory < Base
+
+            def initialize( command, mod )
+                super( command, 10, :clean, mod )
+            end
+
+            def execute()
+                logger.info "Removing build directory"
+                @module.remove_build_directory
+            end
+
+        end
+
         class Configure < Base
 
             def initialize( command, mod )
@@ -243,7 +201,7 @@ def initialize( command, mod, target = nil )
             end
 
             def execute()
-                pb = Progressbar.new( "Make #{@target}" ) do
+                @module.build_system_required.progressbar( "Make #{@target}" ) do
                     @module.build_system_required.make( @target )
                 end
             end
@@ -258,7 +216,7 @@ def initialize( command, mod, fast = false )
             end
 
             def execute()
-                pb = Progressbar.new( "Install #{@fast ? 'fast' : '' }" ) do
+                @module.build_system_required.progressbar( "Install #{@fast ? 'fast' : ''}" ) do
                     @module.build_system_required.install( @fast )
                 end
             end