build-tool 0.1.4 → 0.2

data.tar.gz.sig

@@ -1,3 +1,2 @@
-x���yg-���E�SSJ��
-��*��ho����I0,�n~�@�G-���ȡ ��I,K<�OYծ���R�{������}C�j�B��Ƥ�x>���ݫ�+߂fuj�@���(�������A�
-夤m�~�9�xT:�q؅�1����=��/Z�M.?3ʽv��N�!�"�d�6����`�q�)X�8O`�n�f6
+e�̾�Rگe�8���d*��qI�%)�0����9�s�^����[H�����	�9n�������0��#�"<�.������Z�7������2c������w›
+�}��

data/History.txt

@@ -1,6 +1,35 @@
+== 0.2
+- Features
+    * Implement include directive.
+    * Implement feature directive.
+        * Group modules into features.
+        * Enable/Disable features.
+    * Implement "gc" command.
+        * execute "git gc" for all git repositories.
+    * Implement build-system "None".
+    * Implement vcs "archive".
+        - Download an archive.
+        - Unpack it.
+    * Add a database
+        - Keep record of executed commands and results
+        - Command "history" to query the commands.
+            - no argument -> show last 50 commands
+            - number -> show detailed info about that command
+            - +number -> show detailed info about number last command
+                    +0 = last
+                    +1 = next to last
+                    ...
+            - <module> -> show the last 3 commands affecting the module.
+- Fixes
+    * Sort command listing on "help".
+    * Fixed autoconf support.
+    * Many changes to the kde recipe.
+
+
 == 0.1.4 2009-12-10
 * konversation moved to git
 
+
 == 0.1.3 2009-11-28
 * Add some links to the homepage with documentation
 * kdevelop/kdevplatform moved to extragear for the kde recipe

data/Manifest.txt

@@ -3,6 +3,9 @@ Manifest.txt
 README.txt
 Rakefile
 bin/build-tool
+db/migrations/001_command_histories.rb
+db/migrations/002_module_events.rb
+db/migrations/003_command_histories_add_logfile.rb
 lib/build-tool.rb
 lib/build-tool/GUI.rb
 lib/build-tool/application.rb
@@ -10,6 +13,8 @@ lib/build-tool/build-system/autoconf.rb
 lib/build-tool/build-system/base.rb
 lib/build-tool/build-system/cmake.rb
 lib/build-tool/build-system/custom.rb
+lib/build-tool/build-system/kdel10n.rb
+lib/build-tool/build-system/none.rb
 lib/build-tool/build-system/qt.rb
 lib/build-tool/cfg/lexer.rb
 lib/build-tool/cfg/lexer.rex
@@ -18,6 +23,7 @@ lib/build-tool/cfg/node.rb
 lib/build-tool/cfg/parser.rb
 lib/build-tool/cfg/parser.y
 lib/build-tool/cfg/visitor.rb
+lib/build-tool/command_actions.rb
 lib/build-tool/commands.rb
 lib/build-tool/commands/build.rb
 lib/build-tool/commands/configure.rb
@@ -27,9 +33,12 @@ lib/build-tool/commands/environments/list.rb
 lib/build-tool/commands/environments/set.rb
 lib/build-tool/commands/fetch.rb
 lib/build-tool/commands/files.rb
+lib/build-tool/commands/gc.rb
 lib/build-tool/commands/help.rb
+lib/build-tool/commands/history.rb
 lib/build-tool/commands/info.rb
 lib/build-tool/commands/install.rb
+lib/build-tool/commands/lsfeatures.rb
 lib/build-tool/commands/modules.rb
 lib/build-tool/commands/modules/info.rb
 lib/build-tool/commands/modules/list.rb
@@ -42,13 +51,15 @@ lib/build-tool/commands/recipes/list.rb
 lib/build-tool/configuration.rb
 lib/build-tool/environment.rb
 lib/build-tool/errors.rb
+lib/build-tool/feature.rb
+lib/build-tool/history.rb
 lib/build-tool/module.rb
-lib/build-tool/pluginbase.rb
 lib/build-tool/recipe.rb
 lib/build-tool/repository.rb
 lib/build-tool/server.rb
 lib/build-tool/singleton.rb
 lib/build-tool/sshkey.rb
+lib/build-tool/vcs/archive.rb
 lib/build-tool/vcs/base.rb
 lib/build-tool/vcs/git-svn.rb
 lib/build-tool/vcs/git.rb
@@ -57,10 +68,35 @@ lib/mj/logging.rb
 lib/mj/tools/ssh.rb
 lib/mj/tools/subprocess.rb
 lib/mj/visitor.rb
