build-tool 0.5.7 → 0.6.0.rc1

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

@@ -0,0 +1,66 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Features
+
+    #
+    # BuildCommand
+    #
+    class Enable < Standard
+
+        name        'enable'
+        description 'Enable the given features.'
+        long_description [ 'Sets the features status.' ]
+
+        def initialize_options
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... FEATURE..."
+            options.separator( "" )
+            options.separator( "Options" )
+
+            @default = false
+            options.on( "--default", "Set to use default state if possible." ) { |t|
+                @default = true
+                }
+
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def do_execute( args )
+
+            for feat in args
+                enable_feature( feat )
+            end
+
+            configuration.save()
+
+            return 0
+        end
+
+        def enable_feature( name )
+            feature = configuration.features[name]
+
+            if feature.nil?
+                error( "Unknown feature '%s'" % name )
+                return -1
+            end
+
+            if @default and feature.default_active? == true
+                info( '%-35s: using default (enabled).' % feature.name )
+                feature.active = nil
+            else
+                info( '%-35s: enabled explicitely.' % feature.name )
+                feature.active = true
+            end
+        end
+
+    end # class Activate
+
+end; end; end # module BuildTool::Commands::Modules
+
+
+

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

@@ -0,0 +1,92 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Features
+
+    #
+    # BuildCommand
+    #
+    class List < Standard
+
+        name        "list"
+        description "Print a list of features."
+        long_description [
+            "Prints a list of features. Withput a parameter all active features are shown. When given",
+            "parameters lists all features matching them.",
+            "",
+            "The first column of the output is one character wide:",
+            "  First column: Is the module active?",
+            "    'A': Active",
+            "    'I': Inactive",
+            "  Second column: The feature name.",
+            "  Third column: The features short description." ]
+        cmdalias    "lsfeatures"
+
+        def initialize_options
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [FEATURES]..."
+            options.separator( "" )
+            options.separator( "Options" )
+
+            options.on( "--all", "Include inactive modules." ) {
+                @all = true
+                }
+
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def do_execute( args )
+            if args.length > 1
+                # *TODO* print better message
+                return usage "To many arguments."
+            end
+
+            if args.length == 1
+                return show_feature( args[0] )
+            else
+                return list_features
+            end
+        end
+
+        def list_features
+            features = configuration.features
+            features.keys.sort.each do |name|
+                feature = features[name]
+                # skip inactive features if --all was not specified.
+                next if not feature.active? and not @all
+                # Skip feature without modules.
+                next if feature.modules.empty?
+                info( "%s %-30s : %s" % [ feature.active_char, name, feature.description ] )
+            end
+
+            return 0
+        end
+
+        def show_feature( name )
+            feature = configuration.features[name]
+
+            if feature.nil?
+                error( "Unknown feature '%s'" % name )
+                return -1
+            end
+
+            info( "Name    : %s" % feature.path )
+            info( "Modules" )
+            info( "====================================================" )
+            feature.modules.each do |mod|
+                next if mod.is_template?
+                info( "%s%s %-35s : %s" % [ mod.active_char, mod.state_char, mod.name,  mod.description || "No description specified" ] )
+            end
+            return 0
+        end
+
+    end # class
+
+end; end; end # module BuildTool::Commands::Modules
+
+
+

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

@@ -1,3 +1,7 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess'
+
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -27,7 +31,9 @@ def applicable?
         end
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULES..."
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULES..."
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
@@ -35,7 +41,7 @@ def is_module_ready?( mod )
             isready = true
             isready &= mod.ready_for_fetch
             if isready && !mod.vcs.fetching_supported?
-                logger.warn "#{mod.name}: fetching not supported by #{mod.vcs.name} -> implicit rebase."
+                warn( "#{mod.name}: fetching not supported by #{mod.vcs.name} -> implicit rebase." )
             end
             return isready
         end
@@ -56,7 +62,7 @@ def teardown_command
 
         def prepare_module( mod )
             isready = true
-            @update  &&                         isready &= mod.prepare_for_vcs_access
+            isready &= mod.prepare_for_fetch
             return isready
         end # prepare_module
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -33,7 +35,9 @@ def do_execute( args )
         end
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [FILENAME]"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [FILENAME]"
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
@@ -41,13 +45,13 @@ def print_file_list
             recipe = Application::instance.recipe
             files_dir = recipe.files_path
             if !files_dir.exist?
