build-tool 0.6.2 → 0.6.3

data/History.rdoc

@@ -1,3 +1,12 @@
+== Version 0.6.3
+=== Enhancements
+- <tt>module shell<</tt>: Add <tt>--batch</tt> option.
+- Archive Buildsystem now supports xz archives.
+
+=== Bugfixes
+- Reordering modules in the recipe did not change the build order.
+- Features no longer present in the recipe were not deleted from the db.
+
 == Version 0.6.2
 === Features
 - <tt>environment set</tt>: Add <tt>--command</tt> option (Execute command and return)

data/lib/build-tool/application.rb

@@ -4,17 +4,12 @@
 Logging.init :debug2, :debug, :trace, :verbose, :info, :warn, :error
 include Logging.globally
 
-require 'optparse'
-require 'erb'
-require 'yaml'
-
 require 'mj/logging'
 
 require "build-tool/errors"
 require 'build-tool/singleton'
 
 require 'active_record'
-require 'sqlite3'
 
 $noop = false
 
@@ -54,72 +49,7 @@ def configuration
             require 'build-tool/recipe'
 
             # Read the configuration from the database
-            @configuration = Configuration.new()
-            @configuration.load()
-
-            #
-            ### MIGRATION FROM 0.5 START
-            #
-            # First load the old settings file if it exists. For new style the settings are
-            # correctly loaded from the database already.
-            file = local_settings_file_path
-            if file.exist?
-                logger.info "Loading old style settings file #{file}."
-                YAML.load( File.open( file, 'r:UTF-8' ) ).each do |n, v|
-                    case n 
-                    when 'RECIPE'
-                        n = "BUILD_TOOL.RECIPE"
-                        logger.debug( "  %s='%s'" % [ n, v ] )
-                        s = ( @configuration.settings[ n ] or Setting.new( :name => n ) )
-                        s.value = v
-                        @configuration.add_setting( s )
-                    when 'SETTINGS'
-                        v.each do |n, v|
-                            logger.debug( "  %s='%s'" % [ n, v ] )
-                            s = ( @configuration.settings[ n ] or Setting.new( :name => n ) )
-                            s.value = v
-                            @configuration.add_setting( s )
-                        end
-                    else
-                        logger.warn( 'Unknown setting %s found in %s' % [ n, file ] )
-                    end
-                end
-                @configuration.save()
-                # Now rename the old file.
-                file.rename( file.to_s + '_0.5' )
-                logger.info( "Renamed old style settings file to #{file}_0.5. Please delete later!" )
-            end
-            #
-            ### MIGRATION FROM 0.5 END
-            #
-
-
-            # Find the recipe. Will throw an exception if recipe is invalid.
-            recipe = BuildTool::Recipe.new( @configuration.settings['BUILD_TOOL.RECIPE'].value )
-            logger.debug( 'Determined associated recipe as %s ( %s )' % [ recipe.name, recipe.global_path ] )
-            @configuration.recipe = recipe
-
-            # Initialize the settings from the settings.yaml file from the recipe
-            logger.debug( 'Loading configuration values from recipe:settings.yaml' )
-            YAML.load( File.open( recipe.global_config_file_path( 'settings.yaml' ), 'r:UTF-8' ) ).each do |v|
-                name = v['name']
-                logger.debug2( '  - Setting %s' % name )
-                s = ( @configuration.settings[ name ] or Setting.new( :name => name ) )
-                s.description = v['description']
-                s.default = v['default']
-                s.seen = true
-                @configuration.add_setting( s )
-            end
-
-            # Load the recipe
-            logger.debug( 'Loading recipe %s' % recipe.name )
-            @configuration = recipe.load( name, @configuration )
-
-            # Save possible changes to the configuration.
-            @configuration.save
-
-            # Migrate the recipe (if necessary)
-            @configuration.migrate()
+            @configuration = BuildToolConfiguration.new( name, local_settings_file_path )
 
             # Finished.
             @configuration

