build-tool 0.6.1 → 0.6.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    build-tool (0.6.0.rc2)
+    build-tool (0.6.2)
       activerecord (>= 3.2.1)
       ansi (>= 1.4.2)
       grit (>= 2.4.1)
@@ -11,15 +11,15 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.1)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     ansi (1.4.2)
@@ -31,17 +31,17 @@ GEM
       mime-types (~> 1.15)
     i18n (0.6.0)
     little-plugger (1.1.3)
-    logging (1.7.0)
+    logging (1.7.2)
       little-plugger (>= 1.1.3)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.2.0)
     racc (1.4.7)
     rake (0.9.2.2)
     rexical (1.0.5)
     sqlite3 (1.3.5)
     turn (0.9.3)
       ansi
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
     yard (0.7.5)
 
 PLATFORMS

data/History.rdoc

@@ -1,349 +1,85 @@
-== 0.6.1 ==
+== Version 0.6.2
+=== Features
+- <tt>environment set</tt>: Add <tt>--command</tt> option (Execute command and return)
+- <tt>module shell</tt>: Add <tt>--command</tt> option (Execute command and return)
+
+=== Enhancements
+- <tt>module list</tt>: Add <tt>--outdated</tt> option (Sort by last successful build)
+
+=== Bugfixes
+- <tt>git-svn clone</tt>: Correctly fetch HEAD. Cloned the complete history.
+- <tt>module enable</tt>: Did not work (Failed to save the change.).
+- <tt>module info</tt>: Handle mercurial.
+- Correctly handle two modules removed at once from the recipe.
+- Features nested three levels did not work.
+- The pushUrl in GIT would always be set.
+
+== Version 0.6.1
+
+=== Bugfixes
+- Fix qt build-system if no custom flags are defined.
+
+== Version 0.6.0
+
+=== Features
+- Add --ionice and --nice N options to set IO (idle) and CPU Priority.
+    kde-build --ionice --nice 19 build ....
+- When updating the source show the newly applied commits if -v is specified.
+  They will allways end up in the rebase logfile.
+- Make it possible to specify all modules at once. 
+  kde-build fetch :all
+- New command 'recipe edit'
+  - Opens the recipe override file in a editor.
+  - --global will open the recipe itself.
+  - --browser will open a file browser instead.
+- New command 'module cleanup'
+  - Can remove the src and build dir of a module. Handle with care.
+- The enabled/disabled state of features has been moved to the database.
+  - On the first start the current state will be migrated to the database.
+    AFTER that remove all 'feature enable|disable' lines from the override
+    file.
+  - command 'feature enable FEATURE' enables a feature.
+  - command 'feature disable FEATURE' disables a feature.
+- The enabled/disabled state of modules has been moved to the database.
+  - On the first start the current state will be migrated to the database.
+    AFTER that remove all 'modules enable|disable' lines from the override
+    file.
+  - command 'module enable MODULE' enables a module.
+  - command 'module disable MODULE' disables a module and has options to
+    remove src and bld directory in one step.
+- The 'recipe fetch incoming' command now works against a branch that has the
+  build-tool version encoded. This makes it possible to make a recipe that is
+  compatible to more than one version.
+- The configuration values have been moved into the command line. A migration
+  will be done automatically on first run.
+  - 'configuration list' Will show the configuration values.
+  - 'configuration edit' will edit them.
+- Support for the bazar vcs.
+
+
+=== Enhancements
+- Most of the --help texts have been improved dramatically.
+- Unit testing was reenabled again.
+- Command: lsmod
+  - Sort output alphabetically by default
+  - With --broken only shows modules that failed.
+  - With --no-sort shows modules in order of declaration / build order.
+  - With --all shows disabled modules too.
+  - With --disabled shows only disabled modules.
+- Command lsfeat
+  - Looks much more similar to the module list output.
+  - Shows only active features by default.
+  - With --all shows all features.
+- The long description statement now accepts multiline string with """....""".
+- Command: gc
+  - Cleanup the logfiles more thoroughly.
+- Disabled modules are accepted when given explicit on the command line if
+  they are associated with a active feature. This makes it possible to build
+  disabled modules.
+
+
+=== Bugfixes
+- Change current directory to $HOME on start. The current working directory
+  could be removed while the command runs.
 