-                logger.error "No files supplied with this recipe"
+                error( "No files supplied with this recipe" )
                 return 0
             end
             Dir.new(files_dir).sort.each do |entry|
                 next if entry == "."
                 next if entry == ".."
-                say entry
+                info( entry )
             end
             return 0
         end
@@ -56,12 +60,12 @@ def print_file( filename )
             recipe = Application::instance.recipe
             files_dir = recipe.files_path
             if !files_dir.exist?
-                logger.error "No files supplied with this recipe"
+                error( "No files supplied with this recipe" )
                 return 0
             end
             file = files_dir.join( filename )
             if !file.exist?
-                logger.error "File '#{filename}' not found! Found those:"
+                error( "File '#{filename}' not found! Found those:" )
                 print_file_list
                 return -1
             end

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands;
@@ -11,10 +13,12 @@ class Gc < ModuleBasedCommand
         description "Remove old stuff"
         long_description [ "Invokes maintenance actions. The history db is purged from entries older",
                            "than 10 days. If supplied do garbage collection for the modules too.",
-                           "What that means is subject to the modules. See with -vvvv."]
+                           "What that means is subject to the modules. See with -vv --dry-run."]
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [MODULE|GROUP]..."
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [MODULE|GROUP]..."
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
@@ -22,26 +26,55 @@ def applicable?
             BuildTool::Application.instance.has_recipe?
         end
 
+        # Make sure at least the log directories are cleaned up
         def do_execute( args )
-            case args.length
+            cleanup_logdirectories()
 
-            when 0
-                # Nothing
-                #
-            else
-                super
+            # Only call the base class if there we modules specified. We get an error else.
+            if args.length > 0
+                return super
             end
+            return 0
+        end
 
+        # Clean up the log directories.
+        def cleanup_logdirectories
+            logdir = configuration.log_directory
+
+            info( "Removing outdated log files( older than 10 days )." )
+            # FIRST STEP: Removing old command logs from db and log/ directory.
             BuildTool::History::CommandLog.older_than.each do |cmd|
                 if cmd.logdir
-                    if $noop
-                        say "rm -rf #{cmd.logdir}"
-                    else
-                        logger.debug("Removing #{cmd.logdir}");
-                        FileUtils.rm_rf( cmd.logdir ) if File.exist?( cmd.logdir )
-                    end
+                    verbose( "  - Removing outdated log #{cmd.logdir}");
+                    FileUtils.rm_rf( cmd.logdir, :noop => $noop ) if File.exist?( cmd.logdir )
+                end
+                cmd.destroy() if not $noop
+            end
+
+            # SECOND STEP: Remove old command logs from log/ directory that have no associated
+            # entry in the database
+            info( "Removing orphaned log directories" )
+            logdir.children().sort().each do |abspath|
+                next if abspath.basename().to_s == 'latest'
+                # Check if it is in the db
+                cl = BuildTool::History::CommandLog.where( :logdir => abspath.to_s )
+                if cl.count == 0
+                    verbose( '  - Removing %s' % abspath.to_s )
+                    FileUtils.rm_r( abspath, :noop => $noop )
+                else
+                    debug( '  - Keeping %s' % abspath.to_s )
+                end
+            end
+
+            # THIRD STEP: Remove old command logs from database that have no associated directory
+            # in log/
+            info( "Removing orphaned database entries." )
+            BuildTool::History::CommandLog.all( :order => :id ).each do |cl|
+                abspath = Pathname.new( cl.logdir )
+                if not abspath.exist?
+                    verbose( '  - Removing orphaned db entry %d' % cl.id )
+                    cl.destroy() if not $noop
                 end
-                cmd.destroy
             end
             return 0
         end

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 require 'ansi'
@@ -10,8 +12,6 @@ module BuildTool; module Commands;
     #
     class History < Standard
 
-        include ANSI::Code
-
         name        "history"
         description "show command history"
         long_description [ "Query the command history",
@@ -21,9 +21,10 @@ class History < Standard
                            "    MODULE:   Show the last three commands on MODULE" ]
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [NUMBER|+NUMBER|MODULE]"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [NUMBER|+NUMBER|MODULE]"
+            options.separator( "" )
+            options.separator( "Options" )
 
