build-tool 0.2 → 0.3

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

@@ -45,6 +45,16 @@ module BuildTool; module VCS
         #
         attr_reader :config
 
+        #
+        ### CAPABILITIES
+        def patches_supported?
+            false
+        end
+
+        def apply_patches_after_rebase?
+            false
+        end
+
         # Collect garbage, do maintenance ...
         def gc
         end
@@ -80,6 +90,10 @@ module BuildTool; module VCS
             logger.debug "VCS #{name} did not implement configure!"
         end
 
+        def recipe
+            Application::instance.recipe
+        end
+
         #
         ### VIRTUAL FUNCTIONS
         #

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

@@ -0,0 +1,113 @@
+require 'build-tool/vcs/base'
+require 'build-tool/errors'
+
+module BuildTool; module VCS
+
+    class MercurialError < BuildTool::Error; end
+
+    class MercurialConfiguration < BaseConfiguration
+
+        def name
+            "mercurial"
+        end
+
+        attr_accessor :remote
+
+        def initialize( mod = nil )
+            super( mod )
+            @remote = {}
+        end
+
+        def vcs( mod )
+            @module = mod
+            Mercurial.new( self )
+        end
+
+        def branch
+            self.module.remote_path
+        end
+    end
+
+    #
+    # Implementation for the hg version control system.
+    #
+    class Mercurial < Base
+
+        def initialize( config )
+            super( config )
+            @remote = {}
+            @vcs = nil
+        end
+
+        #
+        ### ATTRIBUTES
+        #
+        def name
+            "mercurial"
+        end
+
+        def fetching_supported?
+            true
+        end
+
+        #
+        ### METHODS
+        #
+
+        def checkedout?
+            return false if !local_path_exist?
+            if !Pathname.new( local_path ).join( ".hg" ).exist?
+                raise Base::VcsError, "Checkout path #{local_path} is not a mercurial repo!"
+            end
+            return true
+        end
+
+        # Initialize the local repository
+        def clone
+            # Check if path exists
+            if local_path_exist?
+                raise MercurialError, "Failed to create repository at '#{local_path}': Path exists"
+            end
+            FileUtils.mkdir_p Pathname.new( local_path ).dirname if ! $noop
+
+            # Initialize the repository
+            if hg( "clone #{repository.url} #{local_path}", Pathname.new( local_path ).dirname) != 0
+                raise MercurialError, "Error while initializing the repo `hg init #{local_path}'`: #{$?}"
+            end
+
+            fetch()
+            rebase()
+        end
+
+        # Fetch from +repository+
+        #
+        # Initializes the local clone if it does not exist.
+        def fetch()
+            if !checkedout? and !$noop
+                clone
+            end
+            cmd = "pull #{repository.url}"
+            if ( rc = hg( cmd ) ) != 0
+                raise MercurialError, "Error while fetching: #{rc}"
+            end
+        end
+
+        def hg( command, wd = local_path, &block )
+            rc = self.class.execute "hg #{command}", wd, &block
+            if rc != 0
+                raise MercurialError, "hg #{command || "" } failed with error code #{rc}";
+            end
+            rc
+        end
+
+        def rebase
+            if 0 != ( hg "update #{config.branch}" )
+                raise MercurialSvnError, "Error while rebasing the repo with `hg update: #{$?}"
+            end
+        end
+
+    end # class Mercurial
+
+end; end # module BuildTool::VCS
+
+

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

@@ -4,6 +4,11 @@ module BuildTool; module VCS
 
     class SvnConfiguration < BaseConfiguration
 
+        def initialize
+            super
+            @only = nil
+        end
+
         def name
             "svn"
         end
@@ -13,6 +18,12 @@ module BuildTool; module VCS
             Svn.new( self ) 
         end
 
+        attr_reader :only
+        def only=( list )
+            @only = list
+            puts @only.inspect
+        end
+
     end
 
     #
@@ -45,7 +56,7 @@ module BuildTool; module VCS
         def checkedout?
             return false if !local_path_exist?
             if !File.exists? "#{local_path}/.svn"
-                $log.debug("Checkout path #{local_path} is not a svn repo")
+                logger.debug("Checkout path #{local_path} is not a svn repo")
                 return false
             end
             return true
@@ -62,7 +73,14 @@ module BuildTool; module VCS
             FileUtils.mkdir_p( File.dirname( local_path ) ) if !$noop
 
             # Init the repository
-            svn "checkout --depth=infinity #{repository.url}/#{remote_path} #{local_path}", File.dirname(local_path)
+            if config.only
+                svn "checkout --depth=files #{repository.url}/#{remote_path} #{local_path}", local_path.dirname
+                config.only.each do |elem|
+                    svn "update --depth=infinity #{elem}", local_path
+                end
+            else
+                svn "checkout --depth=infinity #{repository.url}/#{remote_path} #{local_path}", local_path.dirname
+            end
         end
 
         def fetch()

