build-tool 0.4.6 → 0.5.0

data/History.txt

@@ -1,11 +1,3 @@
-== 0.4.6
-- Bugfix
-  - Recent rexical version seem to work differently. Fix generated lexer.
-
-== 0.4.5
-- Bugfix
-  - Readd the missing lexer.rb and parser.rb files.
-
 == 0.4.4
 - Enhancements
   - More ways to specify a module on the command line.

data/Manifest.txt

@@ -24,8 +24,6 @@ lib/build-tool/cfg/lexer_base.rb
 lib/build-tool/cfg/node.rb
 lib/build-tool/cfg/parser.y
 lib/build-tool/cfg/visitor.rb
-lib/build-tool/cfg/parser.rb
-lib/build-tool/cfg/lexer.rb
 lib/build-tool/command_actions.rb
 lib/build-tool/commands.rb
 lib/build-tool/commands/build.rb

data/lib/build-tool.rb

@@ -2,6 +2,6 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BuildTool
-  VERSION = '0.4.6'
+  VERSION = '0.5.0'
 end
 

data/lib/build-tool/cfg/lexer.rex

@@ -154,12 +154,34 @@ rule
     :ENVIRONMENT {STRINGERROR} { [:GARBAGE, text];   }
     :ENVIRONMENT .             { [:GARBAGE, text];   }
 
