build-tool 0.1.4 → 0.2

data/lib/build-tool/cfg/parser.y

@@ -1,20 +1,27 @@
 class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
 
     token APPEND
+    token ARCHIVE
     token BUILD_PREFIX
     token BUILD_SYSTEM
+    token DESCRIPTION
+    token DISABLE
+    token ENABLE
     token END
     token ENVIRONMENT
     token EXTERNAL
+    token FEATURE
     token FILE
     token GIT
     token GIT_SVN
     token HOST
+    token INCLUDE
     token INHERITANCE
     token INPLACE
     token INSTALL_PREFIX
     token LOCAL_PATH
     token LOG_DIRECTORY
+    token LONG
     token MODULE
     token OPTION
     token PATH
@@ -25,6 +32,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token REPOSITORY
     token SERVER
     token SET
+    token SHORT
     token SSH_KEY
     token STRING
     token TEMPLATE
@@ -38,7 +46,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
 rule
 
     main
-        : statements { result = ConfigurationFileList.new( val[0] ); }
+        : top_level_statements { result = ConfigurationFileList.new( val[0] ); }
         ;
 
     #
@@ -54,29 +62,59 @@ rule
         : INHERITANCE { result = :INHERITANCE; }
         ;
 
-    # 
+    #
     ### TOP LEVEL STATEMENTS
     #
-    statements
+    top_level_statements
         : /* empty */
-        | statement statements { result = val.flatten; }
+        | top_level_statement top_level_statements { result = val.flatten; }
+        ;
+
+    top_level_statement
+        : LOG_DIRECTORY STRING       { result = LogDirectoryNode.new( val[1] ); }
+        | DISABLE FEATURE identifier { result = DisableFeatureNode.new( val[2] ); }
+        | ENABLE  FEATURE identifier { result = EnableFeatureNode.new( val[2] ); }
+        | DISABLE MODULE  identifier { result = DisableModuleNode.new( val[2] ); }
+        | ENABLE  MODULE  identifier { result = EnableModuleNode.new( val[2] ); }
+        | statement                  { result = val[0]; }
         ;
 
+    #
+    ### STATEMENTS
+    #
+
     statement
-        : LOG_DIRECTORY STRING     { result = LogDirectoryNode.new( val[1] ); }
-        | build_system_declaration { result = val[0]; }
+        : build_system_declaration { result = val[0]; }
         | environment_declaration  { result = val[0]; }
         | module_declaration       { result = val[0]; }
         | repository_declaration   { result = val[0]; }
         | server_declaration       { result = val[0]; }
         | ssh_key_declaration      { result = val[0]; }
+        | include_directive        { result = val[0]; }
+        | feature_declaration      { result = val[0]; }
         ;
 
     vcs_declaration
         : git_declaration          { result = val[0]; }
         | git_svn_declaration      { result = val[0]; }
+        | archive_declaration      { result = val[0]; }
         ;
 
+    #
+    ### GIT-SVN CONFIGURATION
+    #
+    archive_declaration
+        : VCS ARCHIVE archive_statements END { result = ArchiveDeclarationNode.new( val[2] ); }
+        ;
+
+    archive_statements
+        : /* empty */
+        # | archive_statement archive_statements { result = val.flatten; }
+        ;
+
+    # archive_statement
+        # ;
+
     #
     ### BUILD SYSTEM DECLARATION
     #
@@ -113,6 +151,24 @@ rule
         | VAR TOKEN APPEND  STRING { result = EnvironmentVariableNode.new( val[1..-1] ); }
         ;
 
+    #
+    ### FEATURE DECLARATION
+    #
+    feature_declaration
+        : FEATURE identifier feature_statements END { result = FeatureNode.new( val[1..-2] ) }
+        ;
+
+    feature_statements
+        : /* empty */
+        | feature_statement feature_statements { result = val.flatten; }
+        ;
+
+    feature_statement
+        : statement                 { result = val.flatten; }
+        | LONG DESCRIPTION STRING   { result = LongDescriptionNode.new( val[2] ); }
+        | SHORT DESCRIPTION STRING  { result = ShortDescriptionNode.new( val[2] ); }
+        ;
+
     #
     ### GIT CONFIGURATION
     #
@@ -152,8 +208,15 @@ rule
         ;
 
     git_svn_statement
-        : git_statement
-        | EXTERNAL STRING     { result = GitSvnExternalNode.new( val[1] ); }
+        : git_statement   { result = val[0]; }
+        | EXTERNAL STRING { result = GitSvnExternalNode.new( val[1] ); }
+        ;
+
+    #
+    ### INCLUDE DIRECTIVE
+    #
+    include_directive
+        : INCLUDE STRING { result = IncludeNode.new( val[1] ) };
         ;
 
     #
@@ -198,11 +261,12 @@ rule
         ;
 
     repository_statement