-- Bugfixes
-  - Fix qt build-system if no custom flags are defined.
 
-== 0.6.0 ==
-
-- Features
-  - Add --ionice and --nice N options to set IO (idle) and CPU Priority.
-    > kde-build --ionice --nice 19 build ....
-  - When updating the source show the newly applied commits if -v is specified.
-    They will allways end up in the rebase logfile.
-  - Make it possible to specify all modules at once. 
-    kde-build fetch :all
-  - New command 'recipe edit'
-    - Opens the recipe override file in a editor.
-    - --global will open the recipe itself.
-    - --browser will open a file browser instead.
-  - New command 'module cleanup'
-    - Can remove the src and build dir of a module. Handle with care.
-  - The enabled/disabled state of features has been moved to the database.
-    - On the first start the current state will be migrated to the database.
-      AFTER that remove all 'feature enable|disable' lines from the override
-      file.
-    - command 'feature enable FEATURE' enables a feature.
-    - command 'feature disable FEATURE' disables a feature.
-  - The enabled/disabled state of modules has been moved to the database.
-    - On the first start the current state will be migrated to the database.
-      AFTER that remove all 'modules enable|disable' lines from the override
-      file.
-    - command 'module enable MODULE' enables a module.
-    - command 'module disable MODULE' disables a module and has options to
-      remove src and bld directory in one step.
-  - The 'recipe fetch incoming' command now works against a branch that has the
-    build-tool version encoded. This makes it possible to make a recipe that is
-    compatible to more than one version.
-  - The configuration values have been moved into the command line. A migration
-    will be done automatically on first run.
-    - 'configuration list' Will show the configuration values.
-    - 'configuration edit' will edit them.
-  - Support for the bazar vcs.
-
-
-- Enhancements
-  - Most of the --help texts have been improved dramatically.
-  - Unit testing was reenabled again.
-  - Command: lsmod
-    - Sort output alphabetically by default
-    - With --broken only shows modules that failed.
-    - With --no-sort shows modules in order of declaration / build order.
-    - With --all shows disabled modules too.
-    - With --disabled shows only disabled modules.
-  - Command lsfeat
-    - Looks much more similar to the module list output.
-    - Shows only active features by default.
-    - With --all shows all features.
-  - The long description statement now accepts multiline string with """....""".
-  - Command: gc
-    - Cleanup the logfiles more thoroughly.
-  - Disabled modules are accepted when given explicit on the command line if
-    they are associated with a active feature. This makes it possible to build
-    disabled modules.
-
-
-- Bugfixes
-  - Change current directory to $HOME on start. The current working directory
-    could be removed while the command runs.
-
-
-
-== 0.5.7 ==
-
-- Features
-    - None
-
-- Enhancements
-    - Check for git, svn and git-svn executables before doing anything.
-    - Guard against relative pathnames.
-    - Better error message in case of a ambiguous module name.
-
-- Bugfixes
-    - "git files <unknown>" npo longer throws scary backtrace.
-    - git supports serverless declaration for push url too.
-        git "server" "path/to"
-        git "full/url"
-
-== 0.5.6 ==
-
-Failed release.
-
-== 0.5.5 ==
-
-Failed release.
-
-== 0.5.4 ==
-
-- Features
-    - Support --resume-from for all module based commands (configure)
-    - Show a progressbar when checking for obstacles at the beginning. That can take quite some time.
-    - If a repository contains a file named .commit-template add it to the git configuration.
-
-- Enhancements
-    - Check the recipe directory for validity before installing the recipe.
-    - Only consider a directory a valid recipe if it has a recipe file.
-    - Support --resume-from for all module based commands (configure)
-    - Support --resume-from for all module based commands (configure)
-    - Show core dumps too if make fails.
-    - If a exception happens when checking if modules are ready stop the command.
-
-- Bugfixes
-    - If an svn repository had no repository an error occured while trying to build the error message.
-    - Fix reconfigure --from-scratch
-    - AutoConf: Fix options without values
-    - sqlite3-ruby was renamed to sqlite3 only.
-    - Add grit as dependency
-    - Bugfix: Use correct Error class
-    - Fix a exception of recipe info <recipe>.
-    - Do not claim to Fetch if we do Clone.
-    - Remove a wrong info() line
-    - Bugfix: history <modulename> -> Use same logic as build.
-
-== 0.5.3
-- Feature
-  - Errors during a make call are both printed to the logfile and stdout even without verbose
-    mode. Currently lines with "error:" and "ld:" are considered as errors. Report more. If the
-    progressbar was active it is stopped.
-  - Git: Check for a dirty index if asked for rebase. No automatic stashing (Yet?). Build-tool
-    will bail out with an error message if you have uncommited changes. This step will be done
-    before asking for the ssh key.
-- Enhancements
-  - Do not print the classname for BuildTool Error classes. Only the message.
-  - First fetch and rebase, then clean out the build-dir. If the fetch rebase fails you still have
-    your old build to sort out the problems.
-  - Improve the error message if --resume-from is given an invalid/ambiguous module name.
-- Bugfix
-  - Fix ssh key handling. Now build-tool will stop if ssh-add fails.
-  - Fix the progressbar for build-system not giving progress information(like qmake)
-
-== 0.5.2
-- Bugfix
-  - Be less verbose about adding ssh-key to the agent. One time is enough.
-  - If a environment variable is empty in the recipe remove it from the environment instead of
-    setting it to "".
-  - Bring back the archive build-system. It was temporarily unavailable since 0.5.0
-
-== 0.5.1
-- Bugfix
-  - Add missing files.
-
-== 0.5.0
-- Enhancements
-  - Support url and pushUrl for git modules.
-
-== 0.4.4
-- Enhancements
-  - More ways to specify a module on the command line.
-    - foo matches any module foo disregarding namespaces as long as only one matching module is
-      found. ( kdelibs -> KDE/kdelibs )
-    - foo/ matches any module that has foo/ as a namespace part. 
-      ( kdebase/ -> kdebase/(runtime, workspace, apps )
-  - Implement kdesrc-builds --resume-from feature. Skips all modules before the module specified is
-    found.
-    - kde-build build --resume-from kdebase/runtime KDE/
-    - kde-build build --resume-from runtime KDE/
-  - Build System Qt: Print a message when running bin/synqt after each rebase.
-  - Build System Autotools: Try autoconf to bootstrap. May fail.
-  - Build System Package: Be more verbose about what we do.
-  - CMD: build - If a module is not checked out ignore it when --update is not given on the command line.
-- Bugfix
-  - The command "environment set [env] did set a wrong shell var to the name of the environment
-    set. Use the documented BUILD_TOOL_ENV instead.
-
-== 0.4.3
-- Ruby 1.9 Compatibility.
-
-== 0.4.2
-- Enhancements
-  - Usability: When working on many modules show (current number/total number) of modules for information.
-  - SSH Key Handling: Make it possible to associate a key with a server.
-  - SSH Key Handling: Print a message when adding/removing keys from ssh-agent.
-- Bugfixes
-  - Some typo fixes.
-  - Improved documentation.
-  - Fixed gem dependencies.
-
-== 0.4.1
-- Enhancements
-  - Colorize the output of the history command.
-  - When fetching from remote specify the --prune option.
-  - Improve some error messages.
-- Bugfix
-  - Some ruby 1.9 compatibility fixes. No idea if it really works with 1.99.
-  - Do not register remotes as repository declarations.
-
-== 0.4.0
-- Feature
-  - Show a ansi terminal code based progressbar when compiling or installing in non verbose mode.
-    That feature is courtesy of the ansi rubygem from (http://github.com/rubyworks/ansi). The lib
-    has some shortcomings.
-  - Colorize output. Powered by the ansi module too. The lib has a shortcoming here. It does not
-    check if the terminal supports colors. You will get some escape codes then. I will send a
-    patch upstream.
-- Enhancements
-  - Rework the way build-systems are handled. This makes it possible to solve the cmake issue with
-    rpath handling by properly creating an inheritance between build-systems. It makes it possible
-    to alter or overwrite build-system options too.
-
-
-== 0.3.3
-- Feature
-  - The history command now supports the -n --number [COUNT] option. Use it to specify how many
-    entries you want to see.
-- Bugfixes
-  - Fix the gc command. Sqlite really starts to enforce foreign key constraints.
-  - Support arbitrary build options for autoconf
-  - Do not reassociate a module / environment with a different feature when just changing it. The
-    initial associtation is correct.
-
-
-== 0.3.2
-- Main Features
-  - none
-- Bugfixes
-  - Fix the database initialization. SQLite3 seems to start enforcing foreign keys. And ours had a
-    typo.
-  - Fix the "vcs git remote "whatever" end end" stuff. Handle it exactly like a repository. This
-    fixes the qt/qt modules initialization from the kdeqt recipe. It tried to clone a pure server
-    url because the path part was not possible to specify for remotes.
-  - Fix a bug with the sequel logging stuff that only happened if sequel reported an error.
-  - Imporve the warning that say "The following command sometimes fails ..." on git clone.
-  - If a module is specified for a command and inactive issue a warning. Same for specified groups
-    with only inactive modules.
-
-
-== 0.3.1
-- Main Features
-  - BuildSystem: QMake support
-- Bugfixes
-  - Fix the gc command
-  - Fix the installation comment on gem update/install
-
-
-== 0.3
-- Main Features
-  * Split the recipes from the gem
-    * New command: recipe add <url> <name>
-    * New command: recipe incoming
-  * Qt: Call bin/synqt after each rebase
-- Features
-  * VCS Autoconf: support autogen.sh and bootstrap
-  * VCS SVN: sparse checkout support
-  * VCS: Mercurial support
-- Bugfixes
-  * Initialize the log directory on demand
-
-
-== 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
-
-== 0.1.2 2009-11-28
-* Add support for Shared-desktop-ontologies.
-* Switch the qt tracking branch to master.
-* Build phonon from kdesupport for now. It is currently needed because of some
-  recent pulseaudio related changes which makes it a requirement event for
-  those of us which do not need pulseaudio.
-* Add attica because it is needed for knewstuff3.
-
-== 0.1.1 2009-11-19
-* No changes
-
-== 0.1.0 2009-11-19
-* Major rewrite
-  * Substitute the yaml format for a tailormade file format with
-    handmade lexer and parser
-  * This release is a major backstep in case of functionality but it is
-    usable for everyday use.
-
-== 0.0.3 2009-07-07
-* New commands:
-  * ctags - Create tags file for module(s)
-  * compile - Just compile the module(s)
-  * configure - Just configure the module(s)
-  * install - install the module(s)
-  * fetch - Only fetch remote changes. Do not update only if vcs supports
-    it.
-  * rebase - Rebase the checkout against already fetched remote changes.
-    This command will not fetch.
-  * info - Print out some usefule information about a module.
-* Example Config File
-  * Set PKG_CONFIG_PATH
-  * Fix lensfun receipt
-  * Fix some packages and orders
-* General Bugfixing
-  * Fix subversion repository initialization.
-  * Improve the documentation strings
-
-
-== 0.0.2 2009-06-14
-* Improved example configuration file
-  * Checkout the 4.5 version by default. Not trunk.
-* Some bugfixes
-  * Make sure the build directory exists, THEN call bootstrap.
-  * Show the options for subcommands in the help texts
-* Improvement
-  * Add option "remote-branch" for git-svn. Default to master
-  * Break out of the program on SIGBREAK. Not only out of the currently
-  * build module.
-
-
-== 0.0.1 2009-06-04
-
-* 1 major enhancement:
-  * Initial release (test)
-  * The only currently supported command is build. It's possible to compile a
-    complete kde session using it with nearly no manual intervention. If your
-    system has the deveopment requirements met for kde.

data/lib/build-tool/cfg/visitor.rb

@@ -288,7 +288,7 @@ def visit_FeatureNode( node )
             # Get the name if nested
             name = childs.shift
             if configuration.active_feature
-               @feature = configuration.feature( "#{configuration.active_feature.name}/#{name}" )
+               @feature = configuration.feature( "#{configuration.active_feature.path}/#{name}" )
             else
                @feature = configuration.feature( name )
             end

data/lib/build-tool/commands/environments/set.rb

@@ -11,7 +11,11 @@ class Set < Standard
 
         name        "set"
         description "Open a shell with the environment set."
-        long_description "Opens a new shell with the exact environment used by build-tool for the script."
+        long_description [
+            "Opens a new shell with the given environment and and executes COMMAND.",
+            "It then waits for COMMAND to finish and returns its exit code. The",
+            "default command is $SHELL." ]
+
 
         def do_execute( args )
             case args.length
@@ -25,13 +29,30 @@ def do_execute( args )
 
             # Get the environment.
             env = configuration.environment(args[0])
-            return env.shell
+
+            verbose "> #{@command}"
+            rc = env.shell( @command, { detach: @detach } )
+            verbose "> #{rc}"              if not @detach
+            verbose "> send to background" if @detach
+
+            return rc.exitstatus if not @detach
+            return 0
         end
 
         def initialize_options
             options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULE"
             options.separator( "" )
             options.separator( "Options" )
+
+            @command = ENV['SHELL']
+            options.on( "-c", "--command COMMAND", "Execute command COMMAND (#{@command}]" ) { |c|
+                @command = "#{ENV['SHELL']} -c '#{c}'"
+                }
+
+            @detach = nil
+            options.on( "-d", "--detach", "Detach the process and return immediately." ) {
+                @detach = true
+                }
             super
         end
 

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

@@ -74,13 +74,44 @@ def show_feature( name )
                 return -1
             end
 
-            info( "Name    : %s" % feature.path )
+            info( "%s : %s" % [ feature.path, feature.description ] )
+            if feature.parent
+                info( "Active : %s (Parent %s: %s)" % [ feature.active_char, feature.parent.name, feature.parent.active_char ] )
+            else
+                info( "Active : %s" % [ feature.active_char ] )
+            end
+            info( "" )
+
+            if feature.long_description
+                info( feature.long_description.sub( /^/, '    ' ) )
+                info( "" )
+            end
+
+            subfeats = []
+            features = configuration.features
+            features.keys.sort.each do |name|
+                if name.start_with? feature.path
+                    next if name == feature.path
+                    subfeats << features[name]
+                end
+            end
+
+            if not subfeats.empty?
+                info( "Features" )
+                info( "====================================================" )
+                subfeats.each do |feat|
+                    info( "%s %-35s : %s" % [ feat.active_char, feat.path,  feat.description || "No description specified" ] )
+                end
+                info( "" )
+            end
+
             info( "Modules" )
             info( "====================================================" )
             feature.modules.each do |mod|
                 next if mod.is_template?
                 info( "%s%s %-35s : %s" % [ mod.active_char, mod.state_char, mod.name,  mod.description || "No description specified" ] )
             end
+            info( "" )
             return 0
         end
 

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

@@ -33,6 +33,12 @@ def applicable?
             BuildTool::Application.instance.has_recipe?
         end
 
+        def do_execute( args )
+            super( args )
+            configuration.save()
+            return 0
+        end
+
         def do_execute_module( mod )
 
             if @default and mod.default_active? == true

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

@@ -62,6 +62,9 @@ def do_execute_module( mod )
                     info( "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ] )
                 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'

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

@@ -28,21 +28,35 @@ class List < Standard
             "  Fourth column: The modules short description." ]
         cmdalias    "lsmods"
 
+        def ensure_option_not_set( option, name, conflicts )
+            if option
+                raise UsageError, "Options --#{conflicts} and --#{name} are mutually exclusive."
+            end
+        end
+
         def initialize_options
             options.banner = "Usage: #{self.fullname} [OPTIONS]... [MODULE|GROUP]..."
             options.separator( "" )
             options.separator( "Options" )
 
-            @all = true
+            @all = false
+
+            options.separator( '' )
+            options.separator( '  Criterias' )
 
             @active = true
             @inactive = false
             options.on( "--all", "Include inactive modules." ) {
+                ensure_option_not_set( @disabled, 'disabled', 'all' )
+                ensure_option_not_set( @broken, 'broken', 'all' )
+                @all = true
                 @active = true
                 @inactive = true
                 }
 
             options.on( "--disabled", "Only show inactive modules." ) {
+                ensure_option_not_set( @all, 'all', 'disabled' )
+                ensure_option_not_set( @broken, 'broken', 'disabled' )
                 @active = false
                 @inactive = true
                 }
@@ -54,11 +68,23 @@ def initialize_options
 
             @broken = false
             options.on( "--broken", "Show only broken modules." ) {
+                ensure_option_not_set( @all, 'all', 'broken' )
+                ensure_option_not_set( @disabled, 'disabled', 'broken' )
                 @broken = true
                 }
 
+            options.separator( '' )
+            options.separator( '  Sort order' )
+
+            @outdated = false
+            options.on( "--outdated", "Show modules sorted by date of last successful compile." ) {
+                ensure_option_not_set( !@sort, 'no-sort', 'outdated' )
+                @outdated = true
+                }
+
             @sort = true
             options.on( "--no-sort", "Show modules in order of declaration." ) {
+                ensure_option_not_set( @outdated, 'outdated', 'no-sort' )
                 @sort = false
                 }
 
@@ -82,6 +108,7 @@ def do_execute( args )
 
         def show_modules( mods )
             mods = mods.sort if @sort
+            mods = mods.sort { |x, y| x.last_success <=> y.last_success }.reverse if @outdated
             mods.each do |mod|
                 show_module( mod )
             end
@@ -98,8 +125,15 @@ def show_module( mod )
 
             if @broken
                 info( "%s%s %-35s : %-25s" % [ mod.active_char, mod.state_char, mod.name, mod.state ] )
+            elsif @outdated
+                if mod.last_success == DateTime.new
+                    success = 'unknown'
+                else
+                    success =  mod.last_success.strftime("%x %X")
+                end
+                info( "%s%s %-35s : %s" % [ mod.active_char, mod.state_char, mod.name, success ] )
             else
-                info( "%s%s %-35s : %s" % [ mod.active_char, mod.state_char, mod.name,  mod.description || "No description specified" ] )
+                info( "%s%s %-35s : %s" % [ mod.active_char, mod.state_char, mod.name, mod.description || "No description specified" ] )
             end
         end
 

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

@@ -14,12 +14,27 @@ class MyShell < Standard
 
         name        "shell"
         description "Open a shell with the environment for the given module."
+        long_description [
+            "Opens a new shell with the exact environment used to build the MODULE and",
+            "then executes the given shell command. It then waits for the shell command",
+            "to finish and returns its exit code. The default command is $SHELL." ]
 
         def initialize_options
             options.banner = "Usage: #{self.fullname} [OPTIONS]... MODULE"
             options.separator( "" )
             options.separator( "Options" )
+
+            @command = ENV['SHELL']
+            options.on( "-c", "--command COMMAND", "Execute command COMMAND (#{@command}]" ) { |c|
+                @command = "#{ENV['SHELL']} -c '#{c}'"
+                }
+
+            @detach = nil
+            options.on( "-d", "--detach", "Detach the process and return immediately" ) {
+                @detach = true
+                }
             super
+
         end
 
         def do_execute( args )
@@ -35,7 +50,13 @@ def do_execute( args )
             end
 
             # Get our one and only module
-            mod[0].environment.shell
+            verbose "> #{@command}"
+            rc = mod[0].environment.shell( @command, { detach: @detach } )
+            verbose "> #{rc}"              if not @detach
+            verbose "> send to background" if @detach
+
+            return rc.exitstatus if not @detach
+            return 0
         end
 
     end # class Shell

data/lib/build-tool/configuration.rb

@@ -193,7 +193,7 @@ def add_build_system( bs )
         def save
             logger.debug "Saving features to database."
             @features.each do |name, f|
-                logger.debug2( " Feature %s" % [ f.name ] ) if f.changed?
+                logger.debug2( " Feature %s (%s)" % [ f.name, f.parent_id ] ) if f.changed?
                 f.save! if f.changed?
             end
             logger.debug "Saving modules to database."
@@ -247,7 +247,7 @@ def truncate
         def migrate()
 
             logger.debug( 'Checking for obsolete modules in db.' )
-            for mod in @modules do
+            for mod in @modules.reverse() do
                 if not mod.found_in_recipe
                     logger.info 'Module %s no longer supported by recipe. Removing it from db.' % [ mod.name ]
                     # Remove it from our bookkeeping first.

data/lib/build-tool/environment.rb

@@ -74,14 +74,23 @@ def set( name, value )
         # It sets an environment variable *BUILD_TOOL_ENV* with the name of
         # the environment set. This can be used to add this information to
         # the prompt.
-        def shell( wd = nil )
+        def shell( command = nil, options = {} )
+            wd     = options[ :wd ]
+            detach = options[ :detach ] || false
+
             begin
+                logger.verbose( "BUILD_TOOL_ENV = #{name}" )
                 ENV['BUILD_TOOL_ENV'] = name
                 self.class.adjust_environment( wd, values ) {
-                    logger.info "Starting #{ENV['SHELL']}"
-                    system( ENV['SHELL'] )
-                    logger.info "#{ENV['SHELL']} stopped."
-                    return 0;
+                    pid = Process.fork {
+                        exec( command )
+                    }
+                    if detach
+                        return Process.detach( pid )
+                    else
+                        Process.wait( pid )
+                        return $?
+                    end
                 }
             ensure
                 ENV['BUILD_TOOL_ENV'] = nil

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

@@ -79,6 +79,15 @@ 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
 
+            # Return the last entry with the given state.
+            def last_success_by_module( modname )
+                where( "command_logs.id not in ( select command_log_id from module_logs where module_logs.module = ? and module_logs.state != #{StateHelper::FINISHED_SUCCESSFUL})", modname ).
+                joins( "INNER JOIN module_logs ON module_logs.command_log_id = command_logs.id and module_logs.module = \"#{modname}\"" ).
+                order( 'id DESC' ).
+                first()
+            end
+
+
             # Get all commands older than :days
             def older_than
                 where( 'finished_at < ?', Date.today - 10 )

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

@@ -65,7 +65,7 @@ def path
             if parent.nil?
                 name
             else
-                "%s/%s" % [ parent.name, name ]
+                "%s/%s" % [ parent.path, name ]
             end
         end
 

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

@@ -46,6 +46,7 @@ def my_initialize()
 
             @long_description = nil
             @description = nil
+            @last_success = nil
         end
 
         #
@@ -150,7 +151,6 @@ def build_system_required
 
         # Return true if the last build failed for whatever reason
         def broken?
-            lastlog = BuildTool::History::CommandLog.last_by_module( name )
             return true if lastlog.empty?
             lastlog[0].module_logs.where( :module => name ).each do |e|
                 if e.state != History::ModuleLog::FINISHED_SUCCESSFUL
@@ -262,9 +262,13 @@ def source_directory
         end
         alias source_directory_required source_directory
 
+        # Return the logfile of the last compilation attempt
+        def lastlog
+            return BuildTool::History::CommandLog.last_by_module( name )
+        end
+
         # Returns a current state in string format
         def state
-            lastlog = BuildTool::History::CommandLog.last_by_module( name )
             return 'UNKNOWN' if lastlog.empty?
             lastlog[0].module_logs.where( :module => name ).each do |e|
                 if e.state != History::ModuleLog::FINISHED_SUCCESSFUL
@@ -276,7 +280,6 @@ def state
 
         # Return the current state as one char.
         def state_char
-            lastlog = BuildTool::History::CommandLog.last_by_module( name )
             return '?' if lastlog.empty?
             lastlog[0].module_logs.where( :module => name ).each do |e|
                 if e.state != History::ModuleLog::FINISHED_SUCCESSFUL
@@ -286,6 +289,17 @@ def state_char
             return History::ModuleLog::state_char( History::ModuleLog::FINISHED_SUCCESSFUL )
         end
 
+        def last_success
+            return @last_success if @last_success
+            lastlog = BuildTool::History::CommandLog.last_success_by_module( name )
+            if lastlog.nil?
+                @last_success = DateTime.new
+            else
+                @last_success = lastlog[:finished_at]
+            end
+            return @last_success
+        end
+
         def active_char
             if active?
                 ANSI::Code.green { "A" }

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

@@ -104,9 +104,9 @@ def apply_patches( patches )
 
         end
 
-        def clone
-            fetch()
-            rebase()
+        def clone( verbose = false )
+            fetch( verbose )
+            rebase( verbose )
             0
         end
 

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

@@ -110,7 +110,7 @@ def checkedout?
             return true
         end
 
-        def clone
+        def clone( verbose = false )
             if local_path_exist?
                 raise GitSvnError, "Failed to create repository at '#{local_path}': Path exists"
             end
@@ -121,7 +121,7 @@ def clone
                 raise GitSvnError, "Error while initializing the repo `git svn init '#{config.repository}/#{remote_path}'`: #{$?}"
             end
 
-            fetch( revision: "HEAD" )
+            fetch(false, "HEAD")
         end
 
         def configure
@@ -131,11 +131,9 @@ def configure
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
-        def fetch( verbose = false, options = {} )
-            revision = options[:revision] || nil
-
+        def fetch( verbose = false, revision = nil )
             if !checkedout? and !$noop # Beware of looping
-                clone
+                clone( verbose )
             else
                 # clone() calls those methods.
                 git.check_config

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

@@ -366,7 +366,7 @@ def check_config
                     end
 
                     if val.push_server and val.push_url
-                        if val.push_url != gitconfig["remote.#{name}.pushurl"].nil?
+                        if val.push_url != gitconfig["remote.#{name}.pushurl"]
                             if git( "remote set-url --push #{name} #{val.push_url}" ) != 0
                                 raise GitError, "Error while initializing the repo `git remote add #{name} #{val.url}`: #{$?}"
                             end

data/lib/build-tool/version.rb

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

data/tasks/rdoc.rake

@@ -1,7 +1,7 @@
 require 'yard'
 
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']  
+  t.files   = ['lib/**/*.rb', '-', 'README.rdoc', 'History.rdoc' ]
   # t.options = [] -> see .yardopts
   t.name    = 'doc'
 end

data/test/integration/parser_feature_test.rb

@@ -72,4 +72,18 @@ def setup
 
     end
 
+    test 'Nested feature definitione' do
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+            feature "test_root"
+                feature "test_child1"
+                    feature "test_grandchild1"
+                    end
+                end
+            end
+            EOF
+        assert( @configuration.feature( 'test_root' ) )
+        assert( @configuration.feature( 'test_root/test_child1' ) )
+        assert( @configuration.feature( 'test_root/test_child1/test_grandchild1' ) )
+    end
+
 end # class TestParserFeatureTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-tool
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &5733960 !ruby/object:Gem::Requirement
+  requirement: &5733800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *5733960
+  version_requirements: *5733800
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &5733340 !ruby/object:Gem::Requirement
+  requirement: &5733160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *5733340
+  version_requirements: *5733160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &5732660 !ruby/object:Gem::Requirement
+  requirement: &5732520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *5732660
+  version_requirements: *5732520
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &5731740 !ruby/object:Gem::Requirement
+  requirement: &5731580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *5731740
+  version_requirements: *5731580
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &5731220 !ruby/object:Gem::Requirement
+  requirement: &5731060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *5731220
+  version_requirements: *5731060
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &5730680 !ruby/object:Gem::Requirement
+  requirement: &5730500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *5730680
+  version_requirements: *5730500
 - !ruby/object:Gem::Dependency
   name: rexical
-  requirement: &5730220 !ruby/object:Gem::Requirement
+  requirement: &5730040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *5730220
+  version_requirements: *5730040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5759100 !ruby/object:Gem::Requirement
+  requirement: &5758900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *5759100
+  version_requirements: *5758900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &5758600 !ruby/object:Gem::Requirement
+  requirement: &5758400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *5758600
+  version_requirements: *5758400
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &5757980 !ruby/object:Gem::Requirement
+  requirement: &5757740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *5757980
+  version_requirements: *5757740
 description: ! "\n    The tool helps \n\n    ...\n  "
 email:
 - info@michael-jansen.biz