+    #
+    ### GIT_SVN
+    #
+    :GIT_SVN external\b     { [:EXTERNAL, text]; }
+    :GIT_SVN use\b          { @states.push @state; @state = :USE;     [:USE,     text]; }
+    :GIT_SVN track\b        { [:TRACK, text]; }
+    :GIT_SVN ssh-key\b      { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
+    :GIT_SVN repository\b   { @states.push @state; @state = :REPOSITORY;   [:REPOSITORY,   text]; }
+    :GIT_SVN remote-path\b  { [:REMOTE_PATH,    text]; }
+    :GIT_SVN remote\b       { @states.push @state; @state = :GIT_REMOTE; [:REMOTE, text]; }
+    :GIT_SVN end\b          { @state = @states.pop; [ :END, text ]; }
+    # COMMON
+    :GIT_SVN {STRING}      { [:STRING,  @ss[1]]; }
+    :GIT_SVN {TOKEN}       { [:TOKEN,   text];   }
+    :GIT_SVN {COMMENT}     { [:COMMENT, text];   }
+    :GIT_SVN {BLANK}       { [:IGNORE,  text];   }
+    :GIT_SVN {LF}          { [:IGNORE,  text];   }
+    :GIT_SVN {STRINGERROR} { [:GARBAGE, text];   }
+    :GIT_SVN .             { [:GARBAGE, text];   }
+
     #
     ### GIT
     #
-    :GIT external\b     { [:EXTERNAL, text]; }
-    :GIT track-branch\b { [:TRACK_BRANCH, text]; }
-    :GIT remote\b { @states.push @state; @state = :REPOSITORY; [:REMOTE, text]; }
+    :GIT url\b          { [:URL, text]; }
+    :GIT track\b        { [:TRACK, text]; }
+    :GIT push\b         { [:PUSH, text]; }
+    :GIT ssh-key\b { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
+    :GIT remote\b { @states.push @state; @state = :GIT_REMOTE; [:REMOTE, text]; }
     :GIT end\b    { @state = @states.pop; [ :END, text ]; }
     # COMMON
     :GIT {STRING}      { [:STRING,  @ss[1]]; }
@@ -170,6 +192,22 @@ rule
     :GIT {STRINGERROR} { [:GARBAGE, text];   }
     :GIT .             { [:GARBAGE, text];   }
 
+    #
+    ### GIT REMOTE
+    #
+    :GIT_REMOTE url\b          { [:URL, text]; }
+    :GIT_REMOTE push\b         { [:PUSH, text]; }
+    :GIT_REMOTE ssh-key\b { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
+    :GIT_REMOTE end\b    { @state = @states.pop; [ :END, text ]; }
+    # COMMON
+    :GIT_REMOTE {STRING}      { [:STRING,  @ss[1]]; }
+    :GIT_REMOTE {TOKEN}       { [:TOKEN,   text];   }
+    :GIT_REMOTE {COMMENT}     { [:COMMENT, text];   }
+    :GIT_REMOTE {BLANK}       { [:IGNORE,  text];   }
+    :GIT_REMOTE {LF}          { [:IGNORE,  text];   }
+    :GIT_REMOTE {STRINGERROR} { [:GARBAGE, text];   }
+    :GIT_REMOTE .             { [:GARBAGE, text];   }
+
     #
     ### MODULE
     #
@@ -181,12 +219,10 @@ rule
     :MODULE description\b    { [:DESCRIPTION,    text ]; }
     :MODULE install-prefix\b { [:INSTALL_PREFIX, text]; }
     :MODULE local-path\b     { [:LOCAL_PATH,     text]; }
-    :MODULE remote-path\b    { [:REMOTE_PATH,    text]; }
     :MODULE TEMPLATE\b       { [:TEMPLATE,       text]; }
 
     :MODULE build-system\b { @states.push @state; @state = :BUILD_SYSTEM; [:BUILD_SYSTEM, text]; }
     :MODULE environment\b  { @states.push @state; @state = :ENVIRONMENT;  [:ENVIRONMENT,  text]; }
-    :MODULE repository\b   { @states.push @state; @state = :REPOSITORY;   [:REPOSITORY,   text]; }
     :MODULE use\b          { @states.push @state; @state = :USE;          [:USE,          text]; }
     :MODULE vcs\b          { @states.push @state; @state = :VCS;          [:VCS,          text]; }
 
@@ -253,8 +289,11 @@ rule
     #
     ### SVN
     #
-    :SVN only\b   { [:ONLY, text]; }
-    :SVN end\b    { @state = @states.pop; [ :END, text ]; }
+    :SVN only\b         { [:ONLY, text]; }
+    :SVN end\b          { @state = @states.pop; [ :END, text ]; }
+    :SVN repository\b   { @states.push @state; @state = :REPOSITORY;   [:REPOSITORY,   text]; }
+    :SVN use\b          { @states.push @state; @state = :USE;     [:USE,     text]; }
+    :SVN remote-path\b  { [:REMOTE_PATH,    text]; }
     # COMMON
     :SVN {STRING}      { [:STRING,  @ss[1]]; }
     :SVN {TOKEN}       { [:TOKEN,   text];   }
@@ -285,7 +324,7 @@ rule
     #
     ### VCS
     #
-    :VCS git-svn\b  { @state = :GIT; [:GIT_SVN, text]; }
+    :VCS git-svn\b  { @state = :GIT_SVN; [:GIT_SVN, text]; }
     :VCS git\b      { @state = :GIT; [:GIT, text]; }
     :VCS svn\b      { @state = :SVN; [:SVN, text]; }
     :VCS archive\b  { @state = :ARCHIVE; [:ARCHIVE, text]; }

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

@@ -44,6 +44,10 @@ def initialize(values = nil)
 
         GitDeclaration
         GitRemotePath
+        GitRemoteUrl
+        GitRemoteDeclaration
+        GitRemotePush
+        GitTrack
         GitServer
 
         GitSvnExternal
@@ -56,10 +60,8 @@ def initialize(values = nil)
         ModuleDeclaration
         ModuleInstallPrefix
         ModuleLocalPath
-        ModuleRemotePath
         ModuleTemplate
 
-        RemoteDeclaration
         RepositoryDeclaration
         RepositoryPath
         RepositoryUser
@@ -74,6 +76,7 @@ def initialize(values = nil)
 
         SvnDeclaration
         SvnCheckoutOnly
+        SvnRemotePath
 
         UseBuildSystem
         UseEnvironment

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

@@ -30,6 +30,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token PATH
     token PREPEND
     token PROTOCOL
+    token PUSH
     token REMOTE
     token REMOTE_PATH
     token REPOSITORY
@@ -41,7 +42,8 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token SVN
     token TEMPLATE
     token TOKEN
-    token TRACK_BRANCH
+    token TRACK
+    token URL
     token USE
     token USER
     token VAR
@@ -185,13 +187,27 @@ rule
         : VCS GIT git_statements END { result = GitDeclarationNode.new( val[2] ); }
         ;
 
+    git_remote_statements
+        : /* empty */
+        | git_remote_statement git_remote_statements    { result = val.flatten(); }
+        ;
+
+    git_remote_statement
+        : URL   STRING STRING             { result = GitRemoteUrlNode.new( val[1..-1] ); }
+        | URL   STRING                    { result = GitRemoteUrlNode.new( val[1..-1] ); }
+        | PUSH  STRING STRING             { result = GitRemotePushNode.new( val[1..-1] ); }
+        | PUSH  STRING                    { result = GitRemotePushNode.new( val[1..-1] ); }
+        ;
+
     git_statements
         : /* empty */
-        | git_statement git_statements { result = val.flatten; }
+        | git_statement git_statements    { result = val.flatten; }
         ;
 
     git_statement
-        : REMOTE STRING repository_statements END { result = RemoteDeclarationNode.new( val[1..-1]); }
+        : REMOTE STRING git_remote_statements END { result = GitRemoteDeclarationNode.new( val[1..-1]); }
+        | TRACK STRING                    { result = GitTrackNode.new( val[1] ); }
+        | git_remote_statement            { result = val[0]; }
         ;
 
     #
@@ -207,8 +223,11 @@ rule
         ;
 
     git_svn_statement
-        : git_statement   { result = val[0]; }
-        | EXTERNAL STRING { result = GitSvnExternalNode.new( val[1] ); }
+        : git_statement                 { result = val[0]; }
+        | USE REPOSITORY identifier     { result = UseRepositoryNode.new( val[2] ); }
+        | EXTERNAL STRING               { result = GitSvnExternalNode.new( val[1] ); }
+        | REMOTE_PATH STRING            { result = SvnRemotePathNode.new( val[1] ); }
+        | repository_declaration        { result = val[0]; }
         ;
 
     #
@@ -234,17 +253,14 @@ rule
     module_statement
         : USE BUILD_SYSTEM identifier { result = UseBuildSystemNode.new( val[2] ); }
         | USE ENVIRONMENT  identifier { result = UseEnvironmentNode.new( val[2] ); }
-        | USE REPOSITORY   identifier { result = UseRepositoryNode.new( val[2] ); }
         | USE VCS          identifier { result = UseVcsNode.new(         val[2] ); }
         | LONG DESCRIPTION multiline_string   { result = LongDescriptionNode.new( val[2] ); }
         | DESCRIPTION STRING          { result = ShortDescriptionNode.new( val[1] ); }
         | build_system_declaration    { result = val[0]; }
         | vcs_declaration             { result = val[0]; }
-        | repository_declaration      { result = val[0]; }
         | environment_declaration     { result = val[0]; }
         | INSTALL_PREFIX STRING { result = ModuleInstallPrefixNode.new( val[1] ); }
         | BUILD_PREFIX   STRING { result = ModuleBuildPrefixNode.new(   val[1] ); }
-        | REMOTE_PATH    STRING { result = ModuleRemotePathNode.new(    val[1] ); }
         | LOCAL_PATH     STRING { result = ModuleLocalPathNode.new(     val[1] ); }
         | TEMPLATE              { result = ModuleTemplateNode.new(); }
         | APPLY PATCH STRING    { result = ApplyPatchesNode.new(val[2]); }
@@ -321,6 +337,9 @@ rule
 
     svn_statement
         : ONLY STRING { result = SvnCheckoutOnlyNode.new(val[1]); }
+        | USE REPOSITORY   identifier { result = UseRepositoryNode.new( val[2] ); }
+        | REMOTE_PATH STRING          { result = SvnRemotePathNode.new(    val[1] ); }
+        | repository_declaration      { result = val[0]; }
         ;
 
     #

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

@@ -21,6 +21,10 @@ def initialize( configuration )
             @configuration = configuration
         end
 
+        def visit_Object( object )
+            raise "#{self.class}: Not a visitor for #{object.class}!"
+        end
+
     end # class VisitorBase
 
 
@@ -297,22 +301,67 @@ def visit_ShortDescriptionNode( node )
     end # class FeatureNodeVisitor
 
 
-    class GitDeclarationNodeVisitor < ListVisitor
+
+    class GitRemoteDeclarationNodeVisitor < ListVisitor
+
+        def visit_GitRemoteDeclarationNode( node )
+            name = node.values[0]
+            @remote = BuildTool::VCS::GitRemote.new( name )
+            stmts = node.values[1]
+            visit_nodes( stmts )
+            return @remote
+        end
+
+        def visit_GitRemoteUrlNode( node )
+            if node.values.length == 2
+                @remote.server = configuration.server( node.values[0] )
+                if @remote.server.nil?
+                    raise ConfigurationError, "Unknown server #{node.values[0]} configured."
+                end
+                @remote.path = node.values[1]
+            else
+                @remote.server = BuildTool::Server.new( "unnamed" )
+                @remote.server.host = node.values[0]
+            end
+        end
+
+        def visit_GitRemotePushNode( node )
+            @remote.push_server = configuration.server( node.values[0] )
+            if @remote.push_server.nil?
+                raise ConfigurationError, "Unknown server #{node.values[0]} configured."
+            end
+            @remote.push_path = node.values[1]
+        end
+
+    end # class GitRemoteDeclarationNodeVisitor
+
+
+
+    class GitDeclarationNodeVisitor < GitRemoteDeclarationNodeVisitor
 
         def initialize( configuration, vcs = BuildTool::VCS::GitConfiguration.new )
             super( configuration )
+            @remote = BuildTool::VCS::GitRemote.new( "origin" )
             @vcs = vcs
+            @vcs.remote[@remote.name] = @remote
         end
 
         def visit_GitDeclarationNode( node )
             visit_nodes( node.values )
+            if @remote.server.nil? and @remote.path.nil?
+                @vcs.remote.delete( "origin" )
+            end
             return @vcs
         end
 
-        def visit_RemoteDeclarationNode( node )
-            visitor = RepositoryDeclarationNodeVisitor.new( configuration )
-            repo = node.accept(visitor)
-            @vcs.remote[repo.name] = repo
+        def visit_GitRemoteDeclarationNode( node )
+            visitor = GitRemoteDeclarationNodeVisitor.new( configuration )
+            remote = node.accept(visitor)
+            @vcs.remote[remote.name] = remote
+        end
+
+        def visit_GitTrackNode( node )
+            @vcs.track = node.values
         end
 
     end # class GitDeclarationNodeVisitor
@@ -326,6 +375,9 @@ def initialize( configuration, vcs )
 
         def visit_GitSvnDeclarationNode( node )
             visit_nodes( node.values )
+            if @remote.server.nil? and @remote.path.nil?
+                @vcs.remote.delete( "origin" )
+            end
             return @vcs
         end
 
@@ -334,6 +386,23 @@ def visit_GitSvnExternalNode( node )
             @vcs.add_external( name, value )
         end
 
+        def visit_RepositoryDeclarationNode( node )
+            visitor = RepositoryDeclarationNodeVisitor.new( configuration )
+            @vcs.repository = node.accept( visitor )
+        end
+
+        def visit_UseRepositoryNode( node )
+            repo = configuration.repository( node.value )
+            if repo.nil?
+                raise ConfigurationError, "Unknown repository #{node.value}!"
+            end
+            @vcs.repository = repo
+        end
+
+        def visit_SvnRemotePathNode( node )
+            @vcs.remote_path = node.value
+        end
+
     end # class GitSvnDeclarationNodeVisitor
 
 
@@ -410,12 +479,8 @@ def visit_GitDeclarationNode( node )
             #     vcs.copy_configuration( @module.vcs_configuration )
             # end
             @module.vcs_configuration = vcs
-            begin
-                visitor = GitDeclarationNodeVisitor.new( configuration, vcs )
-                node.accept( visitor )
-            rescue ConfigurationError => e
-                raise ConfigurationError, "Module #{@module.name}: #{e.to_s}"
-            end
+            visitor = GitDeclarationNodeVisitor.new( configuration, vcs )
+            node.accept( visitor )
         end
 
         def visit_GitSvnDeclarationNode( node )
@@ -465,7 +530,11 @@ def visit_ModuleDeclarationNode( node )
                     configuration.active_feature.modules << @module
                 end
             end
-            self.visit_nodes( stmts )
+            begin
+                self.visit_nodes( stmts )
+            rescue ConfigurationError => e
+                raise ConfigurationError, "Module #{@module.name}: #{e.to_s}"
+            end
         end
 
         def visit_ModuleInstallPrefixNode( node )
@@ -476,19 +545,10 @@ def visit_ModuleLocalPathNode( node )
             @module.local_path = node.value
         end
 
-        def visit_ModuleRemotePathNode( node )
-            @module.remote_path = node.value
-        end
-
         def visit_ModuleTemplateNode( node )
             @module.is_template = true
         end
 
-        def visit_RepositoryDeclarationNode( node )
-            visitor = RepositoryDeclarationNodeVisitor.new( configuration )
-            @module.repository = node.accept( visitor )
-        end
-
         def visit_ShortDescriptionNode( node )
             if !@module.description.nil?
                 logger.warn "Overwriting short description for module #{@module.name}"
@@ -521,13 +581,6 @@ def visit_UseEnvironmentNode( node )
             end
         end
 
-        def visit_UseRepositoryNode( node )
-            @module.repository = configuration.repository( node.value )
-            if @module.repository.nil?
-                raise ConfigurationError, "Unknown repository #{node.value} configured for module #{@module.name}!"
-            end
-        end
-
         def visit_UseVcsNode( node )
             @module.vcs_configuration = configuration.vcs(node.value)
         end
@@ -549,14 +602,6 @@ def visit_RepositoryDeclarationNode( node )
             return @repository
         end
 
-        def visit_RemoteDeclarationNode( node )
-            name = node.values[0]
-            @repository = BuildTool::Repository.new( name )
-            stmts = node.values[1]
-            visit_nodes( stmts )
-            return @repository
-        end
-
         def visit_RepositoryPathNode( node )
             @repository.path = node.value
         end
@@ -663,7 +708,8 @@ def visit_SshKeyFileNode( node )
     class SvnDeclarationNodeVisitor < ListVisitor
 
         def initialize( configuration, vcs )
-            super( configuration, vcs )
+            super( configuration )
+            @vcs = vcs
         end
 
         def visit_SvnDeclarationNode( node )
@@ -675,6 +721,24 @@ def visit_SvnCheckoutOnlyNode( node )
             @vcs.only = node.value.split( / +/ )
         end
 
+        def visit_RepositoryDeclarationNode( node )
+            visitor = RepositoryDeclarationNodeVisitor.new( configuration )
+            @vcs.repository = node.accept( visitor )
+        end
+
+        def visit_UseRepositoryNode( node )
+            repo = configuration.repository( node.value )
+            if repo.nil?
+                raise ConfigurationError, "Unknown repository #{node.value}!"
+            end
+            @vcs.repository = repo
+        end
+
+        def visit_SvnRemotePathNode( node )
+            @vcs.remote_path = node.value
+        end
+
+
     end # class SvnDeclarationNodeVisitor
 
 end; end

data/lib/build-tool/commands.rb

@@ -521,7 +521,13 @@ def do_execute( args )
             # 2. Check prerequisites
             isready = true
             modules.each do |mod|
-                isready &= is_module_ready?( mod )
+                begin
+                    isready &= is_module_ready?( mod )
+                rescue Exception => e
+                    logger.error   "#{mod.name}: #{e.message}"
+                    logger.verbose e.backtrace.join("\n")
+                    isready = false
+                end
             end
 
             if !isready

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

@@ -22,15 +22,15 @@ def do_execute_module( mod )
 
             say "Active:            #{mod.active?}"
 
-            if mod.repository
-                say "Repository:        #{mod.repository.url}/#{mod.remote_path}"
-                if mod.repository.sshkey
-                    say "  SSH Key:         '#{mod.repository.sshkey.name}' (#{mod.repository.sshkey.file})"
-                end
-                say "Apply Patches:     #{mod.patches.join(", ")}"
-            else
-                say "Repository:        not configured"
-            end
+            # if mod.repository
+                # say "Repository:        #{mod.repository.url}/#{mod.remote_path}"
+                # if mod.repository.sshkey
+                    # say "  SSH Key:         '#{mod.repository.sshkey.name}' (#{mod.repository.sshkey.file})"
+                # end
+                # say "Apply Patches:     #{mod.patches.join(", ")}"
+            # else
+                # say "Repository:        not configured"
+            # end
 
             if mod.build_prefix
                 say "Local Checkout:    #{mod.vcs.local_path} #{mod.checkedout? ? '(EXISTS)' : '(TODO)' }"
@@ -53,15 +53,19 @@ def do_execute_module( mod )
             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 ]
                 when 'archive'
                 when 'git'
-                    say "  Remote:       %s -> %s" % [ "origin", mod.vcs_configuration.repository.url ]
                     mod.vcs_configuration.remote.each do |key, val|
-                        say "  Remote:       %s -> %s" % [ key, val.url ]
+                        if val.push_url
+                            say "  Remote:       %s -> %s (push to %s)" % [ key, val.url, val.push_url ]
+                        else
+                            say "  Remote:       %s -> %s" % [ key, val.url ]
+                        end
                     end
                     say "  Track branch: #{mod.vcs_configuration.track_remote}/#{mod.vcs_configuration.track_branch}"
                 when 'git-svn'
-                    say "  Remote:       %s -> %s" % [ "git-svn", mod.vcs_configuration.repository.url ]
+                    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 ]
                     end

data/lib/build-tool/module.rb

@@ -23,7 +23,6 @@ def initialize( name, parent = nil )
             @remote_path = nil
             @environment = nil
             @build_system = nil
-            @repository = nil
             @install_prefix = nil
             @is_template = false
             @vcs_configuration = nil
@@ -205,22 +204,6 @@ def remote_path
             @remote_path || @name
         end
 
-        # Repository
-        def repository=( repository )
-            @repository = repository
-        end
-
-        def repository
-            return @repository if @repository
-            return @parent.repository if @parent && @parent.repository
-        end
-
-        def repository_required
-            repo = self.repository
-            return repo if repo
-            raise ConfigurationError, "No repository configured for #{name}!"
-        end
-
         def source_directory
             build_prefix_required.join("src", local_path)
         end
@@ -253,12 +236,6 @@ def vcs_configuration_required
         end
 
         def vcs_required
-            if repository.nil?
-                raise ConfigurationError, "No repository specified for module #{name}."
-            end
-            if remote_path.nil?
-                raise ConfigurationError, "No remote path specified for module #{name}."
-            end
             if source_directory.nil?
                 raise ConfigurationError, "No source directory specified for module #{name}."
             end
@@ -340,14 +317,9 @@ def cleanup_after_vcs_access
 
         # Check if an ssh-key is required and active it if necessary
         def prepare_for_vcs_access
-            if key = repository_required.sshkey
-                if !MJ::Tools::SSH::has_key? key.file
-                    logger.info ""
-                    logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
-                    MJ::Tools::SSH::add_key key.file
-               end
+            if vcs
+                return vcs.prepare_for_access
             end
-            return true
         end
 
         def prepare_for_installation

data/lib/build-tool/repository.rb

@@ -36,7 +36,7 @@ def sshkey
             return @sshkey if @sshkey
 
             if !server
-                raise ConfigurationError, "No server specified for repository #{name}"
+                return nil
             end
 
             return server.sshkey

data/lib/build-tool/server.rb

@@ -40,6 +40,10 @@ def url
             url
         end
 
+        def to_s
+            "Server: #{url}"
+        end
+
     end # class Server
 
 

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

@@ -12,14 +12,6 @@ def initialize
             @module = nil
         end
 
-        def remote_path
-            @module.remote_path
-        end
-
-        def repository
-            @module.repository
-        end
-
         def local_path
             @module.source_directory
         end
@@ -69,18 +61,6 @@ def local_path
             local_path
         end
 
-        def remote_path
-            remote_path = @config.remote_path
-            raise ConfigurationError, "#{self.class}.remote_path not set" if remote_path.nil?
-            remote_path
-        end
-
-        def repository
-            repository = @config.repository
-            raise ConfigurationError, "#{self.class}.repository not set" if repository.nil?
-            repository
-        end
-
         #
         ### METHODS
         #
@@ -94,6 +74,15 @@ def configure
             logger.debug "VCS #{name} did not implement configure!"
         end
 
+        def prepare_for_vcs_access
+            if key = repository.ssh_key and  !MJ::Tools::SSH::has_key? key.file
+                logger.info ""
+                logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
+                MJ::Tools::SSH::add_key key.file
+            end
+            return true
+        end
+
         def recipe
             Application::instance.recipe
         end

data/lib/build-tool/vcs/git-svn.rb

@@ -32,6 +32,25 @@ def copy_configuration( other )
             @externals = {}     # Do not copy the externals
         end
 
+        attr_writer :repository
+        def repository
+            if @repository.nil?
+                 raise ConfigurationError, "No repository configured for module #{self.module.name}."
+            end
+            @repository
+        end
+
+        attr_writer :remote_path
+        def remote_path
+            if @remote_path.nil?
+                return @module.name
+            end
+            @remote_path
+        end
+
+        def track_branch
+            "git-svn"
+        end
     end
 
     #
@@ -75,8 +94,8 @@ def clone
             # Create the directory
             FileUtils.mkdir_p( local_path ) if !$noop
             # Init the repository
-            if 0 != ( git_svn "init #{repository.url}/#{remote_path}" )
-                raise GitSvnError, "Error while initializing the repo `git svn init '#{repository}/#{remote_path}'`: #{$?}"
+            if 0 != ( git_svn "init #{config.repository.url}/#{remote_path}" )
+                raise GitSvnError, "Error while initializing the repo `git svn init '#{config.repository}/#{remote_path}'`: #{$?}"
             end
             fetch( "HEAD" )
         end
@@ -123,8 +142,25 @@ def git_svn( command, wd = local_path, &block )
             rc
         end
 
+        def prepare_for_access
+            # If our server has an associated ssh-key, add it to the ssh-agent.
+            if config.repository.sshkey
+                key = config.repository.sshkey
+                logger.info ""
+                logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
+                MJ::Tools::SSH::add_key key.file
+            end
+            true
+        end
+
         def rebase
-            git.git( "rebase git-svn" )
+            if 0 != ( git.git "rebase #{config.track_branch}" )
+                raise GitSvnError, "Error while rebasing the repo with `#{config.track_branch}': #{$?}"
+            end
+        end
+
+        def remote_path
+            @config.remote_path
         end
 
         def update_externals

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

@@ -1,10 +1,88 @@
 require 'build-tool/vcs/base'
 require 'build-tool/errors'
+require 'grit'
 
 module BuildTool; module VCS
 
     class GitError < BuildTool::Error; end
 
+    class GitRemote
+
+        # The name for the remote
+        attr_accessor :name
+
+        # The hostname for the remote
+        attr_accessor :server
+
+        # The path for the remote
+        attr_accessor :path
+
+        # The hostname to push to for the remote
+        attr_accessor :push_server
+
+        # The path to push to for the remote
+        attr_accessor :push_path
+
+        attr_reader   :user
+
+        def initialize( name )
+            self.name = name
+            @user = nil
+        end
+
+        def url
+            if !server
+                raise ConfigurationError, "No server specified for remote #{name}"
+            end
+            if !server.host
+                raise ConfigurationError, "No host specified for server #{server.name}"
+            end
+
+            url = server.host
+            if server.path
+                url = "#{url}/#{server.path}"
+            end
+            if user
+                url = "#{user}@#{url}"
+            end
+            if server.protocol
+                url = "#{server.protocol}://#{url}"
+            end
+            if path
+                url = "#{url}/#{path}"
+            end
+            url
+        end
+
+        # Returns the pushUrl configured or nil if not configured.
+        def push_url
+            if !push_server
+                return nil
+            end
+            if !push_server.host
+                raise ConfigurationError, "No host specified for server #{push_server.name}"
+            end
+
+            url = push_server.host
+            if push_server.path
+                url = "#{url}/#{push_server.path}"
+            end
+            if user
+                url = "#{user}@#{url}"
+            end
+            if push_server.protocol
+                url = "#{push_server.protocol}://#{url}"
+            end
+            if path
+                url = "#{url}/#{path}"
+            end
+            url
+        end
+
+    end
+
+
+
     class GitConfiguration < BaseConfiguration
 
         def name
@@ -16,6 +94,7 @@ def name
         def initialize
             super
             @remote = {}
+            @track = "origin/master"
         end
 
         def vcs( mod )
@@ -24,8 +103,11 @@ def vcs( mod )
             Git.new( self )
         end
 
+        # The branch to track
+        attr_accessor :track
+
         def track_remote
-            rc = self.module.remote_path.split('/')
+            rc = track.split('/')
             # If there is only one string we assume it is the branch name from
             # origin
             return "origin" if rc.length == 1
@@ -33,7 +115,7 @@ def track_remote
         end
 
         def track_branch
-            rc = self.module.remote_path.split('/')
+            rc = track.split('/')
             # If there is only one string we assume it is the branch name from
             # origin
             return rc[0] if rc.length == 1
@@ -69,6 +151,11 @@ def fetching_supported?
             true
         end
 
+        def repo
+            return @repo if @repo
+            @repo = Grit::Repo.new( local_path )
+            @repo
+        end
         #
         ### METHODS
         #
@@ -100,11 +187,9 @@ def clone
                 if git( "remote add #{name} #{val.url}" ) != 0
                     raise GitError, "Error while initializing the repo `git remote add #{name} #{val.url}`: #{$?}"
                 end
-            end
-
-            cmd = "remote add origin #{repository.url}"
-            if git( cmd, local_path ) != 0
-                raise GitError, "Error while initializing the repo `#{cmd}`: #{$?}"
+                if val.push_url and git( "remote set-url --push #{name} #{val.push_url}" ) != 0
+                    raise GitError, "Error while initializing the repo `git remote add #{name} #{val.url}`: #{$?}"
+                end
             end
 
             logger.info <<-EOS
@@ -127,14 +212,6 @@ def gc
             git( "gc" )
         end
 
-        def remote?( name )
-            found = false
-            git( "remote" ) do |line|
-                found = true if line == name
-            end
-            return found
-        end
-
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
@@ -156,9 +233,34 @@ def git( command, wd = local_path, &block )
             rc
         end
 
+        def prepare_for_access
+            # If our server has an associated ssh-key, add it to the ssh-agent.
+            if config.remote[ config.track_remote ].server.sshkey
+                logger.info ""
+                logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
+                MJ::Tools::SSH::add_key key.file
+            end
+
+            # Check that the remotes are the same as configured.
+            if checkedout? 
+                gitconfig = repo.config
+                config.remote.each do |name, val|
+                    if val.url and val.url != gitconfig["remote.#{name}.url"]
+                        logger.info "#{config.module.name}: Setting remote.origin.url to #{val.url}"
+                        gitconfig["remote.#{name}.url"] = val.url
+                    end
+                    if val.push_server and val.push_url != gitconfig["remote.#{name}.pushurl"]
+                        logger.info "#{config.module.name}: Setting remote.origin.pushurl to #{val.push_url}"
+                        gitconfig["remote.#{name}.pushurl"] = val.push_url
+                    end
+                end
+            end
+            return true
+        end
+
         def rebase
             if 0 != ( git "rebase #{config.track_remote}/#{config.track_branch}" )
-                raise GitSvnError, "Error while rebasing the repo with `git rebase git-svn: #{$?}"
+                raise GitSvnError, "Error while rebasing the repo with `#{config.track_remote}/#{config.track_branch}': #{$?}"
             end
         end
 

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

@@ -4,9 +4,14 @@ module BuildTool; module VCS
 
     class SvnConfiguration < BaseConfiguration
 
+        # The repository
+        attr_accessor :repository
+
         def initialize
             super
             @only = nil
+            @repository = nil
+            @remote_path = nil
         end
 
         def name
@@ -29,6 +34,23 @@ def copy_configuration( other )
             super
             @only = nil     # Do not copy nil
         end
+
+        attr_writer :repository
+        def repository
+            if @repository.nil?
+                 raise ConfigurationError, "No repository configured for module #{mod.name}."
+            end
+            @repository
+        end
+
+        attr_writer :remote_path
+        def remote_path
+            if @remote_path.nil?
+                return @module.name
+            end
+            @remote_path
+        end
+
     end
 
     #
@@ -112,6 +134,26 @@ def last_changed_rev
             return version
         end
 
+        def prepare_for_access
+            # If our server has an associated ssh-key, add it to the ssh-agent.
+            if config.repository.sshkey
+                key = config.repository.sshkey
+                logger.info ""
+                logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
+                MJ::Tools::SSH::add_key key.file
+            end
+            true
+        end
+
+        def remote_path
+            @config.remote_path
+        end
+
+        def repository
+            config.repository
+        end
+
+
         # Call svn with command
         def svn( command, wd = local_path, &block )
             self.class.svn( command, wd, &block )

data/lib/mj/visitor.rb

@@ -12,7 +12,7 @@ def accept( visitor )
             if klass
                 return visitor.send( method_name, self )
             else
-                raise "#{visitor.class}: Not a visitor for #{self.class}!"
+                raise "#{visitor.class}: Should not happen!"
             end
         end
 

metadata

@@ -2,7 +2,7 @@
 name: build-tool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors: 
 - Michael Jansen
@@ -31,7 +31,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,8 +197,6 @@ files:
 - lib/build-tool/cfg/node.rb
 - lib/build-tool/cfg/parser.y
 - lib/build-tool/cfg/visitor.rb
-- lib/build-tool/cfg/parser.rb
-- lib/build-tool/cfg/lexer.rb
 - lib/build-tool/command_actions.rb
 - lib/build-tool/commands.rb
 - lib/build-tool/commands/build.rb