data/lib/mj/error.rb

@@ -0,0 +1,7 @@
+#
+#
+module MJ
+
+    class Error < StandardError; end
+
+end # module MJ

data/lib/mj/vcs/git.rb

@@ -0,0 +1,133 @@
+require 'mj/tools/subprocess'
+require 'mj/error'
+
+#
+#
+module MJ; module VCS; module Git;
+
+    # Thrown if git signals a problem
+    class GitError < MJ::Error; end
+
+    # A (local) git repository.
+    #
+    class Repository
+
+        include MJ::Tools::SubProcess
+
+        attr_reader :path
+
+        # Some helper methods that should be factored out somewhere
+
+        # Create directory +dir+ recursively if needed.
+        def mkdir_p(dir)
+            logger.debug "mkdir -p #{dir}"
+            FileUtils.mkdir_p(dir) if !@noop
+        end
+
+        # Checkout a branch
+        def checkout(opts)
+            if ! exist? and ! $noop
+                raise GitError, "Repository #{path} does not exist!"
+            end
+            # Fetch only from remote if specified
+            git("checkout " + opts)
+        end
+
+        # Clone a repository
+        def clone(url)
+            # Initialize the repository
+            init(url)
+            remote_add(url, "origin")
+            fetch("origin")
+            checkout("-b master origin/master")
+        end # def clone
+
+        # Check if the repository exists
+        def exist?
+            # If path does not exist the repo does not exist
+            return false if !path.exist?
+            # If the path is not a directory we have a problem
+            raise GitError, "#{path.to_s} is not a directory!" if !path.directory?
+            # If the path is a directory but no .git directory is found we have a problem too
+            if !path.join( ".git" ).exist?
+                raise GitError, "#{path.to_s} is not a git repo!"
+            end
+            return true
+        end
+
+        def fetch(remote = nil)
+            if ! exist? and ! $noop
+                raise GitError, "Repository #{path} does not exist!"
+            end
+            # Fetch only from remote if specified
+            cmd = "fetch"
+            if remote
+                cmd += " -q #{remote}"
+            end
+            git(cmd)
+        end
+
+        # Execute +command+ from working directory +wd+. If specified call +block+ with every line
+        # of command output.
+        def git(command, wd = path, &block)
+            rc = self.class.execute "git #{command}", wd, &block
+            if rc != 0
+                raise GitError, "git #{command || "" } failed with error code #{rc}";
+            end
+            rc
+        end
+
+        def init(url)
+            # If the repository already exists we cannot initialize
+            if exist?
+                raise GitError, "Repository #{path} already exists!"
+            end
+            # Create the repository parent directory if needed
+            mkdir_p path
+            # Initialize the repository
+            git("init")
+        end
+
+        # If +noop+ is true no methods invoked on this object actually do any changes. The
+        # required actions will be logged but not executed.
+        def initialize(path, noop=false)
+            @path = path
+            @noop = noop
+        end
+
+        def log(rev="")
+            @lines = Array.new
+            git("log #{rev}") do |line|
+                @lines << line
+            end
+            @lines
+        end
+
+        def rebase(branch, remote="origin")
+            if ! exist? and ! $noop
+                raise GitError, "Repository #{path} does not exist!"
+            end
+            # Fetch only from remote if specified
+            cmd = "rebase "
+            if remote
+                cmd += "#{remote}/#{branch}"
+            else
+                cmd += "origin/#{branch}"
+            end
+            git(cmd)
+        end
+
+        # Add a new remote
+        def remote_add(url, name)
+            if ! exist? and ! $noop
+                raise GitError, "Repository #{path} does not exist!"
+            end
+            # Add the origin remote
+            git("remote add #{name} #{url.to_s}")
+        end
+
+
+    end # class Git
+
+end; end; end # module BuildTool::VCS::Git
+

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Michael Jansen
@@ -35,7 +35,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2010-05-16 00:00:00 +02:00
+date: 2010-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -244,6 +244,8 @@ files:
 - lib/build-tool/commands/modules/shell.rb
 - lib/build-tool/commands/rebase.rb
 - lib/build-tool/commands/recipes.rb
+- lib/build-tool/commands/recipes/add.rb
+- lib/build-tool/commands/recipes/incoming.rb
 - lib/build-tool/commands/recipes/info.rb
 - lib/build-tool/commands/recipes/install.rb
 - lib/build-tool/commands/recipes/list.rb
