build-tool 0.3.1 → 0.3.2

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

@@ -187,17 +187,7 @@ rule
         ;
 
     git_statement
-        : REMOTE STRING git_remote_values END { result = GitRemoteNode.new( [ val[1], GitRemoteValueList.new( val[2] ) ] ); }
-        ;
-
-    git_remote_values
-        : /* empty */
-        | git_remote_value git_remote_values { result = val.flatten; }
-        ;
-
-    git_remote_value
-        : server_declaration { result = val[0]; }
-        | USE SERVER identifier { result = UseServerNode.new( val[2] ); }
+        : REMOTE STRING repository_statements END { result = RepositoryDeclarationNode.new( val[1..-1]); }
         ;
 
     #

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

@@ -288,10 +288,10 @@ module BuildTool; module Cfg;
             return @vcs
         end
 
-        def visit_GitRemoteNode( node )
-            visitor = GitRemoteNodeVisitor.new( configuration )
-            remote = node.accept(visitor)
-            @vcs.remote[remote.name] = remote
+        def visit_RepositoryDeclarationNode( node )
+            visitor = RepositoryDeclarationNodeVisitor.new( configuration )
+            repo = node.accept(visitor)
+            @vcs.remote[repo.name] = repo
         end
 
     end # class GitDeclarationNodeVisitor
@@ -316,44 +316,6 @@ module BuildTool; module Cfg;
     end # class GitSvnDeclarationNodeVisitor
 
 
-    class GitRemoteNodeVisitor < ListVisitor
-
-        def initialize( configuration )
-            super( configuration )
-            @remote = nil
-        end
-
-        def visit_GitRemoteNode( node )
-            name = node.values[0]
-            @remote = BuildTool::VCS::GitRemote.new( name ) if @remote.nil?
-            node = node.values[1]
-            self.visit_nodes(node.values)
-            return @remote
-        end
-
-        def visit_GitRemotePathNode( node )
-            @remote.path = node.value
-        end
-
-        def visit_GitRemoteValueList( node )
-            self.visit(node)
-        end
-
-        def visit_ServerDeclarationNode( node )
-            visitor = ServerDeclarationNodeVisitor.new( configuration )
-            @remote.server = node.accept(visitor)
-        end
-
-        def visit_UseServerNode( node )
-            @remote.server = configuration.server( node.value )
-            if @remote.server.nil?
-                raise ConfigurationError, "Unknown server #{node.value} configured for remote #{@remote.name}!"
-            end
-        end
-
-    end # class GitRemoteNodeVisitor
-
-
     class IncludeNodeVisitor < ListVisitor
 
         def visit_IncludeNode( node )

data/lib/build-tool/commands.rb

@@ -313,11 +313,19 @@ module BuildTool; module Commands;
 
     class Standard < Base
 
+        def initialize( *args )
+            # Only used by child classes but needed for complete_modules
+            @all = false
+            super( *args )
+        end
+
         def initialize_options
             options.separator "Common options"
 
             options.on( "-v", "--verbose", "Enable verbose output" ) do
                 Logging.appenders['stdout'].level = [ Logging.appenders['stdout'].level-1, 0 ].max
+                Logging.logger['MJ::Logging::LoggerAdapter'].level =
+                    [ Logging.logger['MJ::Logging::LoggerAdapter'].level - 1, 0 ].max
             end
 
             options.on( nil, "--dry-run", "Enable dry run." ) do
@@ -329,25 +337,37 @@ module BuildTool; module Commands;
             end
         end
 
-        def complete_modules( name, all = false )
+        # Gathers all modules currently known.
+        #
+        # @param all Return template modules too.
+        def complete_modules( name, include_templates = false )
             res = []
             found = false
             configuration.modules.each do |mod|
-                next if ( !all and mod.is_template? )
+                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
-                    res << mod
                     found = true
-                elsif mod.name == name
+                    # Now check if it is active.
+                    next if !( mod.active? || @all )
                     res << mod
+                elsif mod.name == name
                     found = true
