build-tool 0.6.0.rc2 → 0.6.0

data/{History.txt → History.rdoc}

@@ -33,6 +33,7 @@
     will be done automatically on first run.
     - 'configuration list' Will show the configuration values.
     - 'configuration edit' will edit them.
+  - Support for the bazar vcs.
 
 
 - Enhancements

data/{README.txt → README.rdoc}

@@ -6,16 +6,16 @@
 
 This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].
 
-It help in building and maintaining a development environment. It downloads
+It helps in building and maintaining a development environment. It downloads
 and configures sources and updates them later.
 
 == FEATURES/PROBLEMS:
 
 The tool uses recipes to build software from scratch. It does
-    - Check out the sources from the repository (git, git-svn, svn).
+    - Check out the sources from the repository (git, git-svn, svn, mercurial, bazar, archive).
     - Update the sources.
     - Set the build environment.
-    - Configure (qt, cmake, custom)
+    - Configure (qt, cmake, autoconf, custom)
     - Build
     - Install
 
@@ -37,10 +37,10 @@ Currently the following recipes are provided:
   > build-tool recipe install kde
   ...
   # Adapt the configuration
-  > vim ~/.build-tool/kde.yaml
+  > kde-build configuration edit
 
   # Build kdesupport/ modules and the base kde workspace
-  kde-build build kdesupport/ KDE/
+  > kde-build build -u kdesupport/ KDE/
 
 == Documentation
 
@@ -54,5 +54,5 @@ http://michael-jansen.biz/build-tool
 
 (The GPL LICENSE)
 
-Copyright (c) 2009-2011 Michael Jansen
+Copyright (c) 2009-2012 Michael Jansen
 

data/build-tool.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   # Documentation
   s.rubyforge_project = 'build-tool'
-  s.extra_rdoc_files = [ 'README.txt' ]
+  s.extra_rdoc_files = [ 'README.rdoc' ]
 
   # Dependencies
   s.add_dependency( 'logging', '>= 1.6.0' ) # Logging Support

data/lib/build-tool/application.rb

@@ -144,7 +144,8 @@ def open_database( name )
             logger.debug "Opening the database #{path}."
             ActiveRecord::Base.establish_connection(
                 :adapter => 'sqlite3',
-                :database => path.to_s )
+                :database => path.to_s,
+                :timeout  => 5000 )
             ActiveRecord::Migrator.migrate(
                 [ application_root.join( 'db/migrations' ) ] )
         end

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

@@ -92,6 +92,23 @@ rule
     :ARCHIVE {STRINGERROR} { [:GARBAGE, text];   }
     :ARCHIVE .             { [:GARBAGE, text];   }
 
