build-tool 0.5.7 → 0.6.0.rc1

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -18,9 +20,10 @@ def log?
         end
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [MODULES]..."
+            options.banner = "Usage: #{fullname} [OPTIONS]... MODULE..."
+            options.separator( "" )
+            options.separator( "Options" )
 
-            @options.separator "Options:"
             @clean        = false
             @configure    = false
             @from_scratch = false
@@ -53,6 +56,10 @@ def initialize_options
                 @from_scratch = true
                 }
 
+            @verbose_rebase = true
+            options.on( nil, "--[no]-verbose-rebase", "Show the changes applied by rebase." ) { |t|
+                @verbose_rebase = false
+                }
 
             super
         end
@@ -63,14 +70,11 @@ def applicable?
 
         def is_module_ready?( mod )
             isready = true
-            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)"
+                    warn( "#{mod.name}: is not checked out. Skipping (add -u for checkout)" )
                 end
             end
             @install &&                         isready &= mod.prepare_for_installation
@@ -88,8 +92,8 @@ def do_execute_module( mod )
 
             if not ( $noop or mod.checkedout? or @update )
                 # If the module is not checked out or $noop is active skip the module
-                logger.warn "Module is not checked out! Use -u to check it out."
-                logger.warn "skipped!"
+                warn( "Module is not checked out! Use -u to check it out." )
+                warn( "skipped!" )
                 return 0
             end
 
@@ -97,7 +101,7 @@ def do_execute_module( mod )
             if @update
                 if mod.checkedout?
                     fetch( mod )
-                    rebase( mod )
+                    rebase( mod, @verbose_rebase )
                 else
                     clone( mod )
                 end

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

@@ -0,0 +1,25 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands
+
+    class ConfigurationsCLI < Commands::SubCommands
+
+        name        "configuration"
+        description "Configuration related commands."
+
+        def initialize_options
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+    end # class ConfigurationsCLI
+
+end; end # module BuildTool::Commands::ConfigurationsCLI
+
+
+

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