+                    # Now check if it is active.
+                    if mod.active? || @all
+                        res << mod
+                    end
+                    break
                 end
             end
+            # Raise an error if the module was not found
             raise UsageError, "Unknown module/package #{name}" if !found
+            # Give a warning if all modules where 
+            logger.warn "All modules for #{name} are inactive! Will ignore it." if res.empty?
             return res
         end
 
@@ -415,7 +435,6 @@ module BuildTool; module Commands;
     class ModuleBasedCommand < Standard
 
         def initialize( *args )
-            @all = false
             super( *args )
         end
 
@@ -455,8 +474,6 @@ module BuildTool; module Commands;
 
                 modules.each do |mod|
 
-                    next if !( mod.active? || @all )
-
                     begin
                         logger.info ""
                         logger.info "#### Module #{mod.name}"

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

@@ -17,7 +17,6 @@ module BuildTool; module Commands; module Modules
             @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [MODULE|GROUP]..."
 
             @template = false
-            @all = false
 
             @options.separator "Options:"
 

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

@@ -105,7 +105,7 @@ module BuildTool; module VCS
             logger.info <<-EOS
 The following command sometimes fails when issued from this script. Reason unknown. The
 best chance you have is issuing the command manually!
-#{local_path}: #{cmd}
+#{local_path}: git fetch #{config.track_remote}
 #{local_path}: git checkout -b #{config.track_branch} #{config.track_remote}/#{config.track_branch}
             EOS
 
@@ -159,33 +159,5 @@ best chance you have is issuing the command manually!
 
     end # class Git
 
-    class GitRemote
-
-        attr_accessor :server
-        attr_accessor :path
-        attr_reader   :name
-
-        def initialize( name )
-            @name = name
-            @path = nil
-        end
-
-        def url
-            url = ""
-            if @server
-                url = @server.url
-            end
-            if @path
-                url = "#{url}/#{path}"
-            end
-            url
-        end
-
-        def to_s
-            "REMOTE: #{name} #{url}"
-        end
-
-    end # class Remote
-
 end; end # module BuildTool::VCS
 

data/lib/mj/logging.rb

@@ -15,10 +15,10 @@ module MJ; module Logging;
 
           return case event.level
 
-          when ::Logging::level_num(:ERROR)
+          when ::Logging::level_num((:ERROR))
               sprintf("error: %s\n", obj)
 
-          when ::Logging::level_num(:WARN)
+          when ::Logging::level_num((:WARN))
               sprintf("warning: %s\n", obj)
 
           else
@@ -28,14 +28,55 @@ module MJ; module Logging;
 
     end # class BasicLayout
 
+    # :TODO: Map the Logging Levels to Logger Levels instead of hardcoding them here.
     class LoggerAdapter
 
         def initialize( prefix )
             @prefix = prefix.upcase
         end
 
+        def debug( string )
+            logger.debug( "<#{@prefix}> #{string}" )
+        end
+
+        def debug?
+            return logger.level > ::Logging.level_num(:debug)
+        end
+
         def info( string )
-            logger.trace( "<#{@prefix}> #{string}" )
+            logger.info( "<#{@prefix}> info #{string}" )
+        end
+
+        def info?
+            return logger.level > ::Logging.level_num(:info)
+        end
+
+        def warn( string )
+            logger.arn( "<#{@prefix}> #{string}" )
+        end
+
+        def warn?
+            return logger.level > ::Logging.level_num(:warn)
+        end
+
+        def error( string )
+            logger.error( "<#{@prefix}> #{string}" )
+        end
+
+        def error?
+            return logger.level > ::Logging.level_num(:error)
+        end
+
+        def fatal( string )
+            logger.error( "<#{@prefix}> #{string}" )
+        end
+
+        def fatal?
+            return logger.level > ::Logging.level_num(:error)
+        end
+
+        def unknown( string )
+            logger.error( "<#{@prefix}> UNKNOWN: #{string}" )
         end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Michael Jansen
@@ -36,7 +36,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2010-07-09 00:00:00 +02:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency