build-tool 0.5.3 → 0.5.4

data/History.txt

@@ -1,3 +1,30 @@
+== 0.5.4 ==
+
+- Features
+    - Support --resume-from for all module based commands (configure)
+    - Show a progressbar when checking for obstacles at the beginning. That can take quite some time.
+    - If a repository contains a file named .commit-template add it to the git configuration.
+
+- Enhancements
+    - Check the recipe directory for validity before installing the recipe.
+    - Only consider a directory a valid recipe if it has a recipe file.
+    - Support --resume-from for all module based commands (configure)
+    - Support --resume-from for all module based commands (configure)
+    - Show core dumps too if make fails.
+    - If a exception happens when checking if modules are ready stop the command.
+
+- Bugfixes
+    - If an svn repository had no repository an error occured while trying to build the error message.
+    - Fix reconfigure --from-scratch
+    - AutoConf: Fix options without values
+    - sqlite3-ruby was renamed to sqlite3 only.
+    - Add grit as dependency
+    - Bugfix: Use correct Error class
+    - Fix a exception of recipe info <recipe>.
+    - Do not claim to Fetch if we do Clone.
+    - Remove a wrong info() line
+    - Bugfix: history <modulename> -> Use same logic as build.
+
 == 0.5.3
 - Feature
   - Errors during a make call are both printed to the logfile and stdout even without verbose

data/KNOWN_PROBLEMS

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

data/Manifest.txt

@@ -78,19 +78,3 @@ lib/mj/tools/ssh.rb
 lib/mj/tools/subprocess.rb
 lib/mj/vcs/git.rb
 lib/mj/visitor.rb
-tasks/rspec.rake
-test/commands/test_build.rb
-test/test_build_system.rb
-test/test_cli.rb
-test/test_command.rb
-test/test_configuration_parser.rb
-test/test_environment.rb
-test/test_feature.rb
-test/test_helper.rb
-test/test_history.rb
-test/test_module.rb
-test/test_repository.rb
-test/test_singleton.rb
-test/test_ssh_key.rb
-test/test_svn_parser.rb
-test/test_vcs.rb

data/Rakefile

@@ -39,8 +39,9 @@ Hoe.spec( 'build-tool' ) do
   self.extra_deps <<
     ['logging', ">= 1.4.3"] <<
     ['sequel', ">= 3.18.0"] <<
-    ['sqlite3-ruby', ">= 1.3.1" ] <<
-    ['ansi', '>= 1.2.2' ]
+    ['sqlite3', ">= 1.3.3" ] <<
+    ['ansi', '>= 1.2.2' ] <<
+    ['grit', ">= 2.4.1" ]
 
   self.extra_dev_deps <<
     ['hoe-debugging', ">= 1.0.1"] <<

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.3'
+  VERSION = '0.5.4'
 end
 

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

@@ -107,10 +107,10 @@ def option_string
             arr = []
             option_names.each do |var|
                 val = self[var]
-                if val
+                if val and !val.empty?
                     arr << "--#{var}='#{val}'"
                 else
-                    arr << "--#{var}'"
+                    arr << "--#{var}"
                 end
             end
             arr.join(" ")

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

@@ -234,35 +234,7 @@ 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
+    class ProgressbarBase < MJ::Logging::Progressbar
 
         def write( event )
             message = event.data

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

@@ -23,6 +23,8 @@ def make( target, build_directory, environment )
                         logger.error( line )
                     elsif line.index( /\/ld:/ )
                         logger.error( line )
+                    elsif line.index( /(core dumped)/ )
+                        logger.error( line )
                     else
                         logger.verbose( line )
                     end

data/lib/build-tool/command_actions.rb

@@ -104,12 +104,11 @@ def execute()
         class Clone < Base
 
             def initialize( command, mod )
-                logger.info "Cleaning build directory"
                 super( command, 20, :fetch, mod )
             end
 
             def execute()
-                logger.info "Fetching"
+                logger.info "Cloning"
                 @module.clone
             end
 
@@ -155,8 +154,12 @@ def initialize( command, mod )
             end
 
             def execute()
-                logger.info "Removing build directory"
-                @module.remove_build_directory
+                if @module.build_system_required.out_of_source
+                    logger.info "Removing build directory"
+                    @module.remove_build_directory
+                else
+                    logger.warn "in source build. Will not remove source directory!"
+                end
             end
 
         end

data/lib/build-tool/commands.rb

@@ -372,7 +372,9 @@ def complete_modules( name, include_templates = false )
             res = []
             found = false
             should_be_unique = false
+            resume = ( @resume_from.nil? and @resume_after.nil? )
             configuration.modules.each do |mod|
