build-tool 0.5.7 → 0.6.0.rc1

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/commands'
 require 'build-tool/recipe'
 
@@ -13,14 +15,16 @@ class List < Standard
         long_description [ "Shows the list of recipes." ]
 
         def initialize_options
-            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname}"
+            options.banner = "Usage: #{self.fullname} [OPTIONS]..."
+            options.separator( "" )
+            options.separator( "Options" )
             super
         end
 
         def do_execute( args )
             recipes = Recipe.all_recipes
             recipes.keys.sort.each do |name|
-                say format( "%-20s - %s", name, recipes[name].short_description )
+                info( format( "%-20s - %s", name, recipes[name].short_description ) )
             end
 
             return 0

data/lib/build-tool/configuration.rb

@@ -1,9 +1,17 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/editor'
+
 require 'build-tool/vcs/git'
 require 'build-tool/vcs/git-svn'
 require 'build-tool/vcs/svn'
 require 'build-tool/vcs/archive'
 require 'build-tool/vcs/mercurial'
 
+require 'build-tool/model/module'
+require 'build-tool/model/feature'
+require 'build-tool/model/setting'
+
 require 'build-tool/build-system/cmake'
 require 'build-tool/build-system/qt'
 require 'build-tool/build-system/autoconf'
@@ -17,16 +25,39 @@ module BuildTool
 
     class Configuration
 
-        attr_reader :recipe
+        def self.edit( only = [] )
+
+            settings = BuildTool::Setting::export(
+                    BuildTool::Application.instance.configuration.settings,
+                    only )
+
+            editor = MJ::Tools::TmpFileEditor.new( YAML::dump( settings ) )
+
+            editor.edit()
+            if not Pathname.new( editor.path() ).exist?
+                info( "File deleted!" )
+                return 0
+            end
+            values = YAML::load( File.open( editor.path(), 'r:UTF-8' ) )
+
+            BuildTool::Setting::import(
+                    BuildTool::Application.instance.configuration.settings,
+                    values )
+            return 0
+        end
+
+        attr_accessor :recipe
         attr_reader :modules
         attr_reader :environments
         attr_reader :features
         attr_accessor :active_feature
+        attr_reader :settings
 
         def log_directory
             return @log_directory if @log_directory
             raise BuildTool::ConfigurationError, "No log directory configured"
         end
+
         def log_directory=( path )
             path = Pathname.new( path.sub( /\$HOME/, '~' ) )
             if path.to_s[0] != '~' and path.relative?
@@ -84,8 +115,12 @@ def add_sshkey( key )
             @sshkey[key.name] = key
         end
 
-        def initialize( recipe = nil )
-            @recipe = recipe
+        def add_setting( s )
+            @settings[s.name] = s
+        end
+
+        def initialize()
+            @recipe = nil
             @server = {}
             @log_directory = nil
             @environments = {}
@@ -96,6 +131,7 @@ def initialize( recipe = nil )
             @sshkey = {}
             @active_feature = nil
             @features = {}
+            @settings = {}
         end
 
         def vcs( name )
@@ -151,6 +187,55 @@ def add_build_system( bs )
             return @build_system[bs.name] = bs
         end
 
+        def save
+            logger.debug "Saving features to database."
+            @features.each do |name, f|
+                logger.debug2( " Feature %s" % [ f.name ] ) if f.changed?
+                f.save! if f.changed?
+            end
+            logger.debug "Saving modules to database."
+            @modules.each do |m|
+                logger.debug2( " Module %s" % [ m.name ] ) if m.changed?
+                m.save! if m.changed?
+            end
+            logger.debug "Saving settings to database."
+            @settings.each do |n, s|
+                logger.debug2( " Setting %s: %s" % [ s.name, s.value ] ) if s.changed?
+                s.save! if s.changed?
+            end
+        end
+
+        def load
+            logger.debug "Loading features from database."
+            BuildTool::Feature.all.each do |f|
+                logger.debug2 "  - Feature %s" % [ f.name ]
+                add_feature( f )
+            end
+            logger.debug "Loading modules from database."
+            BuildTool::Module.all.each do |m|
+                logger.debug2 "  - Module %s" % [ m.name ]
+                add_module( m )
+            end
+            logger.debug "Loading settings from database."
+            BuildTool::Setting.all.each do |s|
+                logger.debug2 "  - Setting %s: %s" % [ s.name, s.value ]
+                add_setting( s )
+            end
+        end
+
+        def truncate
+            logger.debug "Deleting all features from database."
+            BuildTool::Feature.delete_all()
+            @features = {}
+            logger.debug "Deleting all modules from database."
+            BuildTool::Module.delete_all()
+            @module = {}
+            @modules = []
+            logger.debug "Deleting all settings from database."
+            BuildTool::Setting.delete_all()
+            @settings = {}
+        end
+
     end # Configuration
 
 end # module BuildTool

data/lib/build-tool/environment.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 
 module BuildTool

data/lib/build-tool/errors.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 module BuildTool
 
     # Base class for all BuildTool Errors
@@ -6,4 +8,7 @@ class Error < StandardError; end
     # A configuration error happened.
     class ConfigurationError < Error; end
 
+    # A parser error happend
+    class ParseError < Error; end
+
 end

data/lib/build-tool/history.rb

@@ -1,183 +1,5 @@
-require 'sequel'
-require 'ansi'
-
-module BuildTool
-
-    #
-    # Provide method to add and retrieve entries from the history
-    #
-    module History
-
-        module StateHelper
-
-            # ATTENTION
-            #
-            # Ansi::Code and Sequel don't like each other. Do not include Ansi::Code here.
-
-            # 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
-                    ANSI::Code.red { "CANCELED" }
-                when FINISHED_SUCCESSFUL
-                    ANSI::Code.green { "SUCCESS" }
-                when FINISHED_WITH_ERRORS
-                    ANSI::Code.red { "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
-
-            def before_destroy
-                self.module_logs_dataset.delete
-                super
-            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
+# -*- coding: UTF-8 -*-
 
+require 'build-tool/model/command_log'
+require 'build-tool/model/module_log'
 

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

@@ -0,0 +1,93 @@
+# -*- coding: UTF-8 -*-
+
+require 'build-tool/state_helper'
+require 'build-tool/model/module_log'
+
+require 'active_record'
+
+module BuildTool module History
+
+    # Represents a log entry for a command.
+    class CommandLog < ActiveRecord::Base
+
+        include StateHelper
+
+        # A command can have many module events
+        has_many :module_logs, :order => :id, :dependent => :destroy
+
+        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
+
+        # def before_destroy
+            # self.module_logs_dataset.delete
+            # super
+        # 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( 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 end # class CommandLog
+
+end
+