+    #
+    ### BAZAR
+    #
+    :BAZAR {INHERITANCE}  { [:INHERITANCE, text] }
+    :BAZAR url\b          { [:URL, text]; }
+    :BAZAR push\b         { [:PUSH, text]; }
+    :BAZAR ssh-key\b      { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
+    :BAZAR end\b          { @state = @states.pop; [ :END, text ]; }
+    # COMMON
+    :BAZAR {STRING}      { [:STRING,  @ss[1]]; }
+    :BAZAR {TOKEN}       { [:TOKEN,   text];   }
+    :BAZAR {COMMENT}     { [:COMMENT, text];   }
+    :BAZAR {BLANK}       { [:IGNORE,  text];   }
+    :BAZAR {LF}          { [:IGNORE,  text];   }
+    :BAZAR {STRINGERROR} { [:GARBAGE, text];   }
+    :BAZAR .             { [:GARBAGE, text];   }
+
     #
     ### BUILD SYSTEM
     #
@@ -358,6 +375,7 @@ rule
     #
     ### VCS
     #
+    :VCS bazar\b    { @state = :BAZAR;   [:BAZAR, text]; }
     :VCS git-svn\b  { @state = :GIT_SVN; [:GIT_SVN, text]; }
     :VCS git\b      { @state = :GIT; [:GIT, text]; }
     :VCS svn\b      { @state = :SVN; [:SVN, text]; }

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

@@ -72,6 +72,9 @@ def initialize(values = nil, *args )
         MercurialTrack
         MercurialUrl
 
+        BazarDeclaration
+        BazarUrl
+
         ModuleBuildPrefix
         ModuleDeclaration
         ModuleInstallPrefix

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

@@ -3,6 +3,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token APPEND
     token APPLY
     token ARCHIVE
+    token BAZAR
     token BUILD_PREFIX
     token BUILD_SYSTEM
     token DESCRIPTION
@@ -119,6 +120,7 @@ rule
 
     vcs_declaration
         : git_declaration          { result = val[0]; }
+        | bazar_declaration        { result = val[0]; }
         | svn_declaration          { result = val[0]; }
         | git_svn_declaration      { result = val[0]; }
         | archive_declaration      { result = val[0]; }
@@ -205,6 +207,23 @@ rule
         | SHORT DESCRIPTION STRING  { result = ShortDescriptionNode.new( val[2] ); }
         ;
 
+    #
+    ### BAZAR CONFIGURATION
+    #
+    bazar_declaration
+        : VCS BAZAR bazar_statements END              { result = BazarDeclarationNode.new( val[2] ); }
+        | VCS BAZAR inheritance bazar_statements END  { result = BazarDeclarationNode.new( val[3] ); result.options[:inheritance] = true; }
+        ;
+
+    bazar_statements
+        : /* empty */
+        | bazar_statement bazar_statements      { result = val.flatten; }
+        ;
+
+    bazar_statement
+        : URL   STRING                                  { result = BazarUrlNode.new( val[1..-1] ); }
+        ;
+
     #
     ### GIT OPTION DECLARATION
     #

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

@@ -486,6 +486,26 @@ def visit_IncludeNode( node )
         end
     end
 
+    class BazarDeclarationNodeVisitor < ListVisitor
+
+        def initialize( configuration, vcs )
+            super( configuration )
+            @vcs = vcs
+        end
+
+        def visit_BazarDeclarationNode( node )
+            visit_nodes( node.values )
+            @vcs
+        end
+
+        def visit_BazarUrlNode( node )
+            @vcs.url = node.values[0]
+        end
+
+    end
+
+
+
     class MercurialDeclarationNodeVisitor < ListVisitor
 
         def initialize( configuration, vcs )
@@ -585,6 +605,24 @@ def visit_GitDeclarationNode( node )
             node.accept( visitor )
         end
 
+        def visit_BazarDeclarationNode( node )
+            vcs = BuildTool::VCS::BazarConfiguration.new
+            if node.options[:inheritance]
+                if not @module.vcs_configuration
+                    raise ConfigurationError,
+                        "#{@module.name} has no previous bazar configuration!"
+                end
+                if @module.vcs_configuration.name != "bazar"
+                    raise ConfigurationError,
+                        "#{@module.name} has a #{@module.vcs_configuration.name} configuration!"
+                end
+                vcs.parent = @module.vcs_configuration
+            end
+            @module.vcs_configuration = vcs
+            visitor = BazarDeclarationNodeVisitor.new( configuration, vcs )
+            node.accept( visitor )
+        end
+
         def visit_GitSvnDeclarationNode( node )
             vcs = BuildTool::VCS::GitSvnConfiguration.new
             if node.options[:inheritance]

data/lib/build-tool/command_actions.rb

@@ -117,8 +117,9 @@ def execute()
 
         class Fetch < Base
 
-            def initialize( command, mod )
+            def initialize( command, mod, verbose )
                 super( command, 20, :fetch, mod )
+                @verbose = verbose
                 if !mod.vcs_required.fetching_supported?
                     logger.info "Fetching/Rebase not supported by vcs #{mod.vcs.name}. Doing it in one step."
                 end
@@ -126,7 +127,7 @@ def initialize( command, mod )
 
             def execute()
                 logger.info "Fetching remote changes."
-                @module.fetch
+                @module.fetch( @verbose )
             end
 
         end

data/lib/build-tool/commands.rb

@@ -669,8 +669,8 @@ def configure( mod )
         # Call the #fetch method of the module.
         #
         # @param [Object] mod The module to use
-        def fetch( mod )
-            ModuleActions::Fetch.new( self, mod ).do
+        def fetch( mod, verbose = false )
+            ModuleActions::Fetch.new( self, mod, verbose ).do
         end
 
         # Call the #install method of the module.

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

@@ -56,9 +56,9 @@ def initialize_options
                 @from_scratch = true
                 }
 
