build-tool 0.5.7 → 0.6.0.rc1

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

@@ -1,36 +1,21 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/visitor'
+
 require 'build-tool/configuration'
 require 'build-tool/environment'
-require 'build-tool/feature'
+require 'build-tool/model/feature'
 require 'build-tool/repository'
-require 'build-tool/module'
+require 'build-tool/model/module'
 require 'build-tool/sshkey'
 require 'build-tool/server'
 
 module BuildTool; module Cfg;
 
-    # Base class for all Visitors.
-    class VisitorBase
-
-        # The configuration object to fill with our parse results.
-        attr_reader :configuration
-
-        class ArgumentsError < StandardError
-        end
-
-        def initialize( configuration )
-            @configuration = configuration
-        end
-
-        def visit_Object( object )
-            raise "#{self.class}: Not a visitor for #{object.class}!"
-        end
-
-    end # class VisitorBase
-
 
     # Base class for all Visitors which need to iterate over their child
     # nodes.
-    class ListVisitor < VisitorBase
+    class ListVisitor < MJ::VisitorBase
 
         # Visit one node.
         def visit( node )
@@ -111,39 +96,19 @@ def visit_EnvironmentDeclarationNode( node )
         end
 
         def visit_EnableFeatureNode( node )
-            featureName = node.value
-            feat = configuration.feature( featureName )
-            if feat.nil?
-                raise ConfigurationError, "Attempt to enable unknown feature '%s'!" % featureName
-            end
-            feat.active = true
+            set_feature_status( node.value, true, node.options[:global] )
         end
 
         def visit_DisableFeatureNode( node )
-            featureName = node.value
-            feat = configuration.feature( featureName )
-            if feat.nil?
-                raise ConfigurationError, "Attempt to disable unknown feature '%s'!" % featureName
-            end
-            feat.active = false
+            set_feature_status( node.value, false, node.options[:global] )
         end
 
         def visit_EnableModuleNode( node )
-            modName = node.value
-            mod = configuration.module( modName )
-            if mod.nil?
-                raise ConfigurationError, "Attempt to enable unknown module '%s'!" % modName
-            end
-            mod.active = true
+            set_module_status( node.value, true, node.options[:global] )
         end
 
         def visit_DisableModuleNode( node )
-            modName = node.value
-            mod = configuration.module( modName )
-            if mod.nil?
-                raise ConfigurationError, "Attempt to disable unknown module '%s'!" % modName
-            end
-            mod.active = false
+            set_module_status( node.value, false, node.options[:global] )
         end
 
         def visit_FeatureNode( node )
@@ -151,6 +116,11 @@ def visit_FeatureNode( node )
             node.accept( visitor )
         end
 
+        def visit_GitOptionsDeclarationNode( node )
+            visitor = GitOptionsDeclarationNodeVisitor.new( configuration )
+            node.accept( visitor )
+        end
+
         def visit_IncludeNode( node )
             visitor = IncludeNodeVisitor.new( configuration )
             node.accept( visitor )
@@ -176,6 +146,40 @@ def visit_SshKeyDeclarationNode( node )
             node.accept(visitor)
         end
 
+    protected
+
+        def set_feature_status( featureName, status, global )
+            feat = configuration.feature( featureName )
+            # Make sure the feature is known.
+            if feat.nil?
+                raise ConfigurationError, "Attempt to disable unknown feature '%s'!" % featureName
+            end
+            # Disable the feature.
+            if global
+                # We are still loading the recipe. OK
+                feat.default_active = status
+            else
+                # We are in the user recipe override file. Issue a warning.
+                feat.active = status
+            end
+        end
+
+        def set_module_status( moduleName, status, global )
+            mod = configuration.module( moduleName )
+            # Make sure the feature is known.
+            if mod.nil?
+                raise ConfigurationError, "Attempt to disable unknown module '%s'!" % moduleName
+            end
+            # Disable the feature.
+            if global
+                # We are still loading the recipe. OK
+                mod.default_active = status
+            else
+                # We are in the user recipe override file. Issue a warning.
+                mod.active = status
+            end
+        end
+
     end # class StatementVisitor
 
 
