build-tool 0.6.0.rc1 → 0.6.0.rc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    build-tool (0.6)
+    build-tool (0.6.0.rc2)
       activerecord (>= 3.2.1)
       ansi (>= 1.4.2)
       grit (>= 2.4.1)
@@ -23,7 +23,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     ansi (1.4.2)
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     grit (2.4.1)

data/lib/build-tool/application.rb

@@ -46,27 +46,6 @@ def initialize( name, application_root )
             @local_settings_file_path = local_configuration_dir.join("#{@name}.yaml")
         end
 
-        # Execute necessary migration steps
-        def migrate()
-
-            logger.debug( 'Checking for obsolete modules in db.' )
-            for mod in @configuration.modules do
-                if not mod.found_in_recipe
-                    logger.info 'Module %s no longer supported by recipe. Removing it from db.' % [ mod.name ]
-                    mod.destroy()
-                end
-            end
-
-            logger.debug( 'Checking for obsolete settings in db.' )
-            @configuration.settings.each do |n, s|
-                if not s.seen and not n.start_with? 'BUILD_TOOL.'
-                    logger.info 'Setting %s no longer supported by recipe. Removing it from db.' % [ s.name ]
-                    s.destroy()
-                end
-            end
-
-        end
-
         # Load the configuration
         def configuration
             return @configuration if @configuration
@@ -140,7 +119,7 @@ def configuration
             @configuration.save
 
             # Migrate the recipe (if necessary)
-            migrate()
+            @configuration.migrate()
 
             # Finished.
             @configuration

data/lib/build-tool/commands.rb

@@ -376,85 +376,15 @@ def initialize_options
             end
         end
 
-        # Complete buildsets
-        def complete_buildsets( name )
-            if name == ':all'
-                return complete_modules( '*' )
-            end
-        end
-
         # Gathers all modules currently known.
         #
         # @param all Return template modules too.
         def complete_modules( name, include_templates = false )