data/lib/build-tool/cfg/visitor.rb

@@ -294,8 +294,7 @@ def visit_FeatureNode( node )
             end
             # Create a new feature if needed
             if @feature.nil?
-                @feature = BuildTool::Feature.create( :name => name, :parent => configuration.active_feature )
-                configuration.add_feature( @feature )
+                @feature = configuration.create_feature( name, configuration.active_feature )
             end
             # Set it as the current feature
             old_feat = configuration.active_feature
@@ -676,16 +675,20 @@ def visit_ModuleDeclarationNode( node )
             # Check if the module is alread defined. If yes we reopen it.
             @module = configuration.module( name )
             if @module.nil?
-                @module = BuildTool::Module.create( { :name => name } )
-                configuration.add_module( @module )
-            end
-
-            if inheritance
+                @module = configuration.create_module( name )
 
-                if @module.found_in_recipe
-                    raise ConfigurationError, "Attempt to change a module #{name} while specifying inheritance!"
+                # Only add a module to a feature if it is the first time declared.
+                if !configuration.active_feature.nil?
+                    @module.feature = configuration.active_feature
+                    configuration.active_feature.modules << @module
                 end
 
+            elsif inheritance
+
+                raise ConfigurationError, "Attempt to change a module #{name} while specifying inheritance!"
+            end
+
+            if inheritance
                 parentName = node.values[2]
                 parent = configuration.module( parentName )
                 if parent.nil?
@@ -696,17 +699,6 @@ def visit_ModuleDeclarationNode( node )
                 @module.parent = parent
             end
 
-            # Only add a module to a feature if it is the first time declared.
-            if !@module.found_in_recipe
-                if !configuration.active_feature.nil?
-                    @module.feature = configuration.active_feature
-                    configuration.active_feature.modules << @module
-                end
-            end
-
-            # Mark the module as found in the recipe
-            @module.found_in_recipe = true
-
             # Work on the child nodes.
             begin
                 self.visit_nodes( stmts )

data/lib/build-tool/command_actions.rb

@@ -90,14 +90,13 @@ def while_logging( level = :trace, &block )
 
         class Clean < Base
 
-            def initialize( command, mod, remove_build_directory )
+            def initialize( command, mod )
                 super( command, 10, :clean, mod )
-                @remove_build_directory = remove_build_directory
             end
 
             def execute()
                 logger.info "Cleaning"
-                @module.clean( @remove_build_directory )
+                @module.clean()
             end
 
         end

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

@@ -8,7 +8,7 @@ module BuildTool; module Commands; module Modules
     #
     # BuildCommand
     #
-    class MyShell < Standard
+    class MyShell < ModuleBasedCommand
 
         include MJ::Tools::SubProcess
 
@@ -17,7 +17,17 @@ class MyShell < Standard
         long_description [
             "Opens a new shell with the exact environment used to build the MODULE and",
             "then executes the given shell command. It then waits for the shell command",
-            "to finish and returns its exit code. The default command is $SHELL." ]
+            "to finish and returns its exit code. The default command is $SHELL.",
+            "",
+            "The option --batch makes it possible to execute one command for many modules",
+            "but will not return the exit code. Instead the exit code will only show if",
+            "build-tool encountered a problem.",
+            "",
+            "The working directory is the build directory.",
+            "",
+            "The following environment variables will be set.",
+            "BT_SOURCE    Source directory path"
+            ]
 
         def initialize_options
             options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULE"
@@ -33,25 +43,37 @@ def initialize_options
             options.on( "-d", "--detach", "Detach the process and return immediately" ) {
                 @detach = true
                 }
+
+            @batch = false
+            options.on( "--batch", "Execute the command for many modules." ) {
+                @batch = true
+                }
             super
 
         end
 
         def do_execute( args )