-            @verbose_rebase = true
-            options.on( nil, "--[no]-verbose-rebase", "Show the changes applied by rebase." ) { |t|
-                @verbose_rebase = false
+            @verbose_rebase = false
+            options.on( nil, "--[no-]verbose-rebase", "Show the changes applied by rebase." ) { |t|
+                @verbose_rebase = t
                 }
 
             super
@@ -100,7 +100,7 @@ def do_execute_module( mod )
             # fetch/rebase
             if @update
                 if mod.checkedout?
-                    fetch( mod )
+                    fetch( mod, @verbose_rebase )
                     rebase( mod, @verbose_rebase )
                 else
                     clone( mod )

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

@@ -60,6 +60,8 @@ def do_execute_module( mod )
                 case mod.vcs_configuration.name
                 when 'svn'
                     info( "  Repository:       %s/%s" % [ mod.vcs_configuration.repository.url, mod.vcs_configuration.remote_path ] )
+                when 'bazar'
+                    info( "  Branch:       %s" % [ mod.vcs_configuration.url ] )
                 when 'archive'
                     info( "  URL:              %s" % [ mod.vcs.archive_url ] )
                 when 'git'

data/lib/build-tool/configuration.rb

@@ -7,6 +7,7 @@
 require 'build-tool/vcs/svn'
 require 'build-tool/vcs/archive'
 require 'build-tool/vcs/mercurial'
+require 'build-tool/vcs/bazar'
 
 require 'build-tool/model/module'
 require 'build-tool/model/feature'
@@ -146,6 +147,8 @@ def vcs( name )
                 return BuildTool::VCS::ArchiveConfiguration.new
             when "mercurial"
                 return BuildTool::VCS::MercurialConfiguration.new
+            when "bazar"
+                return BuildTool::VCS::BazarConfiguration.new
             else
                 raise StandardError, "Unknown Version Control System #{name}"
             end
@@ -302,15 +305,9 @@ def complete_modules( name, include_templates = false, all = false, resume_from
                     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
+                    found = true
+                    should_be_unique = true
+                    take_module = true
                 elsif name == '*'
                     found = true
                     # Now check if it is active.
@@ -336,8 +333,19 @@ def complete_modules( name, include_templates = false, all = false, resume_from
             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( ', ' ) })."
+            if should_be_unique
+
+                if res.size > 1
+                    raise BuildTool::ConfigurationError, "#{name} is ambiguous (#{res.map { |m| m.name }.join( ', ' ) })."
+                end
+
+                mod = res[0]
+
+                # If the module is inactive make sure the feature is active
+                if not ( mod.active? || mod.feature.nil? || mod.feature.active? )
+                    raise BuildTool::ConfigurationError, "Can't select module %s from inactive feature %s" % [ mod.name, mod.feature.name ]
+                end
+
             end
 
             # Give a warning if all modules where 

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

@@ -355,8 +355,8 @@ def clone
 
         # Fetch changes from the remote repository. Do not change the local
         # checkout.
-        def fetch
-            vcs_required.fetch
+        def fetch( verbose = false )
+            vcs_required.fetch( verbose = verbose )
         end
 
         # Update the local changes with remote changes. Do not fetch changes

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

@@ -110,7 +110,7 @@ def clone
             0
         end
 
-        def fetch()
+        def fetch( verbose = false )
             # Check if the archive is already downloaded
             if File.exist? archive_local_path
                 logger.trace "Archive already fetched. Skipping."

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

@@ -0,0 +1,150 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/mixins/inherited_attributes'
+require 'build-tool/vcs/base'
+require 'build-tool/errors'
+
+module BuildTool; module VCS
+
+    class BazarError < BuildTool::Error; end
+
+    class BazarConfiguration < BaseConfiguration
+
+        include MJ::Mixins::InheritedAttributes
+
+        def name
+            "bazar"
+        end
+
+        def initialize
+            super
+            @url = nil
+        end
+
+        def vcs( mod )
+            raise StandardError if @module and ! mod.equal?( @module )
+            @module = mod
+            Bazar.new( self )
+        end
+
+        inherited_attr_accessor :url
+
+        def copy_configuration( other )
+            super
+        end
+    end
+
+    #
+    # Implementation for the bzr version control system.
+    #
+    class Bazar < Base
+
+        def initialize( config )
+            super( config )
+            @vcs = nil
+        end
+
+        #
+        ### ATTRIBUTES
+        #
+        def name
+            "bazar"
+        end
+
+        def fetching_supported?
+            false
+        end
+
+        #
+        ### METHODS
+        #
+
+        def checkedout?
+            return false if !local_path_exist?
+            if !Pathname.new( local_path ).join( ".bzr" ).exist?
+                raise Base::VcsError, "Checkout path #{local_path} is not a bazar repo!"
+            end
+            return true
+        end
+
+        # Initialize the local repository
+        def clone
+            # Check if path exists
+            if local_path_exist?
+                raise BazarError, "Failed to create repository at '#{local_path}': Path exists"
+            end
+            FileUtils.mkdir_p Pathname.new( local_path ).dirname if ! $noop
+
+            # Initialize the repository
+            if bzr( "branch #{config.url} #{local_path}", Pathname.new( local_path ).dirname) != 0
+                raise BazarError, "Error while initializing the repo `bzr branch #{config.url} #{local_path}'`: #{$?}"
+            end
+        end
+
+        # Is the git executable available?
+        def self.bzr_available?()
+            return @bzr_available unless @bzr_available.nil?
+            %x( bzr --version 2>&1 )
+            @bzr_available = $?.success?
+            return @bzr_available
+        end
+
+        def ready_for_fetch
+            if not self.class.bzr_available?
+                logger.error( "#{config.module.name}: Calling `bzr` failed!" )
+                return false
+            end
+
+            if checkedout?
+                # Check if the index is dirty.
+                if bzr( "diff" ) != 0
+                    logger.info( "#{config.module.name}: Local changes will prevent the update." )
+                    bzr( "status --short --versioned" ) do |line|
+                        logger.info line.chomp
+                    end
+                    return false
+                end
+            end
+
+            return true
+        end
+
+        # Fetch from +repository+
+        #
+        # Initializes the local clone if it does not exist.
+        def fetch( verbose = false )
+
+            if !checkedout? and !$noop
+                clone
+            end
+
+            if verbose
+                cmd = "update -v"
+            else
+                cmd = "update"
+            end
+
+            rc = bzr( cmd ) do |line|
+                logger.info( line )
+            end
+
+            if rc != 0
+                raise BazarError, "Error while update: #{rc}"
+            end
+        end
+
+        # Execute +command+ in directory +wd+ and yield every line of output.
+        def bzr( command, wd = local_path, &block )
+            rc = self.class.execute "bzr #{command}", wd, &block
+        end
+
+        def rebase( verbose = false )
+            # Rebasing is not supported
+            0
+        end
+
+    end # class Bazar
+
+end; end # module BuildTool::VCS
+
+

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

@@ -121,7 +121,7 @@ def clone
                 raise GitSvnError, "Error while initializing the repo `git svn init '#{config.repository}/#{remote_path}'`: #{$?}"
             end
 
-            fetch( "HEAD" )
+            fetch( revision: "HEAD" )
         end
 
         def configure
@@ -131,21 +131,26 @@ def configure
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
-        def fetch( revision = nil )
+        def fetch( verbose = false, options = {} )
+            revision = options[:revision] || nil
+
             if !checkedout? and !$noop # Beware of looping
                 clone
             else
                 # clone() calls those methods.
                 git.check_config
             end
+
             if revision
                 cmd = "fetch -r#{revision}"
             else
                 cmd = "fetch"
             end
+
             if ( rc = git_svn( cmd ) ) != 0
                 raise GitSvnError, "Error while fetching: #{rc}"
             end
+
             update_externals
         end
 
@@ -175,7 +180,7 @@ def rebase( verbose = false )
             remote_branch = "#{config.track_branch}"
 
             if verbose
-                git.git('log --first-parent HEAD..%s' % remote_branch ) do |line|
+                git.git('log --first-parent --pretty=oneline HEAD..%s' % remote_branch ) do |line|
                     logger.info( line )
                 end
             end

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

@@ -300,7 +300,7 @@ def gc
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
-        def fetch()
+        def fetch( verbose = false )
             if !checkedout? and !$noop
                 clone
             else
@@ -439,7 +439,7 @@ def rebase( verbose = false )
             remote_branch = "#{config.track_remote}/#{config.track_branch}"
 
             if verbose
-                git('log --first-parent HEAD..%s' % remote_branch ) do |line|
+                git('log --first-parent --pretty=oneline HEAD..%s' % remote_branch ) do |line|
                     logger.info( line )
                 end
             end

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

@@ -95,7 +95,7 @@ def clone
         # Fetch from +repository+
         #
         # Initializes the local clone if it does not exist.
-        def fetch()
+        def fetch( verbose = false )
             if !checkedout? and !$noop
                 clone
             end

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

@@ -66,7 +66,7 @@ class << self
             svn_available = nil
 
             # Is the git executable available?
-            def svn_available
+            def svn_available?
                 return @svn_available unless @svn_available.nil?
                 %x( svn --version 2>&1 )
                 @svn_available = $?.success?
@@ -120,21 +120,31 @@ def clone
             else
                 svn "checkout --depth=infinity #{repository.url}/#{remote_path} #{local_path}", local_path.dirname
             end
+            return true
         end
 
         def ready_for_fetch
-            if not Svn.svn_available
+            if not Svn.svn_available?
                 logger.info( "#{config.module.name}: Calling `svn` failed!" )
+                return false
             end
-            return Svn.svn_available
+            return true
         end
 
-        def fetch()
+        def fetch( verbose = false )
+
             if !checkedout?
-               clone
-            else
-                svn "update"
+               return clone
             end
+
+            if verbose
+                svn "log -r HEAD:BASE -q" do |line|
+                    logger.info( line )
+                end
+            end
+
+            svn "update"
+
             return true
         end
 
@@ -181,11 +191,6 @@ def self.svn( command, wd, &block )
         end
 
         def rebase( verbose = false )
-
-            if verbose
-                logger.info( 'Verbose rebase not yet implemented for subversion.' )
-            end
-
             # Rebasing is not supported
             0
         end

data/lib/build-tool/version.rb

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

data/test/integration/configuration_test.rb

@@ -20,6 +20,17 @@ module "toplevel2_disabled"
         end
         disable module "toplevel2_disabled"
 
+        feature "feature2"
+
+            module "feature2/module1"
+            end
+
+            module "feature2/module2"
+            end
+            disable module "feature2/module2"
+        end
+        disable feature "feature2"
+
         feature "feature1"
 
             module "feature1/module1"
@@ -34,16 +45,6 @@ module "feature1/module3"
             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
 
@@ -79,21 +80,24 @@ module "feature2/module2"
     end
 
     test 'selecting a active module from a inactive feature works not.' do
-        assert_raises( BuildTool::ConfigurationError ) do
+        exc = assert_raises( BuildTool::ConfigurationError ) do
             @configuration.complete_modules( 'feature2/module1' )
         end
+        assert_match( /inactive feature/, exc.message )
     end
 
     test 'selecting a inactive module from a inactive feature works not.' do
-        assert_raises( BuildTool::ConfigurationError ) do
+        exc = assert_raises( BuildTool::ConfigurationError ) do
             @configuration.complete_modules( 'feature2/module2' )
         end
+        assert_match( /inactive feature/, exc.message )
     end
 
     test 'selecting a nonexistant module works not.' do
-        assert_raises( BuildTool::ConfigurationError ) do
+        exc = assert_raises( BuildTool::ConfigurationError ) do
             @configuration.complete_modules( 'nothere' )
         end
+        assert_match( /Unknown module/, exc.message )
     end
 
     test 'selecting a group works.' do
@@ -119,11 +123,26 @@ module "feature2/module2"
             [ '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
+
+    test 'selecting a notexistand package works not.' do
+        exc = assert_raises( BuildTool::ConfigurationError ) do
+            @configuration.complete_modules( 'unknownpackage/' )
+        end
+        assert_match( /Unknown module/, exc.message )
+    end
+
+    test 'selecting a ambiguous module throws ambiguous message' do
+        exc = assert_raises( BuildTool::ConfigurationError ) do
+            @configuration.complete_modules( 'module1' )
+        end
+        assert_match( /ambiguous/, exc.message )
+    end
 end
 
 

data/test/integration/parser_bazar_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+require 'build-tool/cfg/parser'
+
+class TestParserBazar < ActiveSupport::TestCase
+
+    def setup
+        @configuration = BuildTool::Configuration.new()
+        @configuration.truncate()
+        @parser = BuildTool::Cfg::Parser.new( @configuration )
+    end
+
+    test "Parses a valid bazar repository declation." do
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        module "oxygen-icons"
+            vcs bazar
+                url "https://bazar.url/test"
+            end # vcs
+        end # module
+        EOF
+        # Now check the parsed configuration
+        assert_not_nil( @configuration.module('oxygen-icons') )
+        assert_attributes(
+            @configuration.module('oxygen-icons'),
+            {
+                :vcs =>
+                    {
+                    :name => 'bazar',
+                    :config =>
+                        {
+                        :url => 'https://bazar.url/test',
+                        }
+                    }
+
+            }
+        )
+    end
+
+    test "Bazar Repository inheritance works." do
+        assert_nothing_raised() { @parser.parse_string <<-EOF }
+        module "oxygen-icons"
+            vcs bazar
+                url "https://bazar.url/test"
+            end # vcs
+        end # module
+        module "oxygen-icons"
+            vcs bazar <
+            end
+        end # module
+        EOF
+        # Now check the parsed configuration
+        assert_not_nil( @configuration.module('oxygen-icons') )
+        assert_attributes(
+            @configuration.module('oxygen-icons'),
+            {
+                :vcs =>
+                    {
+                    :name => 'bazar',
+                    :config =>
+                        {
+                        :url => 'https://bazar.url/test',
+                        }
+                    }
+
+            }
+        )
+    end
+
+end
+
+
+
+

data/test/integration/parser_mercurial_test.rb

@@ -38,7 +38,7 @@ module "oxygen-icons"
         )
     end
 
-    test "Git-SVN Repository inheritance works." do
+    test "Mercurial Repository inheritance works." do
         assert_nothing_raised() { @parser.parse_string <<-EOF }
         module "oxygen-icons"
             vcs mercurial

data/test/test_helper.rb

@@ -15,7 +15,7 @@
 # Set up the database.
 def setup_database
     if not ActiveRecord::Base.connected?
-        ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ':memory:' )
+        ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ':memory:', :timeout => 5000 )
         ActiveRecord::Migrator.migrate( [ 'db/migrations' ] )
     end
 end

