build-tool 0.6.7 → 0.6.8

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

@@ -103,11 +103,7 @@ def fetching_supported?
         #
 
         def checkedout?
-            return false if !local_path_exist?
-            if !Pathname.new( local_path ).join( ".git" ).exist?
-                raise Base::VcsError, "Checkout path #{local_path} is not a git repo!"
-            end
-            return true
+            git.checkedout?
         end
 
         def clone( verbose = false )
@@ -121,6 +117,8 @@ def clone( verbose = false )
                 raise GitSvnError, "Error while initializing the repo `git svn init '#{config.repository}/#{remote_path}'`: #{$?}"
             end
 
+            check_config
+
             fetch(false, "HEAD")
         end
 
@@ -128,6 +126,25 @@ def configure
             git.configure
         end
 
+        def check_config
+            return if @already_checked_config
+            git.check_config
+            if checkedout?
+                # Check that the remotes are the same as configured.
+                gitconfig = Grit::RepoConfig.new(git.repo)
+                svnurlrec = Pathname.new( config.repository.url ).join( remote_path ).cleanpath
+                svnurlcur = Pathname.new( gitconfig["svn-remote.svn.url"] ).cleanpath
+                if svnurlcur.nil?
+                    if git.git( "svn init #{svnurl}" ) != 0
+                        raise GitError, "Error while initializing the repo `git svn init #{svnurlrec}`"
+                    end
+                elsif svnurlcur != svnurlrec
+                    logger.info "repo: Setting remote.origin.url to #{svnurlrec}"
+                    gitconfig["svn-remote.svn.url"] = svnurlrec
+                end
+            end
+        end
+
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
@@ -136,7 +153,7 @@ def fetch( verbose = false, revision = nil )
                 clone( verbose )
             else
                 # clone() calls those methods.
-                git.check_config
+                check_config
             end
 
             if revision
@@ -174,7 +191,7 @@ def prepare_for_fetch
         end
 
         def rebase( verbose = false )
-            git.check_config
+            check_config
             remote_branch = "#{config.track_branch}"
 
             if verbose
@@ -188,6 +205,18 @@ def rebase( verbose = false )
             end
         end
 
+        def dirty?
+            return git.dirty?
+        end
+
+        def do_remote_changes( &block )
+            return git.do_remote_changes( &block )
+        end
+
+        def do_local_changes( &block )
+            return git.do_local_changes( &block )
+        end
+
         def ready_for_fetch
             if not GitSvn.git_svn_available
                 logger.info( "#{config.module.name}: Calling `git svn` failed!" )

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

@@ -410,20 +410,26 @@ def ready_for_fetch
             return true
         end
 
+        # Check if the checkout is dirty.
+        def dirty?
+            # Check if the index is dirty.
+            if git( "diff --exit-code" ) != 0
+                return true
+            end
+
+            if git( "diff --cached --exit-code" ) != 0
+                return true
+            end
+
+            return false
+        end
+
         # Check if the module is ready for a rebase.
         def ready_for_rebase
             check_user_config
             if checkedout?
                 # Check if the index is dirty.
-                if git( "diff --exit-code" ) != 0
-                    logger.info( "#{config.module.name}: A dirty index will prevent the rebase." )
-                    git( "status -s -uno" ) do |line|
-                        logger.info line.chomp
-                    end
-                    return false
-                end
-
-                if git( "diff --cached --exit-code" ) != 0
+                if dirty?
                     logger.info( "#{config.module.name}: A dirty index will prevent the rebase." )
                     git( "status -s -uno" ) do |line|
                         logger.info line.chomp
@@ -434,12 +440,28 @@ def ready_for_rebase
             true
         end
 
+        # Print the pending changes.
+        #
+        #
+        def do_remote_changes( &block )
+            remote_branch = "#{config.track_remote}/#{config.track_branch}"
+            git('log --first-parent --pretty=oneline HEAD..%s' % remote_branch, &block )
+        end
+
+        # Print the unpushed changes.
+        #
+        #
+        def do_local_changes( &block )
+            remote_branch = "#{config.track_remote}/#{config.track_branch}"
+            git('log --first-parent --pretty=oneline %s..HEAD' % remote_branch, &block )
+        end
+
         def rebase( verbose = false )
             check_config
             remote_branch = "#{config.track_remote}/#{config.track_branch}"
 
             if verbose