-        : SERVER identifier { result = RepositoryServerNode.new( val[1] ); }
-        | PATH   STRING     { result = RepositoryPathNode.new(   val[1] ); }
+        : PATH   STRING     { result = RepositoryPathNode.new(   val[1] ); }
         | USER   identifier { result = RepositoryUserNode.new(   val[1] ); }
         | USE SSH_KEY identifier { result = UseSshKeyNode.new( val[2] ); }
+        | USE SERVER  identifier { result = UseServerNode.new( val[2] ); }
         | ssh_key_declaration { result = val[0]; }
+        | server_declaration  { result = val[0]; }
         ;
 
     #
@@ -239,7 +303,6 @@ rule
         : FILE STRING { result = SshKeyFileNode.new( val[1] ); }
         ;
 
-
 end # class BuildTool::Cfg::GitParser
 
 ---- header ----

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

@@ -1,5 +1,6 @@
 require 'build-tool/configuration'
 require 'build-tool/environment'
+require 'build-tool/feature'
 require 'build-tool/repository'
 require 'build-tool/module'
 require 'build-tool/sshkey'
@@ -13,6 +14,9 @@ module BuildTool; module Cfg;
         # The configuration object to fill with our parse results.
         attr_reader :configuration
 
+        class ArgumentsError < StandardError
+        end
+
         def initialize( configuration )
             @configuration = configuration
         end
@@ -72,11 +76,8 @@ module BuildTool; module Cfg;
 
     end
 
-
-    # The Configuration File Visitor.
-    #
-    # This is the toplevel visitor.
-    class ConfigurationFileVisitor < ListVisitor
+    # Statement Visitor
+    class StatementVisitor < ListVisitor
 
         def visit_BuildSystemDeclarationNode( node )
             raise ArgumentsError if node.values.length != 2
@@ -94,13 +95,55 @@ module BuildTool; module Cfg;
             node.accept( visitor )
         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
+        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
+        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
+        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
+        end
+
+        def visit_FeatureNode( node )
+            visitor = FeatureNodeVisitor.new( configuration )
+            node.accept( visitor )
+        end
+
         def visit_GitDeclarationNode( node )
             visitor = GitDeclarationNodeVisitor.new( configuration )
             return node.accept( visitor )
         end
 
-        def visit_LogDirectoryNode( node )
-            configuration.log_directory = node.value
+        def visit_IncludeNode( node )
+            visitor = IncludeNodeVisitor.new( configuration )
+            node.accept( visitor )
         end
 
         def visit_ModuleDeclarationNode( node )
@@ -123,6 +166,34 @@ module BuildTool; module Cfg;
             node.accept(visitor)
         end
 
+    end # class StatementVisitor
+
+
+    class ArchiveDeclarationNodeVisitor < ListVisitor
+
+        def initialize( configuration, vcs )
+            super( configuration )
+            @vcs = vcs
+        end
+
+        def visit_ArchiveDeclarationNode( node )
+            visit_nodes( node.values )
+            return @vcs
+        end
+
+    end # class ArchiveDeclarationNodeVisitor
+
+
+    # The Configuration File Visitor.
+    #
+    # This is the toplevel visitor.
+    class ConfigurationFileVisitor < StatementVisitor
+
+        def visit_LogDirectoryNode( node )
+            configuration.log_directory = node.value
+        end
+
+
     end # class ConfigurationFileVisitor
 
 
@@ -133,8 +204,16 @@ module BuildTool; module Cfg;
             @environment = configuration.environment( name )
             @environment = BuildTool::Environment.new( name ) if @environment.nil?
             configuration.add_environment( @environment )
+            if !configuration.active_feature.nil?
+                @environment.feature = configuration.active_feature
+                configuration.active_feature.environments << @environment
+            end
             if node.values[1] == :INHERITANCE
-                @environment.parent = configuration.environment(node.values[2])
+                parentName = node.values[2]
+                @environment.parent = configuration.environment(parentName)
+                if @environment.parent.nil?
+                    raise ConfigurationError, "Environment #{name} inherits from unknown environment #{parentName}!"
+                end
                 self.visit_nodes( node.values[3] )
             else
                 self.visit_nodes( node.values[1] )
@@ -154,6 +233,55 @@ module BuildTool; module Cfg;
     end # class EnvironmentDeclarationNodeVisitor
 
 