+                take_module = false
                 next if ( !include_templates and mod.is_template? )
                 # We match on the following conditions:
                 #   1. name  = mod.name
@@ -382,20 +384,31 @@ def complete_modules( name, include_templates = false )
                     found = true
                     # Now check if it is active.
                     next if !( mod.active? || @all )
-                    res << mod
+                    take_module = true
                 elsif mod.name == name
                     found = true
                     should_be_unique = true
                     # Now check if it is active.
                     next if !( mod.active? || @all )
-                    res << mod
+                    take_module = true
                 elsif mod.name.end_with?( "/#{name}" )
                     found = true
                     should_be_unique = true
                     # Now check if it is active.
                     next if !( mod.active? || @all )
-                    res << mod
+                    take_module = true
                 end
+
+                if not resume and @resume_from and mod.name == @resume_from.name
+                        resume = true
+                end
+
+                res << mod if resume and take_module
+
+                if not resume and @resume_after and mod.name == @resume_after.name
+                        resume = true
+                end
+
             end
 
             # Raise an error if the module was not found
@@ -405,7 +418,7 @@ def complete_modules( name, include_templates = false )
 
             # Raise an error if the result should be unique but is not.
             if should_be_unique and res.size > 1
-                raise UsageError, "#{name} is ambiguos. Please be more specific."
+                raise UsageError, "#{name} is ambiguos #{res}. Please be more specific."
             end
 
             # Give a warning if all modules where 
@@ -487,12 +500,48 @@ def log_directory
 
     end # class Standard
 
+    class ModuleProgressbar < MJ::Logging::Progressbar
+
+        def initialize( title, mod, &block )
+            super( title, mod.size ) do
+                mod.each_with_index do |mod, i|
+                    if @pbar
+                        @pbar.set( i )
+                        @pbar.title= mod.name.split( '/' )[-1]
+                    end
+                    yield mod
+                end
+                @pbar.title= 'finished' if @pbar
+            end
+        end
+
+
+        def write( event )
+            message = event.data
+            return if message.empty?
+
+            # Remove the progressbar and print the message
+            case event.level
+            when ::Logging::level_num( :ERROR ), ::Logging::level_num( :WARN ),  ::Logging::level_num( :INFO )
+                begin
+                    @pbar.clear()       if @pbar
+                    @oldlogger.append(event)
+                rescue Exception => e
+                    puts e
+                end
+            end
+        end
+
+    end # class ModuleProgress
+
     class ModuleBasedCommand < Standard
 
         def initialize( *args )
             super( *args )
             @failed_modules = []
             @resume_from  = nil
+            @resume_after  = nil
+            @stop_on_error = false
         end
 
         def initialize_options
@@ -502,6 +551,18 @@ def initialize_options
                 rescue UsageError => e
                     raise UsageError, "--resume-from: #{e}"
                 end
+                raise UsageError, "Both --resume-from and --resume-after specified!" if @resume_after
+                }
+            options.on( "--resume-after [module]", "Skip all module before and including module." ) { |t|
+                begin
+                    @resume_after = complete_module( t )
+                rescue UsageError => e
+                    raise UsageError, "--resume-after: #{e}"
+                end
+                raise UsageError, "Both --resume-from and --resume-after specified!" if @resume_from
+                }
+            options.on( "--[no-]stop-on-error", "Break on the first error." ) { |t|
+                @stop_on_error = t
                 }
 
             super
@@ -531,15 +592,10 @@ def do_execute( args )
             end
 
             # 2. Check if the modules are ready
+            logger.info( '#### Checking for obstacles' )
             isready = true
-            modules.each do |mod|
-                begin
-                    isready &= is_module_ready?( mod )
-                rescue Exception => e
-                    logger.error   "#{mod.name}: #{e.message}"
-                    logger.verbose e.backtrace.join("\n")
-                    isready = false
-                end
+            ModuleProgressbar.new( 'Modules', modules ) do |mod|
+                isready &= is_module_ready?( mod )
             end
 
             if !isready
@@ -554,10 +610,6 @@ def do_execute( args )
                 rescue Interrupt => e
                     logger.info( "User Interrupt" )
                     return -1
-                rescue Exception => e
-                    logger.error   "#{mod.name}: #{e.message}"
-                    logger.verbose e.backtrace.join("\n")
-                    isready = false
                 end
             end
 
@@ -576,15 +628,6 @@ def do_execute( args )
 
                     modules.each_with_index do |mod, index|
 