-                git('log --first-parent --pretty=oneline HEAD..%s' % remote_branch ) do |line|
+                remote_changes.each do |line|
                     logger.info( line )
                 end
             end

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

@@ -92,6 +92,29 @@ def clone
             rebase()
         end
 
+        def ready_for_fetch
+            if not self.class.hg_available?
+                logger.error( "#{config.module.name}: Calling `hg` failed!" )
+                return false
+            end
+            return true
+        end
+
+        def ready_for_rebase
+            if checkedout?
+                # Check if the index is dirty.
+                if dirty?
+                    logger.info( "#{config.module.name}: Local changes will prevent the update." )
+                    hg( "status -q" ) do |line|
+                        logger.info line.chomp
+                    end
+                    return false
+                end
+            end
+
+            return true
+        end
+
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
@@ -114,7 +137,6 @@ def hg( command, wd = local_path, &block )
         end
 
         def rebase( verbose = false )
-
             if verbose
                 logger.info( 'Verbose rebase not yet implemented for mercurial.' )
             end
@@ -124,6 +146,39 @@ def rebase( verbose = false )
             end
         end
 
+        def dirty?
+            dirty = false
+            hg( "status -q" ) do
+                dirty = true
+            end
+            return dirty
+        end
+
+        def do_remote_changes
+            yield nil
+        end
+
+        def do_local_changes
+            yield nil
+        end
+
+        #
+        # CLASS METHODS
+        #
+        # Is the git executable available?
+        class << self
+
+            @hg_available = nil
+
+            def hg_available?()
+                return @hg_available unless @hg_available.nil?
+                %x( hg --version 2>&1 )
+                @hg_available = $?.success?
+                return @hg_available
+            end
+
+        end
+
     end # class Mercurial
 
 end; end # module BuildTool::VCS

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

@@ -57,13 +57,15 @@ class Svn < Base
 
         class SvnError < BuildTool::Error; end
 
-        # def initialize( *args )
-        #     super( *args )
-        # end
+        def initialize( *args )
+            super( *args )
+            @remote_info = nil
+            @local_info
+        end
 
         class << self
 
-            svn_available = nil
+            @svn_available = nil
 
             # Is the git executable available?
             def svn_available?
@@ -101,6 +103,14 @@ def checkedout?
             return true
         end
 
+        # Make sure the configuration is correct.
+        def check_config
+            if self.url != "#{remote_url}"
+                logger.info( "Relocating checkout to #{remote_url}" )
+                svn( "switch --relocate #{self.url} #{remote_url}" )
+            end
+        end
+
         # Initialize the local repository
         def clone
             # Check if local_path exists
@@ -113,13 +123,16 @@ def clone
 
             # Init the repository
             if config.only
-                svn "checkout --depth=files #{repository.url}/#{remote_path} #{local_path}", local_path.dirname
+                svn "checkout --depth=files #{remote_url} #{local_path}", local_path.dirname
                 config.only.each do |elem|
                     svn "update --depth=infinity #{elem}", local_path
                 end
             else
-                svn "checkout --depth=infinity #{repository.url}/#{remote_path} #{local_path}", local_path.dirname
+                svn "checkout --depth=infinity #{remote_url} #{local_path}", local_path.dirname
             end
+
+            check_config
+
             return true
         end
 
@@ -135,6 +148,9 @@ def fetch( verbose = false )
 
             if !checkedout?
                return clone
+            else
+                # Micro optimization. clone calls check_config
+                check_config
             end
 
             if verbose
@@ -148,21 +164,46 @@ def fetch( verbose = false )
             return true
         end
 
+        # Run svn info and return the result in a hash
+        def info( local = true )
+            if local
+                return @local_info if @local_info
+                @local_info = Hash.new
+                svn( "info" ) {
+                    |line|
+                    key, value = line.chomp.split( ':', 2 )
+                    @local_info[key] = value
+                }
+                return @local_info
+            else
+                return @remote_info if @remote_info
+                @remote_info = Hash.new
+                svn( "info #{remote_url}", nil ) {
+                    |line|
+                    key, value = line.chomp.split( ':', 2 )
+                    @remote_info[key] = value
+                }
+                return @remote_info
+            end
+        end
+
         # Returns the last changed revision on the remote repository.
         # Return 0 if the last changed revision could not be determined.
         def last_changed_rev