@@ -290,7 +294,7 @@ def visit_FeatureNode( node )
             end
             # Create a new feature if needed
             if @feature.nil?
-                @feature = BuildTool::Feature.new( name, configuration.active_feature )
+                @feature = BuildTool::Feature.create( :name => name, :parent => configuration.active_feature )
                 configuration.add_feature( @feature )
             end
             # Set it as the current feature
@@ -359,11 +363,55 @@ def visit_GitRemotePushNode( node )
 
     end # class GitRemoteDeclarationNodeVisitor
 
+    module GitOptionDeclarationMethods
+
+        def self.included( base )
+            base.class_eval do
+                extend ClassMethods
+                include InstanceMethods
+            end
+        end
+
+        module ClassMethods
+        end
+
+        module InstanceMethods
+
+            def visit_GitOptionsDeclarationNode( node )
+                visit_nodes( node.values )
+            end
+
+            def visit_GitOptionNode( node )
+                if ( node.args[0] == :GLOBAL )
+                    @vcs.global_options[ node.values[0] ] = node.values[1]
+                else
+                    @vcs.options[ node.values[0] ] = node.values[1]
+                end
+            end
+        end
+
+    end
+
+    class GitOptionsDeclarationNodeVisitor < ListVisitor
+
+        include GitOptionDeclarationMethods
+
+        def initialize( configuration )
+            super( configuration )
+            if BuildTool::VCS::GitConfiguration.global_config.nil?
+                BuildTool::VCS::GitConfiguration.global_config = BuildTool::VCS::GitConfiguration.new
+            end
+            @vcs = BuildTool::VCS::GitConfiguration.global_config
+        end
+
+    end
 
 
     class GitDeclarationNodeVisitor < GitRemoteDeclarationNodeVisitor
 
-        def initialize( configuration, vcs = BuildTool::VCS::GitConfiguration.new )
+        include GitOptionDeclarationMethods
+
+        def initialize( configuration, vcs )
             super( configuration )
             @remote = BuildTool::VCS::GitRemote.new( "origin" )
             @vcs = vcs
@@ -438,11 +486,33 @@ def visit_IncludeNode( node )
         end
     end
 
+    class MercurialDeclarationNodeVisitor < ListVisitor
+
+        def initialize( configuration, vcs )
+            super( configuration )
+            @vcs = vcs
+        end
+
+        def visit_MercurialDeclarationNode( node )
+            visit_nodes( node.values )
+            @vcs
+        end
+
+        def visit_MercurialTrackNode( node )
+            @vcs.track = node.values
+        end
+
+        def visit_MercurialUrlNode( node )
+            @vcs.url = node.values[0]
+        end
+
+    end
+
 
     class ModuleDeclarationNodeVisitor < ListVisitor
 
         def initialize( configuration )
-            super
+            super( configuration )
             @module = nil
         end
 
@@ -470,13 +540,13 @@ def visit_BuildSystemDeclarationNode( node )
             #   3. The module has no parent and no build-system. Inherit from the build-system
             #      standard module.
             if @module.our_build_system
-                # puts "Inherit from previous build-system for #{@module.name}"
+                # logger.debug2( "Inherit from previous build-system for #{@module.name}" )
                 build_system = configuration.build_system_adjust( name, @module.our_build_system )
             elsif @module.parent
-                # puts "Inherit without parent for #{@module.name}"
+                # logger.debug2( "Inherit without parent for #{@module.name}" )
                 build_system = configuration.build_system_adjust( name, nil )
             else
-                # puts "Inherit from #{name} for #{@module.name}"
+                # logger.debug2( "Inherit from #{name} for #{@module.name}" )
                 build_system = configuration.build_system_adjust( name, configuration.build_system_defaults( name ) )
             end
             visitor = BuildSystemDeclarationNodeVisitor.new( configuration, build_system )
