build-tool 0.6.7 → 0.6.8

data/History.rdoc

@@ -1,3 +1,26 @@
+== Version 0.6.8
+
+== Features
+- Implement option --quiet
+- module status: New command that shows
+  - Local unpushed changes (if vcs supports that)
+  - Local uncommitted changes
+  - Remote changes
+
+== Enhancements
+- module history: Print name instead of id
+- module info:
+  - Show ssh key for svn too
+  - Show timestamp for module state too
+- Minor Performance improvements
+- Disable ansi color output for files (logfiles too)
+- VCS SVN: Do a "switch --relocate" if required
+- VCS GIT-SVN: Change gitconfig svn-remote.svn.url if required.
+
+== Bugfixes
+- VCS Archive: Is Checked out if the source-dir exists, not when the archive is there.
+- Custom BuildSystem: Is configured is the build dir exists
+
 == Version 0.6.7
 === Bugfix
 - Fix [#29650] 'could not parse line' when installing recipe

data/lib/build-tool/application.rb

@@ -1,7 +1,7 @@
 # -*- encoding: UTF-8 -*-
 
 require 'logging'
-Logging.init :debug2, :debug, :trace, :verbose, :info, :warn, :error
+Logging.init :debug2, :debug, :trace, :verbose, :info, :quiet, :warn, :error
 include Logging.globally
 
 require 'mj/logging'
@@ -10,6 +10,7 @@
 require 'build-tool/singleton'
 
 require 'active_record'
+require 'ansi/code'
 
 $noop = false
 
@@ -39,6 +40,11 @@ def initialize( name, application_root )
             @database = nil
             @name = File.basename( name ).sub( "-build", "" )
             @local_settings_file_path = local_configuration_dir.join("#{@name}.yaml")
+
+            # If stdout is not a terminal don't use ansi codes
+            if ! STDOUT.tty?
+                $ansi = false
+            end
         end
 
         # Load the configuration

data/lib/build-tool/build-system/custom.rb

@@ -27,6 +27,7 @@ def initialize( *args )
 
         # Check if the module is configured
         def configured?
+            Pathname.new( build_directory ).exist?
         end
 
         def name

data/lib/build-tool/commands.rb

@@ -153,7 +153,6 @@ def complete_arguments( args )
 
         def do_complete( args )
             return complete_arguments( args )
-            do_complete( args )
         end
 
         def each_option
@@ -296,6 +295,11 @@ def skip_command
             @skip_command = true
         end
 
+        # Print out a normal message (if enabled)
+        def quiet( *args )
+            logger.quiet( *args )
+        end
+
         # Print out a normal message (if enabled)
         def info( *args )
             logger.info( *args )
@@ -367,6 +371,10 @@ def initialize_options
                 Logging.appenders['stdout'].level = [ Logging.appenders['stdout'].level - 1, 0 ].max()
             end
 
+            options.on( "-q", "--quiet", "More quiet output" ) do
+                Logging.appenders['stdout'].level = [ Logging.appenders['stdout'].level + 1, 0 ].max()
+            end
+
             options.on( nil, "--dry-run", "Enable dry run." ) do
                 $noop = true
             end
@@ -454,9 +462,9 @@ def log_directory
 
     class ModuleProgressbar < MJ::Logging::Progressbar
 
-        def initialize( title, mod, &block )
-            super( title, mod.size ) do
-                mod.each_with_index do |mod, i|
+        def initialize( title, mods, &block )
+            super( title, mods.size ) do
+                mods.each_with_index do |mod, i|
                     if @pbar
                         @pbar.set( i )
                         @pbar.title= mod.name.split( '/' )[-1]
@@ -539,6 +547,7 @@ def do_execute( args )
             # 1. Resolve the modules
             modules = []
             args.each do |arg|
+                # :FIXME: what if arg is invalid?
                 complete_modules( arg ).each do |mod|
                     modules << mod
                 end
@@ -605,7 +614,7 @@ def do_execute( args )
                         begin
 
                             info( "" )
-                            info( "#### Module #{mod.name} (#{index+1}/#{modules.size})" )
+                            quiet( "#### Module #{mod.name} (#{index+1}/#{modules.size})" )
                             do_execute_module( mod )
                         rescue Interrupt => e
                             raise e
@@ -816,7 +825,7 @@ def do_complete( args )
         end
 
         def complete_command( cmdname )
-            cmds = @commands.collect { |com|
+            @commands.collect { |com|
                 com.name if com.name.start_with? cmdname
             }.compact
         end

data/lib/build-tool/commands/history.rb

@@ -94,7 +94,7 @@ def show_module_history( modname )
                 last_module=""
                 cmd.module_logs.where( :module => mod.name ).each do |e|
                     if e.module != last_module
-                        info( blue { "\t#{e.module}" } )
+                        info( blue { "\t#{e.module.name}" } )
                         last_module = e.module
                     end
                     info( "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ] )
@@ -119,7 +119,7 @@ def show_detailed_command_history( id )
             last_module=""
             cmd.module_logs.each do |e|
                 if e.module != last_module
-                    info( blue { "\t#{e.module}" } )
+                    info( blue { "\t#{e.module.name}" } )
                     last_module = e.module
                 end
                 info( "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ] )

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

@@ -58,15 +58,23 @@ def do_execute_module( mod )
             info( "VCS: #{mod.vcs_configuration ? mod.vcs_configuration.name : 'not configured' }" )
             if mod.vcs_configuration
                 case mod.vcs_configuration.name
+
                 when 'svn'
                     info( "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ] )
+                    if mod.vcs_configuration.repository and mod.vcs_configuration.repository.sshkey
+                        info( "  SSH Key:         '#{mod.vcs_configuration.repository.sshkey.name}' (#{mod.vcs_configuration.repository.sshkey.file})" )
+                    end
+
                 when 'bazar'
                     info( "  Branch:       %s" % [ mod.vcs_configuration.url ] )
+
                 when 'mercurial'
                     info( "  URL:              %s" % [ mod.vcs_configuration.url ] )
                     info( "  Track:            %s" % [ mod.vcs_configuration.track ] )
+
                 when 'archive'
                     info( "  URL:              %s" % [ mod.vcs.archive_url ] )
+
                 when 'git'
                     mod.vcs_configuration.merged_remote.each do |key, val|
                         if val.push_url
@@ -76,6 +84,7 @@ def do_execute_module( mod )
                         end
                     end
                     info( "  Track branch: #{mod.vcs_configuration.track_remote}/#{mod.vcs_configuration.track_branch}" )
+
                 when 'git-svn'
                     info( "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ] )
                     mod.vcs_configuration.merged_remote.each do |key, val|
@@ -84,9 +93,12 @@ def do_execute_module( mod )
                     mod.vcs_configuration.merged_externals.each do |key, val|
                         info( "  External:            #{key} -> #{val}" )
                     end
+
                 else
                     warn( "Unknown vcs #{mod.vcs_configuration.name}" )
                 end
+
+
             end # if mod.vcs_configuration
 
             bs = mod.build_system

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

@@ -0,0 +1,84 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/commands'
+
+module BuildTool; module Commands; module Modules
+
+    #
+    # BuildCommand
+    #
+    class Status < ModuleBasedCommand
+
+        name        "status"
+        description "show module status"
+        long_description [ "Show information about the modules status" ]
+
+        def do_execute_module( mod )
+
+            info( "Active:            #{mod.active?}" )
+            info( "Status:            #{mod.state}" )
+
+            dirty = mod.dirty?
+            if dirty
+                quiet( "Modified:          #{dirty}" )
+            else
+                info( "Modified:          #{dirty}" )
+            end
+
+            info( "VCS: #{mod.vcs_configuration ? mod.vcs_configuration.name : 'not configured' }" )
+
+            if mod.vcs_configuration
+
+                c = mod.vcs.remote_changes()
+                if c.nil?
+                    verbose( "Remote Changes:           Not supported." )
+                elsif c.empty?
+                    verbose( "Remote Changes:           None" )
+                else
+                    quiet( "Remote Changes" )
+                    c.each do |line|
+                        quiet( "  " + line )
+                    end
+                end
+
+                if not @local_only
+                    c = mod.vcs.local_changes()
+                    if c.nil?
+                        verbose( "Local Changes:            Not supported." )
+                    elsif c.empty?
+                        verbose( "Local Changes:            None" )
+                    else
+                        quiet( "Local Changes:" )
+                        c.each do |line|
+                            quiet( "  " + line )
+                        end
+                    end
+                end
+
+            end # if mod.vcs_configuration
+
+            return 0
+        end
+
+        def initialize_options
+            options.banner = "Usage: #{self.fullname}  [OPTIONS]... MODULES..."
+            options.separator( "" )
+            options.separator( "Options" )
+
+            @all = false
+            options.on( "--all", "Include inactive modules." ) {
+                @all = true
+                }
+
+            @local_only = false
+            options.on( "--local-only", "Only show local unpushed changes." ) {
+                @local_only = true
+                }
+            super
+        end
+
+    end # class Info
+
+end; end; end # module BuildTool::Commands::Modules
+
+

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

@@ -13,7 +13,7 @@ class CommandLog < ActiveRecord::Base
         include StateHelper
 
         # A command can have many module events
-        has_many :module_logs, :order => :id, :dependent => :destroy
+        has_many :module_logs, :order => :id, :dependent => :destroy, :include => :module
 
         def duration
             if self.finished_at

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

@@ -86,6 +86,13 @@ def active?
             end
         end
 
+        def dirty?
+            if vcs
+                return vcs.dirty?
+            end
+            return false
+        end
+
         # not inherited
         def build_directory
             build_prefix_required.join("bld", local_path)
@@ -265,13 +272,18 @@ def lastlog
 
         # Returns a current state in string format
         def state
-            return 'UNKNOWN' if lastlog.empty?
-            lastlog[0].module_logs.where( :module => name ).each do |e|
-                if e.state != History::ModuleLog::FINISHED_SUCCESSFUL
-                    return "#{e.state_str} (#{e.event})"
-                end
+            log = lastlog
+            return 'UNKNOWN' if log.empty?
+
+            e = log[0].module_logs.reverse_order.where( :module => name ).first
+            if e.nil?
+                return "UNKNOWN"
+            end
+            if e.state != History::ModuleLog::FINISHED_SUCCESSFUL
+                return "#{e.started_at.strftime("%x %X")}: #{e.state_str} (#{e.event})"
+            else
+                return "#{e.started_at.strftime("%x %X")}: #{e.state_str}"
             end
-            return History::ModuleLog::state_str( History::ModuleLog::FINISHED_SUCCESSFUL )
         end
 
         # Return the current state as one char.

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

@@ -89,7 +89,7 @@ def archive_url
         #
 
         def checkedout?
-            File.exist? archive_local_path
+            local_path_exist?
         end
 
         def apply_patches( patches )
@@ -247,6 +247,18 @@ def prepare_for_fetch
             return check_for_sshkey( config.repository.sshkey )
         end
 
+        def dirty?
+            return nil
+        end
+
+        def do_remote_changes
+            yield nil
+        end
+
+        def do_local_changes
+            yield nil
+        end
+
     end # class Archive
 
 end; end

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

@@ -127,7 +127,10 @@ def recipe
             :rebase,
             :fetching_supported?,
             :[]=,
-            :[]
+            :[],
+            :dirty?,
+            :do_remote_changes,
+            :do_local_changes
         ] do
             class_eval <<-EOS
                 def #{method}
@@ -136,6 +139,36 @@ def #{method}
             EOS
         end
 
+        def remote_changes( &block )
+            if block_given?
+                do_remote_changes( &block )
+            else
+                r = []
+                do_remote_changes() do |c|
+                    r << c
+                end
+                if r == [ nil ]
+                    return nil
+                end
+                return r
+            end
+        end
+
+        def local_changes
+            if block_given?
+                do_local_changes( &block )
+            else
+                r = []
+                do_local_changes() do |c|
+                    r << c
+                end
+                if r == [ nil ]
+                    return nil
+                end
+                return r
+            end
+        end
+
     end # class Base
 
 end; end # module BuildTool::VCS

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

@@ -81,23 +81,18 @@ def clone
             end
         end
 
-        # Is the git executable available?
-        def self.bzr_available?()
-            return @bzr_available unless @bzr_available.nil?
-            %x( bzr --version 2>&1 )
-            @bzr_available = $?.success?
-            return @bzr_available
-        end
-
         def ready_for_fetch
             if not self.class.bzr_available?
                 logger.error( "#{config.module.name}: Calling `bzr` failed!" )
                 return false
             end
+            return true
+        end
 
+        def ready_for_rebase
             if checkedout?
                 # Check if the index is dirty.
-                if bzr( "diff" ) != 0
+                if dirty?
                     logger.info( "#{config.module.name}: Local changes will prevent the update." )
                     bzr( "status --short --versioned" ) do |line|
                         logger.info line.chomp
@@ -105,7 +100,6 @@ def ready_for_fetch
                     return false
                 end
             end
-
             return true
         end
 
@@ -125,7 +119,9 @@ def fetch( verbose = false )
             end
 
             rc = bzr( cmd ) do |line|
-                logger.info( line )
+                if verbose
+                    logger.info( line )
+                end
             end
 
             if rc != 0
@@ -135,7 +131,7 @@ def fetch( verbose = false )
 
         # Execute +command+ in directory +wd+ and yield every line of output.
         def bzr( command, wd = local_path, &block )
-            rc = self.class.execute "bzr #{command}", wd, &block
+            self.class.execute "bzr #{command}", wd, &block
         end
 
         def rebase( verbose = false )
@@ -143,6 +139,39 @@ def rebase( verbose = false )
             0
         end
 
+        def dirty?
+            # Check if the index is dirty.
+            if bzr( "diff" ) != 0
+                return true
+            end
+            return false
+        end
+
+        def do_remote_changes
+            yield nil
+        end
+
+        def do_local_changes
+            yield nil
+        end
+
+        #
+        ### CLASS METHODS
+        #
+        class << self
+
+            @bzr_available = nil
+
+            # Is the git executable available?
+            def bzr_available?()
+                return @bzr_available unless @bzr_available.nil?
+                %x( bzr --version 2>&1 )
+                @bzr_available = $?.success?
+                return @bzr_available
+            end
+
+        end
+
     end # class Bazar
 
 end; end # module BuildTool::VCS