build-tool 0.0.3 → 0.1.0

data/test/test_vcs.rb

@@ -0,0 +1,33 @@
+require 'pathname'
+require Pathname.new( File.dirname(__FILE__)).join( 'test_helper' ).cleanpath
+
+require 'build-tool/repository'
+require 'build-tool/module'
+require 'build-tool/server'
+require 'build-tool/vcs/git-svn'
+
+class TestVcs < Test::Unit::TestCase
+
+    def initialize( *args )
+        super
+        @server = BuildTool::Server.new( "anonsvn.kde.org" )
+        @server.protocol = "svn+ssh"
+        @server.path = "/home/kde"
+
+        @repo = BuildTool::Repository.new( 'kde' )
+        @repo.server = @server
+        @repo.user = "mjansen"
+    end
+
+    # *TODO* More tests
+    def test_git_svn
+        mod = BuildTool::Module.new( "test" )
+        mod.repository= @repo
+        mod.build_prefix = "~/build"
+        config = BuildTool::VCS::GitSvnConfiguration.new( mod )
+        config.add_external( "kwin/client/nitrogen", "http://some.svn.server/ddjdjd" )
+        gitsvn = BuildTool::VCS::GitSvn.new( config )
+        assert( !gitsvn.checkedout? )
+    end
+
+end

metadata

@@ -1,56 +1,57 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Jansen
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBDMQwwCgYDVQQDDANrZGUx
+  HjAcBgoJkiaJk/IsZAEZFg5taWNoYWVsLWphbnNlbjETMBEGCgmSJomT8ixkARkW
+  A2JpejAeFw0wOTA2MDkyMDI1MThaFw0xMDA2MDkyMDI1MThaMEMxDDAKBgNVBAMM
+  A2tkZTEeMBwGCgmSJomT8ixkARkWDm1pY2hhZWwtamFuc2VuMRMwEQYKCZImiZPy
+  LGQBGRYDYml6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurxaZL3l
+  DVi5wG2HKTLVjl9Wl9gJT5L8edAxHrNMQtT3WQlyo3QNhOgLfVP9zMg49Y8dBRAP
+  w9ez71UJfjI17+KEEI6rdMF+poljfpszboRNqkuhn8b+kPy9vyVz93lIhyCUi4dx
+  Nyc2BSGjoYqQkVNZymz4TTb2xoMjUWkCjBsr8sxjB74zFaYqzjNMhWZUZB4CH1J1
+  S2+rdybmeC3/Yt3ck9kPgUQNRL5pnH9eJrFYzocbFHjp28CJf0zNmn8aUS1R32hD
+  5optxe9j6Jh0sXW2Qqw3swfVwaJIrDI4KNcWlJTAO++FHsV8Jh9Y1HMUgcSVpWVj
+  2SdR6e6L30jpNwIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQU5L+10wMUoKc2MaHICpfSJ+HCffgwDQYJKoZIhvcNAQEFBQADggEBABWy
+  Uio+50gcBdYsmWRVcS2W3BLGes7KwD9CAcVZGa7adH8EY+ZrPkbhB2Csk/UZnuo5
+  2THemT8qy42gxgI1RRv9+PFDCXA+p2URzlhXhsO4JHdNeaGEwsOETx29xRO1QTnl
+  bOjSlG4mdCB9WMAD2w58JAefhObPKQMl2L8sc0S3pEIcFmbLAVT4W6AbUiiK9C4T
+  AjmSlxUk0RdTT1xL0QQ88HoNxLK8hJHAT8pNq36taixh0ORmmqocRvIL0YrHUPa3
+  bdM0RIoUSO1SXrHpXDdvfp9w4BsMZiAf87eeq974P8VuyKbHgxN9El1nwtFGEfwm
+  M3zOaQdtTmiQPBqNIsE=
+  -----END CERTIFICATE-----
 