-            # Check the number of commandline args
-            if args.length != 1
-                return usage( "Wrong number of arguments" )
-            end
-
-            # Translate argument into modules
-            mod = complete_modules( args[0] )
-            if mod.length != 1
-                return usage( "This command only works on one module" )
+            if @batch
+                super( args )
+            else
+                 # Check the number of commandline args
+                 if args.length != 1
+                     return usage( "Wrong number of arguments" )
+                 end
+
+                 # Translate argument into modules
+                 mod = complete_modules( args[0] )
+                 if mod.length != 1
+                     return usage( "This command only works on one module" )
+                 end
+
+                 return do_execute_module( mod[0] )
             end
+        end
 
-            # Get our one and only module
+        def do_execute_module( mod )
             verbose "> #{@command}"
-            rc = mod[0].environment.shell( @command, { detach: @detach } )
+            rc = mod.shell( @command, { detach: @detach } )
             verbose "> #{rc}"              if not @detach
             verbose "> send to background" if @detach
 

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

@@ -48,7 +48,7 @@ def do_execute( args )
                 repo.fetch("origin")
             end
 
-            repo.log('HEAD..%s' % branch ).each do |line|
+            repo.log('HEAD..origin/%s' % branch ).each do |line|
                 info( line )
             end
 

data/lib/build-tool/configuration.rb

@@ -79,17 +79,51 @@ def feature( name )
             @features[name]
         end
 
-        def add_feature( feature )
-            @features[feature.path] = feature
+        def create_feature( name, parent = active_feature )
+
+            if parent
+                path = "#{parent.path}/#{name}"
+            else
+                path = "#{name}"
+            end
+
+            if @features.has_key?( path )
+                raise StandardError, "Attempt to create already existing feature #{name}"
+            end
+
+            if @cached_features.has_key?( path )
+                # Found in cache. Add it for real and remove from cache.
+                logger.debug( "Getting feature #{path} from cache" )
+                add_feature( @cached_features[ path] )
+                @cached_features.delete( path)
+            else
+                logger.debug( "Creating feature #{path}" )
+                add_feature( BuildTool::Feature.create(
+                    :name => name,
+                    :parent => parent ) )
+            end
+            @features[path]
         end
 
         def module( name )
             @module[name]
         end
 
-        def add_module( mod )
-            @module[mod.name] = mod
-            @modules << mod
+        def create_module( name )
+            if @module.has_key?( name )
+                raise StandardError, "Attempt to create already existing module #{name}"
+            end
+
+            if @cached_modules.has_key?( name )
+                # Found in cache. Add it for real and remove from cache.
+                logger.debug( "Getting module #{name} from cache" )
+                add_module( @cached_modules[ name ] )
+                @cached_modules.delete( name )
+            else
+                logger.debug( "Creating module #{name}" )
+                add_module( BuildTool::Module.create( { :name => name } ) )
+            end
+            @module[name]
         end
 
         def repository( name )
@@ -133,6 +167,9 @@ def initialize()
             @active_feature = nil
             @features = {}
             @settings = {}
+            @cached_modules = {}
+            @cached_features = {}
+            base_load()
         end
 
         def vcs( name )
@@ -208,32 +245,16 @@ def save
             end
         end
 
-        def load
-            logger.debug "Loading features from database."
-            BuildTool::Feature.all.each do |f|
-                logger.debug2 "  - Feature %s" % [ f.name ]
-                add_feature( f )
-            end
-            logger.debug "Loading modules from database."
-            BuildTool::Module.all.each do |m|
-                logger.debug2 "  - Module %s" % [ m.name ]
-                add_module( m )
-            end
-            logger.debug "Loading settings from database."
-            BuildTool::Setting.all.each do |s|
-                logger.debug2 "  - Setting %s: %s" % [ s.name, s.value ]
-                add_setting( s )
-            end
-        end
-
         def truncate
             logger.debug "Deleting all features from database."
             BuildTool::Feature.delete_all()
             @features = {}
