build-tool 0.4.0 → 0.4.1

data.tar.gz.sig

@@ -1 +1 @@
-k�#��Wg>��%��BA���l�Tq�4f����85V���52l�� �Ď����܆!�7B���9CH�09H[=]�K4��
��O��Aі���ͬ֔���^DS�0�;{@(0��74s��64IЏ�w��O?��L�f��xϗ$�4�u��!�m@�艢��Se&��02���hY�ْ�U?�4b�4ݔb�/�P��.��ָ���0�9��Cz7PPT�;���B(�7B"��q��<%`����\{�ܥ�
+1>�2��,
H�|Ѳ��-�w�m,[B��$ʺBmi���HG�x�-_�Մr�l�oƵ�
+N8"�,΍h(M3܅^8�!w�2��it�^�j��T���_��v;�8�����f�܉��-p��?o?+��؍F�$n�N@u�5�Zk�>I�������.B^��E,9����������%�a+�ւ�,��������F1y��^j�	��3nh�#kD�Q �.��u�z��>�;���W4�-

data/History.txt

@@ -1,3 +1,12 @@
+== 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.

data/Manifest.txt

@@ -5,6 +5,7 @@ Manifest.txt
 README.txt
 Rakefile
 bin/build-tool
+bin/build-tool-1.9
 db/migrations/001_command_histories.rb
 db/migrations/002_module_events.rb
 db/migrations/003_command_histories_add_logfile.rb

data/README.txt

@@ -50,7 +50,10 @@ http://michael-jansen.biz/build-tool
 
 == REQUIREMENTS:
 
-* logging > 1.2.2
+* logging      >= 1.2.2
+* sequel       >= 3.8.0
+* sqlite3-ruby >= 1.2
+* ansi         >= 1.2
 
 == INSTALL:
 
@@ -60,5 +63,5 @@ http://michael-jansen.biz/build-tool
 
 (The GPL LICENSE)
 
-Copyright (c) 2009 Michael Jansen
+Copyright (c) 2009-2010 Michael Jansen
 

data/bin/build-tool-1.9

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby1.9
+#
+#  Created by Michael Jansen on 2009-8-31.
+#  Copyright (c) 2009. All rights reserved.
+
+require 'pathname'
+require 'rubygems'
+
+# libs relative to the link target
+if File.symlink?(__FILE__)
+    root_directory = File.dirname(File.readlink(__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 'build-tool/application'
+
+exit BuildTool.main( $0, ARGV, root_directory );

data/lib/build-tool.rb

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

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

@@ -89,7 +89,7 @@ def option_names
         end
 
         def to_s
-            return "#{self.object_id} #{self.module} #{@options.keys.join( ', ')}"
+            return "#{self.module.name} #{self.name} #{@options.keys.join( ', ')}"
         end
 
         def active?
@@ -121,7 +121,7 @@ def []( var )
             end
             return parentval       if !parentval.nil?
             return ""              if @supported_options.include?( var )
-            raise UnknownOptionError, "#{self} Option #{var} is unknown for build-system #{name}"
+            raise UnknownOptionError, "[#{self.module.name}] Option #{var} is unknown for build-system #{name}"
         end
 
         def []=( var, value )

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

@@ -53,12 +53,16 @@ def execute( script )
             if !path.executable?
                 raise CustomError, "Script %s not executable!" % path.to_s
             end
-            return self.module.environment.execute(
-                "%s %s" % [ path.to_s, source_directory ],
+            command = "%s %s" % [ path.to_s, source_directory ]
+            rc = self.module.environment.execute(
+                command,
                 build_directory,
                 {
                     'INSTALL_PREFIX' => install_prefix.to_s,
                 }.merge(Hash[option_hash]))
+            if rc != 0
+                raise CustomError, "#{command.to_s} failed with error code #{rc}";
+            end
         end
 
         def install( fast )

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

@@ -59,6 +59,7 @@ def initialize(values = nil)
         ModuleRemotePath
         ModuleTemplate
 
+        RemoteDeclaration
         RepositoryDeclaration
         RepositoryPath
         RepositoryUser

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

@@ -22,7 +22,7 @@ module Cfg
 
     class Parser < BuildTool::Cfg::Lexer
 
-module_eval <<'..end lib/build-tool/cfg/parser.y modeval..idd46b8544c3', 'lib/build-tool/cfg/parser.y', 344
+module_eval <<'..end lib/build-tool/cfg/parser.y modeval..id8d638bce17', 'lib/build-tool/cfg/parser.y', 344
 #
 ### INNER
 #
@@ -40,7 +40,7 @@ def parse_string( string, file = "<string>" )
     return configuration
 end
 
-..end lib/build-tool/cfg/parser.y modeval..idd46b8544c3
+..end lib/build-tool/cfg/parser.y modeval..id8d638bce17
 
 ##### racc 1.4.5 generates ###
 
@@ -797,7 +797,7 @@ def _reduce_51( val, _values, result )
 
 module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 193
   def _reduce_52( val, _values, result )
- result = RepositoryDeclarationNode.new( val[1..-1]);
+ result = RemoteDeclarationNode.new( val[1..-1]);
    result
   end
 .,.,

data/lib/build-tool/cfg/parser.y

@@ -191,7 +191,7 @@ rule
         ;
 
     git_statement
-        : REMOTE STRING repository_statements END { result = RepositoryDeclarationNode.new( val[1..-1]); }
+        : REMOTE STRING repository_statements END { result = RemoteDeclarationNode.new( val[1..-1]); }
         ;
 
     #

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

@@ -309,7 +309,7 @@ def visit_GitDeclarationNode( node )
             return @vcs
         end
 
-        def visit_RepositoryDeclarationNode( node )
+        def visit_RemoteDeclarationNode( node )
             visitor = RepositoryDeclarationNodeVisitor.new( configuration )
             repo = node.accept(visitor)
             @vcs.remote[repo.name] = repo
@@ -358,11 +358,10 @@ def visit_ApplyPatchesNode( node )
         end
 
         def visit_ArchiveDeclarationNode( node )
-            if @module.vcs_configuration and @module.vcs_configuration.name == "archive"
-                vcs = @module.vcs_configuration.dup
-            else
-                vcs = BuildTool::VCS::ArchiveConfiguration.new
-            end
+            vcs = BuildTool::VCS::ArchiveConfiguration.new
+            # if @module.vcs_configuration and @module.vcs_configuration.name == "archive"
+            #     vcs.copy_configuration( @module.vcs_configuration )
+            # end
             @module.vcs_configuration = vcs
             visitor = ArchiveDeclarationNodeVisitor.new( configuration, vcs )
             node.accept( visitor )
@@ -406,11 +405,10 @@ def visit_EnvironmentDeclarationNode( node )
         end
 
         def visit_GitDeclarationNode( node )
-            if @module.vcs_configuration and @module.vcs_configuration.name == "git"
-                vcs = @module.vcs_configuration.dup
-            else
-                vcs = BuildTool::VCS::GitConfiguration.new
-            end
+            vcs = BuildTool::VCS::GitConfiguration.new
+            # if @module.vcs_configuration and @module.vcs_configuration.name == "git"
+            #     vcs.copy_configuration( @module.vcs_configuration )
+            # end
             @module.vcs_configuration = vcs
             begin
                 visitor = GitDeclarationNodeVisitor.new( configuration, vcs )
@@ -421,11 +419,10 @@ def visit_GitDeclarationNode( node )
         end
 
         def visit_GitSvnDeclarationNode( node )
-            if @module.vcs_configuration and @module.vcs_configuration.name == "gitsvn"
-                vcs = @module.vcs_configuration.dup
-            else
-                vcs = BuildTool::VCS::GitSvnConfiguration.new
-            end
+            vcs = BuildTool::VCS::GitSvnConfiguration.new
+            # if @module.vcs_configuration and @module.vcs_configuration.name == "gitsvn"
+            #     vcs.copy_configuration( @module.vcs_configuration )
+            # end
             @module.vcs_configuration = vcs
             visitor = GitSvnDeclarationNodeVisitor.new( configuration, vcs )
             node.accept( visitor )
@@ -500,11 +497,10 @@ def visit_ShortDescriptionNode( node )
         end
 
         def visit_SvnDeclarationNode( node )
-            if @module.vcs_configuration and @module.vcs_configuration.name == "svn"
-                vcs = @module.vcs_configuration.dup
-            else
-                vcs = BuildTool::VCS::SvnConfiguration.new
-            end
+            vcs = BuildTool::VCS::SvnConfiguration.new
+            # if @module.vcs_configuration and @module.vcs_configuration.name == "svn"
+            #     vcs.copy_configuration( @module.vcs_configuration )
+            # end
             @module.vcs_configuration = vcs
             visitor = SvnDeclarationNodeVisitor.new( configuration, vcs )
             node.accept( visitor )
@@ -553,6 +549,14 @@ def visit_RepositoryDeclarationNode( node )
             return @repository
         end
 
+        def visit_RemoteDeclarationNode( node )
+            name = node.values[0]
+            @repository = BuildTool::Repository.new( name )
+            stmts = node.values[1]
+            visit_nodes( stmts )
+            return @repository
+        end
+
         def visit_RepositoryPathNode( node )
             @repository.path = node.value
         end
@@ -646,7 +650,7 @@ def visit_SshKeyFileNode( node )
 
     end
 
-    class SvnDeclarationNodeVisitor < GitDeclarationNodeVisitor
+    class SvnDeclarationNodeVisitor < ListVisitor
 
         def initialize( configuration, vcs )
             super( configuration, vcs )

data/lib/build-tool/command_actions.rb

@@ -65,6 +65,7 @@ class Base
 
             def initialize( command, prio, type, mod )
                 @command = command
+                @level = nil
                 @logdir = command.log_directory.join( mod.name )
                 @type = type
                 @prio = prio
@@ -77,9 +78,18 @@ def do
                 # Make sure the directory for this module exists
                 FileUtils.mkdir_p( @logdir ) if ! $noop
 
+                oldlevel = Logging.appenders['stdout'].level
+                if @level
+                    Logging.appenders['stdout'].level = @level
+                end
+
                 # Open the logfile and then execute the command
-                while_logging do
-                    execute
+                begin
+                    while_logging do
+                        execute
+                    end
+                ensure
+                    Logging.appenders['stdout'].level = oldlevel
                 end
             end
 

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

@@ -1,5 +1,8 @@
 require 'build-tool/commands'
 
+require 'ansi'
+
+
 module BuildTool; module Commands;
 
     #
@@ -7,6 +10,8 @@ module BuildTool; module Commands;
     #
     class History < Standard
 
+        include ANSI::Code
+
         name        "history"
         description "show command history"
         long_description [ "Query the command history",
@@ -57,7 +62,7 @@ def do_execute( args )
 
         def show_command( cmd )
             if @long
-                say " %04d %s %s # %s [%s]" % [ cmd.id, cmd.started_at.strftime("%x %X"), cmd.duration, cmd.command, cmd.state_str ]
+                say " %04d %s # %s [%s]" % [ cmd.id, cmd.started_at.strftime("%x %X"), cmd.command, cmd.state_str ]
             else
                 say " %04d %s [%s]" % [ cmd.id, cmd.command, cmd.state_str ]
             end
@@ -84,7 +89,7 @@ def show_module_history( modname )
                 last_module=""
                 cmd.module_logs_dataset.filter( :module => modname ).each do |e|
                     if e.module != last_module
-                        say "\t#{e.module}"
+                        say blue { "\t#{e.module}" }
                         last_module = e.module
                     end
                     say "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ]
@@ -109,7 +114,7 @@ def show_detailed_command_history( id )
             last_module=""
             cmd.module_logs.each do |e|
                 if e.module != last_module
-                    say "\t#{e.module}"
+                    say blue { "\t#{e.module}" }
                     last_module = e.module
                 end
                 say "\t\t %s %s (%s) [%s]" % [ e.duration, e.event, e.logfile, e.state_str ]

data/lib/build-tool/configuration.rb

@@ -133,7 +133,7 @@ def create_build_system( name, parent = nil, *args )
         end
 
         def build_system_adjust( name, parent = nil, *args )
-            bs = create_build_system( name )
+            bs = create_build_system( name, parent )
             bs.defaults = build_system_defaults( name )
             return bs
         end

data/lib/build-tool/environment.rb

@@ -45,14 +45,13 @@ def append( name, value )
         end
 
         # Execute command in a shell with the environment set.
-        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}";
+        def execute( command, wd = nil, envadd = nil )
+            env = Hash.new
+            for var in vars do
+                env[var] = self[var]
             end
-            rc
+            env.merge!( envadd ) if envadd
+            return self.class.execute( command.to_s, wd, env )
         end
 
         # Prepend +value+ to variable +name+. A ':' is added when necessary.

data/lib/build-tool/history.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'ansi'
 
 module BuildTool
 
@@ -9,6 +10,10 @@ 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
@@ -20,11 +25,11 @@ def state_str
                 when STARTED
                     "STARTED"
                 when CANCELED_BY_USER
-                    "CANCELED"
+                    ANSI::Code.red { "CANCELED" }
                 when FINISHED_SUCCESSFUL
-                    "SUCCESS"
+                    ANSI::Code.green { "SUCCESS" }
                 when FINISHED_WITH_ERRORS
-                    "ERRORS"
+                    ANSI::Code.red { "ERRORS" }
                 else
                     "#{self.state.to_s}?"
                 end

data/lib/build-tool/module.rb

@@ -1,6 +1,7 @@
-require 'ftools'
 require 'mj/tools/ssh'
 
+require 'fileutils'
+
 module BuildTool
 
     #
@@ -233,18 +234,18 @@ def vcs
         attr_writer :vcs_configuration
         def vcs_configuration
             return @vcs_configuration if @vcs_configuration
-            return @parent.vcs_configuration if @parent
+            if @parent && @parent.vcs_configuration
+                # puts "copying vcs for #{name} from #{@parent.name}"
+                vc = @parent.vcs_configuration.class.new
+                vc.copy_configuration( @parent.vcs_configuration )
+                @vcs_configuration = vc
+                return vc
+            end
             nil
         end
 
         def vcs_configuration_required
-            if @vcs_configuration
-                vc = @vcs_configuration
-            elsif @parent
-                vc = @parent.vcs_configuration
-            else
-                vc = nil
-            end
+            vc = vcs_configuration
             if vc.nil?
                 raise ConfigurationError, "No version control system configure for module #{name}."
             end

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

@@ -13,10 +13,15 @@ def name
         end
 
         def vcs( mod )
+            raise StandardError if @module and ! mod.equal?( @module )
             @module = mod
             Archive.new( self )
         end
 
+        def copy_configuration( other )
+            super
+        end
+
     end # class ArchiveConfiguration
 
     class Archive < Base

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

@@ -8,8 +8,8 @@ class BaseConfiguration
 
         attr_reader :module
 
-        def initialize( mod = nil )
-            @module = mod
+        def initialize
+            @module = nil
         end
 
         def remote_path
@@ -24,6 +24,10 @@ def local_path
             @module.source_directory
         end
 
+        def copy_configuration( other )
+            @module = nil
+        end
+
     end
 
     #

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

@@ -12,12 +12,13 @@ def name
 
         attr_reader :externals
 
-        def initialize( mod = nil )
-            super( mod )
+        def initialize
+            super
             @externals = {}
         end
 
         def vcs( mod )
+            raise StandardError if @module and ! mod.equal?( @module )
             @module = mod
             GitSvn.new( self )
         end
@@ -26,6 +27,11 @@ def add_external( local, target )
             @externals[local] = target
         end
 
+        def copy_configuration( other )
+            super
+            @externals = {}     # Do not copy the externals
+        end
+
     end
 
     #

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

@@ -13,12 +13,13 @@ def name
 
         attr_accessor :remote
 
-        def initialize( mod = nil )
-            super( mod )
+        def initialize
+            super
             @remote = {}
         end
 
         def vcs( mod )
+            raise StandardError if @module and ! mod.equal?( @module )
             @module = mod
             Git.new( self )
         end
@@ -39,6 +40,10 @@ def track_branch
             return rc[1..-1].join( '/' )
         end
 
+        def copy_configuration( other )
+            super
+            @remote = {}     # Do not copy the remotes
+        end
 
     end
 
@@ -137,7 +142,7 @@ def fetch()
             if !checkedout? and !$noop
                 clone
             end
-            cmd = "fetch -q #{config.track_remote}"
+            cmd = "fetch -q --prune #{config.track_remote}"
             if ( rc = git( cmd ) ) != 0
                 raise GitError, "Error while fetching: #{rc}"
             end

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

@@ -19,6 +19,7 @@ def initialize( mod = nil )
         end
 
         def vcs( mod )
+            raise StandardError if @module and ! mod.equal?( @module )
             @module = mod
             Mercurial.new( self )
         end
@@ -26,6 +27,11 @@ def vcs( mod )
         def branch
             self.module.remote_path
         end
+
+        def copy_configuration( other )
+            super
+            @remote = {}     # Do not copy the remote
+        end
     end
 
     #

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

@@ -14,6 +14,7 @@ def name
         end
 
         def vcs( mod )
+            raise StandardError if @module and ! mod.equal?( @module )
             @module = mod
             Svn.new( self ) 
         end
@@ -24,6 +25,10 @@ def only=( list )
             puts @only.inspect
         end
 
+        def copy_configuration( other )
+            super
+            @only = nil     # Do not copy nil
+        end
     end
 
     #

data/lib/mj/tools/subprocess.rb

@@ -20,15 +20,25 @@ def execute( command, wd = ENV["HOME"], env = nil )
                             begin
                                 while
                                     line = f.readline
-                                    logger.verbose line.chomp
+                                    if line.start_with?( "error:" )
+                                        logger.error line.chomp
+                                    elsif line.start_with?( "warning:" )
+                                        logger.warn line.chomp
+                                    elsif line.start_with?( "trace:" )
+                                        logger.trace line.chomp
+                                    elsif line.start_with?( "info:" )
+                                        logger.info line.chomp
+                                    else
+                                        logger.verbose line.chomp
+                                    end
                                     yield line.chomp if block_given?
                                 end
-                            rescue EOFError:
+                            rescue EOFError
                                 # Expected. Do nothing
                             end
                         }
                         if $?.coredump? or $?.signaled?
-                            raise CoreDumpError, "Command '#{command}' core dumped because of signal #{$?.termsig}!";
+                            raise CoreDumpError, "Command '#{command}' core dumped because of signal #{$?.termsig}!"
                         end
                         logger.trace "= #{$?.exitstatus}"
                         return $?.exitstatus

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Michael Jansen
@@ -36,7 +36,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2010-08-15 00:00:00 +02:00
+date: 2010-12-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -206,6 +206,7 @@ email:
 - info@michael-jansen.biz
 executables: 
 - build-tool
+- build-tool-1.9
 extensions: []
 
 extra_rdoc_files: 
@@ -220,6 +221,7 @@ files:
 - README.txt
 - Rakefile
 - bin/build-tool
+- bin/build-tool-1.9
 - db/migrations/001_command_histories.rb
 - db/migrations/002_module_events.rb
 - db/migrations/003_command_histories_add_logfile.rb

metadata.gz.sig

@@ -1 +1,2 @@
-*�3䎼X�?$�/��8�;!A���"sN3qv��_6 g���䭤�.~9H����������?���W�Z�"����ka�X�{���E!��o;��Gû�����{�!�;p��?�KhT��q�Շjjw�uBD�|�	˲"J�m�I?�e�L�=�V�f��JH�8�TT�w��W.�}��2ɦ�kR�����Ƣ�Q��Y��)Xt��tƳ	�~�kK	Ef��b��y[}ci����	�!~��W�18�
+	��^�r1Bzz)VW�I`2�X�HeI>P�Yy�2���
+NV+j|d��a(�3[:���zx�aUf!��k�+ei2�Y��\C.MPگ�m��8��k]x��6�[5�#^H����-�&�VWX��]X��., �e�����Ep�<������K/�&���#���4�8+N��xML���m�aD�E�G�`|+���a�VCN