build-tool 0.1.4 → 0.2

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

@@ -11,6 +11,11 @@ module BuildTool; module Commands;
         name        "build"
         description "Build a module."
 
+        # Log this command if $noop is not active
+        def log?
+            ! $noop
+        end
+
         def initialize_options
 
             @clean        = false
@@ -73,34 +78,34 @@ module BuildTool; module Commands;
 
         def do_execute_module( mod )
             if @from_scratch or @clean
-                mod.clean( @log_directory, @from_scratch )
+                clean( mod, @from_scratch )
             end
 
             if @update
                 if mod.checkedout?
-                    mod.fetch( @log_directory )
-                    mod.rebase( @log_directory )
+                    fetch( mod )
+                    rebase( mod )
                 else
-                    mod.clone( @log_directory )
+                    clone( mod )
                 end
             end
 
             if $noop or mod.checkedout?
                 if @configure or @reconfigure or !mod.configured?
                     if @reconfigure
-                        mod.reconfigure( @log_directory )
+                        reconfigure( mod )
                     else
                         # See outer if. @configure or !mod.configured?
-                        mod.configure( @log_directory )
+                        configure( mod )
                     end
                 end
 
                 if @build
-                    mod.make( @log_directory )
+                    make( mod )
                 end
 
                 if @install
-                    mod.install( @log_directory )
+                    install( mod, true )
                 end
 
             else

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

@@ -14,6 +14,11 @@ module BuildTool; module Commands;
         name        "configure"
         description "configure the module"
 
+        # Log this command if $noop is not active
+        def log?
+            ! $noop
+        end
+
         def initialize_options
 
             @rmcache      = false
@@ -51,13 +56,13 @@ module BuildTool; module Commands;
         def do_execute_module( mod )
             if mod.checkedout?
                 if @from_scratch or @clean
-                    mod.clean( @log_directory, @from_scratch )
+                    clean( mod, @from_scratch )
                 end
 
                 if @rmcache and !@from_scratch
-                    mod.reconfigure( @log_directory )
+                    reconfigure( mod )
                 else
-                    mod.configure( @log_directory )
+                    configure( mod )
                 end
             else
                 logger.info "Not checked out. Skipping"

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

@@ -1,8 +1,8 @@
 require 'build-tool/commands'
 
-module BuildTool; module Commands; module Environments
+module BuildTool; module Commands
 
-    class CLI < Commands::SubCommands
+    class EnvironmentsCLI < Commands::SubCommands
 
         name        "environments"
         description "Environment related commands."
@@ -19,11 +19,7 @@ module BuildTool; module Commands; module Environments
             raise NotImplementedError
         end
 
-    end # class CLI
+    end # class EnvironmentsCLI
 
-    def self.create( *args )
-        cmd = CLI.new( *args )
-    end
-
-end; end; end # module BuildTool::Commands::Environments
+end; end # module BuildTool::Commands::EnvironmentsCLI
 

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

@@ -11,6 +11,13 @@ module BuildTool; module Commands; module Environments
         description "List all available environments in alphabetical order."
         cmdalias    "lsenv"
 
+        def initialize_options
+            @all = false
+            options.on( "--all", "Show inactive environments." ) { |t|
+                @all = true
+                }
+        end
+
         def do_execute( args )
             if args.length != 0
                 return usage( "To many arguments." )
@@ -20,6 +27,7 @@ module BuildTool; module Commands; module Environments
             say "------------------------------------------------------------"
             configuration.environments.keys.sort.each do |name|
                 env = configuration.environment(name)
+                next if !env.active? && !@all
                 if env.parent
                     say "%-15s %s" % [ name, env.parent.name ]
                 else

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

@@ -14,6 +14,11 @@ module BuildTool; module Commands;
         name        "fetch"
         description "fetch remote changes (if applicable)"
 
+        # Log this command if $noop is not active
+        def log?
+            ! $noop
+        end
+
         def applicable?
             BuildTool::Application.instance.name != "build-tool"
         end
@@ -30,9 +35,9 @@ module BuildTool; module Commands;
         def do_execute_module( mod )
 
             if mod.checkedout?
-                mod.fetch( @log_directory )
+                fetch( mod )
             else
-                mod.clone( @log_directory )
+                clone( mod )
             end
 
         end

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

@@ -0,0 +1,53 @@
+require 'build-tool/commands'
+
+module BuildTool; module Commands;
+
+    #
+    # BuildCommand
+    #
+    class Gc < ModuleBasedCommand
+
+        name        "gc"
+        description "Remove old stuff"
+
+        def initialize_options
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.name != "build-tool"
+        end
+
+        def do_execute( args )
+            case args.length
+
+            when 0:
+                # Nothing
+                #
+            else
+                super
+            end
+
+            BuildTool::History::CommandLog.older_than.each do |cmd|
+                if cmd.logdir
+                    if $noop
+                        say "rm -rf #{cmd.logdir}"
+                    else
+                        debug("Removing #{cmd.logdir}");
+                        File.rm_rf( cmd.logdir ) if File.exist?( cmd.logdir )
+                    end
+                end
+                cmd.delete
+            end
+            return 0
+        end
+
+        def do_execute_module( mod )
+            mod.gc
+        end
+
+    end # class Info
+
+end; end # module BuildTool::Commands
+
+

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

@@ -0,0 +1,111 @@
+require 'build-tool/commands'
+
+module BuildTool; module Commands;
+
+    #
+    # BuildCommand
+    #
+    class History < Standard
+
+        name        "history"
+        description "show command history"
+
+        def initialize_options
+
+            # Show detailed history. Add start time, duration and success/failure
+            @long = false
+            options.on( "-l", "--long", "Use long list format." ) { |t|
+                @long = true
+                }
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.name != "build-tool"
+        end
+
+        def do_execute( args )
+            case args.length
+
+            when 0:
+                return show_command_history
+            when 1:
+                return show_detailed_command_history( args[0] ) if args[0] =~ /^[0-9]+/
+                case args[0][0,1]
+                when '+':
+                    return show_detailed_command_history( args[0] )
+                else
+                    return show_module_history( args[0] )
+                end
+            else
+                return usage( "To many arguments" )
+            end
+        end
+
+        def show_command( cmd )
+            if @long
+                say " %04d %s %s # %s [%s]" % [ cmd.id, cmd.started_at.strftime("%x %X"), cmd.duration, cmd.command, cmd.state_str ]
+            else
+                say " %04d %s [%s]" % [ cmd.id, cmd.command, cmd.state_str ]
+            end
+        end
+
+        def show_command_history
+            # *TODO* Make the number of printed command configurable
+            BuildTool::History::CommandLog.last(50).reverse().each do |cmd|
+                show_command cmd
+            end
+
+            return 0
+        end
+
+        def show_module_history( modname )
+            mod = Application::instance.configuration.module( modname )
+            if mod.nil?
+                return usage( "Unknown module #{modname}" )
+            end
+
+            BuildTool::History::CommandLog.last_by_module( modname ).reverse.each do |cmd|
+                show_command( cmd )
+
+                last_module=""
+                cmd.module_logs_dataset.filter( :module => modname ).each do |e|
+                    if e.module != last_module
+                        say "\t#{e.module}"
+                        last_module = e.module
+                    end
+                    say "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ]
+                end
+            end
+            return 0
+        end
+
+        def show_detailed_command_history( id )
+            if id[0,1] == '+'
+                cmd = BuildTool::History::CommandLog.most_recent( id.to_i )
+                return 0 if cmd.nil?
+            else
+                cmd = BuildTool::History::CommandLog[id.to_i]
+                if cmd.nil?
+                    logger.error( "No entry with id #{id.to_i} found in history!")
+                    return -1
+                end
+            end
+            show_command( cmd )
+
+            last_module=""
+            cmd.module_logs.each do |e|
+                if e.module != last_module
+                    say "\t#{e.module}"
+                    last_module = e.module
+                end
+                say "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ]
+            end
+
+            return 0
+        end
+
+    end # class Info
+
+end; end # module BuildTool::Commands
+

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

@@ -14,6 +14,11 @@ module BuildTool; module Commands;
         name        "install"
         description "install the module"
 
+        # Log this command if $noop is not active
+        def log?
+            ! $noop
+        end
+
         def initialize_options
 
             @fast        = false
@@ -40,7 +45,7 @@ module BuildTool; module Commands;
 
         def do_execute_module( mod )
             if mod.checkedout?
-                mod.install( @log_directory, @fast )
+                install( mod, @fast )
             else
                 logger.info "Not checked out. Skipping"
             end

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