+            @cached_features = {}
             logger.debug "Deleting all modules from database."
             BuildTool::Module.delete_all()
             @module = {}
             @modules = []
+            @cached_modules = {}
             logger.debug "Deleting all settings from database."
             BuildTool::Setting.delete_all()
             @settings = {}
@@ -247,16 +268,20 @@ def truncate
         def migrate()
 
             logger.debug( 'Checking for obsolete modules in db.' )
-            for mod in @modules.reverse() do
-                if not mod.found_in_recipe
-                    logger.info 'Module %s no longer supported by recipe. Removing it from db.' % [ mod.name ]
-                    # Remove it from our bookkeeping first.
-                    @module.delete( mod.name )
-                    @modules.delete( mod )
-                    # Remove it from the db
-                    mod.destroy()
-                end
+            for mod in @cached_modules.values() do
+                logger.info 'Module %s no longer supported by recipe. Removing it from db.' % [ mod.name ]
+                # Remove it from the db
+                mod.destroy()
+            end
+            @cached_modules = {}
+
+            logger.debug( 'Checking for obsolete features in db.' )
+            for feat in @cached_features.values() do
+                logger.info 'Feature %s no longer supported by recipe. Removing it from db.' % [ feat.path ]
+                # Remove it from the db
+                feat.destroy()
             end
+            @cached_features = {}
 
             logger.debug( 'Checking for obsolete settings in db.' )
             settings.each do |n, s|