+recipes/kde/custom/qt/qtscriptgenerator/compile.sh
+recipes/kde/custom/qt/qtscriptgenerator/configure.sh
+recipes/kde/custom/qt/qtscriptgenerator/install.sh
+recipes/kde/custom/scripting/pyqt4/compile.sh
+recipes/kde/custom/scripting/pyqt4/configure.sh
+recipes/kde/custom/scripting/pyqt4/install.sh
+recipes/kde/custom/scripting/sip/compile.sh
+recipes/kde/custom/scripting/sip/configure.sh
+recipes/kde/custom/scripting/sip/install.sh
 recipes/kde/files/finish_installation.sh
 recipes/kde/files/kde4.desktop
 recipes/kde/files/xsession
 recipes/kde/info.yaml
+recipes/kde/kde-bindings.recipe
+recipes/kde/kde-core.recipe
+recipes/kde/kde-devel.recipe
+recipes/kde/kde-finance.recipe
+recipes/kde/kde-graphics.recipe
+recipes/kde/kde-kdevelop.recipe
+recipes/kde/kde-l10n.recipe
+recipes/kde/kde-multimedia.recipe
+recipes/kde/kde-network.recipe
+recipes/kde/kde-office.recipe
+recipes/kde/kde-plasma.recipe
+recipes/kde/kde-qt.recipe
+recipes/kde/kde-scripting.recipe
+recipes/kde/kde-support.recipe
+recipes/kde/kde-utils.recipe
+recipes/kde/kde-webdev.recipe
 recipes/kde/recipe
 recipes/kde/recipe-local
 recipes/kde/settings.yaml
@@ -68,24 +104,17 @@ recipes/kde43/info.yaml
 recipes/kde43/recipe
 recipes/kde43/recipe-local
 recipes/kde43/settings.yaml
-recipes/kdeqt4.6/custom/qt/qtscriptgenerator/compile.sh
-recipes/kdeqt4.6/custom/qt/qtscriptgenerator/configure.sh
-recipes/kdeqt4.6/custom/qt/qtscriptgenerator/install.sh
-recipes/kdeqt4.6/info.yaml
-recipes/kdeqt4.6/recipe
-recipes/kdeqt4.6/recipe-local
-recipes/kdeqt4.6/settings.yaml
 tasks/genfiles.rake
-tasks/rdoc.rake
 tasks/rspec.rake
-test.rb
 test/commands/test_build.rb
 test/test_build_system.rb
 test/test_cli.rb
 test/test_command.rb
 test/test_configuration_parser.rb
 test/test_environment.rb
+test/test_feature.rb
 test/test_helper.rb
+test/test_history.rb
 test/test_module.rb
 test/test_repository.rb
 test/test_singleton.rb

data/README.txt

@@ -1,6 +1,6 @@
 = build-tool
 
-* http://build-tool.rubyforge.org
+* http://michael-jansen.biz/build-tool
 
 == DESCRIPTION:
 
@@ -11,8 +11,6 @@ and configures sources and updates them later.
 
 == FEATURES/PROBLEMS:
 
-* This is major rewrite version. Use at your own risk.
-
 The tool uses recipes to build software from scratch. It does
     - Check out the sources from the repository (git, git-svn, svn).
     - Update the sources.
@@ -21,10 +19,10 @@ The tool uses recipes to build software from scratch. It does
     - Build
     - Install
 
-It's main purpose is supporting me developing kde while having a
-complete kde workspace from trunk. I would like to have reliable and
-reproducable build so i'm sure the code is the problem and not my environment
-if something fails to build.
+It's main purpose is supporting me in developing kde while having a complete
+kde workspace from trunk. I would like to have reliable and reproducable
+builds so i'm sure the code is the problem and not my environment if something
+fails to build.
 
 Additional features are:
     - Open a shell with the environment used to build the sources.
@@ -53,7 +51,6 @@ http://michael-jansen.biz/build-tool
 == REQUIREMENTS:
 
 * logging > 1.2.2
-* hoe     > 2.3.3
 
 == INSTALL:
 

data/Rakefile

@@ -1,10 +1,13 @@
 # -*- ruby -*-
-
 require 'rubygems'
 require 'hoe'
 require 'fileutils'
 require './lib/build-tool'
 