@@ -262,47 +264,14 @@ files:
 - lib/build-tool/vcs/base.rb
 - lib/build-tool/vcs/git-svn.rb
 - lib/build-tool/vcs/git.rb
+- lib/build-tool/vcs/mercurial.rb
 - lib/build-tool/vcs/svn.rb
+- lib/mj/error.rb
 - lib/mj/logging.rb
 - lib/mj/tools/ssh.rb
 - lib/mj/tools/subprocess.rb
+- lib/mj/vcs/git.rb
 - lib/mj/visitor.rb
-- recipes/kde/custom/qt/qtscriptgenerator/compile.sh
-- recipes/kde/custom/qt/qtscriptgenerator/configure.sh
-- recipes/kde/custom/qt/qtscriptgenerator/install.sh
-- recipes/kde/custom/scripting/pyqt4/compile.sh
-- recipes/kde/custom/scripting/pyqt4/configure.sh
-- recipes/kde/custom/scripting/pyqt4/install.sh
-- recipes/kde/custom/scripting/sip/compile.sh
-- recipes/kde/custom/scripting/sip/configure.sh
-- recipes/kde/custom/scripting/sip/install.sh
-- recipes/kde/files/finish_installation.sh
-- recipes/kde/files/kde4.desktop
-- recipes/kde/files/xsession
-- recipes/kde/info.yaml
-- recipes/kde/kde-bindings.recipe
-- recipes/kde/kde-core.recipe
-- recipes/kde/kde-devel.recipe
-- recipes/kde/kde-finance.recipe
-- recipes/kde/kde-graphics.recipe
-- recipes/kde/kde-kdevelop.recipe
-- recipes/kde/kde-l10n.recipe
-- recipes/kde/kde-multimedia.recipe
-- recipes/kde/kde-network.recipe
-- recipes/kde/kde-office.recipe
-- recipes/kde/kde-plasma.recipe
-- recipes/kde/kde-qt.recipe
-- recipes/kde/kde-scripting.recipe
-- recipes/kde/kde-support.recipe
-- recipes/kde/kde-utils.recipe
-- recipes/kde/kde-webdev.recipe
-- 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
 - tasks/genfiles.rake
 - tasks/rspec.rake
 - test/commands/test_build.rb

metadata.gz.sig

@@ -1,3 +1,2 @@
-NB��H����	l��zU�����WL���u�:x��63^���k��h�f����0ȷ��'j(i�(�f�}�D-y$B
-��אPB����}���D�������1qn��>�_-�f'�n�{΁d4�"��Y჻�l�Cå�(6��({�F��o����:Q'cs�N1jn���%���k�M��"�����<���ĥ���i�+i
-i86��N�-��M&b*�|N�&���v%���F)
+���@X��T�Kзa@�W�k�Z�Η����
+z�7����D�[����&"%/no#r���M0X�=�:0�

data/recipes/kde/custom/qt/qtscriptgenerator/compile.sh

@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# Uncomment this line if you want to debug the script
-# set -x 
-
-echo "
-If you get compile errors about missing phonon or xmlreader files, then
-patch manually the qtbindings/qtbinding.pro file. Remove any subdirs your qt
-does not support. E.g.
-
-          qtscript_svg \\
-          qtscript_xml \\
--         qtscript_phonon \\
-          qtscript_webkit \\
--         qtscript_xmlpatterns \\
-          qtscript_uitools \\
-          qs_eval
-
-if you use the default configuration of qt this recipe provides.
-qtscriptgenerator does no automatic configuring.
-"
-
-source_directory=$1
-build_directory=$(pwd)
-
-# Check the requirements
-if test "x${QTDIR}x" == "xx"; then
-    echo "QTDIR has to be set for the qtscriptgenerator to build!";
-    exit -1;
-fi
-
-cd generator
-rc=$?
-if test $rc -ne 0; then
-    echo "The generator directory does not exist: $rc" >&2;
-    exit -1;
-fi
-
-echo "  - calling make"
-make
-rc=$?
-if test $rc -ne 0; then
-    echo "make failed with error code: $rc" >&2;
-    exit -1;
-fi
-
-echo "  - executing the generator"
-./generator
-rc=$?
-if test $rc -ne 0; then
-    echo "./generator failed with error code: $rc" >&2;
-    exit -1;
-fi
-
-echo "Generator created successfully"
-cd ..
-
-echo "Creating the bindings"
-cd qtbindings
-rc=$?
-if test $rc -ne 0; then
-    echo "The qtbindings directory does not exists"
-    exit -1;
-fi
-
-echo "  - calling make"
-make
-rc=$?
-if test $rc -ne 0; then
-    echo "make failed with error code: $rc" >&2;
-    exit -1;
-fi
-
-echo "Bindings created successfully"
-cd ..
-
-exit 0