-            if name.start_with? ':'
-                return complete_buildsets( name )
-            end
-            res = []
-            found = false
-            should_be_unique = false
-            resume = ( @resume_from.nil? and @resume_after.nil? )
-            configuration.modules.each do |mod|
-                take_module = false
-                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 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 )
-                    take_module = true
-                elsif mod.name == name
-                    found = true
-                    should_be_unique = true
-                    take_module = true
-                elsif name == '*'
-                    found = true
-                    # Now check if it is active.
-                    next if !( mod.active? || @all )
-                    take_module = true
-                elsif mod.name.end_with?( "/#{name}" )
-                    found = true
-                    should_be_unique = true
-                    take_module = true
-                end
-
-                if not resume and @resume_from and mod.name == @resume_from.name
-                        resume = true
-                end
-
-                res << mod if resume and take_module
-
-                if not resume and @resume_after and mod.name == @resume_after.name
-                        resume = true
-                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 ambiguous (#{res.map { |m| m.name }.join( ', ' ) })."
-            end
-
-            # Give a warning if all modules where 
-            warn( "All modules for #{name} are inactive! Will ignore it." ) if res.empty?
-            return res
+            configuration.complete_modules( name, include_templates, @all, @resume_from, @resume_after )
         end
 
         def complete_module( name, include_templates = false )
-            modules = complete_modules( name, include_templates )
-            case modules.size
-            when 0 then return nil
-            when 1 then return modules[0]
-            else raise UsageError, "#{name} is ambiguous. Please be more specific"
-            end
+            configuration.complete_module( name, include_templates, @all, @resume_from, @resume_after )
         end
 
         def while_logging_to( dir, fname, level, &block )
@@ -624,11 +554,11 @@ def do_execute( args )
                     info( "User Interrupt"  )
                     return -1
                 rescue BuildTool::Error => e
-                    error( e.message )
+                    error( '%s: %s' % [ mod.name, e.message ] )
                     verbose( e.backtrace.join("\n") )
                     raise
                 rescue Exception => e
-                    error( "#{e.class}:#{e.message}" )
+                    error( '%s:%s: %s' % [ mod.name, e.class, e.message ] )
                     verbose( e.backtrace.join("\n") )
                     raise
                 end

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

@@ -54,10 +54,10 @@ def disable_feature( name )
             end
 
             if @default and feature.default_active? == false
-                info( '%s: using default (disabled).' % mod.name )
+                info( '%s: using default (disabled).' % feature.name )
                 feature.active = nil
             else
-                info( '%s: disabled explicitely.' % mod.name )
+                info( '%s: disabled explicitely.' % feature.name )
                 feature.active = false
             end
         end

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

@@ -40,7 +40,7 @@ def initialize_options
         def is_module_ready?( mod )
             isready = true
             isready &= mod.ready_for_fetch
-            if isready && !mod.vcs.fetching_supported?
+            if isready && !mod.vcs_required.fetching_supported?
                 warn( "#{mod.name}: fetching not supported by #{mod.vcs.name} -> implicit rebase." )
             end
             return isready

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

@@ -72,7 +72,7 @@ def print_file( filename )
 
             erb = ERB.new( file.read, nil, "%<>" )
             b = binding
-            settings = recipe.settings
+            settings = BuildTool::Application.instance.configuration.settings
             puts erb.result(b)
             return 0
         end

data/lib/build-tool/configuration.rb

@@ -236,6 +236,115 @@ def truncate
             @settings = {}
         end
 
+        # Execute the necessary steps to adapt the configuration to the current state of the
+        # recipe.
+        #
+        # The recipe has to be loaded before calling this method. With the configuration given.
+        # The method removes obsolete stuff from the database.
+        def migrate()
+
+            logger.debug( 'Checking for obsolete modules in db.' )
+            for mod in @modules 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.
+                    @module.delete( mod.name )
+                    @modules.delete( mod )
+                    # Remove it from the db
+                    mod.destroy()
+                end
+            end
+
+            logger.debug( 'Checking for obsolete settings in db.' )
+            settings.each do |n, s|
+                if not s.seen and not n.start_with? 'BUILD_TOOL.'
+                    logger.info 'Setting %s no longer supported by recipe. Removing it from db.' % [ s.name ]
+                    s.destroy()
+                end
+            end
+
+        end
+
+        # Complete buildsets
+        def complete_buildsets( name )
+            if name == ':all'
+                return complete_modules( '*' )
+            end
+        end
+
+        def complete_module( name, include_templates = false, all = false, resume_from = nil, resume_after = nil )
+            modules = complete_modules( name, include_templates, all, resume_from, resume_after )
+            case modules.size
+            when 0 then return nil
+            when 1 then return modules[0]
+            else raise BuildTool::ConfigurationError, "#{name} is ambiguous. Please be more specific"
+            end
+        end
+
+        def complete_modules( name, include_templates = false, all = false, resume_from = nil, resume_after = nil )
+            if name.start_with? ':'
+                return complete_buildsets( name )
+            end
+            res = []
+            found = false
+            should_be_unique = false
+            resume = ( resume_from.nil? and resume_after.nil? )
+            modules.each do |mod|
+                take_module = false
+                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 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 )
+                    take_module = true
+                elsif mod.name == name or mod.name.end_with?( "/#{name}" )
+                    # if a module is specified by name we add it regardless of its enabled /
+                    # disabled state. But only if the associated features is enabled.
+                    if ( mod.active? ) or ( !mod.active? && ( mod.feature.nil? || mod.feature.active? ) )
+                        found = true
+                        should_be_unique = true
+                        take_module = true
+                    else
+                        raise BuildTool::ConfigurationError, "Can't select module %s from inactive feature %s" % [ mod.name, mod.feature.name ]
+                    end
+                elsif name == '*'
+                    found = true
+                    # Now check if it is active.
+                    next if !( mod.active? || @all )
+                    take_module = true
+                end
+
+                if not resume and resume_from and mod.name == resume_from.name
+                        resume = true
+                end
+
+                res << mod if resume and take_module
+
+                if not resume and resume_after and mod.name == resume_after.name
+                        resume = true
+                end
+
+            end
+
+            # Raise an error if the module was not found
+            if !found
+                raise BuildTool::ConfigurationError, "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 BuildTool::ConfigurationError, "#{name} is ambiguous (#{res.map { |m| m.name }.join( ', ' ) })."
+            end
+
+            # Give a warning if all modules where 
+            warn( "All modules for #{name} are inactive! Will ignore it." ) if res.empty?
+            return res
+        end
+
     end # Configuration
 
 end # module BuildTool

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

@@ -52,7 +52,7 @@ def my_initialize()
         ### ATTRIBUTES
         #
 
-        attr_writer :feature
+        attr_accessor :feature
         attr_reader :patches
 
         # The previous version of this module.

data/lib/build-tool/version.rb

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

data/test/integration/configuration_test.rb

@@ -0,0 +1,129 @@
+require 'test_helper.rb'
+
+require 'build-tool/cfg/parser'
+require 'build-tool/configuration'
+
+class TestConfiguration < ActiveSupport::TestCase
+
+    def setup()
+        @configuration = BuildTool::Configuration.new()
+        @configuration.truncate()
+        @parser = BuildTool::Cfg::Parser.new( @configuration )
+
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        log-directory   "$HOME/test/log"
+
+        module "toplevel1_enabled"
+        end
+
+        module "toplevel2_disabled"
+        end
+        disable module "toplevel2_disabled"
+
+        feature "feature1"
+
+            module "feature1/module1"
+            end
+
+            module "feature1/module2"
+            end
+
+            module "feature1/module3"
+            end
+
+            disable module "feature1/module2"
+        end
+
+        feature "feature2"
+
+            module "feature2/module1"
+            end
+
+            module "feature2/module2"
+            end
+            disable module "feature2/module2"
+        end
+        disable feature "feature2"
+        EOF
+    end
+
+    test '":all" works.' do
+        assert_equal(
+            [ 'toplevel1_enabled', 'feature1/module1', 'feature1/module3' ],
+            @configuration.complete_modules( ":all" ).map { |m| m.name } )
+    end
+
+    test 'selecting a active toplevel module works.' do
+        assert_equal(
+            [ 'toplevel1_enabled' ],
+            @configuration.complete_modules( 'toplevel1_enabled' ).map { |m| m.name } )
+    end
+
+    test 'selecting a inactive toplevel module works.' do
+        assert_equal(
+            [ 'toplevel2_disabled' ],
+            @configuration.complete_modules( 'toplevel2_disabled' ).map { |m| m.name } )
+    end
+
+
+    test 'selecting a active module works from a active feature works.' do
+        assert_equal(
+            [ 'feature1/module1' ],
+            @configuration.complete_modules( 'feature1/module1' ).map { |m| m.name } )
+    end
+
+    test 'selecting a inactive module from a active feature works.' do
+        assert_equal(
+            [ 'feature1/module2' ],
+            @configuration.complete_modules( 'feature1/module2' ).map { |m| m.name } )
+    end
+
+    test 'selecting a active module from a inactive feature works not.' do
+        assert_raises( BuildTool::ConfigurationError ) do
+            @configuration.complete_modules( 'feature2/module1' )
+        end
+    end
+
+    test 'selecting a inactive module from a inactive feature works not.' do
+        assert_raises( BuildTool::ConfigurationError ) do
+            @configuration.complete_modules( 'feature2/module2' )
+        end
+    end
+
+    test 'selecting a nonexistant module works not.' do
+        assert_raises( BuildTool::ConfigurationError ) do
+            @configuration.complete_modules( 'nothere' )
+        end
+    end
+
+    test 'selecting a group works.' do
+        assert_equal(
+            [ 'feature1/module1', 'feature1/module3' ],
+            @configuration.complete_modules( 'feature1/' ).map { |m| m.name } )
+    end
+
+    test 'selecting a group works with all = true.' do
+        assert_equal(
+            [ 'feature1/module1', 'feature1/module2', 'feature1/module3' ],
+            @configuration.complete_modules( 'feature1/', false, true ).map { |m| m.name } )
+    end
+
+    test 'selecting a group works with all = true and resume_after.' do
+        assert_equal(
+            [ 'feature1/module2', 'feature1/module3' ],
+            @configuration.complete_modules( 'feature1/', false, true, nil, @configuration.complete_module( 'feature1/module1' ) ).map { |m| m.name } )
+    end
+
+    test 'selecting a group works with all = true and resume_before.' do
+        assert_equal(
+            [ 'feature1/module2', 'feature1/module3' ],
+            @configuration.complete_modules( 'feature1/', false, true, @configuration.complete_module( 'feature1/module2' ) ).map { |m| m.name } )
+    end
+    test 'selecting a group works with all = true on disabled feature' do
+        assert_equal(
+            [ 'feature2/module1', 'feature2/module2' ],
+            @configuration.complete_modules( 'feature2/', false, true ).map { |m| m.name } )
+    end
+end
+
+

data/test/integration/parser_module_test.rb

@@ -22,8 +22,11 @@ module "test_disabled"
             disable module "test_disabled"
             EOF
         # Now check the parsed configuration
+        assert_not_nil( @configuration.module( 'test_default' ) )
         assert( @configuration.module( 'test_default' ).default_active? )
         assert( @configuration.module( 'test_default' ).active? )
+
+        assert_not_nil( @configuration.module( 'test_disabled' ) )
         assert( !@configuration.module( 'test_disabled' ).default_active? )
         assert( !@configuration.module( 'test_disabled' ).active? )
 
@@ -34,6 +37,9 @@ module "test_disabled"
             EOF
 
         # Now check the parsed configuration
+        assert_not_nil( @configuration.module( 'test_default' ) )
+        assert_not_nil( @configuration.module( 'test_disabled' ) )
+        # Active values changed
         assert( !@configuration.module( 'test_default' ).active? )
         assert( @configuration.module( 'test_disabled' ).active? )
         # But the defaults are the same
@@ -50,7 +56,7 @@ module "test_default"
             end
             EOF
         # Now check the parsed configuration
-        assert( @configuration.module( 'test_default' ) )
+        assert_not_nil( @configuration.module( 'test_default' ) )
         mod = @configuration.module( 'test_default' )
         assert_equal( mod.description, 'Default is a test module' )
         assert_equal( mod.long_description, 'It really is' )
@@ -100,4 +106,36 @@ module "test_disabled"
 
     end
 
+    test 'Removes obsolete modules' do
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+            module "remains"
+            end
+            module "obsolete"
+            end
+            EOF
+
+        assert_not_nil( @configuration.module( 'remains' ) )
+        assert_not_nil( @configuration.module( 'obsolete' ) )
+
+        @configuration = BuildTool::Configuration.new()
+        @configuration.load()
+        @parser = BuildTool::Cfg::Parser.new( @configuration )
+        @localparser = BuildTool::Cfg::Parser.new( @configuration, false )
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+            module "remains"
+            end
+            EOF
+
+        # Now check the parsed configuration. Still the same
+        assert_not_nil( @configuration.module( 'remains' ) )
+        assert_not_nil( @configuration.module( 'obsolete' ) )
+
+        # Migrate
+        @configuration.migrate()
+
+        # Now check the parsed configuration. Not the same anymore.
+        assert_not_nil( @configuration.module( 'remains' ) )
+        assert_nil( @configuration.module( 'obsolete' ) )
+    end
+
 end # class TestParserModuleTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-tool
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc1
+  version: 0.6.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &5457780 !ruby/object:Gem::Requirement
+  requirement: &5454660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *5457780
+  version_requirements: *5454660
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &5457040 !ruby/object:Gem::Requirement
+  requirement: &5454160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *5457040
+  version_requirements: *5454160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &5454900 !ruby/object:Gem::Requirement
+  requirement: &5453620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *5454900
+  version_requirements: *5453620
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &5454320 !ruby/object:Gem::Requirement
+  requirement: &5453100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *5454320
+  version_requirements: *5453100
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &5453780 !ruby/object:Gem::Requirement
+  requirement: &5452240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *5453780
+  version_requirements: *5452240
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &5453320 !ruby/object:Gem::Requirement
+  requirement: &5482440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *5453320
+  version_requirements: *5482440
 - !ruby/object:Gem::Dependency
   name: rexical
-  requirement: &5452780 !ruby/object:Gem::Requirement
+  requirement: &5481740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *5452780
+  version_requirements: *5481740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5452280 !ruby/object:Gem::Requirement
+  requirement: &5481200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *5452280
+  version_requirements: *5481200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &5451800 !ruby/object:Gem::Requirement
+  requirement: &5480720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *5451800
+  version_requirements: *5480720
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &5482100 !ruby/object:Gem::Requirement
+  requirement: &5480260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *5482100
+  version_requirements: *5480260
 description: ! "\n    The tool helps \n\n    ...\n  "
 email:
 - info@michael-jansen.biz
@@ -234,6 +234,7 @@ files:
 - tasks/rdoc.rake
 - tasks/rexical.rake
 - tasks/test.rake
+- test/integration/configuration_test.rb
 - test/integration/history_test.rb
 - test/integration/parser_configuration.rb
 - test/integration/parser_environment_parser.rb
@@ -287,6 +288,7 @@ signing_key:
 specification_version: 3
 summary: A tool helping to download, configure and compile from sources.
 test_files:
+- test/integration/configuration_test.rb
 - test/integration/history_test.rb
 - test/integration/parser_configuration.rb
 - test/integration/parser_environment_parser.rb