+Hoe.plugin :git
+Hoe.plugin :doofus
+Hoe.plugin :debugging
+
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 Hoe.spec( 'build-tool' ) do |build_tool|
@@ -20,14 +23,19 @@ Hoe.spec( 'build-tool' ) do |build_tool|
   build_tool.rubyforge_name       = build_tool.name
 
   build_tool.extra_deps           = [
-    ['logging','>= 1.2.2'],
-    ['hoe', ">= 2.3.3"], # -> hoe, rubigen
+    ['logging', ">= 1.2.2"],
+    ['sequel', ">= 3.8.0"],
+    ['sqlite3-ruby', ">= 1.2" ]
   ]
 
-  # build_tool.extra_rdoc_files = Dir.glob( "doc/*.txt") + Dir.glob( "doc/*.html" )
+  build_tool.extra_dev_deps           = [
+    ['hoe-debugging', ">= 1.0.1"],
+    ['hoe-doofus', ">= 1.0.0"],
+    ['hoe-git', ">= 1.3.0"],
+    ['racc', ">= 1.4.6"],
+    ['rexical', ">= 1.0.4"]
+  ]
 
-  # Does not work
-  # build_tool.local_rdoc_dir = "html_docs"
 end
 
 Dir['tasks/**/*.rake'].each { |t| load t }

data/bin/build-tool

@@ -5,7 +5,6 @@
 
 require 'pathname'
 require 'rubygems'
-require 'logging'
 
 # libs relative to the link target
 if File.symlink?(__FILE__)
@@ -13,41 +12,10 @@ if File.symlink?(__FILE__)
 else
     root_directory = File.dirname(__FILE__)
 end
+
 root_directory = Pathname.new( root_directory ).join( '..' )
 require File.expand_path( root_directory + "lib/build-tool")
-require 'mj/logging'
-
-#
-# CONFIGURE LOGGING
-#
-Logging.init :debug, :trace, :verbose, :info, :warn, :error
-include Logging.globally
-Logging.logger.root.level = :debug
-# Special case for the configurationParser. It is very verbose if active.
-Logging.logger['BuildTool::Cfg::Parser'].level = :info
-Logging.logger.root.appenders = Logging.appenders.stdout(
-    :layout => MJ::Logging::BasicLayout.new(),
-    :level  => :info)
 
-# if the name we were called with is a symbolic link we have to search for our
-
-
-require "build-tool/application"
-require "build-tool/errors"
-
-begin
-    app = BuildTool::Application.new( $0, root_directory )
-    rc = app.execute( ARGV )
-rescue Interrupt => e
-    logger.info "User interrupt!"
-    rc = 0
-rescue BuildTool::Error => e
-    logger.error   e.message
-    logger.verbose e.backtrace.join("\n")
-    rc = -1
-rescue Exception => e
-    logger.error e
-    rc = -1
-end
+require 'build-tool/application'
 
-exit rc
+exit BuildTool.main( $0, ARGV, root_directory );

data/db/migrations/001_command_histories.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'sequel/extensions/migration'
+
+Class.new( Sequel::Migration ) do
+
+    def up
+        create_table :command_logs do
+            primary_key :id, :null => false
+            String   :command, :null => false
+            DateTime :started_at
+            DateTime :finished_at
+            Integer  :state, :default => 0, :null => false
+        end
+    end
+
+    def down
+        drop_table :command_logs
+    end
+
+end

data/db/migrations/002_module_events.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'sequel/extensions/migration'
+
+Class.new( Sequel::Migration ) do
+
+    def up
+        create_table :module_logs do
+            primary_key :id
+            foreign_key :command_log_id, :command_log, :null => false
+            String :module, :null => false
+            String :event, :size => 20, :null => false
+            String :logfile
+            DateTime :started_at
+            DateTime :finished_at
+            Integer  :state, :default => 0, :null => false
+        end
+    end
+
+    def down
+        drop_table :module_events
+    end
+
+end
+

data/db/migrations/003_command_histories_add_logfile.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'sequel/extensions/migration'
+
+Class.new( Sequel::Migration ) do
+
+    def up
+        alter_table :command_logs do
+            add_column :logdir, String
+        end
+    end
+
+    def down
+        alter_table :command_logs do
+            remove_column :logdir
+        end
+    end
+
+end
+

data/lib/build-tool.rb

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

data/lib/build-tool/application.rb

@@ -1,8 +1,17 @@
+
+require 'logging'
+Logging.init :debug, :trace, :verbose, :info, :warn, :error
+include Logging.globally
+
 require 'optparse'
 require 'erb'
 require 'yaml'
+require 'sequel'
+require 'sequel/extensions/migration'
 
-require 'build-tool/commands'
+require 'mj/logging'
+
+require "build-tool/errors"
 require 'build-tool/recipe'
 require 'build-tool/singleton'
 require 'build-tool/cfg/parser'
@@ -16,9 +25,11 @@ module BuildTool
     #
     class Application < Singleton
 
-        attr_reader :name
         attr_reader :application_root
         attr_reader :cli
+        attr_reader :database
+        attr_reader :local_settings_file_path
+        attr_reader :name
 
         def recipe
             return @recipe if @recipe
@@ -29,40 +40,26 @@ module BuildTool
         def initialize( name, application_root )
             super()
             @application_root = Pathname.new( application_root ).expand_path
+            @database = nil
+            @name = File.basename( name ).sub( "-build", "" )
             @recipe = nil
-
-            # Determine the recipe name
-            @name = File.basename( name )
-            @name.sub!( "-build", "" )
-
-            # Create the shell
-            @cli = Commands::Shell.new
-            @cli.load_commands( @application_root.join( "lib/build-tool/commands" ), "Commands" )
+            @local_settings_file_path = local_configuration_dir.join("#{@name}.yaml")
         end
 
+        # Load the configuration
         def configuration
-            return  @configuration if @configuration
+            return @configuration if @configuration
+            # First load the settings file
+            file = local_settings_file_path
+            logger.debug "Loading settings file #{file}"
+            raise ConfigurationError, "Configuration File #{file} does not exists!" if !file.exist?
+            @settings = YAML.load_file( file )
+            # Then load the recipe
             logger.debug "Loading configuration for #{name}"
-            load_settings
             @recipe = BuildTool::Recipe.new( @settings['RECIPE'] || name )
             @configuration = @recipe.load( name, @settings['SETTINGS'] )
         end
 
-        def load_settings
-            file = local_settings_file_path
-            if file.exist?
-                @settings = YAML.load_file( file )
-            else
-                raise ConfigurationError, "Configuration File #{file} does not exists!"
-            end
-            @settings
-        end
-
-
-        def local_settings_file_path
-            local_configuration_dir.join("#{name}.yaml")
-        end
-
         # Return the local configuration dir. Makes sure the directory exists
         # before returning it
         def local_configuration_dir
@@ -74,11 +71,87 @@ module BuildTool
             @local_configuration_dir
         end
 
-        def execute( args )
-            @cli.execute( args )
+        # Open the database
+        #
+        # @return [Object] The database handle
+        def open_database
+            path = local_configuration_dir.join( "#{name}.db" )
+            logger.debug "Opening the database #{path}."
+            @database = Sequel.connect( "sqlite:///#{path.to_s}" )
+            @database.logger= MJ::Logging::LoggerAdapter.new( 'db' )
+            # Try to upgrade the database if necessary
+            Sequel::Migrator.apply( @database, application_root.join( 'db/migrations' ) )
+        end
+
+        # Close the database
+        def close_database
+            @database.disconnect
+            path = local_configuration_dir.join( "#{name}.db" )
+            logger.debug "Closing the database #{path}."
+        end
+
+        # Get the database handle
+        def database
+            @database
+        end
+
+        def main( args )
+            # The configuration is loaded on demand to make it possible to execute command that
+            # don't need a configuration. Help for example.
+
+            # Initialize the database.
+            open_database()
+
+            begin
+
+                # Initialize the shell
+                require 'build-tool/commands'
+                @cli = Commands::Shell.new
+
+                # Load the commands. This has to be done AFTER the database is opened because
+                # sequel expects that there is a database before a Sequel::Model is created.
+                #
+                # And the commands require all that database related stuff.
+                @cli.load_commands( @application_root.join( "lib/build-tool/commands" ), BuildTool::Commands )
+
+                # Execute the given command (or start the cli)
+                @cli.execute( args )
+            ensure
+                # Make sure the database is closed correctly
+                close_database
+            end
         end
 
     end # class Application
 
-end
+end # module BuildTool
+
+
+def BuildTool.main(name, args, root_directory)
+
+    begin
+        # Setup logging
+        Logging.logger.root.level = :debug
+        # Special case for the configurationParser. It is very verbose if active.
+        Logging.logger['BuildTool::Cfg::Parser'].level = :info
+        Logging.logger.root.appenders = Logging.appenders.stdout(
+            :layout => MJ::Logging::BasicLayout.new(),
+            :level  => :info)
+        # Create the application
+        app = BuildTool::Application.new( name, root_directory )
+        # Execute the application
+        return app.main( args )
+    rescue Interrupt => e
+        logger.info "User interrupt!"
+        return 0
+    rescue BuildTool::Error => e
+        logger.error   e.message
+        logger.verbose e.backtrace.join("\n")
+        return -1
+    rescue Exception => e
+        logger.error e
+        return -1
+    end
+
+end # main()