@@ -499,9 +569,17 @@ def visit_EnvironmentDeclarationNode( node )
 
         def visit_GitDeclarationNode( node )
             vcs = BuildTool::VCS::GitConfiguration.new
-            # if @module.vcs_configuration and @module.vcs_configuration.name == "git"
-            #     vcs.copy_configuration( @module.vcs_configuration )
-            # end
+            if node.options[:inheritance]
+                if not @module.vcs_configuration
+                    raise ConfigurationError,
+                        "#{@module.name} has no previous git configuration!"
+                end
+                if @module.vcs_configuration.name != "git"
+                    raise ConfigurationError,
+                        "#{@module.name} has a #{@module.vcs_configuration.name} configuration!"
+                end
+                vcs.parent = @module.vcs_configuration
+            end
             @module.vcs_configuration = vcs
             visitor = GitDeclarationNodeVisitor.new( configuration, vcs )
             node.accept( visitor )
@@ -509,14 +587,40 @@ def visit_GitDeclarationNode( node )
 
         def visit_GitSvnDeclarationNode( node )
             vcs = BuildTool::VCS::GitSvnConfiguration.new
-            # if @module.vcs_configuration and @module.vcs_configuration.name == "gitsvn"
-            #     vcs.copy_configuration( @module.vcs_configuration )
-            # end
+            if node.options[:inheritance]
+                if not @module.vcs_configuration
+                    raise ConfigurationError,
+                        "#{@module.name} has no previous git-svn configuration!"
+                end
+                if @module.vcs_configuration.name != "git-svn"
+                    raise ConfigurationError,
+                        "#{@module.name} has a #{@module.vcs_configuration.name} configuration!"
+                end
+                vcs.parent = @module.vcs_configuration
+            end
             @module.vcs_configuration = vcs
             visitor = GitSvnDeclarationNodeVisitor.new( configuration, vcs )
             node.accept( visitor )
         end
 
+        def visit_MercurialDeclarationNode( node )
+            vcs = BuildTool::VCS::MercurialConfiguration.new
+            if node.options[:inheritance]
+                if not @module.vcs_configuration
+                    raise ConfigurationError,
+                        "#{@module.name} has no previous mercurial configuration!"
+                end
+                if @module.vcs_configuration.name != "mercurial"
+                    raise ConfigurationError,
+                        "#{@module.name} has a #{@module.vcs_configuration.name} configuration!"
+                end
+                vcs.parent = @module.vcs_configuration
+            end
+            @module.vcs_configuration = vcs
+            visitor = MercurialDeclarationNodeVisitor.new( configuration, vcs )
+            node.accept( visitor )
+        end
+
         def visit_ModuleBuildPrefixNode( node )
             @module.build_prefix = node.value
         end
@@ -524,36 +628,48 @@ def visit_ModuleBuildPrefixNode( node )
         def visit_ModuleDeclarationNode( node )
             name = node.values[0]
             inheritance = node.values[1] == :INHERITANCE
+
             if inheritance
                 stmts = node.values[3]
             else
                 stmts = node.values[1]
             end
+
             # Check if the module is alread defined. If yes we reopen it.
             @module = configuration.module( name )
-            if @module
-                if inheritance
-                    raise ConfigurationError, "Attempt change existing module #{name} with inheritance!"
+            if @module.nil?
+                @module = BuildTool::Module.create( { :name => name } )
+                configuration.add_module( @module )
+            end
+
+            if inheritance
+
+                if @module.found_in_recipe
+                    raise ConfigurationError, "Attempt to change a module #{name} while specifying inheritance!"
                 end
-            else
-                parent = nil
-                if inheritance
-                    parentName = node.values[2]
-                    parent = configuration.module( parentName )
-                    if parent.nil?
-                        raise ConfigurationError,
-                            "Module %s attempts to inherit from not existant module %s" % 
-                                [ name, parentName ]
-                    end
+
+                parentName = node.values[2]
+                parent = configuration.module( parentName )
+                if parent.nil?
+                    raise ConfigurationError,
+                        "Module %s attempts to inherit from not existant module %s" % 
+                            [ name, parentName ]
                 end