-                        if not @resume_from.nil?
-                            if mod.name == @resume_from.name
-                                @resume_from = nil
-                            else
-                                logger.info "Skipping module #{mod.name} (#{index+1}/#{modules.size})"
-                                next
-                            end
-                        end
-
                         begin
 
                             logger.info ""
@@ -597,11 +640,13 @@ def do_execute( args )
                             logger.verbose e.backtrace.join("\n")
                             @failed_modules << mod.name
                             rc = -1
+                            break if @stop_on_error
                         rescue Exception => e
                             logger.error   "#{e.class}:#{e.message}"
                             logger.verbose e.backtrace.join("\n")
                             @failed_modules << mod.name
                             rc = -1
+                            break if @stop_on_error
                         ensure
                             logger.info "#### Module #{mod.name} finished"
                         end

data/lib/build-tool/commands/build.rb

@@ -63,7 +63,11 @@ def applicable?
 
         def is_module_ready?( mod )
             isready = true
-            @update  &&                         isready &= mod.ready_for_vcs_access
+            if @from_scratch and not mod.build_system_required.out_of_source
+                logger.warn "#{mod.name}: is compiled in source. Skipping --from-scratch!"
+            end
+            @update  &&                         isready &= mod.ready_for_fetch
+            @update  &&                         isready &= mod.ready_for_rebase
             if !@update and (@build or @install or @configure)
                 if !mod.checkedout?
                     logger.warn "#{mod.name}: is not checked out. Skipping (add -u for checkout)"
@@ -75,7 +79,8 @@ def is_module_ready?( mod )
 
         def prepare_module( mod )
             isready = true
-            @update  &&                         isready &= mod.prepare_for_vcs_access
+            @update  &&                         isready &= mod.prepare_for_fetch
+            @update  &&                         isready &= mod.prepare_for_rebase
             return isready
         end # prepare_module
 

data/lib/build-tool/commands/configure.rb

@@ -60,8 +60,12 @@ def is_module_ready?( mod )
 
         def do_execute_module( mod )
             if mod.checkedout?
-                if @from_scratch or @clean
-                    clean( mod, @from_scratch )
+
+                # clean/from-scratch
+                if @from_scratch
+                    remove_build_directory( mod )
+                elsif @clean
+                    clean( mod )
                 end
 
                 if @rmcache and !@from_scratch

data/lib/build-tool/commands/fetch.rb

@@ -33,7 +33,7 @@ def initialize_options
 
         def is_module_ready?( mod )
             isready = true
-            isready &= mod.ready_for_vcs_access
+            isready &= mod.ready_for_fetch
             if !mod.vcs.fetching_supported?
                 logger.warn "#{mod.name}: fetching not supported by #{mod.vcs.name} -> implicit rebase."
             end

data/lib/build-tool/commands/history.rb

@@ -78,16 +78,16 @@ def show_command_history
         end
 
         def show_module_history( modname )
-            mod = Application::instance.configuration.module( modname )
+            mod = complete_module( modname )
             if mod.nil?
                 return usage( "Unknown module #{modname}" )
             end
 
-            BuildTool::History::CommandLog.last_by_module( modname, @lines || 3 ).reverse.each do |cmd|
+            BuildTool::History::CommandLog.last_by_module( mod.name, @lines || 3 ).reverse.each do |cmd|
                 show_command( cmd )
 
                 last_module=""
-                cmd.module_logs_dataset.filter( :module => modname ).each do |e|
+                cmd.module_logs_dataset.filter( :module => mod.name ).each do |e|
                     if e.module != last_module
                         say blue { "\t#{e.module}" }
                         last_module = e.module

data/lib/build-tool/commands/rebase.rb

@@ -32,20 +32,23 @@ def initialize_options
         def is_module_ready?( mod )
             isready = true
             if !mod.checkedout?
-                logger.warn "#{mod.name}: module not checked out -> skipping."
-            end
-            if !mod.vcs.fetching_supported?
-                logger.warn "#{mod.name}: fetching not support by #{mod.vcs.name} -> will have no effect."
+                logger.info "#{mod.name}: Skipping: Not checked out."
+            else
+                isready &= mod.ready_for_rebase
+                if !mod.vcs.fetching_supported?
+                    logger.info "#{mod.name}: Skipping: Rebasing not support by #{vcs.name}"
+                end
             end
             return isready
         end
 
 
         def do_execute_module( mod )
-            if mod.checkedout?
+            if mod.checkedout? and mod.vcs.fetching_supported?
+                logger.info "Skipping: Rebasing not support by #{vcs.name}"
                 rebase( mod )
             else
-                logger.info "Not checked out. Skipping"
+                logger.info "Skipping: Not checked out."
             end
         end