data/test/unit/configuration_test.rb

@@ -12,12 +12,16 @@ class ConfigurationTest < ActiveSupport::TestCase
 
     test 'log_directory is not allowed to be relative' do
         c = BuildTool::Configuration.new
-        assert_raises( BuildTool::ConfigurationError, /Log directory .* is relative/ ) do
+
+        exc = assert_raises( BuildTool::ConfigurationError ) do
             c.log_directory = 'my/relative/dir'
         end
-        assert_raises( BuildTool::ConfigurationError, /Log directory .* is relative/ ) do
+        assert_match( /Log directory .* is relative/, exc.message )
+
+        exc = assert_raises( BuildTool::ConfigurationError ) do
             c.log_directory = '$SOME_SHELL_VAR/relative/dir'
         end
+        assert_match( /Log directory .* is relative/, exc.message )
     end
 
     test 'log_directory handles ~ and $HOME' do

data/test/unit/mercurial_configuration_test.rb

@@ -14,7 +14,7 @@ class MercurialConfigurationTest < ActiveSupport::TestCase
 
     test 'accessor url() works.' do
         cfg = create_configuration
-        assert_equal( 'some_branch', cfg.track )
+        assert_equal( 'some_url', cfg.url )
     end
 
     test 'accessor url() works with inheritance.' do