-                @module = BuildTool::Module.new( name, parent )
-                configuration.add_module( @module )
-                # Only add a module to a feature if it is the first time declared.
+                @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 )
             rescue ConfigurationError => e
@@ -582,16 +698,24 @@ def visit_ShortDescriptionNode( node )
 
         def visit_SvnDeclarationNode( node )
             vcs = BuildTool::VCS::SvnConfiguration.new
-            # if @module.vcs_configuration and @module.vcs_configuration.name == "svn"
-            #     vcs.copy_configuration( @module.vcs_configuration )
-            # end
+            if node.options[:inheritance]
+                if not @module.vcs_configuration
+                    raise ConfigurationError,
+                        "#{@module.name} has no previous svn configuration!"
+                end
+                if @module.vcs_configuration.name != "svn"
+                    raise ConfigurationError,
+                        "#{@module.name} has a #{@module.vcs_configuration.name} configuration!"
+                end
+                vcs.parent = @module.vcs_configuration
+            end
             @module.vcs_configuration = vcs
             visitor = SvnDeclarationNodeVisitor.new( configuration, vcs )
             node.accept( visitor )
         end
 
         def visit_UseBuildSystemNode( node )
-            # puts "Inherit from build-system #{node.value} for #{@module.name}"
+            # logger.debug2( "Inherit from build-system #{node.value} for #{@module.name}" )
             @module.build_system = configuration.build_system_adjust(
                 node.value,
                 configuration.build_system_defaults( node.value ) )

data/lib/build-tool/command_actions.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'ansi'
 require 'logging'
 require 'fileutils'
@@ -59,11 +61,10 @@ def while_logging( level = :trace, &block )
                     logentry = nil
                     state = History::ModuleLog::FINISHED_SUCCESSFUL
                     if @command.cmd
-                        logentry = History::ModuleLog.new(
-                            :module => @module.name,
+                        logentry = @command.cmd.module_logs.build(
+                            :module => @module,
                             :event  => @type,
-                            :logfile => @logfile)
-                        @command.cmd.add_module_log(logentry)
+                            :logfile => @logfile.to_s.encode( 'UTF-8' ) )
                         logentry.started
                     end
                     logger.debug "Opening logfile #{@logfile}"
@@ -132,38 +133,53 @@ def execute()
 
         class Rebase < Base
 
-            def initialize( command, mod )
+            def initialize( command, mod, verbose )
                 super( command, 20, :rebase, mod )
+                @verbose = verbose
                 if !mod.vcs_required.fetching_supported?
                     logger.info "Fetching not supported by vcs #{mod.vcs.name}. Doing nothing."
-                    return
                 end
             end
 
             def execute()
                 logger.info "Rebasing"
-                @module.rebase
+                @module.rebase( @verbose )
             end
 
         end
 
         class RemoveBuildDirectory < Base
 
-            def initialize( command, mod )
+            def initialize( command, mod, force = false )
+                @force = force
                 super( command, 10, :clean, mod )
             end
 
             def execute()
-                if @module.build_system_required.out_of_source
+                if @module.build_system_required.out_of_source or @force
                     logger.info "Removing build directory"
                     @module.remove_build_directory
                 else
-                    logger.warn "in source build. Will not remove source directory!"
+                    logger.warn "In source build. Will not remove source directory!"
                 end
             end
 
         end
 
+        class RemoveSourceDirectory < Base
+
+            def initialize( command, mod, force = false )
+                @force = force
+                super( command, 10, :clean, mod )
+            end
+
+            def execute()
+                logger.info "Removing source directory"
+                @module.remove_source_directory
+            end
+
+        end
+
         class Configure < Base
 
             def initialize( command, mod )