-            info = Hash.new
-            svn( "info #{repository.url}/#{remote_path}", nil ) {
-                |line|
-                key, value = line.chomp.split( ':', 2 )
-                info[key] = value
-            }
             return 777777 if $noop
-            version = info["Last Changed Rev"];
-            raise SvnError, "Failed to determine revision for #{repository.url}/#{remote_path}" if version.nil?
+            version = info( false )["Last Changed Rev"];
+            raise SvnError, "Failed to determine revision for #{remote_url}" if version.nil?
             return version
         end
 
+        # Return the currently active url
+        def url
+            return "http://example.com/my/example_repo" if $noop
+            url = info( true )["URL"]
+            raise SvnError, "Failed to determine url for #{remote_url}" if url.nil?
+            return url
+        end
+
         def prepare_for_fetch
             # If our server has an associated ssh-key, add it to the ssh-agent.
             return check_for_sshkey( config.repository.sshkey )
@@ -172,10 +213,38 @@ def remote_path
             @config.remote_path
         end
 
+        # convenience method
+        def remote_url
+            "#{repository.url}/#{remote_path}"
+        end
+
+
         def repository
             config.repository
         end
 
+        def dirty?
+            dirty = false
+            svn( "status -q" ) do
+                dirty = true
+            end
+            return dirty
+        end
+
+        def do_local_changes
+            yield nil
+        end
+
+        def do_remote_changes( &block )
+            svn( "log -rHEAD:BASE --quiet" ) do |x|
+                if not x.starts_with?( '----------' )
+                    yield x
+                end
+            end
+        end
+
+
+
 
         # Call svn with command
         def svn( command, wd = local_path, &block )

data/lib/build-tool/version.rb

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

data/lib/mj/logging.rb

@@ -58,6 +58,10 @@ def debug?
             return logger.level > ::Logging.level_num(:debug)
         end
 
+        def quiet( string )
+            logger.quiet( "<#{@prefix}> info #{string}" )
+        end
+
         def info( string )
             logger.info( "<#{@prefix}> info #{string}" )
         end
@@ -103,27 +107,30 @@ def initialize( title, total = 100, &block )
             super( 'Progressbar', :level => :DEBUG )
             @pbar = nil
             @oldlogger = nil
-            if ::Logging.appenders['stdout'].level >= ::Logging::level_num(:INFO)
+            if not STDOUT.tty? or
+               ::Logging.appenders['stdout'].level != ::Logging::level_num(:INFO)
                 # We only do the progressbar thing if there is no verbose output active.
-                begin
-                    # Remove the old stdout logger.
-                    @oldlogger = ::Logging.appenders[ 'stdout' ]
-                    ::Logging.logger[ 'root' ].remove_appenders( 'stdout' )
-                    ::Logging.logger[ 'root' ].add_appenders( self )
-                    # Add the progressbar logger
-                    @pbar = ANSI::Progressbar.new( title, total )
-                    yield
-                ensure
-                    @pbar.finish unless @pbar.nil?
-                    # Reset the logger
-                    ::Logging.logger[ 'root' ].remove_appenders( 'Progressbar' )
-                    ::Logging.logger[ 'root' ].add_appenders( @oldlogger )
-                end
-            else
-                # If there is verbose output just print the text
+                # And only if there is a terminal listening.
                 logger.info( title )
                 yield
+                return
+            end
+
+            begin
+                # Remove the old stdout logger.
+                @oldlogger = ::Logging.appenders[ 'stdout' ]
+                ::Logging.logger[ 'root' ].remove_appenders( 'stdout' )
+                ::Logging.logger[ 'root' ].add_appenders( self )
+                # Add the progressbar logger
+                @pbar = ANSI::Progressbar.new( title, total, out = STDOUT )
+                yield
+            ensure
+                @pbar.finish unless @pbar.nil?
+                # Reset the logger
+                ::Logging.logger[ 'root' ].remove_appenders( 'Progressbar' )
+                ::Logging.logger[ 'root' ].add_appenders( @oldlogger )
             end
         end
     end # class Progressbar
+
 end; end