@@ -31,12 +31,12 @@ class MercurialConfigurationTest < ActiveSupport::TestCase
         assert_equal( 'some_url', cfg.url )
     end
 
-    test 'accessor branch() works.' do
+    test 'accessor track() works.' do
         cfg = create_configuration
         assert_equal( 'some_branch', cfg.track )
     end
 
-    test 'accessor branch() works with inheritance.' do
+    test 'accessor track() works with inheritance.' do
         parent = create_configuration
         cfg = BuildTool::VCS::MercurialConfiguration.new
         cfg.parent = parent

data/test/unit/model/bazar_configuration_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+require 'build-tool/vcs/bazar'
+
+class BazarConfigurationTest < ActiveSupport::TestCase
+
+    test 'Constructor' do
+        cfg = BuildTool::VCS::BazarConfiguration.new
+        cfg.vcs( ModuleMock.new( 'bazar/test' ) )
+        assert_equal( cfg.name, 'bazar' )
+        assert_nil( cfg.url )
+    end
+
+    test 'accessor url() works.' do
+        cfg = create_configuration
+        assert_equal( 'some_url', cfg.url() )
+    end
+
+    test 'accessor url() works with inheritance.' do
+        parent = create_configuration
+        cfg = BuildTool::VCS::BazarConfiguration.new
+        cfg.parent = parent
+        # We get the value from the parent
+        assert_equal( 'some_url', cfg.url )
+        # Unless we have it overriden
+        cfg.url = 'different_url'
+        assert_equal( 'different_url', cfg.url )
+        # But we can reset it
+        cfg.url = nil
+        assert_equal( 'some_url', cfg.url )
+    end
+
+    #######
+    private
+    #######
+
+    def create_configuration
+        cfg = BuildTool::VCS::BazarConfiguration.new
+        cfg.url = 'some_url'
+        cfg
+    end
+
+end
+

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: build-tool
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc2
-  prerelease: 6
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Michael Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &5454660 !ruby/object:Gem::Requirement
+  requirement: &5456920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *5454660
+  version_requirements: *5456920
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &5454160 !ruby/object:Gem::Requirement
+  requirement: &5454940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *5454160
+  version_requirements: *5454940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &5453620 !ruby/object:Gem::Requirement
+  requirement: &5454460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *5453620
+  version_requirements: *5454460
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &5453100 !ruby/object:Gem::Requirement
+  requirement: &5453900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *5453100
+  version_requirements: *5453900
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &5452240 !ruby/object:Gem::Requirement
+  requirement: &5453440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *5452240
+  version_requirements: *5453440
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &5482440 !ruby/object:Gem::Requirement
+  requirement: &5452620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *5482440
+  version_requirements: *5452620
 - !ruby/object:Gem::Dependency
   name: rexical