@@ -353,6 +378,121 @@ def complete_modules( name, include_templates = false, all = false, resume_from
             return res
         end
 
+
+        #######
+        private
+        #######
+
+        def base_load()
+
+            logger.debug "Loading features from database."
+            BuildTool::Feature.all.each do |f|
+                logger.debug2 "  - Feature %s" % [ f.path ]
+                @cached_features[f.path] = f
+            end
+
+            logger.debug "Loading modules from database."
+            BuildTool::Module.all.each do |m|
+                logger.debug2 "  - Module %s" % [ m.name ]
+                @cached_modules[m.name] = m
+            end
+
+            logger.debug "Loading settings from database."
+            BuildTool::Setting.all.each do |s|
+                logger.debug2 "  - Setting %s: %s" % [ s.name, s.value ]
+                add_setting( s )
+            end
+
+        end
+
+        def add_module( mod )
+            @module[mod.name] = mod
+            @modules << mod
+        end
+
+        def add_feature( feature )
+            @features[feature.path] = feature
+        end
+
+
     end # Configuration
 
+    class BuildToolConfiguration < Configuration
+
+        def initialize( name, settings_file )
+            super()
+            load( name, settings_file )
+        end
+
+        #######
+        private
+        #######
+
+        def load( name, settings_file )
+
+            #
+            ### MIGRATION FROM 0.5 START
+            #
+            # First load the old settings file if it exists. For new style the settings are
+            # correctly loaded from the database already.
+            if ( not settings_file.nil? ) and settings_file.exist?
+                logger.info "Loading old style settings file #{file}."
+                YAML.load( File.open( file, 'r:UTF-8' ) ).each do |n, v|
+                    case n 
+                    when 'RECIPE'
+                        n = "BUILD_TOOL.RECIPE"
+                        logger.debug( "  %s='%s'" % [ n, v ] )
+                        s = ( settings[ n ] or Setting.new( :name => n ) )
+                        s.value = v
+                        add_setting( s )
+                    when 'SETTINGS'
+                        v.each do |n, v|
+                            logger.debug( "  %s='%s'" % [ n, v ] )
+                            s = ( settings[ n ] or Setting.new( :name => n ) )
+                            s.value = v
+                            add_setting( s )
+                        end
+                    else
+                        logger.warn( 'Unknown setting %s found in %s' % [ n, file ] )
+                    end
+                end
+                save()
+                # Now rename the old file.
+                file.rename( file.to_s + '_0.5' )
+                logger.info( "Renamed old style settings file to #{file}_0.5. Please delete later!" )
+            end
+            #
+            ### MIGRATION FROM 0.5 END
+            #
+
+            # Find the recipe. Will throw an exception if recipe is invalid.
+            @recipe = BuildTool::Recipe.new( settings['BUILD_TOOL.RECIPE'].value )
+            logger.debug( 'Determined associated recipe as %s ( %s )' % [ recipe.name, recipe.global_path ] )
+
+            # Initialize the settings from the settings.yaml file from the recipe
+            logger.debug( 'Loading configuration values from recipe:settings.yaml' )
+            YAML.load( File.open( recipe.global_config_file_path( 'settings.yaml' ), 'r:UTF-8' ) ).each do |v|
+                sname = v['name']
+                logger.debug2( '  - Setting %s' % sname )
+                s = ( settings[ sname ] or Setting.new( :name => sname ) )
+                s.description = v['description']
+                s.default = v['default']
+                s.seen = true
+                add_setting( s )
+            end
+
+            # Load the recipe
+            logger.debug( 'Loading recipe %s' % recipe.name )
+            recipe.load( name, self )
+
+            # Save possible changes to the configuration.
+            save()
+
+            # Migrate the recipe (if necessary)
+            migrate()
+
+        end
+
+    end
+
 end # module BuildTool

data/lib/build-tool/environment.rb

@@ -77,11 +77,12 @@ def set( name, value )
         def shell( command = nil, options = {} )
             wd     = options[ :wd ]
             detach = options[ :detach ] || false
+            envvars = options[ :envvars ] || {}
 
             begin
                 logger.verbose( "BUILD_TOOL_ENV = #{name}" )
                 ENV['BUILD_TOOL_ENV'] = name
-                self.class.adjust_environment( wd, values ) {
+                self.class.adjust_environment( wd, values.merge( envvars ) ) {
                     pid = Process.fork {
                         exec( command )
                     }

data/lib/build-tool/model/module.rb

@@ -41,7 +41,6 @@ def my_initialize()
             @vcs_configuration = nil
             @feature = nil
             @default_active = true
-            @found_in_recipe = false
             @parent = nil
 
             @long_description = nil
@@ -59,9 +58,6 @@ def my_initialize()
         # The previous version of this module.
         attr_accessor :parent
 
-        # Signals wether the module was found in the recipe or only in the database.
-        attr_accessor :found_in_recipe
-
         # The default state of the feature
         attr_accessor :default_active
 
@@ -451,6 +447,16 @@ def prepare_for_installation
             return build_system_required.prepare_for_installation
         end
 
+        def shell( command = nil, options = {} )
+
+            envvars = options[ :envvars ] || {}
+            options[ :envvars ] = envvars.merge( {
+                'BT_SOURCE' => source_directory.to_s
+            } )
+
+            environment.shell( command, options )
+        end
+
         def to_s
             "#{object_id}: #{name}"
         end

data/lib/build-tool/recipe.rb

@@ -1,5 +1,6 @@
 # -*- coding: UTF-8 -*-
 
+require 'erb'
 require 'yaml'
 
 require 'build-tool/cfg/parser'

data/lib/build-tool/vcs/archive.rb

@@ -145,13 +145,24 @@ def guess_top_level_directory
             return "<topdir>" if $noop
             topdir = nil
             if archive_name =~ /(\.tgz|\.tar\.gz)$/
-                if self.class.execute( "gunzip -c #{archive_local_path} | tar tf -" ) { |line| 
+                if self.class.execute( "gunzip -c #{archive_local_path} | tar tf -" ) { |line|
                     rc = /^([^\/]*)\//.match( line )
                     if topdir and topdir != rc[1]
                         raise StandardError, "Unable to determine toplevel directory for archive #{archive_name}!"
                     end
                     topdir = rc[1]
-                } != 0 
+                } != 0
+                    # No topdir
+                    return nil
+                end
+            elsif archive_name =~ /(\.txz|\.tar\.xz)$/
+                if self.class.execute( "xz -dc #{archive_local_path} | tar tf -" ) { |line|
+                    rc = /^([^\/]*)\//.match( line )
+                    if topdir and topdir != rc[1]
+                        raise StandardError, "Unable to determine toplevel directory for archive #{archive_name}!"
+                    end
+                    topdir = rc[1]
+                } != 0
                     # No topdir
                     return nil
                 end
@@ -185,6 +196,15 @@ def rebase( verbose = false )
                 if self.class.execute( cmd ) != 0
                     raise StandardError, "Failed to unpack the archive: $?"
                 end
+            elsif archive_name =~ /(\.txz|\.tar\.xz)$/
+                if guess_top_level_directory()
+                    cmd = "xz -dc #{archive_local_path} | tar --strip-components=1 --extract --file=- --directory=#{local_path}"
+                else
+                    cmd = "xz -dc #{archive_local_path} | tar --strip-components=0 --extract --file=- --directory=#{local_path}"
+                end
+                if self.class.execute( cmd ) != 0
+                    raise StandardError, "Failed to unpack the archive: $?"
+                end
             else
                 raise NotImplementedError, "No idea how to unpack the archive"
             end

data/lib/build-tool/version.rb

@@ -26,5 +26,5 @@ def recipe_version()
 
     end
 
-    VERSION = Version.new( 0, 6, 2 )
+    VERSION = Version.new( 0, 6, 3 )
 end

data/lib/mj/tools/subprocess.rb

@@ -48,41 +48,52 @@ def execute( command, wd = ENV["HOME"], env = nil )
 
             # Helper method to adjust LANG to "C"
             def adjust_environment( wd=nil, env=nil, lang="C" )
-                if wd and !$noop
-                    cwd = Dir.getwd
-                    Dir.chdir(wd)
-                end
-                # Set the environment the user wants
-                oldenv = Hash.new
-                if env
-                    env.each do |var, value|
-                        oldenv[var] = ENV[var]
-                        if value.nil? or value == ""
-                            next if ENV.has_key?( value )
-                            ENV[var] = nil
-                            logger.verbose  "Removing #{var} from environment"
-                        else
-                            logger.verbose  "#{var} = #{value}"
-                            ENV[var] = value
+                begin
+                    # Go to the working directory if given
+                    if wd
+                        cwd = Dir.getwd
+                        Dir.chdir(wd) if not $noop
+                        logger.debug( "Changed working directory from #{cwd} to #{wd}" )
+                    end
+
+                    # Set the environment the user wants
+                    oldenv = Hash.new
+                    if env
+                        env.each do |var, value|
+                            oldenv[var] = ENV[var]
+                            if value.nil? or value == ""
+                                next if ENV.has_key?( value )
+                                ENV[var] = nil
+                                logger.verbose  "Removing #{var} from environment"
+                            else
+                                logger.verbose  "#{var} = #{value}"
+                                ENV[var] = value
+                            end
                         end
                     end
+                    # Save old LANG setting and switch to 'C'
+                    oldlang = ENV['LANG']
+                    ENV['LANG'] = lang
+                    yield
+                    # Reset the old LANG setting
+                    ENV['LANG'] = oldlang
+                    # Reset our changes to ENV
+                    oldenv.each do |var, value|
+                        ENV[var] = value
+                    end
+
+                ensure
+                    # Reset the current working directory
+                    if wd
+                        logger.debug( "Changed working directory back to #{cwd}" )
+                        Dir.chdir(cwd) if not $noop
+                    end
+
                 end
-                # Save old LANG setting and switch to 'C'
-                oldlang = ENV['LANG']
-                ENV['LANG'] = lang
-                yield
-                # Reset the old LANG setting
-                ENV['LANG'] = oldlang
-                # Reset our changes to ENV
-                oldenv.each do |var, value|
-                    ENV[var] = value
-                end
-                # Reset the current working directory
-                if wd and !$noop
-                    Dir.chdir(cwd)
-                end
-            end
-        end
+
+            end # adjust_environment()
+
+        end # module ClassMethods
 
         #########
         protected

data/test/integration/parser_feature_test.rb

@@ -55,7 +55,6 @@ def setup
         @configuration.save()
 
         @configuration = BuildTool::Configuration.new()
-        @configuration.load()
         @parser = BuildTool::Cfg::Parser.new( @configuration )
         @localparser = BuildTool::Cfg::Parser.new( @configuration, false )
         assert_nothing_raised() { @parser.parse_string <<-EOF }

data/test/integration/parser_module_test.rb

@@ -87,7 +87,6 @@ module "test_disabled"
         @configuration.save()
 
         @configuration = BuildTool::Configuration.new()
-        @configuration.load()
         @parser = BuildTool::Cfg::Parser.new( @configuration )
         @localparser = BuildTool::Cfg::Parser.new( @configuration, false )
         assert_nothing_raised() { @parser.parse_string <<-EOF }
@@ -118,7 +117,6 @@ module "obsolete"
         assert_not_nil( @configuration.module( 'obsolete' ) )
 
         @configuration = BuildTool::Configuration.new()
-        @configuration.load()
         @parser = BuildTool::Cfg::Parser.new( @configuration )
         @localparser = BuildTool::Cfg::Parser.new( @configuration, false )
         assert_nothing_raised() { @parser.parse_string <<-EOF }
@@ -126,14 +124,13 @@ module "remains"
             end
             EOF
 
-        # Now check the parsed configuration. Still the same
+        # Now check the parsed configuration. Missing obsolete.
         assert_not_nil( @configuration.module( 'remains' ) )
-        assert_not_nil( @configuration.module( 'obsolete' ) )
 
         # Migrate
         @configuration.migrate()
 
-        # Now check the parsed configuration. Not the same anymore.
+        # Now check the parsed configuration. Still the same.
         assert_not_nil( @configuration.module( 'remains' ) )
         assert_nil( @configuration.module( 'obsolete' ) )
     end

data/test/integration/parser_test.rb

@@ -70,4 +70,86 @@ module "test_inherit" < "base"
             'The build directory is correctly set' )
     end
 
+    test "The recipe dictates the order of modules. Not the database." do
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        log-directory   "$HOME/test/log"
+
+        module "first"
+        end
+
+        module "second"
+        end
+        EOF
+        # Now check the parsed configuration
+        assert_equal( [ 'first', 'second' ], @configuration.modules.map { |m| m.name } )
+
+        # Save the config
+        @configuration.save
+
+        # And start again with reversed order.
+        @configuration = BuildTool::Configuration.new()
+        @parser = BuildTool::Cfg::Parser.new( @configuration )
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        log-directory   "$HOME/test/log"
+
+        module "second"
+        end
+
+        module "first"
+        end
+
+        EOF
+        # Now check the parsed configuration
+        assert_equal( [ 'second', 'first' ], @configuration.modules.map { |m| m.name } )
+    end
+
+    test "Obsolete Features will be removed." do
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        log-directory   "$HOME/test/log"
+
+        feature "A"
+            module "first"
+            end
+        end
+
+        feature "B"
+            module "second"
+            end
+        end
+
+        feature "C"
+            module "third"
+            end
+        end
+        EOF
+        # Now check the parsed configuration
+        assert_equal( [ 'first', 'second', 'third' ], @configuration.modules.map { |m| m.name } )
+        assert_equal( [ 'A', 'B', 'C' ], @configuration.features.keys.sort )
+
+        # Save the config
+        @configuration.save
+
+        # And start again with reversed order.
+        @configuration = BuildTool::Configuration.new()
+        @parser = BuildTool::Cfg::Parser.new( @configuration )
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        log-directory   "$HOME/test/log"
+
+        feature "A"
+            module "first"
+            end
+        end
+
+        feature "D"
+            module "fourth"
+            end
+        end
+
+        EOF
+        @configuration.migrate()
+        # Now check the parsed configuration
+        assert_equal( [ 'first', 'fourth' ], @configuration.modules.map { |m| m.name } )
+        assert_equal( [ 'A', 'D' ], @configuration.features.keys.sort )
+    end
+
 end

metadata

@@ -1,135 +1,192 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: build-tool
-version: !ruby/object:Gem::Version
-  version: 0.6.2
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
-authors:
+authors: 
 - Michael Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-27 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: logging
-  requirement: &5733800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :runtime
-  prerelease: false
-  version_requirements: *5733800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &5733160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
         version: 3.2.1
   type: :runtime
-  prerelease: false
-  version_requirements: *5733160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &5732520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 3
+        - 5
         version: 1.3.5
   type: :runtime
-  prerelease: false
-  version_requirements: *5732520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: ansi
-  requirement: &5731580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
   type: :runtime
-  prerelease: false
-  version_requirements: *5731580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: grit
-  requirement: &5731060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 4
+        - 1
         version: 2.4.1
   type: :runtime
-  prerelease: false
-  version_requirements: *5731060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: racc
-  requirement: &5730500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 4
+        - 7
         version: 1.4.7
   type: :development
-  prerelease: false
-  version_requirements: *5730500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rexical
-  requirement: &5730040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 0
+        - 5
         version: 1.0.5
   type: :development
-  prerelease: false
-  version_requirements: *5730040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &5758900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
-  prerelease: false
-  version_requirements: *5758900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &5758400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 7
+        - 5
         version: 0.7.5
   type: :development
-  prerelease: false
-  version_requirements: *5758400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: turn
-  requirement: &5757740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *5757740
-description: ! "\n    The tool helps \n\n    ...\n  "
-email:
+  version_requirements: *id010
+description: "\n    The tool helps \n\n    ...\n  "
+email: 
 - info@michael-jansen.biz
-executables:
+executables: 
 - build-tool
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .gitattributes
 - .gitignore
 - .rvmrc
@@ -262,35 +319,51 @@ files:
 - test/unit/svn_configuration_test.rb
 - lib/build-tool/cfg/parser.rb
 - lib/build-tool/cfg/lexer.rb
+has_rdoc: true
 homepage: http://michael-jansen.biz
-licenses:
+licenses: 
 - GPL-V2+
-post_install_message: ! "Thank you for using build-tool. For documentation see http://michael-jansen.biz/build-tool
-  .\nReport bugs to kde (at) michael-jansen.biz. \n\nTo start with build-tool try
-  the following commands:\n> build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git
-  kde\n> build-tool recipe list\n> build-tool recipe install kde\n\n"
+post_install_message: |+
+  Thank you for using build-tool. For documentation see http://michael-jansen.biz/build-tool .
+  Report bugs to kde (at) michael-jansen.biz. 
+  
+  To start with build-tool try the following commands:
+  > build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git kde
+  > build-tool recipe list
+  > build-tool recipe install kde
+  
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 55
+      segments: 
+      - 1
+      - 9
+      - 2
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: build-tool
-rubygems_version: 1.8.15
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A tool helping to download, configure and compile from sources.
-test_files:
+test_files: 
 - test/integration/configuration_test.rb
 - test/integration/history_test.rb
 - test/integration/parser_bazar_test.rb
@@ -316,4 +389,3 @@ test_files:
 - test/unit/repository_test.rb
 - test/unit/server_test.rb
 - test/unit/svn_configuration_test.rb
-has_rdoc: