build-tool 0.5.7 → 0.6.0.rc1

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

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess'
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -21,9 +24,10 @@ def log?
         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" )
 
-            @options.separator "Options:"
             @fast        = false
             options.on( "--fast", "Fast install. No compile (if supported)" ) { |t|
                 @fast = t
@@ -39,7 +43,7 @@ def applicable?
         def is_module_ready?( mod )
             isready = true
             if !mod.checkedout?
-                logger.warn "#{mod.name}: module not checked out -> skipping."
+                warn( "#{mod.name}: module not checked out -> skipping." )
             end
             return isready
         end
@@ -49,7 +53,7 @@ def do_execute_module( mod )
             if mod.checkedout?
                 install( mod, @fast )
             else
-                logger.info "Not checked out. Skipping"
+                info( "Not checked out. Skipping" )
             end
         end
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands;
@@ -15,10 +17,6 @@ def applicable?
             BuildTool::Application.instance.has_recipe?
         end
 
-        def do_execute
-            raise NotImplementedError
-        end
-
     end # class ModulesCLI
 
 end; end # module BuildTool::Commands::ModulesCLI

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

@@ -0,0 +1,52 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Modules
+
+    #
+    # BuildCommand
+    #
+    class Cleanup < ModuleBasedCommand
+
+        name        "cleanup"
+        description "Module related cleanup actions."
+        long_description [
+            "This commands makes it possible to do some module related cleanups. Take care to not",
+            "lose data." ]
+
+        def initialize_options
+            @all = true
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [MODULE|GROUP]..."
+            options.separator( "" )
+            options.separator( "Options" )
+
+            @remove_build_directory = false
+            options.on( "--rm-bld", "Remove the build directory." ) {
+                @remove_build_directory = true
+                }
+
+            @remove_source_directory = false
+            options.on( "--rm-src", "Remove the source directory." ) {
+                @remove_source_directory = true
+                }
+
+            options.on( "--rm-both", "Remove the source and build directory." ) {
+                @remove_source_directory = true
+                @remove_build_directory = true
+                }
+            super
+        end
+
+
+        def do_execute_module( mod )
+            remove_source_directory( mod, true ) if @remove_source_directory
+            remove_build_directory( mod, true )  if @remove_build_directory
+        end
+
+
+    end # class
+
+end; end; end # module BuildTool::Commands::Modules
+
+

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

@@ -0,0 +1,95 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Modules
+
+    #
+    # BuildCommand
+    #
+    class Disable < ModuleBasedCommand
+
+        name        'disable'
+        description 'Disable the given modules.'
+        long_description [ 'Sets the modules 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
+                }
+
+            @remove_build_directory = false
+            options.on( "--rm-bld", "Remove the build directory." ) {
+                @remove_build_directory = true
+                }
+
+            @remove_source_directory = false
+            options.on( "--rm-src", "Remove the source directory." ) {
+                @remove_source_directory = true
+                }
+
+            options.on( "--rm-both", "Remove the source and build directory." ) {
+                @remove_source_directory = true
+                @remove_build_directory = true
+                }
+
+            super
+
+            # We want to allways match all modules here.
+            @all = true
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def do_execute( args )
+            super( args )
+            configuration.save()
+            return 0
+        end
+
+        def do_execute_module( mod )
+            if @default and mod.default_active? == false
+                info( '%s: using default (disabled).' % mod.name )
+                mod.active = nil
+            else
+                info( '%s: disabled explicitely.' % mod.name )
+                mod.active = false
+            end
+
+            if mod.source_directory.exist?
+                if @remove_source_directory
+                    remove_source_directory( mod, true )
+                else
+                    info( 'Source directory %s still exists.' % mod.source_directory )
+                    verbose( 'module clean --rm-src to remove it' )
+                end
+            elsif @remove_source_directory
+                info( 'Source directory does not exist.' )
+            end
+
+
+            if mod.build_directory.exist?
+                if @remove_build_directory
+                    remove_build_directory( mod, true )
+                else
+                    info( 'Build directory %s still exists.' % mod.build_directory )
+                    verbose( 'module clean --rm-bld to remove it' )
+                end
+            elsif @remove_build_directory
+                info( 'Build directory does not exist.' )
+            end
+        end
+
+    end # class Activate
+
+end; end; end # module BuildTool::Commands::Modules
+
+
+

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

@@ -0,0 +1,52 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Modules
+
+    #
+    # BuildCommand
+    #
+    class Enable < ModuleBasedCommand
+
+        name        'enable'
+        description 'Enable the given modules.'
+        long_description [ 'Sets the modules 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
+
+            # We want to allways match all modules here.
+            @all = true
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def do_execute_module( mod )
+
+            if @default and mod.default_active? == true
+                info( '%-35s: using default (enabled).' % mod.name )
+                mod.active = nil
+            else
+                info( '%-35s: enabled explicitely.' % mod.name )
+                mod.active = true
+            end
+        end
+
+    end # class Activate
+
+end; end; end # module BuildTool::Commands::Modules
+
+
+

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands; module Modules
@@ -12,88 +14,95 @@ class Info < ModuleBasedCommand
 
         def do_execute_module( mod )
             if mod.description
-                say mod.description
-                say ""
+                info( mod.description )
+                info( "" )
             else
-                say "No description specified to the module"
-                say ""
+                info( "No description specified to the module" )
+                info( "" )
+            end
+            if mod.long_description
+                info( mod.long_description )
+                info( "" )
             end
-            say mod.long_description if mod.long_description
 
-            say "Active:            #{mod.active?}"
+            info( "Active:            #{mod.active?}" )
+            info( "Status:            #{mod.state}" )
 
             # if mod.repository
-                # say "Repository:        #{mod.repository.url}/#{mod.remote_path}"
+                # info( "Repository:        #{mod.repository.url}/#{mod.remote_path}" )
                 # if mod.repository.sshkey
-                    # say "  SSH Key:         '#{mod.repository.sshkey.name}' (#{mod.repository.sshkey.file})"
+                    # info( "  SSH Key:         '#{mod.repository.sshkey.name}' (#{mod.repository.sshkey.file})" )
                 # end
-                # say "Apply Patches:     #{mod.patches.join(", ")}"
+                # info( "Apply Patches:     #{mod.patches.join(", ")}" )
             # else
-                # say "Repository:        not configured"
+                # info( "Repository:        not configured" )
             # end
 
             if mod.build_prefix
-                say "Local Checkout:    #{mod.vcs.local_path} #{mod.checkedout? ? '(EXISTS)' : '(TODO)' }"
-                say "Build Directory    #{mod.build_directory} #{mod.configured? ? '(CONFIGURED)' : '(TODO)' }"
+                info( "Local Checkout:    #{mod.vcs.local_path} #{mod.checkedout? ? '(EXISTS)' : '(TODO)' }" )
+                info( "Build Directory    #{mod.build_directory} #{mod.configured? ? '(CONFIGURED)' : '(TODO)' }" )
             else
-                say "Local Checkout:    build-prefix not configured"
+                info( "Local Checkout:    build-prefix not configured" )
             end
 
-            say "Prefix:            #{mod.install_prefix.to_s}"
+            info( "Prefix:            #{mod.install_prefix.to_s}" )
             if mod.environment
-                say "Environment:"
+                info( "Environment: %s (%s)" % [ mod.environment.name, mod.environment.active? ? 'A' : 'I' ] )
                 mod.environment.vars.sort.each do |var|
-                    say "  %-20s %s" % [ var + ":", mod.environment[var] ]
+                    info( "  %-20s %s" % [ var + ":", mod.environment[var] ] )
                 end
             else
-                say "Environment:       Not configured"
+                info( "Environment:       Not configured" )
             end
 
-            say "VCS: #{mod.vcs_configuration ? mod.vcs_configuration.name : 'not configured' }"
+            info( "VCS: #{mod.vcs_configuration ? mod.vcs_configuration.name : 'not configured' }" )
             if mod.vcs_configuration
                 case mod.vcs_configuration.name
                 when 'svn'
-                    say "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ]
+                    info( "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ] )
                 when 'archive'
-                    say "  URL:              %s" % [ mod.vcs.archive_url ]
+                    info( "  URL:              %s" % [ mod.vcs.archive_url ] )
                 when 'git'
-                    mod.vcs_configuration.remote.each do |key, val|
+                    mod.vcs_configuration.merged_remote.each do |key, val|
                         if val.push_url
-                            say "  Remote:       %s -> %s (push to %s)" % [ key, val.url, val.push_url ]
+                            info( "  Remote:       %s -> %s (push to %s)" % [ key, val.url, val.push_url ] )
                         else
-                            say "  Remote:       %s -> %s" % [ key, val.url ]
+                            info( "  Remote:       %s -> %s" % [ key, val.url ] )
                         end
                     end
-                    say "  Track branch: #{mod.vcs_configuration.track_remote}/#{mod.vcs_configuration.track_branch}"
+                    info( "  Track branch: #{mod.vcs_configuration.track_remote}/#{mod.vcs_configuration.track_branch}" )
                 when 'git-svn'
-                    say "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ]
-                    mod.vcs_configuration.remote.each do |key, val|
-                        say "  Remote:       %s -> %s" % [ key, val.url ]
+                    info( "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ] )
+                    mod.vcs_configuration.merged_remote.each do |key, val|
+                        info( "  Remote:       %s -> %s" % [ key, val.url ] )
                     end
-                    mod.vcs_configuration.externals.each do |key, val|
-                        say "  External:            #{key} -> #{val}"
+                    mod.vcs_configuration.merged_externals.each do |key, val|
+                        info( "  External:            #{key} -> #{val}" )
                     end
                 else
-                    logger.warn "Unknown vcs #{mod.vcs_configuration.name}"
+                    warn( "Unknown vcs #{mod.vcs_configuration.name}" )
                 end
             end # if mod.vcs_configuration
 
             bs = mod.build_system
             if bs
-                say "Build System:               #{bs.name}"
-                say "  Out Of Source Build       #{bs.out_of_source}"
+                info( "Build System:               #{bs.name}" )
+                info( "  Out Of Source Build       #{bs.out_of_source}" )
                 bs.option_names.sort.each do |var|
-                    say "  %-28s %s" % [ var + ":", bs[var] ]
+                    info( "  %-28s %s" % [ var + ":", bs[var] ] )
                 end
             else
-                say "Build System:               Not configured"
+                info( "Build System:               Not configured" )
             end
 
             return 0
         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" )
+
             options.on( "--all", "Include inactive modules." ) {
                 @all = true
                 }

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands; module Modules
@@ -9,49 +11,99 @@ class List < Standard
 
         name        "list"
         description "list modules"
-        long_description [ "Shows a list of modules. Without a parameter all modules are show. With",
-                           "parameters list all modules matching them." ]
+        long_description [
+            "Shows a list of modules. Without a parameter all active modules are shown. When given",
+            "parameters list all modules matching them. The list is sorted alphabetically.",
+            "",
+            "The first two columns of the output are each one character wide:",
+            "  First column: Is the module active?",
+            "    'A': Active",
+            "    'I': Inactive",
+            "  Second column: State of the modules last build.",
+            "    'R': Running",
+            "    'C': Cancelled by user",
+            "    'S': Successfull",
+            "    'E': Had errors",
+            "  Third column: The module name.",
+            "  Fourth column: The modules short description." ]
         cmdalias    "lsmods"
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [MODULE|GROUP]..."
-
-            @template = false
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [MODULE|GROUP]..."
+            options.separator( "" )
+            options.separator( "Options" )
 
-            @options.separator "Options:"
+            @all = true
 
+            @active = true
+            @inactive = false
             options.on( "--all", "Include inactive modules." ) {
-                @all = true
+                @active = true
+                @inactive = true
                 }
 
+            options.on( "--disabled", "Only show inactive modules." ) {
+                @active = false
+                @inactive = true
+                }
+
+            @template = false
             options.on( "--template", "Include template modules." ) {
                 @template = true
                 }
 
+            @broken = false
+            options.on( "--broken", "Show only broken modules." ) {
+                @broken = true
+                }
+
+            @sort = true
+            options.on( "--no-sort", "Show modules in order of declaration." ) {
+                @sort = false
+                }
+
             super
         end
 
         def do_execute( args )
             # *TODO* listing local and remote recipes
             if args.length == 0
-                configuration.modules.each do |mod|
-                    if @template or not mod.is_template?
-                        say "%-30s : %s" % [ mod.name, mod.description || "No description specified" ] if ( mod.active? || @all )
-                    end
-                end
+                show_modules( configuration.modules )
             else
                 args.each do |arg|
                     mods = complete_modules( arg, @template )
                     next if !mods
-                    mods.each do |mod|
-                        say "%-30s : %s" % [ mod.name, mod.description || "No description specified" ] if ( mod.active? || @all )
-                    end
+                    show_modules( mods )
                 end
             end
 
             return 0
         end
 
+        def show_modules( mods )
+            mods = mods.sort if @sort
+            mods.each do |mod|
+                show_module( mod )
+            end
+        end
+
+        def show_module( mod )
+            return if @broken         and not mod.broken?
+            if mod.active?
+                return if not @active
+            else
+                return if not @inactive
+            end
+            return if mod.is_template?   and not @template
+
+            if @broken
+                info( "%s%s %-35s : %-25s" % [ mod.active_char, mod.state_char, mod.name, mod.state ] )
+            else
+                info( "%s%s %-35s : %s" % [ mod.active_char, mod.state_char, mod.name,  mod.description || "No description specified" ] )
+            end
+        end
+
+
     end # class
 
 end; end; end # module BuildTool::Commands::Modules