+    class FeatureNodeVisitor < ConfigurationFileVisitor
+
+        def initialize( configuration )
+            super( configuration )
+            @feature = nil
+        end
+
+        def visit_FeatureNode( node )
+            raise ArgumentsError if node.values.length != 2
+            childs = node.values
+            # Get the name if nested
+            name = childs.shift
+            if configuration.active_feature
+               @feature = configuration.feature( "#{configuration.active_feature.name}/#{name}" )
+            else
+               @feature = configuration.feature( name )
+            end
+            # Create a new feature if needed
+            if @feature.nil?
+                @feature = BuildTool::Feature.new( name, configuration.active_feature )
+                configuration.add_feature( @feature )
+            end
+            # Set it as the current feature
+            old_feat = configuration.active_feature
+            configuration.active_feature= @feature
+            # Visit the childs
+            visit_nodes( childs.shift )
+            # Reset the old current feature
+            configuration.active_feature = old_feat
+        end
+
+        def visit_LongDescriptionNode( node )
+            if @feature.long_description
+                puts @feature.description
+                logger.warn "Overwriting long description for feature #{@feature.name}"
+            end
+            @feature.long_description = node.values
+        end
+
+        def visit_ShortDescriptionNode( node )
+            if !@feature.description.nil?
+                logger.warn "Overwriting short description for feature #{@feature.name}"
+            end
+            @feature.description = node.values
+        end
+
+    end # class FeatureNodeVisitor
+
+
     class GitDeclarationNodeVisitor < ListVisitor
 
         def initialize( configuration, vcs = BuildTool::VCS::GitConfiguration.new )
@@ -232,6 +360,15 @@ module BuildTool; module Cfg;
     end # class GitRemoteNodeVisitor
 
 
+    class IncludeNodeVisitor < ListVisitor
+
+        def visit_IncludeNode( node )
+            name = node.value
+            configuration.recipe.include_file( name, configuration )
+        end
+    end
+
+
     class ModuleDeclarationNodeVisitor < ListVisitor
 
         def initialize( configuration )
@@ -239,6 +376,17 @@ module BuildTool; module Cfg;
             @module = nil
         end
 
+        def visit_ArchiveDeclarationNode( node )
+            if @module.vcs_configuration and @module.vcs_configuration.name == "archive"
+                vcs = @module.vcs_configuration.dup
+            else
+                vcs = BuildTool::VCS::ArchiveConfiguration.new
+            end
+            @module.vcs_configuration = vcs
+            visitor = ArchiveDeclarationNodeVisitor.new( configuration, vcs )
+            node.accept( visitor )
+        end
+
         def visit_BuildSystemDeclarationNode( node )
             raise ArgumentsError if node.values.length != 2
             name  = node.values[0]
@@ -258,8 +406,7 @@ module BuildTool; module Cfg;
         end
 
         def visit_GitDeclarationNode( node )
-            name  = node.values[0]
-            if @module.vcs_configuration and @module.vcs_configuration.name == name
+            if @module.vcs_configuration and @module.vcs_configuration.name == "git"
                 vcs = @module.vcs_configuration.dup
             else
                 vcs = BuildTool::VCS::GitConfiguration.new
@@ -274,8 +421,7 @@ module BuildTool; module Cfg;
         end
 
         def visit_GitSvnDeclarationNode( node )
-            name  = node.values[0]
-            if @module.vcs_configuration and @module.vcs_configuration.name == name
+            if @module.vcs_configuration and @module.vcs_configuration.name == "gitsvn"
                 vcs = @module.vcs_configuration.dup
             else
                 vcs = BuildTool::VCS::GitSvnConfiguration.new
@@ -304,12 +450,23 @@ module BuildTool; module Cfg;
                     raise ConfigurationError, "Attempt change existing module #{name} with inheritance!"
                 end
             elsif inheritance
-                @module = BuildTool::Module.new( name, configuration.module(node.values[2]) )
+                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 )
             else
                 @module = BuildTool::Module.new( name )
                 configuration.add_module( @module )
             end
+            if !configuration.active_feature.nil?
+                @module.feature = configuration.active_feature
+                configuration.active_feature.modules << @module
+            end
             self.visit_nodes( stmts )
         end
 
@@ -378,21 +535,26 @@ module BuildTool; module Cfg;
             @repository.path = node.value
         end
 
-        def visit_RepositoryServerNode( node )
-            @repository.server = configuration.server( node.value )
-            if @repository.server.nil?
-                raise ConfigurationError, "Unknown server #{node.value} configured for repository #{@repository.name}!"
-            end
-        end
-
         def visit_RepositoryUserNode( node )
             @repository.user = node.value
         end
 
+        def visit_ServerDeclarationNode( node )
+            visitor = ServerDeclarationNodeVisitor.new( configuration )
+            @repository.server = node.accept(visitor)
+        end
+
         def visit_SshKeyDeclarationNode( node )
             @repository.sshkey = node.value
         end
 
+        def visit_UseServerNode( node )
+            @repository.server = configuration.server( node.value )
+            if @repository.server.nil?
+                raise ConfigurationError, "Unknown server #{node.value} configured for repository #{@repository.name}!"
+            end
+        end
+
         def visit_UseSshKeyNode( node )
             name = node.value
             @repository.sshkey = configuration.sshkey(name)