-date: 2009-07-07 00:00:00 +02:00
+date: 2009-11-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cmdparse
+  name: logging
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: log4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -60,80 +61,118 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
-description: A ruby based alternative to kdesvn-build.
+description: This project is inspired by kdesvn-build[http://kdesvn-build.kde.org/].  It help in building and maintaining a development environment. It downloads and configures sources and updates them later.
 email: 
-- kde@michael-jansen.biz
+- info@michael-jansen.biz
 executables: 
-- kde-build.rb
+- build-tool
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
-- website/index.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
+- README.txt
 - Rakefile
-- TODO
-- bin/kde-build.rb
-- config/website.yml
-- config/website.yml.sample
-- lib/kde-build.rb
-- lib/kde-build/application.rb
-- lib/kde-build/build_system.rb
-- lib/kde-build/build_system/autoconf.rb
-- lib/kde-build/build_system/base.rb
-- lib/kde-build/build_system/cmake.rb
-- lib/kde-build/build_system/qtcopy.rb
-- lib/kde-build/command.rb
-- lib/kde-build/command/build.rb
-- lib/kde-build/command/compile.rb
-- lib/kde-build/command/configure.rb
-- lib/kde-build/command/ctags.rb
-- lib/kde-build/command/fetch.rb
-- lib/kde-build/command/help.rb
-- lib/kde-build/command/info.rb
-- lib/kde-build/command/install.rb
-- lib/kde-build/command/module_based.rb
-- lib/kde-build/command/rebase.rb
-- lib/kde-build/command/version.rb
-- lib/kde-build/configuration.rb
-- lib/kde-build/exception.rb
-- lib/kde-build/metaaid.rb
-- lib/kde-build/module.rb
-- lib/kde-build/module_configuration.rb
-- lib/kde-build/moduleregistry.rb
-- lib/kde-build/subprocess.rb
-- lib/kde-build/tools/ctags.rb
-- lib/kde-build/tools/logging.rb
-- lib/kde-build/tools/make.rb
-- lib/kde-build/tools/ssh.rb
-- lib/kde-build/vcs.rb
-- lib/kde-build/vcs/base.rb
-- lib/kde-build/vcs/git-svn.rb
-- lib/kde-build/vcs/git.rb
-- lib/kde-build/vcs/svn.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- test.yaml.tmpl
+- bin/build-tool
+- lib/build-tool.rb
+- lib/build-tool/GUI.rb
+- lib/build-tool/application.rb
+- lib/build-tool/build-system/autoconf.rb
+- lib/build-tool/build-system/base.rb
+- lib/build-tool/build-system/cmake.rb
+- lib/build-tool/build-system/custom.rb
+- lib/build-tool/build-system/qt.rb
+- lib/build-tool/cfg/lexer.rb
+- lib/build-tool/cfg/lexer.rex
+- lib/build-tool/cfg/lexer_base.rb
+- lib/build-tool/cfg/node.rb
+- lib/build-tool/cfg/parser.rb
+- lib/build-tool/cfg/parser.y
+- lib/build-tool/cfg/visitor.rb
+- lib/build-tool/commands.rb
+- lib/build-tool/commands/build.rb
+- lib/build-tool/commands/configure.rb
+- lib/build-tool/commands/ctags.rb
+- lib/build-tool/commands/environments.rb
+- lib/build-tool/commands/environments/list.rb
+- lib/build-tool/commands/environments/set.rb
+- lib/build-tool/commands/fetch.rb
+- lib/build-tool/commands/files.rb
+- lib/build-tool/commands/help.rb
+- lib/build-tool/commands/info.rb
+- lib/build-tool/commands/install.rb
+- lib/build-tool/commands/modules.rb
+- lib/build-tool/commands/modules/info.rb
+- lib/build-tool/commands/modules/list.rb
+- lib/build-tool/commands/modules/shell.rb
+- lib/build-tool/commands/rebase.rb
+- lib/build-tool/commands/recipes.rb
+- lib/build-tool/commands/recipes/info.rb
+- lib/build-tool/commands/recipes/install.rb
+- lib/build-tool/commands/recipes/list.rb
+- lib/build-tool/configuration.rb
+- lib/build-tool/environment.rb
+- lib/build-tool/errors.rb
+- lib/build-tool/module.rb
+- lib/build-tool/pluginbase.rb
+- lib/build-tool/recipe.rb
+- lib/build-tool/repository.rb
+- lib/build-tool/server.rb
+- lib/build-tool/singleton.rb
+- lib/build-tool/sshkey.rb
+- lib/build-tool/vcs/base.rb
+- lib/build-tool/vcs/git-svn.rb
+- lib/build-tool/vcs/git.rb
+- lib/build-tool/vcs/svn.rb
+- lib/mj/logging.rb
+- lib/mj/tools/ssh.rb
+- lib/mj/tools/subprocess.rb
+- lib/mj/visitor.rb
+- recipes/kde/files/finish_installation.sh
+- recipes/kde/files/kde4.desktop
+- recipes/kde/files/xsession
+- recipes/kde/info.yaml
+- recipes/kde/recipe
+- recipes/kde/recipe-local
+- recipes/kde/settings.yaml
+- recipes/kde43/info.yaml
+- recipes/kde43/recipe
+- recipes/kde43/recipe-local
+- recipes/kde43/settings.yaml
+- recipes/kdeqt4.6/custom/qt/qtscriptgenerator/compile.sh
+- recipes/kdeqt4.6/custom/qt/qtscriptgenerator/configure.sh
+- recipes/kdeqt4.6/custom/qt/qtscriptgenerator/install.sh
+- recipes/kdeqt4.6/info.yaml
+- recipes/kdeqt4.6/recipe
+- recipes/kdeqt4.6/recipe-local
+- recipes/kdeqt4.6/settings.yaml
+- tags
+- tasks/genfiles.rake
+- tasks/rdoc.rake
+- tasks/rspec.rake
+- test.rb
+- test/commands/test_build.rb
+- test/test_build_system.rb
+- test/test_cli.rb
+- test/test_command.rb
+- test/test_configuration_parser.rb
+- test/test_environment.rb
 - test/test_helper.rb
-- test/test_kde-build.rb
-- test/test_vcs_svn.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.html.erb
+- test/test_module.rb
+- test/test_repository.rb
+- test/test_singleton.rb
+- test/test_ssh_key.rb
+- test/test_svn_parser.rb
+- test/test_vcs.rb
 has_rdoc: true
-homepage: http://build-tool.rubyforge.org/git?p=build-tool.git;a=tree
-post_install_message: PostInstall.txt
+homepage: http://build-tool.rubyforge.org
+post_install_message: "    To start with build-tool try the following commands:\n    > build-tool recipe list\n    > build-tool recipe install <recipe>\n"
 rdoc_options: 
 - --main
 - README.txt
@@ -157,8 +196,18 @@ rubyforge_project: build-tool
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: A ruby based alternative to kdesvn-build.
+summary: This project is inspired by kdesvn-build[http://kdesvn-build.kde.org/]
 test_files: 
+- test/test_environment.rb
 - test/test_helper.rb
-- test/test_vcs_svn.rb
-- test/test_kde-build.rb
+- test/test_svn_parser.rb
+- test/test_vcs.rb
+- test/test_repository.rb
+- test/test_singleton.rb
+- test/test_command.rb
+- test/test_ssh_key.rb
+- test/commands/test_build.rb
+- test/test_cli.rb
+- test/test_module.rb
+- test/test_build_system.rb
+- test/test_configuration_parser.rb

data/PostInstall.txt

@@ -1,3 +0,0 @@
-
-For more information on build-tool, see http://build-tool.rubyforge.org
-

data/TODO

@@ -1,2 +0,0 @@
-TODOS:
-- Use a default target

data/bin/kde-build.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding:utf-8 -*-
-
-require 'rubygems'
-
-require File.dirname(__FILE__) + '/../lib/kde-build'
-
-require 'kde-build/application'
-
-app = BuildTool::Application.instance
-
-# Set the root directory. Its where we find the config template
-app.root_directory= Pathname.new( File.dirname(__FILE__) ).join( '..' ).cleanpath
-
-# Read the configuration file. The configuration file to load depends on the
-# scriptname used to invoke us. This makes it possible to have more than one
-# configuration using symlinks
-if app.read_configuration( "#{Pathname.new($0).basename}.yaml" )
-    app.main(ARGV)
-end
-

data/config/website.yml

@@ -1,2 +0,0 @@
-host: mjansen@rubyforge.org
-remote_dir: /var/www/gforge-projects/build-tool

data/config/website.yml.sample

@@ -1,2 +0,0 @@
-host: mjansen@rubyforge.org
-remote_dir: /var/www/gforge-projects/build-tool

data/lib/kde-build.rb

@@ -1,18 +0,0 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-module KdeBuild
-  VERSION = '0.0.3'
-end
-
-module Kernel
-  # Suppresses warnings within a given block.
-  def with_warnings_suppressed
-    saved_verbosity = $-v
-    $-v = nil
-    yield
-  ensure
-    $-v = saved_verbosity
-  end
-end
-

data/lib/kde-build/application.rb

@@ -1,270 +0,0 @@
-# encoding: utf-8
-#
-require 'kde-build/vcs/git-svn'
-require 'kde-build/command/build'
-require 'kde-build/command/compile'
-require 'kde-build/command/configure'
-require 'kde-build/command/ctags'
-require 'kde-build/command/fetch'
-require 'kde-build/command/help'
-require 'kde-build/command/install'
-require 'kde-build/command/info'
-require 'kde-build/command/rebase'
-require 'kde-build/command/version'
-
-require 'kde-build/configuration'
-
-require 'kde-build/tools/ctags.rb'
-require 'kde-build/tools/logging.rb'
-
-require 'kde-build/moduleregistry'
-require 'kde-build/module_configuration'
-
-require 'cmdparse'
-require 'erb'
-require 'singleton'
-require 'yaml'
-require 'fileutils'
-
-# log4r produces nasty warnings
-# (eval):1: warning: redefine off?
-# (eval):2: warning: redefine debug
-# (eval):2: warning: redefine info
-with_warnings_suppressed do
-    require 'log4r'
-    include Log4r
-    Log4r.define_levels('DEBUG','CMDOUT', 'CMD', 'INFO', 'WARN', 'ERROR', 'FATAL')
-    $log = Logger.new('default')
-    $log.outputters = StdoutOutputter.new( "log_stdout", :level => INFO )
-    Outputter["log_stdout"].formatter = BuildTool::PlainFormatter.new
-end
-
-module BuildTool
-
-
-    class Application
-
-        include Singleton
-
-        include MJ::Configuration::Configurable
-
-        # This is where the script is installed.
-        attr_accessor :root_directory
-
-        option( "workdir", "Working directory" ).
-            required.on_write{
-                |val|
-                File.expand_path( val )
-                }
-
-        def initialize
-            $noop = false
-            $verbose = false
-            with_warnings_suppressed do
-                @outputter = Outputter["log_stdout"]
-            end
-
-            @command = CmdParse::CommandParser.new(
-                false,   # handle exceptions
-                true    # Allow partial command matching
-                )
-            @command.program_name = "kde4svn-build"
-            @command.program_version = KdeBuild::VERSION
-            @command.options = CmdParse::OptionParserWrapper.new do |opt|
-                opt.separator "Global Options"
-                opt.on( "--verbose", "Verbose output" ) { |t|
-                    $verbose = true
-                    with_warnings_suppressed do
-                        @outputter.level = DEBUG
-                    end
-                    }
-                opt.on( "--dry-run", "Verbose output" ) { |t|
-                    $noop = true
-                    }
-            end
-
-            YAML.add_domain_type(
-                "michael-jansen.biz,2009", "ApplicationConfiguration" ) {
-                    |type, val|
-                    mc = Application::instance
-                    MJ::Configuration::flatten_values val do
-                        |k, v|
-                        mc.set( k, v )
-                    end
-                    mc
-                }
-
-            @command.add_command( BuildCommand.new )
-            @command.add_command( CompileCommand.new )
-            @command.add_command( ConfigureCommand.new )
-            @command.add_command( CTagsCommand.new )
-            @command.add_command( FetchCommand.new )
-            @command.add_command( InfoCommand.new )
-            @command.add_command( InstallCommand.new )
-            @command.add_command( RebaseCommand.new )
-
-            @command.add_command( HelpCommand.new )
-            @command.add_command( VersionCommand.new )
-
-        end
-
-        # Read the configuration file. If we can't find a configuration file
-        # provide a template file
-        def read_configuration( name )
-
-            configdir  = Pathname.new("~").expand_path.join('.build_tool')
-            # Make sure out configuration directory exists
-            if !configdir.exist?
-                # Create it
-                FileUtils.mkdir_p( configdir )
-            else
-                # It's there. Make sure it's a directory
-                if !configdir.directory?
-                    puts "Failed to create configuration directory #{configdir}. There is a file with this name!"
-                    return false
-                end
-            end
-
-            # Check if the configuration file exists
-            configfile = configdir.join( name )
-            if !configfile.exist?
-                # Copy our template file (if we find it)
-                templatefile = root_directory.join( 'test.yaml.tmpl' )
-                if !templatefile.exist?
-                    $log.error( "Could not find our template file at #{templatefile}!" )
-                    return false
-                end
-                FileUtils.copy( templatefile, configfile )
-                $log.info( "I copied a template configuration file to '#{configfile}'. Please review it and adapt it to your needs." )
-                return false
-            end
-
-            # The config file exists. Go on and read it
-            config_string = File.read(configfile)
-            config = ERB.new( config_string )
-            @configuration = YAML.load( config.result )
-            return true
-
-        end
-
-        def cli
-            require 'readline'
-            require 'shellwords'
-
-            Readline.completion_proc = method(:completion)
-            Readline.completer_word_break_characters = "\x00"
-
-            begin
-
-                while line = Readline.readline('> ', true)
-
-                    return nil if line.nil?
-
-                    # Remove duplicate or empty lines from history
-                    if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
-                        Readline::HISTORY.pop
-                    end
-
-                    # Split the line like bash would do it
-                    execute Shellwords.shellwords( line )
-
-                end
-
-            rescue Interrupt => e
-                exit
-
-            end
-        end
-
-
-        def completion( string )
-            args = Shellwords.shellwords(string)
-
-            # Check if we are able to resolve to a command
-            cmd = @command.main_command.commands[args[0]]
-
-            if cmd
-                # We are still on the first shellword
-                if args.length == 1 and args[0] != cmd.name
-                    return [ cmd.name ]
-                else
-                    return cmd.complete args[1..-1]
-                end
-            else
-                # No command. Try to give some possible expansions
-                args[0] = "" if args[0] === nil
-                cmds = []
-                @command.main_command.commands.each do |name, cmd|
-                    if name.start_with? args[0]
-                        cmds.push cmd.name
-                    end
-                end
-                cmds
-            end
-        end
-
-
-        def execute(args)
-            begin
-
-                @command.parse( args )
-
-            rescue CmdParse::InvalidCommandError => e
-                puts e.message
-                @command.main_command.commands.sort.each do |name, cmd|
-                    print name.ljust( 15 ) + cmd.short_desc.to_s
-                    print " (=default command)" if name == cmd.default_command
-                    print "\n"
-                end
-
-            rescue CmdParse::InvalidOptionError => e
-                puts e.message
-                cmd = @command.main_command.commands[args[0]]
-                cmd.show_help
-
-            rescue Exception => e
-                puts e.message
-                puts e.backtrace if $verbose
-            end
-        end
-
-        def log_directory
-            @log_directory
-        end
-
-        def initialize_logging
-            # Ensure the base log directory exists
-            if !File.exist? "#{workdir}/log"
-                FileUtils.mkdir_p "#{workdir}/log"
-            end
-
-            i = -1
-
-            begin
-                @log_directory = "#{workdir}/log/#{Date.today.to_s}-%02d" % i+=1
-            end until !File.exist?( @log_directory )
-
-            FileUtils.mkdir_p( @log_directory )
-
-            with_warnings_suppressed do
-                $log.add( FileOutputter.new(
-                    "status",
-                    :filename => "#{@log_directory}/build-status",
-                    :level => INFO ) )
-            end
-        end
-
-
-        def main(args)
-            if args.length > 0
-                initialize_logging
-                execute(args)
-            else
-                cli
-            end
-        end
-
-
-    end
-
-end