-  requirement: &5481740 !ruby/object:Gem::Requirement
+  requirement: &5452040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *5481740
+  version_requirements: *5452040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5481200 !ruby/object:Gem::Requirement
+  requirement: &5482000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *5481200
+  version_requirements: *5482000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &5480720 !ruby/object:Gem::Requirement
+  requirement: &5481460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *5480720
+  version_requirements: *5481460
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &5480260 !ruby/object:Gem::Requirement
+  requirement: &5480980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *5480260
+  version_requirements: *5480980
 description: ! "\n    The tool helps \n\n    ...\n  "
 email:
 - info@michael-jansen.biz
@@ -128,7 +128,7 @@ executables:
 - build-tool
 extensions: []
 extra_rdoc_files:
-- README.txt
+- README.rdoc
 files:
 - .gitattributes
 - .gitignore
@@ -136,9 +136,9 @@ files:
 - .yardopts
 - Gemfile
 - Gemfile.lock
-- History.txt
+- History.rdoc
 - KNOWN_PROBLEMS
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/build-tool
 - build-tool.gemspec
@@ -216,6 +216,7 @@ files:
 - lib/build-tool/state_helper.rb
 - lib/build-tool/vcs/archive.rb
 - lib/build-tool/vcs/base.rb
+- lib/build-tool/vcs/bazar.rb
 - lib/build-tool/vcs/git-svn.rb
 - lib/build-tool/vcs/git.rb
 - lib/build-tool/vcs/mercurial.rb