-            @options.separator "Options:"
             # Show detailed history. Add start time, duration and success/failure
             @long = false
             options.on( "-l", "--long", "Use long list format." ) { |t|
@@ -32,8 +33,12 @@ def initialize_options
             super
 
             @lines = nil
-            options.on( "-n", "--number [COUNT]", "Number of lines to show." ) { |t|
-                @lines = t.to_i
+            options.on( "-n", "--number COUNT", "Number of lines to show." ) { |n|
+                if not /^[0-9]+$/.match( n )
+                    raise OptionParser::ParseError.new( 'value "%s" is not a number' % n )
+                end
+
+                @lines = n.to_i()
                 }
             super
         end
@@ -62,9 +67,9 @@ def do_execute( args )
 
         def show_command( cmd )
             if @long
-                say " %04d %s # %s [%s]" % [ cmd.id, cmd.started_at.strftime("%x %X"), cmd.command, cmd.state_str ]
+                info( " %04d %s # %s [%s]" % [ cmd.id, cmd.started_at.strftime("%x %X"), cmd.command, cmd.state_str ] )
             else
-                say " %04d %s [%s]" % [ cmd.id, cmd.command, cmd.state_str ]
+                info( " %04d %s [%s]" % [ cmd.id, cmd.command, cmd.state_str ] )
             end
         end
 
@@ -87,12 +92,12 @@ def show_module_history( modname )
                 show_command( cmd )
 
                 last_module=""
-                cmd.module_logs_dataset.filter( :module => mod.name ).each do |e|
+                cmd.module_logs.where( :module => mod.name ).each do |e|
                     if e.module != last_module
-                        say blue { "\t#{e.module}" }
+                        info( blue { "\t#{e.module}" } )
                         last_module = e.module
                     end
-                    say "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ]
+                    info( "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ] )
                 end
             end
             return 0
@@ -100,12 +105,12 @@ def show_module_history( modname )
 
         def show_detailed_command_history( id )
             if id[0,1] == '+'
-                cmd = BuildTool::History::CommandLog.most_recent( id.to_i )
+                cmd = BuildTool::History::CommandLog.most_recent( id )
                 return 0 if cmd.nil?
             else
-                cmd = BuildTool::History::CommandLog[id.to_i]
+                cmd = BuildTool::History::CommandLog.find( id )
                 if cmd.nil?
-                    logger.error( "No entry with id #{id.to_i} found in history!")
+                    error( "No entry with id #{id.to_i} found in history!")
                     return -1
                 end
             end
@@ -114,10 +119,10 @@ def show_detailed_command_history( id )
             last_module=""
             cmd.module_logs.each do |e|
                 if e.module != last_module
-                    say blue { "\t#{e.module}" }
+                    info( blue { "\t#{e.module}" } )
                     last_module = e.module
                 end
-                say "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ]
+                info( "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ] )
             end
 
             return 0

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands;
@@ -12,7 +14,9 @@ class Info < Standard
         long_description [ "Show information about the currently used recipe" ]
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname}"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]..."
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
@@ -23,21 +27,20 @@ def applicable?
         def do_execute( args )
             if args.length != 0
                 # *TODO* print better message
-                logger.warn "Arguments ignored."
+                warn( "Arguments ignored." )
             end
 
             recipe = configuration.recipe
-            say "Recipe"
-            say "------"
-            say "Name:      #{recipe.name}"
-            say "Short:     #{recipe.short_description}"
-            say "Long:      #{recipe.long_description}"
-            say "Full Path: #{recipe.global_config_file_path('recipe')}"
-            say ""
-            say "Configuration"
-            say "-------------"
-            say "Settings:  #{ Application::instance.local_settings_file_path }"
-            say "Overrides: #{ recipe.local_config_file_path( 'recipe' ) }"
+            info( "Recipe" )
+            info( "------" )
+            info( "Name:      #{recipe.name}" )
+            info( "Short:     #{recipe.short_description}" )
+            info( "Long:      #{recipe.long_description}" )
+            info( "Full Path: #{recipe.global_config_file_path('recipe')}" )
+            info( "" )
+            info( "Configuration" )
+            info( "-------------" )
+            info( "Overrides: #{ recipe.local_config_file_path( 'recipe' ) }" )
 
             return 0
         end