build-tool 0.1.4 → 0.2

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

@@ -12,12 +12,17 @@ module BuildTool; module Commands; module Modules
         cmdalias    "lsmods"
 
         def initialize_options
+            @template = false
             @all = false
 
-            options.on( "--all", "Include template modules" ) {
+            options.on( "--all", "Include inactive modules." ) {
                 @all = true
                 }
 
+            options.on( "--template", "Include template modules." ) {
+                @template = true
+                }
+
             super
 
         end
@@ -26,16 +31,16 @@ module BuildTool; module Commands; module Modules
             # *TODO* listing local and remote recipes
             if args.length == 0
                 configuration.modules.each do |mod|
-                    if @all or not mod.is_template?
-                        say "%-30s : %s" % [ mod.name, mod.description ]
+                    if @template or not mod.is_template?
+                        say "%-30s : %s" % [ mod.name, mod.description ] if ( mod.active? || @all )
                     end
                 end
             else
                 args.each do |arg|
-                    mods = complete_modules( arg, @all )
+                    mods = complete_modules( arg, @template )
                     next if !mods
                     mods.each do |mod|
-                        say "%-30s : %s" % [ mod.name, mod.description ]
+                        say "%-30s : %s" % [ mod.name, mod.description ] if ( mod.active? || @all )
                     end
                 end
             end

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

@@ -14,6 +14,11 @@ module BuildTool; module Commands;
         name        "rebase"
         description "rebase local checkout against previously fetched remote changes."
 
+        # Log this command if $noop is not active
+        def log?
+            ! $noop
+        end
+
         def applicable?
             BuildTool::Application.instance.name != "build-tool"
         end
@@ -32,7 +37,7 @@ module BuildTool; module Commands;
 
         def do_execute_module( mod )
             if mod.checkedout?
-                mod.rebase( @log_directory )
+                rebase( mod )
             else
                 logger.info "Not checked out. Skipping"
             end

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

@@ -1,11 +1,11 @@
 require 'build-tool/commands'
 
-module BuildTool; module Commands; module Recipes
+module BuildTool; module Commands;
 
     #
     # BuildCommand
     #
-    class CLI < Commands::SubCommands
+    class RecipesCLI < Commands::SubCommands
 
         name        "recipes"
         description "build recipe related commands"
@@ -24,9 +24,5 @@ module BuildTool; module Commands; module Recipes
 
     end # class CLI
 
-    def self.create( *args )
-        cmd = CLI.new( *args )
-    end
-
-end; end; end # module BuildTool::Commands::Recipes
+end; end # module BuildTool::Commands::RecipesCLI
 

data/lib/build-tool/configuration.rb

@@ -1,11 +1,14 @@
 require 'build-tool/vcs/git'
 require 'build-tool/vcs/git-svn'
 require 'build-tool/vcs/svn'
+require 'build-tool/vcs/archive'
 
 require 'build-tool/build-system/cmake'
 require 'build-tool/build-system/qt'
 require 'build-tool/build-system/autoconf'
 require 'build-tool/build-system/custom'
+require 'build-tool/build-system/none'
+require 'build-tool/build-system/kdel10n'
 
 
 module BuildTool
@@ -15,13 +18,15 @@ module BuildTool
         attr_reader :recipe
         attr_reader :modules
         attr_reader :environments
+        attr_reader :features
+        attr_accessor :active_feature
 
         def log_directory
             return @log_directory if @log_directory
             raise BuildTool::ConfigurationError, "No log directory configured"
         end
         def log_directory=( path )
-            @log_directory = File.expand_path( path, "~" );
+            @log_directory = Pathname.new( File.expand_path( path, "~" ) )
         end
 
         def environment( name )
@@ -32,6 +37,14 @@ module BuildTool
             @environments[env.name] = env
         end
 
+        def feature( name )
+            @features[name]
+        end
+
+        def add_feature( feature )
+            @features[feature.path] = feature
+        end
+
         def module( name )
             @module[name]
         end
@@ -75,6 +88,8 @@ module BuildTool
             @build_system = {}
             @repository = {}
             @sshkey = {}
+            @active_feature = nil
+            @features = {}
         end
 
         def vcs( name )
@@ -85,6 +100,8 @@ module BuildTool
                 return BuildTool::VCS::GitConfiguration.new
             when "svn"
                 return BuildTool::VCS::SvnConfiguration.new
+            when "archive"
+                return BuildTool::VCS::ArchiveConfiguration.new
             else
                 raise StandardError, "Unknown Version Control System #{name}"
             end
@@ -93,14 +110,20 @@ module BuildTool
         def build_system( name )
             return @build_system[name] if @build_system[name]
             case name
+            when "none"
+                return BuildTool::BuildSystem::None.new
             when "cmake"
                 return BuildTool::BuildSystem::CMake.new
+            when "kdel10n"
+                return BuildTool::BuildSystem::KdeL10n.new
             when "qt"
                 return BuildTool::BuildSystem::Qt.new
             when "qmake"
                 return BuildTool::BuildSystem::QMake.new
             when "custom"
                 return BuildTool::BuildSystem::Custom.new
+            when "autoconf"
+                return BuildTool::BuildSystem::AutoConf.new
             else
                 raise StandardError, "Unknown Version Control System #{name}"
             end

data/lib/build-tool/environment.rb

@@ -15,14 +15,26 @@ module BuildTool
         # Parent environment
         attr_accessor :parent
 
+        attr_accessor :feature
+
         # Create a environment object
         def initialize( name )
             raise StandardError.new "Environment.name has to be set" if name.nil?
             @name = name
             @vars = Hash.new
             @parent = nil
+            @feature = nil
+        end
+
+        def active?
+            if @feature.nil?
+                true
+            else
+                @feature.active?
+            end
         end
 
+
         # Set a environment variable
         def append( name, value )
             if @vars.has_key?(name.to_s) and !@vars[name.to_s].empty?
@@ -33,7 +45,9 @@ module BuildTool
         end
 
         # Execute command in a shell with the environment set.
-        def execute( command, wd = nil )
+        def execute( command, wd = nil, env = nil )
+            values = self.values
+            values = values.merge( env ) if env
             rc = self.class.execute( command.to_s, wd, values )
             if rc != 0
                 raise StandardError, "#{command.to_s} failed with error code #{rc}";
@@ -96,8 +110,8 @@ module BuildTool
             if @parent
                 parentval = @parent[name]
             end
-            # If we don't know the var return the parents value
-            if !@vars.has_key?( name.to_s )
+            # If we don't know the var or the env is not active return the parents value
+            if !@vars.has_key?( name.to_s ) or !active?
                 return parentval
             end
             if parentval.empty?

data/lib/build-tool/feature.rb

@@ -0,0 +1,47 @@
+module BuildTool
+
+class Feature
+
+    attr_writer :active
+    attr_accessor :description
+    attr_accessor :long_description
+    attr_reader :modules
+    attr_reader :environments
+
+    def initialize( name = nil, parent = nil, active = true )
+        @name = name
+        @active = active
+        @parent = parent
+        @description = nil
+        @long_description = nil
+        @modules = []
+        @environments = []
+    end
+
+    def active?
+        if @parent.nil?
+            @active
+        else
+            @parent.active? && @active
+        end
+    end
+
+    def name
+        @name
+    end
+
+    def path
+        if @parent.nil?
+            @name
+        else
+            "%s/%s" % [ @parent.name, @name ]
+        end
+    end
+
+    def parent
+        @parent
+    end
+
+end # class Feature
+
+end # module BuildTool

data/lib/build-tool/history.rb

@@ -0,0 +1,173 @@
+require 'sequel'
+
+module BuildTool
+
+    #
+    # Provide method to add and retrieve entries from the history
+    #
+    module History
+
+        module StateHelper
+
+            # Needed for both Module and Command History
+            STARTED = 0
+            CANCELED_BY_USER = 1
+            FINISHED_SUCCESSFUL = 2
+            FINISHED_WITH_ERRORS = 3
+
+            def state_str
+                case self.state
+                when STARTED
+                    "STARTED"
+                when CANCELED_BY_USER
+                    "CANCELED"
+                when FINISHED_SUCCESSFUL
+                    "SUCCESS"
+                when FINISHED_WITH_ERRORS
+                    "ERRORS"
+                else
+                    "#{self.state.to_s}?"
+                end
+            end
+
+            module ClassMethods
+            end
+
+            def self.included( klass )
+                klass.extend ClassMethods
+            end
+
+        end
+
+        # Represents a log entry for a command.
+        class CommandLog < Sequel::Model( :command_logs )
+
+            include StateHelper
+
+            # A command can have many module events
+            one_to_many :module_logs, :order => :id
+
+            def duration
+                if self.finished_at
+                    dur = self.finished_at - self.started_at
+                    "%02d:%02d" % [ dur.to_i / 60, (dur% 60 ).to_i ]
+                else
+                    "-----"
+                end
+            end
+
+            # Call this if the command is finished. [:finished] will be set to Time.now,
+            # [:state] to the given value and the object is saved.
+            def finished( state )
+                self.finished_at = Time.now
+                self.state = state
+                save
+            end
+
+            # Call this if the command is started. [:started] will be set to Time.now, [:state]
+            # to STARTED and the object is saved.
+            def started
+                self.started_at = Time.now
+                save
+            end
+
+            # Sequel Hook
+            #
+            # Make sure a finished command has one of the accepted finished states.
+            def before_update
+                super
+                if !self.finished_at.nil?
+                    raise StandardError, "Wrong state for finished Command" if ! [ FINISHED_SUCCESSFUL, FINISHED_WITH_ERRORS, CANCELED_BY_USER ].include? self.state
+                end
+            end
+
+            # Class Methods
+            class << self
+
+                # Loads the most recents entry from the database
+                def most_recent( offset = nil )
+                    if offset.nil?
+                        return where( "id = (SELECT MAX(id) FROM #{table_name})" ).first
+                    else
+                        return order( :id.desc ).limit( 1, offset ).first
+                    end
+                end # def most_recent
+
+                # Get the last :count issued commands
+                #
+                # @param [Integer] count Number of commands to return
+                # @return [Array]  List containing the last count issued commands
+                def last( count = 50 )
+                    order(:id.desc).limit(count).all
+                end
+
+                # Get the last :count command entries containing module :modname.
+                def last_by_module( modname, count = 3 )
+                    where( 'id in ( select distinct command_log_id from module_logs where module = ? )', modname ).order( :id.desc ).first( count );
+                end
+
+                # Get all commands older than :days
+                def older_than
+                    where( 'finished_at < ?', Date.today - 10 )
+                end
+
+
+            end # ClassMethods
+
+        end
+
+        # Represents a module event.
+        #
+        # A module event is updating, compiling etc. a module.
+        class ModuleLog < Sequel::Model( :module_logs )
+
+            include StateHelper
+
+            # A module event belongs to a command
+            many_to_one :command_log
+
+            def duration
+                if self.finished_at
+                    dur = self.finished_at - self.started_at
+                    "%02d:%02d" % [ dur.to_i / 60, (dur% 60 ).to_i ]
+                else
+                    "-----"
+                end
+            end
+
+            # Call this if the command is finished. [:finished] will be set to Time.now,
+            # [:state] to the given value and the object is saved.
+            def finished( state )
+                self.finished_at = Time.now
+                self.state = state
+                save
+            end
+
+            # Call this when the command is started. [:started] will be set to Time.now and
+            # the object is saved.
+            def started
+                self.started_at = Time.now
+                save
+            end
+
+            # Sequel Hook
+            #
+            # Make sure a finished command has one of the accepted finished states.
+            def before_update
+                super
+                if !self.finished_at.nil?
+                    raise StandardError, "Wrong state for finished Command" if ! [ FINISHED_SUCCESSFUL, FINISHED_WITH_ERRORS, CANCELED_BY_USER ].include? self.state
+                end
+            end
+
+            class << self
+
+            end # class self
+
+        end
+
+    end # module BuildTool::History
+
+end # module BuildTool
+
+

data/lib/build-tool/module.rb

@@ -1,7 +1,5 @@
-# require 'gbs_signal_slot'
-require 'mj/tools/ssh'
 require 'ftools'
-
+require 'mj/tools/ssh'
 
 module BuildTool
 
@@ -15,6 +13,7 @@ module BuildTool
             if name.nil?
                 raise StandardError, "Module name is required!"
             end
+            @active = nil
             @name = name
             @parent = parent
             @local_path = nil
@@ -26,11 +25,27 @@ module BuildTool
             @install_prefix = nil
             @is_template = false
             @vcs_configuration = nil
+            @feature = nil
         end
 
         #
         ### ATTRIBUTES
         #
+        attr_writer :feature
+        attr_writer :active
+
+        def active?
+            # If the module is activated that wins
+            if @active.nil?
+                if @feature.nil?
+                    return true
+                else
+                    return @feature.active?
+                end
+            else
+                return @active
+            end
+        end
 
         # not inherited
         def build_directory
@@ -88,7 +103,11 @@ module BuildTool
         end
 
         def configured?
-            build_system_required.configured?
+            if build_system
+                return build_system.configured?
+            else
+                return false
+            end
         end
 
         def description
@@ -113,6 +132,11 @@ module BuildTool
             raise ConfigurationError, "No environment configured for #{name}!"
         end
 
+        # Garbage collect
+        def gc
+            vcs.gc
+        end
+
         # Installation prefix
         def install_prefix=( path )
             if path
@@ -227,85 +251,49 @@ module BuildTool
         #
         ### ACTIONS
         #
-        def clean( logdir, remove_build_directory = false )
-            while_logging_to logdir, '10_clean' do
-                if remove_build_directory
-                    logger.info "Removing build directory."
-                    build_system_required.remove_build_directory
-                else
-                    logger.info "Cleaning build directory."
-                    build_system_required.make( "clean" )
-                end
+        def clean( remove_build_directory = false )
+            if remove_build_directory
+                logger.info "Removing build directory."
+                build_system_required.remove_build_directory
+            else
+                logger.info "Cleaning build directory."
+                build_system_required.make( "clean" )
             end
         end
 
 
         # Clone the repository.
-        def clone( logdir )
-            while_logging_to logdir, '20_fetch' do
-                logger.info "Creating local checkout."
-                vcs_required.clone
-            end
+        def clone
+            vcs_required.clone
         end
 
         # Fetch changes from the remote repository. Do not change the local
         # checkout.
-        def fetch( logdir )
-            if !vcs_required.fetching_supported?
-                logger.info "Fetching/Rebase not supported by vcs #{vcs.name}. Doing it in one step."
-            end
-            while_logging_to logdir, '20_fetch' do
-                logger.info "Fetching remote changes."
-                vcs.fetch
-            end
+        def fetch
+            vcs_required.fetch
         end
 
         # Update the local changes with remote changes. Do not fetch changes
         # from the remote repository.
-        def rebase( logdir )
-            if !vcs_required.fetching_supported?
-                logger.info "Fetching not supported by vcs #{vcs.name}."
-                return
-            end
-            while_logging_to logdir, '30_rebase' do
-                logger.info "Rebasing against remote changes."
-                vcs.rebase
-            end
+        def rebase
+            vcs_required.rebase
         end
 
-        def configure( logdir )
-            while_logging_to logdir, '40_configure' do
-                logger.info "Configuring."
-                if !$noop and !vcs_required.checkedout?
-                    raise ConfigurationError, "Failed to configure: Module is not checked out."
-                end
-                build_system_required.configure
-            end
+        def configure
+            build_system_required.configure
         end
 
-        def reconfigure( logdir )
-            while_logging_to logdir, '40_configure' do
-                logger.info "Recreating configuration."
-                if !$noop and !vcs_required.checkedout?
-                    raise ConfigurationError, "Module is not checked out. Enable updating."
-                end
-                build_system_required.reconfigure
-            end
+        def reconfigure
+            build_system_required.reconfigure
         end
 
         # Call make
-        def make( logdir, target = nil )
-            while_logging_to logdir, '50_build' do
-                logger.info "Building module."
-                build_system_required.make( target )
-            end
+        def make( target = nil )
+            build_system_required.make( target )
         end
 
-        def install( logdir, fast = false )
-            while_logging_to logdir, '60_install' do
-                logger.info "Installing module."
-                build_system_required.install( fast )
-            end
+        def install( fast = false )
+            build_system_required.install( fast )
         end
 
         # Check if an ssh-key is required and active it if necessary
@@ -331,35 +319,6 @@ module BuildTool
             return true
         end
 
-    #########
-    protected
-    #########
-
-        def while_logging_to( logdir, fname, level = :trace, &block )
-            dirname = "#{logdir}/#{name}"
-            FileUtils.mkdir_p( dirname )
-            Logging.logger['root'].add_appenders(
-                Logging.appenders.file(
-                    fname,
-                    :filename => dirname + '/' + fname,
-                    :layout => Logging::Layouts::Pattern.new( :pattern => '%m\n' ),
-                    :level => level ))
-
-            begin
-                yield
-            rescue Interrupt => e
-                logger.error "User Interrupt!"
-                raise e
-            rescue Exception => e
-                logger.error   "#{e.class}:#{e.message}"
-                got_exception = true
-                raise e
-            ensure
-                Logging.logger['root'].remove_appenders( fname )
-                logger.info("More information in #{dirname}/#{fname}") if got_exception
-            end
-        end
-
     end # Module