@@ -0,0 +1,73 @@
+require 'build-tool/commands'
+
+module BuildTool; module Commands;
+
+    #
+    # BuildCommand
+    #
+    class Lsfeatures < Standard
+
+        name        "lsfeatures"
+        description "List all available features."
+
+        def initialize_options
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.name != "build-tool"
+        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
+            say "%-30s| %s | %s" % [ "Feature", "A", "Description" ]
+            say "==========================================================="
+            features = configuration.features
+            features.keys.sort.each do |name|
+                feature = features[name]
+                # Skip feature without modules
+                next if feature.modules.empty?
+                active = "N"
+                active = "Y" if feature.active?
+                say "%-30s| %s | %s" % [ name, active, feature.description ]
+            end
+
+            return 0
+        end
+
+        def show_feature( name )
+            feature = configuration.features[name]
+
+            if feature.nil?
+                logger.error( "Unknown feature '%s'" % name )
+                return -1
+            end
+
+            say "Name    : %s" % feature.path
+            say "Modules"
+            say "===================================================="
+            feature.modules.each do |mod|
+                next if mod.is_template?
+                say "  %-20s: %s" % [ mod.name, mod.description ]
+            end
+            return 0
+        end
+
+    end # class Info
+
+end; end # module BuildTool::Commands
+
+
+

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

@@ -1,6 +1,6 @@
 require 'build-tool/commands'
 
-module BuildTool; module Commands; module Modules
+module BuildTool; module Commands;
 
     class CLI < Commands::SubCommands
 
@@ -19,11 +19,7 @@ module BuildTool; module Commands; module Modules
             raise NotImplementedError
         end
 
-    end # class CLI
+    end # class ModulesCLI
 
-    def self.create( *args )
-        cmd = CLI.new( *args )
-    end
-
-end; end; end # module BuildTool::Commands::Modules
+end; end # module BuildTool::Commands::ModulesCLI
 

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

@@ -11,6 +11,7 @@ module BuildTool; module Commands; module Modules
         description "show detailed information about modules."
 
         def do_execute_module( mod )
+            say "Active:            #{mod.active?}"
 
             if mod.repository
                 say "Repository:        #{mod.repository.url}/#{mod.remote_path}"
@@ -26,7 +27,6 @@ module BuildTool; module Commands; module Modules
                 say "Build Directory    #{mod.build_directory} #{mod.configured? ? '(CONFIGURED)' : '(TODO)' }"
             else
                 say "Local Checkout:    build-prefix not configured"
-                say "Local Checkout:    build-prefix not configured"
             end
 
             say "Prefix:            #{mod.install_prefix.to_s}"
@@ -43,26 +43,35 @@ module BuildTool; module Commands; module Modules
             if mod.vcs_configuration
                 case mod.vcs_configuration.name
                 when 'svn'
+                when 'archive'
                 when 'git'
                     say "  Remote:       %s -> %s" % [ "origin", mod.vcs_configuration.repository.url ]
                     mod.vcs_configuration.remote.each do |key, val|
                         say "  Remote:       %s -> %s" % [ key, val.url ]
                     end
+                    say "  Track branch: #{mod.vcs_configuration.track_remote}/#{mod.vcs_configuration.track_branch}"
                 when 'git-svn'
+                    say "  Remote:       %s -> %s" % [ "git-svn", mod.vcs_configuration.repository.url ]
+                    mod.vcs_configuration.remote.each do |key, val|
+                        say "  Remote:       %s -> %s" % [ key, val.url ]
+                    end
                     mod.vcs_configuration.externals.each do |key, val|
                         say "  External:            #{key} -> #{val}"
                     end
                 else
                     logger.warn "Unknown vcs #{mod.vcs_configuration.name}"
                 end
-                say "  Track branch: #{mod.vcs_configuration.track_remote}/#{mod.vcs_configuration.track_branch}"
             end # if mod.vcs_configuration
 
             bs = mod.build_system
-            say "Build System:               #{bs.name}"
-            say "  Out Of Source Build       #{bs.out_of_source}"
-            bs.options.sort.each do |var|
-                say "  %-25s %s" % [ var + ":", bs[var] ]
+            if bs
+                say "Build System:               #{bs.name}"
+                say "  Out Of Source Build       #{bs.out_of_source}"
+                bs.options.sort.each do |var|
+                    say "  %-25s %s" % [ var + ":", bs[var] ]
+                end
+            else
+                say "Build System:               Not configured"
             end
 
             return 0