@@ -236,6 +237,7 @@ files:
 - tasks/test.rake
 - test/integration/configuration_test.rb
 - test/integration/history_test.rb
+- test/integration/parser_bazar_test.rb
 - test/integration/parser_configuration.rb
 - test/integration/parser_environment_parser.rb
 - test/integration/parser_feature_test.rb
@@ -250,6 +252,7 @@ files:
 - test/unit/git_configuration_test.rb
 - test/unit/git_svn_configuration_test.rb
 - test/unit/mercurial_configuration_test.rb
+- test/unit/model/bazar_configuration_test.rb
 - test/unit/model/command_log_test.rb
 - test/unit/model/feature_test.rb
 - test/unit/model/module_log_test.rb
@@ -278,9 +281,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: build-tool
 rubygems_version: 1.8.15
@@ -290,6 +293,7 @@ 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_bazar_test.rb
 - test/integration/parser_configuration.rb
 - test/integration/parser_environment_parser.rb
 - test/integration/parser_feature_test.rb
@@ -304,6 +308,7 @@ test_files:
 - test/unit/git_configuration_test.rb
 - test/unit/git_svn_configuration_test.rb
 - test/unit/mercurial_configuration_test.rb
+- test/unit/model/bazar_configuration_test.rb
 - test/unit/model/command_log_test.rb
 - test/unit/model/feature_test.rb
 - test/unit/model/module_log_test.rb