@@ -0,0 +1,42 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+require 'yaml'
+
+module BuildTool; module Commands; module Configuration
+
+    #
+    # BuildCommand
+    #
+    class Edit < Standard
+
+        name        "edit"
+        description ""
+        long_description [
+            "Prints an alphabetically sorted list of configuration options. If no arguments are
+            given it lists all, if arguments are specified it prints those matching them." ]
+
+        def initialize_options
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... NAMES..."
+            options.separator( "" )
+            options.separator( "Options" )
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def do_execute( args )
+            return edit_config_options( args )
+        end
+
+        def edit_config_options( only )
+            return BuildTool::Configuration.edit( only )
+        end
+
+    end # class
+
+end; end; end # module BuildTool::Commands::Configuration
+

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

@@ -0,0 +1,48 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Configuration
+
+    #
+    # BuildCommand
+    #
+    class List < Standard
+
+        name        "list"
+        description "Print a alphabetically sorted list of configuration options."
+        long_description [
+            "Prints an alphabetically sorted list of configuration options. If no arguments are
+            given it lists all, if arguments are specified it prints those matching them." ]
+
+        def initialize_options
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... NAMES..."
+            options.separator( "" )
+            options.separator( "Options" )
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+        def do_execute( args )
+            return show_config_options( args )
+        end
+
+        def show_config_options( only )
+            for option in BuildTool::Setting::export(
+                    BuildTool::Application.instance.configuration.settings,
+                    only )
+                verbose( blue( "# #{option[:description].split( "\n" ).join( "\n# " ) }" ) )
+                info( '%-30s: %s' % [ option[:name], option[:value] ] )
+                verbose( "" )
+            end
+
+            return 0
+        end
+
+    end # class
+
+end; end; end # module BuildTool::Commands::Configuration
+

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

@@ -1,3 +1,7 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess'
+
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -23,13 +27,13 @@ def log?
 
         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" )
             @rmcache      = false
             @from_scratch = false
             @clean        = false
 
-            @options.separator "Options:"
-
             options.on( "--[no-]clean", "Make clean before building." ) { |t|
                 @clean = t
                 }
@@ -52,7 +56,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
@@ -74,7 +78,7 @@ def do_execute_module( mod )
                     configure( mod )
                 end
             else
-                logger.info "Not checked out. Skipping"
+                info( "Not checked out. Skipping" )
             end
         end
 

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

@@ -1,3 +1,6 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess'
 require 'build-tool/application'
 require 'build-tool/commands'
 
@@ -16,7 +19,9 @@ class Ctags < ModuleBasedCommand
         long_description [ "Invoke ctags for the specified MODULES." ]
 
         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
 
@@ -33,8 +38,8 @@ def do_execute_module( mod )
                           mod.name.gsub( '/', '-' ) + ".tags" ))
 
             else
-                logger.warn "Module is not checked out! Use -u to check it out."
-                logger.warn "skipped!"
+                warn( "Module is not checked out! Use -u to check it out." )
+                warn( "skipped!" )
             end
         end
 

data/lib/build-tool/commands/environments.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 EnvironmentsCLI
 
 end; end # module BuildTool::Commands::EnvironmentsCLI

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands; module Environments
@@ -13,9 +15,10 @@ class List < Standard
         cmdalias    "lsenv"
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname}"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... [ENVIRONMENT]"
+            options.separator( "" )
+            options.separator( "Options" )
 
-            @options.separator "Options:"
             @all = false
             options.on( "--all", "Show inactive environments." ) { |t|
                 @all = true
@@ -26,27 +29,27 @@ def initialize_options
         def do_execute( args )
             if args.length == 0
 
-                say "%-15s (%s)" % [ "Environment", "Inherits" ]
-                say "------------------------------------------------------------"
+                info( "%-15s (%s)" % [ "Environment", "Inherits" ] )
+                info( "------------------------------------------------------------" )
                 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 ]
+                        info( "%-15s %s" % [ name, env.parent.name ] )
                     else
-                        say name
+                        info( name )
                     end
                 end
 
             elsif args.length == 1
 
-                say "Environment:"
+                info( "Environment:" )
                 env = configuration.environment( args[ 0 ] )
                 if env.parent
-                    say "%-15s %s" % [ "Parent", env.parent.name ]
+                    info( "%-15s %s" % [ "Parent", env.parent.name ] )
                 end
                 env.vars.sort.each do |var|
-                    say "  %-20s %s" % [ var + ":", env[var] ]
+                    info( "  %-20s %s" % [ var + ":", env[var] ] )
                 end
 
             else
@@ -60,6 +63,6 @@ def do_execute( args )
 
     end # class
 
-end; end; end # module BuildTool::Commands::Modules
+end; end; end # module BuildTool::Commands::Environments
 
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 
 module BuildTool; module Commands; module Environments
@@ -27,7 +29,9 @@ def do_execute( args )
         end
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULE"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULE"
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 

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

@@ -0,0 +1,24 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands
+
+    class FeaturesCLI < Commands::SubCommands
+
+        name        "features"
+        description "Feature related commands."
+
+        def initialize_options
+            super
+        end
+
+        def applicable?
+            BuildTool::Application.instance.has_recipe?
+        end
+
+    end # class FeaturesCLI
+
+end; end # module BuildTool::Commands::FeaturesCLI
+
+

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

@@ -0,0 +1,70 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Features
+
+    #
+    # BuildCommand
+    #
+    class Disable < Standard
+
+        name        'disable'
+        description 'Disable 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 )
+            if args.length > 1
+                # *TODO* print better message
+                return usage "To many arguments."
+            end
+
+            for feat in args
+                disable_feature( feat )
+            end
+
+            configuration.save()
+
+            return 0
+        end
+
+        def disable_feature( name )
+            feature = configuration.features[name]
+
+            if feature.nil?
+                error( "Unknown feature '%s'" % name )
+                return -1
+            end
+
+            if @default and feature.default_active? == false
+                info( '%s: using default (disabled).' % mod.name )
+                feature.active = nil
+            else
+                info( '%s: disabled explicitely.' % mod.name )
+                feature.active = false
+            end
+        end
+
+    end # class Activate
+
+end; end; end # module BuildTool::Commands::Modules
+
+
+