build-tool 0.4.1 → 0.4.2

data.tar.gz.sig

@@ -1 +1 @@
-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�-
+���{t6�q�g�]O06�Z؞c�z�x	?�X�"S	_0&6�����i��L
�����s�g!�(�r~�u-1��_��8I%��E?R�m�l��-�U���zg�)���K��_G���]���J�?�5~!57�k���eN��`�h�.�npm���d�-(zx��V����}��ܕ�����v�3o>)e?$��x�2clsw����eQ��B&�/�,������K��/�$�{&��8�ɓw

data/History.txt

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

data/README.txt

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-This project is inspired by kdesvn-build[http://kdesvn-build.kde.org/].
+This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].
 
 It help in building and maintaining a development environment. It downloads
 and configures sources and updates them later.
@@ -29,8 +29,6 @@ Additional features are:
     - Provide sample xessions and kde.desktop files to use the result.
 
 Currently the following recipes are provided:
-    - Qt 4.6 (either from the kde-qt or qtsoftware repositories.
-    - KDE 4.3
     - KDE Trunk
 
 == SYNOPSIS:
@@ -50,10 +48,10 @@ http://michael-jansen.biz/build-tool
 
 == REQUIREMENTS:
 
-* logging      >= 1.2.2
-* sequel       >= 3.8.0
-* sqlite3-ruby >= 1.2
-* ansi         >= 1.2
+* logging      >= 1.4.3
+* sequel       >= 3.18.0
+* sqlite3-ruby >= 1.3.1
+* ansi         >= 1.2.2
 
 == INSTALL:
 
@@ -63,5 +61,5 @@ http://michael-jansen.biz/build-tool
 
 (The GPL LICENSE)
 
-Copyright (c) 2009-2010 Michael Jansen
+Copyright (c) 2009-2011 Michael Jansen
 

data/Rakefile

@@ -24,10 +24,10 @@ Hoe.spec( 'build-tool' ) do |build_tool|
   build_tool.rubyforge_name       = build_tool.name
 
   build_tool.extra_deps           = [
-    ['logging', ">= 1.2.2"],
-    ['sequel', ">= 3.8.0"],
-    ['sqlite3-ruby', ">= 1.2" ],
-    ['ansi', '>= 1.2' ]
+    ['logging', ">= 1.4.3"],
+    ['sequel', ">= 3.18.0"],
+    ['sqlite3-ruby', ">= 1.3.1" ],
+    ['ansi', '>= 1.2.2' ]
   ]
 
   build_tool.extra_dev_deps           = [
@@ -35,7 +35,7 @@ Hoe.spec( 'build-tool' ) do |build_tool|
     ['hoe-doofus', ">= 1.0.0"],
     ['hoe-git', ">= 1.3.0"],
     ['racc', ">= 1.4.6"],
-    ['rexical', ">= 1.0.4"]
+    ['rexical', ">= 1.0.5"]
   ]
 
 end

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.1'
+  VERSION = '0.4.2'
 end
 

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

@@ -1,6 +1,6 @@
 #--
 # DO NOT MODIFY!!!!
-# This file is automatically generated by rex 1.0.4
+# This file is automatically generated by rex 1.0.5
 # from lexical definition file "lib/build-tool/cfg/lexer.rex".
 #++
 
@@ -12,8 +12,7 @@
 #
 require 'build-tool/cfg/lexer_base.rb'
 
-module BuildTool::Cfg
-class Lexer < Racc::Parser
+class BuildTool::Cfg::Lexer < Racc::Parser
   require 'strscan'
 
   class ScanError < StandardError ; end
@@ -28,7 +27,7 @@ def scan_setup(str)
     @state  = nil
   end
 
-  def action(&block)
+  def action
     yield
   end
 
@@ -36,6 +35,7 @@ def scan_str(str)
     scan_setup(str)
     do_parse
   end
+  alias :scan :scan_str
 
   def load_file( filename )
     @filename = filename
@@ -52,7 +52,13 @@ def scan_file( filename )
 
   def next_token
     return if @ss.eos?
+    
+    # skips empty actions
+    until token = _next_token or @ss.eos?; end
+    token
+  end
 
+  def _next_token
     text = @ss.peek(1)
     @lineno  +=  1  if text == "\n"
     token = case @state
@@ -502,6 +508,9 @@ def next_token
       when (text = @ss.scan(/end\b/))
          action { @state = @states.pop; [:END, text]; }
 
+      when (text = @ss.scan(/use\b/))
+         action { @states.push @state; @state = :USE;     [:USE,     text]; }
+
       when (text = @ss.scan(/"([^\"\r\n]*)"/))
          action { [:STRING,  @ss[1]]; }
 
@@ -686,15 +695,14 @@ def next_token
       raise  ScanError, "undefined state: '" + state.to_s + "'"
     end  # case state
     token
-  end  # def next_token
+  end  # def _next_token
 
-    include LexerBase
+    include BuildTool::Cfg::LexerBase
     def do_parse
         @states = []
         super
     end
 end # class
-end # module
 
 #
 ### FOOTER

data/lib/build-tool/cfg/lexer.rex

@@ -225,7 +225,8 @@ rule
     :SERVER server\b   { [:SERVER,   text]; }
     :SERVER path\b     { [:PATH,     text]; }
     :SERVER host\b     { [:HOST,     text]; }
-    :SERVER end\b           { @state = @states.pop; [:END, text]; }
+    :SERVER end\b      { @state = @states.pop; [:END, text]; }
+    :SERVER use\b      { @states.push @state; @state = :USE;     [:USE,     text]; }
     # COMMON
     :SERVER {STRING}      { [:STRING,  @ss[1]]; }
     :SERVER {TOKEN}       { [:TOKEN,   text];   }

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..id8d638bce17', 'lib/build-tool/cfg/parser.y', 344
+module_eval <<'..end lib/build-tool/cfg/parser.y modeval..id93c5927fec', 'lib/build-tool/cfg/parser.y', 346
 #
 ### INNER
 #
@@ -40,7 +40,7 @@ def parse_string( string, file = "<string>" )
     return configuration
 end
 
-..end lib/build-tool/cfg/parser.y modeval..id8d638bce17
+..end lib/build-tool/cfg/parser.y modeval..id93c5927fec
 
 ##### racc 1.4.5 generates ###
 
@@ -139,166 +139,170 @@ def parse_string( string, file = "<string>" )
  2, 85, :_reduce_91,
  2, 85, :_reduce_92,
  2, 85, :_reduce_93,
- 4, 60, :_reduce_94,
+ 3, 85, :_reduce_94,
+ 1, 85, :_reduce_95,
+ 4, 60, :_reduce_96,
  0, 86, :_reduce_none,
- 2, 86, :_reduce_96,
- 2, 87, :_reduce_97,
- 4, 65, :_reduce_98,
+ 2, 86, :_reduce_98,
+ 2, 87, :_reduce_99,
+ 4, 65, :_reduce_100,
  0, 88, :_reduce_none,
- 2, 88, :_reduce_100,
- 2, 89, :_reduce_101,
+ 2, 88, :_reduce_102,
+ 2, 89, :_reduce_103,
  0, 75, :_reduce_none,
- 2, 75, :_reduce_103 ]
+ 2, 75, :_reduce_105 ]
 
-racc_reduce_n = 104
+racc_reduce_n = 106
 
-racc_shift_n = 193
+racc_shift_n = 197
 
 racc_action_table = [
-    73,   126,    77,    15,    79,   122,    39,    45,     1,   161,
-   119,    53,   125,   127,    24,   161,   117,    26,    84,    65,
-   118,    72,    37,    54,    73,    57,    77,    15,    79,   157,
-    66,     3,     1,   120,    41,   157,   141,   128,    80,   123,
-    45,    68,    84,    65,    75,    72,   121,   168,    73,    53,
-    77,    15,    79,   124,    66,     3,     1,   115,   129,    38,
-    36,    54,    80,    57,   144,    68,    84,    65,    75,    72,
-   142,    39,    37,   143,    24,   171,    93,    26,    66,     3,
-    93,   169,    24,    92,   170,    26,    80,    92,    15,    68,
-    20,    21,    75,     1,    15,     7,    62,    63,   130,     1,
-    18,     7,   114,   132,   113,     5,    18,     9,    24,   134,
-   135,    26,    58,     9,   136,    24,     3,     6,    26,    86,
-    12,    24,     3,     6,    26,    59,    12,    15,    24,    20,
-    21,    26,     1,    15,     7,    62,    63,   138,     1,    18,
-     7,   112,   110,   109,     5,    18,     9,   102,    41,   108,
-   103,    58,     9,   107,    52,     3,     6,   149,   105,    12,
-     6,     3,     6,    12,    59,    12,    52,    41,    52,    46,
-    47,    99,     6,    24,     6,    12,    26,    12,    98,   155,
-   157,    46,    47,    46,    47,    24,    24,    24,    26,    26,
+    75,   129,    79,    15,    81,   125,   161,    45,     1,   165,
+   122,    36,   128,   130,    24,   165,   120,    26,    86,    67,
+   121,    74,    24,    37,    75,    26,    79,    15,    81,   161,
+    68,     3,     1,   123,    41,   161,   144,   131,    82,    37,
+    45,    70,    86,    67,    77,    74,   124,   172,    75,    38,
+    79,    15,    81,    95,    68,     3,     1,   126,   127,   118,
+    94,    39,    82,   132,   147,    70,    86,    67,    77,    74,
+   145,    24,   133,   146,    26,   175,    95,    24,    68,     3,
+    26,   173,    24,    94,   174,    26,    82,   117,    15,    70,
+    64,    65,    77,     1,    24,     7,    15,    26,    64,    65,
+    18,     1,    24,     7,   135,    26,    60,     9,    18,   104,
+    24,   116,   105,    26,    60,     9,     3,     6,    24,    61,
+    12,    26,   137,    24,     3,     6,    26,    61,    12,    15,
+    24,    20,    21,    26,     1,    15,     7,    20,    21,    55,
+     1,    18,     7,   138,   139,    88,     5,    18,     9,   141,
+   115,    56,     5,    59,     9,   113,    55,     3,     6,    24,
+    12,    12,    26,     3,     6,    52,    53,    12,    56,    52,
+    59,     6,   112,    52,    12,     6,    41,    12,    12,     6,
+    46,    47,    12,    53,    46,    47,   111,    24,    46,    47,
     26,    24,    24,    24,    26,    26,    26,    24,    24,    24,
-    26,    26,    26,    24,    24,    24,    26,    26,    26,    24,
-    89,   166,    26,    86,    35,   172,   173,   174,   175,   176,
-   176,   157,   178,   179,   180,   181,   182,    33,   184,   166,
-   186,   187,   188,   189,   190,    28,   192 ]
+    26,    26,    26,    24,    24,    24,    26,    26,    26,   110,
+   109,   153,   107,    41,   101,   100,   159,    39,    91,   170,
+    88,    35,   176,   177,   178,   179,   180,   180,   161,   182,
+   183,   184,   185,   186,    33,   188,   170,   190,   191,   192,
+   193,   194,    28,   196 ]
 
 racc_action_check = [
-   133,    75,   133,   133,   133,    68,    63,    25,   133,   127,
-    68,    29,    75,    75,   121,   163,    65,   121,   133,   133,
-    66,   133,    62,    29,    31,    29,    31,    31,    31,   127,
-   133,   133,    31,    68,    25,   163,    98,    75,   133,    72,
-    31,   133,    31,    31,   133,    31,    68,   140,    78,    56,
-    78,    78,    78,    73,    31,    31,    78,    60,    76,    21,
-    20,    56,    31,    56,    98,    31,    78,    78,    31,    78,
-    98,    21,    20,    98,    38,   140,    34,    38,    78,    78,
-    91,   140,     6,    34,   140,     6,    78,    91,     0,    78,
-     0,     0,    78,     0,    30,     0,    30,    30,    77,    30,
-     0,    30,    59,    79,    58,     0,    30,     0,   122,    84,
-    86,   122,    30,    30,    87,    37,     0,     0,    37,    88,
-     0,   120,    30,    30,   120,    30,    30,    22,    44,    22,
-    22,    44,    22,    61,    22,    61,    61,    90,    61,    22,
-    61,    57,    55,    54,    22,    61,    22,    46,   101,    53,
-    46,    61,    61,    52,   178,    22,    22,   114,    48,    22,
-   178,    61,    61,   178,    61,    61,    27,    43,    51,   178,
-   178,    42,    27,    47,    51,    27,    47,    51,    41,   124,
-   125,    27,    27,    51,    51,   119,     7,   103,   119,     7,
-   103,   102,     9,    92,   102,     9,    92,    12,    15,    82,
-    12,    15,    82,     3,     1,    36,     3,     1,    36,    39,
-    33,   128,    39,    32,    18,   141,   142,   144,   145,   148,
-   154,   156,   157,   158,   159,   161,   162,    14,   164,   165,
-   166,   167,   168,   169,   171,     5,   191 ]
+   136,    77,   136,   136,   136,    70,   128,    25,   136,   167,
+    70,    20,    77,    77,   123,   130,    67,   123,   136,   136,
+    68,   136,    38,    20,    31,    38,    31,    31,    31,   167,
+   136,   136,    31,    70,    25,   130,   100,    77,   136,    64,
+    31,   136,    31,    31,   136,    31,    70,   143,    80,    21,
+    80,    80,    80,    34,    31,    31,    80,    74,    75,    62,
+    34,    21,    31,    78,   100,    31,    80,    80,    31,    80,
+   100,    39,    79,   100,    39,   143,    93,   125,    80,    80,
+   125,   143,   124,    93,   143,   124,    80,    61,    30,    80,
+    30,    30,    80,    30,     7,    30,    63,     7,    63,    63,
+    30,    63,    44,    63,    81,    44,    30,    30,    63,    46,
+    47,    60,    46,    47,    63,    63,    30,    30,   122,    30,
+    30,   122,    86,    36,    63,    63,    36,    63,    63,    22,
+   110,    22,    22,   110,    22,     0,    22,     0,     0,    58,
+     0,    22,     0,    88,    89,    90,    22,     0,    22,    92,
+    59,    58,     0,    58,     0,    57,    29,    22,    22,   105,
+    58,    22,   105,     0,     0,    27,    58,     0,    29,   182,
+    29,    27,    56,    51,    27,   182,   103,    29,   182,    51,
+    27,    27,    51,    29,   182,   182,    55,   104,    51,    51,
+   104,     6,    94,     9,     6,    94,     9,    12,    84,    15,
+    12,    84,    15,     3,     1,    37,     3,     1,    37,    53,
+    52,   117,    48,    43,    42,    41,   127,    65,    33,   131,
+    32,    18,   144,   145,   147,   148,   152,   158,   160,   161,
+   162,   163,   165,   166,    14,   168,   169,   170,   171,   172,
+   173,   175,     5,   195 ]
 
 racc_action_pointer = [
-    82,   165,   nil,   164,   nil,   196,    43,   147,   nil,   153,
-   nil,   nil,   158,   nil,   227,   159,   nil,   nil,   175,   nil,
-    47,    46,   121,   nil,   nil,   -12,   nil,   137,   nil,    -6,
-    88,    21,   199,   210,    56,   nil,   166,    76,    35,   170,
-   nil,   136,   161,   121,    89,   nil,   112,   134,   148,   nil,
-   nil,   139,   114,   110,   104,   132,    32,   102,    97,    95,
-    47,   127,    -3,   -19,   nil,   -23,   -19,   nil,    -1,   nil,
-   nil,   nil,    32,    25,   nil,    -3,    48,    59,    45,    64,
-   nil,   nil,   160,   nil,    70,   nil,    71,   104,   105,   nil,
-   127,    60,   154,   nil,   nil,   nil,   nil,   nil,    34,   nil,
-   nil,   102,   152,   148,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   118,   nil,   nil,   nil,   nil,   146,
-    82,   -25,    69,   nil,   140,   148,   nil,    -3,   185,   nil,
-   nil,   nil,   nil,    -3,   nil,   nil,   nil,   nil,   nil,   nil,
-    45,   176,   177,   nil,   178,   208,   nil,   nil,   180,   nil,
-   nil,   nil,   nil,   nil,   181,   nil,   189,   183,   213,   214,
-   nil,   186,   216,     3,   218,   203,   191,   221,   193,   194,
-   nil,   195,   nil,   nil,   nil,   nil,   nil,   nil,   125,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   226,   nil ]
+   129,   165,   nil,   164,   nil,   203,   152,    55,   nil,   154,
+   nil,   nil,   158,   nil,   234,   160,   nil,   nil,   182,   nil,
+    -2,    36,   123,   nil,   nil,   -12,   nil,   136,   nil,   139,
+    82,    21,   206,   218,    33,   nil,    84,   166,   -17,    32,
+   nil,   173,   204,   167,    63,   nil,    74,    71,   202,   nil,
+   nil,   144,   171,   171,   nil,   147,   133,   145,   122,   111,
+   104,    80,    49,    90,    14,   192,   nil,   -23,   -19,   nil,
+    -1,   nil,   nil,   nil,    50,    30,   nil,    -3,    53,    33,
+    45,    65,   nil,   nil,   159,   nil,    83,   nil,   104,   134,
+   131,   nil,   139,    56,   153,   nil,   nil,   nil,   nil,   nil,
+    34,   nil,   nil,   130,   148,   120,   nil,   nil,   nil,   nil,
+    91,   nil,   nil,   nil,   nil,   nil,   nil,   172,   nil,   nil,
+   nil,   nil,    79,   -25,    43,    38,   nil,   177,   -26,   nil,
+     3,   193,   nil,   nil,   nil,   nil,    -3,   nil,   nil,   nil,
+   nil,   nil,   nil,    45,   183,   184,   nil,   185,   215,   nil,
+   nil,   nil,   187,   nil,   nil,   nil,   nil,   nil,   188,   nil,
+   196,   190,   220,   221,   nil,   193,   223,    -3,   225,   210,
+   198,   228,   200,   201,   nil,   202,   nil,   nil,   nil,   nil,
+   nil,   nil,   140,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   233,   nil ]
 
 racc_action_default = [
-    -5,  -104,   -11,  -104,   -12,  -104,  -104,  -104,   -13,  -104,
-   -14,   -15,  -104,   -16,  -104,  -104,   -17,    -1,  -104,   -18,
-  -104,  -104,    -5,   -10,    -2,   -37,    -3,   -80,    -7,   -89,
-   -44,   -61,   -95,  -104,   -28,   -58,  -104,  -104,  -104,  -104,
-    -6,  -104,  -104,   -37,  -104,    -4,  -104,  -104,  -104,   -87,
-   -86,   -80,  -104,  -104,  -104,  -104,   -89,  -104,  -104,  -104,
-  -104,   -44,  -104,  -104,   -46,  -104,  -104,   -69,  -104,   -23,
-   -72,   -24,  -104,  -104,   -71,  -104,  -104,  -104,   -61,  -104,
-   -77,   -70,  -104,   -21,  -104,   -22,  -104,  -104,   -95,   193,
-  -104,   -28,  -104,   -34,    -8,   -19,    -9,   -20,  -104,   -35,
-   -38,   -37,  -104,  -104,   -83,   -79,   -81,   -82,   -91,   -93,
-   -88,   -90,   -92,  -102,  -104,   -43,   -45,   -76,   -75,  -104,
-  -104,  -104,  -104,  -102,  -104,   -50,   -26,   -54,   -99,   -59,
-   -74,   -62,   -68,   -61,   -73,   -97,   -94,   -96,   -27,   -29,
-  -104,  -104,  -104,   -39,  -104,  -104,   -85,   -84,   -47,   -48,
-   -64,   -65,   -66,   -63,   -67,   -78,   -50,  -104,  -104,  -104,
-   -56,  -104,  -104,   -54,  -104,   -99,  -104,  -104,  -104,  -104,
-   -30,  -104,   -42,   -40,   -41,   -36,  -103,   -51,   -80,   -49,
-   -25,   -57,   -53,   -55,   -98,  -100,  -101,   -60,   -33,   -31,
-   -32,  -104,   -52 ]
+    -5,  -106,   -11,  -106,   -12,  -106,  -106,  -106,   -13,  -106,
+   -14,   -15,  -106,   -16,  -106,  -106,   -17,    -1,  -106,   -18,
+  -106,  -106,    -5,   -10,    -2,   -37,    -3,   -80,    -7,   -89,
+   -44,   -61,   -97,  -106,   -28,   -58,  -106,  -106,  -106,  -106,
+    -6,  -106,  -106,   -37,  -106,    -4,  -106,  -106,  -106,   -87,
+   -86,   -80,  -106,  -106,   -95,  -106,  -106,  -106,   -89,  -106,
+  -106,  -106,  -106,   -44,  -106,  -106,   -46,  -106,  -106,   -69,
+  -106,   -23,   -72,   -24,  -106,  -106,   -71,  -106,  -106,  -106,
+   -61,  -106,   -77,   -70,  -106,   -21,  -106,   -22,  -106,  -106,
+   -97,   197,  -106,   -28,  -106,   -34,    -8,   -19,    -9,   -20,
+  -106,   -35,   -38,   -37,  -106,  -106,   -83,   -79,   -81,   -82,
+  -106,   -91,   -93,   -88,   -90,   -92,  -104,  -106,   -43,   -45,
+   -76,   -75,  -106,  -106,  -106,  -106,  -104,  -106,   -50,   -26,
+   -54,  -101,   -59,   -74,   -62,   -68,   -61,   -73,   -99,   -96,
+   -98,   -27,   -29,  -106,  -106,  -106,   -39,  -106,  -106,   -85,
+   -84,   -94,   -47,   -48,   -64,   -65,   -66,   -63,   -67,   -78,
+   -50,  -106,  -106,  -106,   -56,  -106,  -106,   -54,  -106,  -101,
+  -106,  -106,  -106,  -106,   -30,  -106,   -42,   -40,   -41,   -36,
+  -105,   -51,   -80,   -49,   -25,   -57,   -53,   -55,  -100,  -102,
+  -103,   -60,   -33,   -31,   -32,  -106,   -52 ]
 
 racc_goto_table = [
-    48,    50,    49,    25,    67,    27,    76,    70,    29,    30,
-    74,    31,    42,    90,    32,    87,   160,    34,   164,    64,
-   162,    55,    17,   148,   106,    50,    49,   158,    60,    44,
-   100,   159,    14,   154,   nil,    82,   nil,   nil,    94,    95,
-    96,    97,   nil,   nil,    40,   nil,   101,   nil,   111,   104,
-    64,    67,   160,   131,    70,   185,   183,    74,   177,   116,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   139,   137,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   133,   nil,   nil,   nil,   145,   nil,
-   nil,   nil,   nil,   nil,   140,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   146,   147,    67,   nil,   167,    70,
-   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   150,   151,   152,   153,   nil,   nil,   nil,   nil,   nil,
+    48,    50,    49,    54,    25,    69,    27,    78,    92,    29,
+    30,    72,    31,    76,    89,    32,    42,   168,    34,    66,
+   164,   166,    57,    17,   108,    50,    49,   162,    62,    44,
+   163,    14,    54,   152,   102,    84,   nil,   nil,   nil,    96,
+    97,    98,    99,   158,   nil,    40,   nil,   103,   nil,   nil,
+   106,   114,    66,   nil,    69,   189,   134,   164,   187,   181,
+    72,   119,    76,   nil,   nil,   nil,   nil,   142,   nil,   nil,
+   nil,   nil,   140,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   136,   nil,   nil,
+   nil,   nil,   nil,   nil,   148,   nil,   nil,   143,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   149,   150,   nil,
+    69,   nil,   171,   151,   nil,   nil,    72,   nil,    76,   nil,
+   nil,   nil,   nil,   nil,   nil,   154,   155,   156,   157,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   191,    50,    49 ]
+   nil,   nil,   nil,   nil,   nil,   195,    50,    49 ]
 
 racc_goto_check = [
-    30,    12,    11,     3,     7,     3,    33,     8,     3,     3,
-    10,     3,    23,    21,     3,    38,    29,     3,    40,     6,
-    31,    36,     2,    27,    30,    12,    11,    28,    25,     4,
-    23,    20,     1,    27,   nil,     4,   nil,   nil,     3,     3,
-     3,     3,   nil,   nil,     2,   nil,     3,   nil,    36,     3,
-     6,     7,    29,    33,     8,    40,    31,    10,    28,    25,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     3,   nil,   nil,   nil,    23,   nil,
-   nil,   nil,   nil,   nil,     3,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     3,     3,     7,   nil,    33,     8,
-   nil,   nil,    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     3,     3,     3,     3,   nil,   nil,   nil,   nil,   nil,
+    30,    12,    11,    12,     3,     7,     3,    33,    21,     3,
+     3,     8,     3,    10,    38,     3,    23,    40,     3,     6,
+    29,    31,    36,     2,    30,    12,    11,    28,    25,     4,
+    20,     1,    12,    27,    23,     4,   nil,   nil,   nil,     3,
+     3,     3,     3,    27,   nil,     2,   nil,     3,   nil,   nil,
+     3,    36,     6,   nil,     7,    40,    33,    29,    31,    28,
+     8,    25,    10,   nil,   nil,   nil,   nil,    21,   nil,   nil,
+   nil,   nil,    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     3,   nil,   nil,
+   nil,   nil,   nil,   nil,    23,   nil,   nil,     3,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     3,     3,   nil,
+     7,   nil,    33,     3,   nil,   nil,     8,   nil,    10,   nil,
+   nil,   nil,   nil,   nil,   nil,     3,     3,     3,     3,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    30,    12,    11 ]
+   nil,   nil,   nil,   nil,   nil,    30,    12,    11 ]
 
 racc_goto_pointer = [
-   nil,    32,    22,     2,     4,   nil,   -11,   -27,   -24,   nil,
-   -21,   -25,   -26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   -95,   -21,   nil,   -13,   nil,    -2,   nil,   -90,   -98,  -111,
-   -27,  -107,   nil,   -25,   nil,   nil,    -8,   nil,   -17,   nil,
-  -110,   nil ]
+   nil,    31,    23,     3,     4,   nil,   -11,   -26,   -20,   nil,
+   -18,   -25,   -26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   -99,   -26,   nil,    -9,   nil,    -2,   nil,   -83,  -101,  -110,
+   -27,  -109,   nil,   -24,   nil,   nil,    -7,   nil,   -18,   nil,
+  -114,   nil ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,    22,    23,     2,     4,     8,
-    10,    11,    13,    16,    19,    81,    83,    85,    69,    71,
-   nil,   nil,    91,   nil,    43,   nil,    61,   nil,   nil,   156,
-   nil,   nil,   163,   nil,    78,    51,   nil,    56,   nil,    88,
-   nil,   165 ]
+    10,    11,    13,    16,    19,    83,    85,    87,    71,    73,
+   nil,   nil,    93,   nil,    43,   nil,    63,   nil,   nil,   160,
+   nil,   nil,   167,   nil,    80,    51,   nil,    58,   nil,    90,
+   nil,   169 ]
 
 racc_token_table = {
  false => 0,
@@ -1069,56 +1073,70 @@ def _reduce_93( val, _values, result )
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 295
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 289
   def _reduce_94( val, _values, result )
- result = SshKeyDeclarationNode.new( val[1..-1] );
+ result = UseSshKeyNode.new( val[2] );
    result
   end
 .,.,
 
- # reduce 95 omitted
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 290
+  def _reduce_95( val, _values, result )
+ result = val[0];
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 300
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 297
   def _reduce_96( val, _values, result )
+ result = SshKeyDeclarationNode.new( val[1..-1] );
+   result
+  end
+.,.,
+
+ # reduce 97 omitted
+
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 302
+  def _reduce_98( val, _values, result )
  result = val.flatten;
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 304
-  def _reduce_97( val, _values, result )
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 306
+  def _reduce_99( val, _values, result )
  result = SshKeyFileNode.new( val[1] );
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 311
-  def _reduce_98( val, _values, result )
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 313
+  def _reduce_100( val, _values, result )
  result = SvnDeclarationNode.new( val[2] );
    result
   end
 .,.,
 
- # reduce 99 omitted
+ # reduce 101 omitted
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 316
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 318
+  def _reduce_102( val, _values, result )
  result = val.flatten;
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 320
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 322
+  def _reduce_103( val, _values, result )
  result = SvnCheckoutOnlyNode.new(val[1]);
    result
   end
 .,.,
 
- # reduce 102 omitted
+ # reduce 104 omitted
 
-module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 328
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'lib/build-tool/cfg/parser.y', 330
+  def _reduce_105( val, _values, result )
  result = val[0] ? val[0] + "\n" + val[1] : val[1];
    result
   end

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

@@ -287,6 +287,8 @@ rule
         : HOST     STRING     { result = ServerHostNode.new( val[1] );     }
         | PROTOCOL STRING     { result = ServerProtocolNode.new( val[1] ); }
         | PATH     STRING     { result = ServerPathNode.new( val[1] );     }
+        | USE SSH_KEY identifier { result = UseSshKeyNode.new( val[2] ); }
+        | ssh_key_declaration { result = val[0]; }
         ;
 
     #

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

@@ -625,6 +625,16 @@ def visit_ServerStatementList( node )
             self.visit( node )
         end
 
+        def visit_SshKeyDeclarationNode( node )
+            @server.sshkey = node.value
+        end
+
+        def visit_UseSshKeyNode( node )
+            name = node.value
+            @server.sshkey = configuration.sshkey(name)
+            raise ConfigurationError, "Unknown ssh-key #{name} configured for server #{@server.name}!" if @server.sshkey.nil?
+        end
+
     end # class ServerDeclarationNodeVisitor
 
 

data/lib/build-tool/commands.rb

@@ -205,6 +205,27 @@ def do_execute
             raise NotImplementedError, "#{self.class}.do_execute() not implemented"
         end
 
+        def setup_command
+        end
+
+        def teardown_command
+        end
+
+        def summarize
+        end
+
+        # Cleanup after vcs_access
+        def cleanup_after_vcs_access
+            if MJ::Tools::SSH::has_keys?
+                logger.info ""
+                logger.info "#### Cleaning up the ssh keys"
+                MJ::Tools::SSH::keys.each do |file|
+                    logger.info "  - Removing key #{file}"
+                end
+                MJ::Tools::SSH::cleanup()
+            end
+        end
+
         def execute( args )
             @options = OptionParser.new
             @options.set_program_name( name )
@@ -220,6 +241,8 @@ def execute( args )
             end
             @parsing = false
 
+            setup_command
+
             # Log the command into history
             state = BuildTool::History::CommandLog::FINISHED_SUCCESSFUL
             rc = -1 # -1 for @skip_command
@@ -246,6 +269,11 @@ def execute( args )
                         @cmd.finished( state )
                         @cmd = nil
                     end
+
+                    teardown_command
+
+                    summarize
+
                 end
             end
 
@@ -343,31 +371,43 @@ def initialize_options
         def complete_modules( name, include_templates = false )
             res = []
             found = false
+            should_be_unique = false
             configuration.modules.each do |mod|
                 next if ( !include_templates and mod.is_template? )
                 # We match on the following conditions:
                 #   1. name  = mod.name
                 #   2. name/ matches beginning of mod.name
-                #   3. name starts with ":". Look for package instead of
-                #   module
-                if name.end_with?('/') and mod.name.start_with? name
+                #   3. name equals last part of mod.name (behind /) and is unique
+                if name.end_with?('/') and mod.name.index "/#{name}" or mod.name.start_with? name
                     found = true
                     # Now check if it is active.
                     next if !( mod.active? || @all )
                     res << mod
                 elsif mod.name == name
                     found = true
+                    should_be_unique = true
                     # Now check if it is active.
-                    if mod.active? || @all
-                        res << mod
-                    end
-                    break
+                    next if !( mod.active? || @all )
+                    res << mod
+                elsif mod.name.end_with?( "/#{name}" )
+                    found = true
+                    should_be_unique = true
+                    # Now check if it is active.
+                    next if !( mod.active? || @all )
+                    res << mod
                 end
             end
+
             # Raise an error if the module was not found
             if !found
                 raise UsageError, "Unknown module/package #{name}"
             end
+
+            # Raise an error if the result should be unique but is not.
+            if should_be_unique and res.size > 1
+                raise UsageError, "#{name} is ambiguos. Please be more specific."
+            end
+
             # Give a warning if all modules where 
             logger.warn "All modules for #{name} are inactive! Will ignore it." if res.empty?
             return res
@@ -438,6 +478,7 @@ class ModuleBasedCommand < Standard
 
         def initialize( *args )
             super( *args )
+            @failed_modules = []
         end
 
         def is_module_ready?( mod )
@@ -472,34 +513,54 @@ def do_execute( args )
 
             rc = 0      # Our return code.
 
+            @failed_modules = []
+
             while_logging_to nil, 'build-status', :info do
 
-                modules.each do |mod|
-
-                    begin
-                        logger.info ""
-                        logger.info "#### Module #{mod.name}"
-                        do_execute_module( mod )
-                    rescue Interrupt => e
-                        raise e
-                    rescue BuildTool::Error => e
-                        logger.error   e.message
-                        logger.verbose e.backtrace.join("\n")
-                        rc = -1
-                    rescue Exception => e
-                        logger.error   "#{e.class}:#{e.message}"
-                        logger.verbose e.backtrace.join("\n")
-                        rc = -1
-                    ensure
-                        logger.info "#### Module #{mod.name} finished"
+                begin
+
+                    modules.each_with_index do |mod, index|
+
+                        begin
+                            logger.info ""
+                            logger.info "#### Module #{mod.name} (#{index+1}/#{modules.size})"
+                            do_execute_module( mod )
+                        rescue Interrupt => e
+                            raise e
+                        rescue BuildTool::Error => e
+                            logger.error   e.message
+                            logger.verbose e.backtrace.join("\n")
+                            @failed_modules << mod.name
+                            rc = -1
+                        rescue Exception => e
+                            logger.error   "#{e.class}:#{e.message}"
+                            logger.verbose e.backtrace.join("\n")
+                            @failed_modules << mod.name
+                            rc = -1
+                        ensure
+                            logger.info "#### Module #{mod.name} finished"
+                        end
                     end
+
                 end
 
             end
 
             return rc;
+
         end
 
+        def summarize
+            logger.info ""
+            if !@failed_modules.empty?
+                logger.info "#### Finished with errors"
+                logger.info "Failed modules:\n\t#{ @failed_modules.join( "\n\t" ) }"
+            else
+                logger.info "#### Finished without errors"
+            end
+        end
+
+
         # Call the #clean method of the module.
         #
         # @param [Object] mod The module to use

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

@@ -61,12 +61,6 @@ def applicable?
             BuildTool::Application.instance.name != "build-tool"
         end
 
-        def do_execute( args )
-            rc = super(args)
-            MJ::Tools::SSH::cleanup()
-            return rc
-        end
-
         def is_module_ready?( mod )
             isready = true
             @update  &&                         isready &= mod.prepare_for_vcs_access
@@ -120,6 +114,10 @@ def do_execute_module( mod )
 
         end # do_execute_module
 
+        def teardown_command
+            cleanup_after_vcs_access
+        end
+
     end # class Build
 
 

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

@@ -35,7 +35,7 @@ def is_module_ready?( mod )
             isready = true
             isready &= mod.prepare_for_vcs_access
             if !mod.vcs.fetching_supported?
-                logger.warn "#{mod.name}: fetching not support by #{mod.vcs.name} -> implicit rebase."
+                logger.warn "#{mod.name}: fetching not supported by #{mod.vcs.name} -> implicit rebase."
             end
             return isready
         end
@@ -50,10 +50,8 @@ def do_execute_module( mod )
 
         end
 
-        def do_execute( args )
-            rc = super(args)
-            MJ::Tools::SSH::cleanup()
-            return rc
+        def teardown_command
+            cleanup_after_vcs_access
         end
 
     end # class Build

data/lib/build-tool/module.rb

@@ -326,10 +326,24 @@ def install( fast = false )
             build_system_required.install( fast )
         end
 
+        # Cleanup after vcs_access
+        def cleanup_after_vcs_access
+            if MJ::Tools::SSH::has_keys?
+                logger.info ""
+                logger.info "#### Cleaning up the ssh keys"
+                MJ::Tools::SSH::keys.each do |file|
+                    logger.info "  - Removing key #{file}"
+                end
+                MJ::Tools::SSH::cleanup()
+            end
+        end
+
         # Check if an ssh-key is required and active it if necessary
         def prepare_for_vcs_access
             if key = repository_required.sshkey
                 if !MJ::Tools::SSH::has_key? key.file
+                    logger.info ""
+                    logger.info "#### Adding required ssh-key #{key.file} to ssh-agent."
                     MJ::Tools::SSH::add_key key.file
                end
             end

data/lib/build-tool/repository.rb

@@ -18,7 +18,7 @@ class Repository
         attr_accessor :user
 
         # The associated ssh-key
-        attr_accessor :sshkey
+        attr_writer :sshkey
 
         # Create a repository
         def initialize(name)
@@ -30,12 +30,24 @@ def initialize(name)
             @sshkey = nil
         end
 
+        # Return the ssh key needed to access this repository. If the repository has no key we
+        # check the associated server.
+        def sshkey
+            return @sshkey if @sshkey
+
+            if !server
+                raise ConfigurationError, "No server specified for repository #{name}"
+            end
+
+            return server.sshkey
+        end
+
         def url
             if !server
                 raise ConfigurationError, "No server specified for repository #{name}"
             end
             if !server.host
-                raise ConfigurationError, "No host specified for rserver #{server.name}"
+                raise ConfigurationError, "No host specified for server #{server.name}"
             end
 
             url = server.host

data/lib/build-tool/server.rb

@@ -14,6 +14,9 @@ class Server
         # The protocol used to access the repository
         attr_accessor :protocol
 
+        # A ssh key associated with this server
+        attr_accessor :sshkey
+
         # Create a repository
         def initialize(name)
             if name.nil?

data/lib/mj/tools/ssh.rb

@@ -8,6 +8,14 @@ class SSH
 
         @keys_added = []
 
+        def self.has_keys?
+            return ! @keys_added.empty?
+        end
+
+        def self.keys
+            return @keys_added
+        end
+
         def self.add_key( key_file )
             if @keys_added.index( key_file )
                 return

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Michael Jansen
@@ -36,7 +36,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2010-12-12 00:00:00 +01:00
+date: 2011-01-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +47,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 1
         segments: 
         - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 4
+        - 3
+        version: 1.4.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,12 +63,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 79
         segments: 
         - 3
-        - 8
+        - 18
         - 0
-        version: 3.8.0
+        version: 3.18.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -79,11 +79,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 25
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -94,11 +95,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 27
         segments: 
         - 1
         - 2
-        version: "1.2"
+        - 2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -173,12 +175,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 5
+        version: 1.0.5
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -189,16 +191,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 47
         segments: 
         - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id010
 description: |-
-  This project is inspired by kdesvn-build[http://kdesvn-build.kde.org/].
+  This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].
   
   It help in building and maintaining a development environment. It downloads
   and configures sources and updates them later.
@@ -344,7 +346,7 @@ rubyforge_project: build-tool
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: This project is inspired by kdesvn-build[http://kdesvn-build.kde.org/]
+summary: This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/]
 test_files: 
 - test/test_environment.rb
 - test/test_helper.rb