build-tool 0.5.7 → 0.6.0.rc1

data/lib/build-tool/recipe.rb

@@ -1,5 +1,9 @@
+# -*- coding: UTF-8 -*-
+
 require 'yaml'
 
+require 'build-tool/cfg/parser'
+
 module BuildTool
 
     #
@@ -9,15 +13,16 @@ class Recipe
 
         attr_accessor :name
         attr_accessor :global_path
-        attr_reader   :settings
 
-        def initialize( name )
+        def initialize( name, find = true )
             raise StandardError if name.nil?
             @name = name
             @metainfo_loaded = false
             @short_description = "no description"
             @long_description = "no description"
-            @global_path = Recipe.find_recipe( @name )
+            if find
+                @global_path = Recipe.find_recipe( @name )
+            end
         end
 
         def browse_repository
@@ -53,7 +58,7 @@ def long_description
 
         def load_metainfo
             begin
-                file = YAML.load_file( metainfo_file_path )
+                file = YAML.load( File.open( metainfo_file_path, 'r:UTF-8' ) )
                 @long_description = file['LONG']
                 @short_description = file['SHORT']
                 @website = file['WEBSITE']
@@ -63,17 +68,14 @@ def load_metainfo
                 logger.verbose "No description file found for recipe #{name}."
                 @short_description = "No description file provided!"
             rescue ArgumentError => e
-                logger.verbose "Invalid description file found for  for recipe #{name}."
+                logger.verbose "Invalid description file found for recipe #{name}."
                 @short_description = "Description File invalid!"
             end
             @metainfo_loaded = true
         end
 
-        def load( local_config_name, settings )
+        def load( local_config_name, configuration )
             @local_config_name = local_config_name
-            raise StandardError, "Usage: recipe.load( settings )" if settings.nil?
-            @settings = settings
-            configuration = Configuration.new( self )
 
             # Load the recipe
             logger.debug "Loading #{global_config_file_path( "recipe" )}"
@@ -83,29 +85,49 @@ def load( local_config_name, settings )
             local_config_file = local_config_file_path( "recipe" )
             if local_config_file.exist?
                 logger.debug "Loading #{local_config_file}"
-                load_from_file( local_config_file, configuration )
+                load_from_file( local_config_file, configuration, false )
             end
-            configuration
+
+            return configuration
         end
 
-        def load_from_file( file, configuration )
+        def load_from_file( file, configuration, global=true )
             # Get the file content
-            recipe = File.read( file )
+            recipe = File.open( file, 'r:UTF-8' ).read()
+
             # Create the parser
-            parser = Cfg::Parser.new( configuration )
+            parser = Cfg::Parser.new( configuration, global )
             # Create the ERB
             erb = ERB.new( recipe, nil, "%<>" )
             # Fill the env for ERB
+            settings = configuration.settings
             b = binding
-            settings = @settings
             # Call the parser with the ERBed file content and return the
             # result
             conf = parser.parse_string( erb.result(b), file )
         end
 
-        def local_config_file_path(name)
-            Pathname.new( BuildTool::Application::instance.local_configuration_dir ).
-                join( @local_config_name, name)
+        def load_from_string( recipe, configuration, global=true )
+            # Create the parser
+            parser = Cfg::Parser.new( configuration, global )
+            # Create the ERB
+            erb = ERB.new( recipe, nil, "%<>" )
+            # Fill the env for ERB
+            settings = configuration.settings
+            b = binding
+            # Call the parser with the ERBed file content and return the
+            # result
+            conf = parser.parse_string( erb.result(b), '<string>' )
+        end
+
+        def local_path()
+            Pathname.new(
+                BuildTool::Application::instance.local_configuration_dir ).
+                join( @local_config_name )
+        end
+
+        def local_config_file_path( name )
+            local_path().join( name )
         end
 
         def global_config_file_path( name )

data/lib/build-tool/repository.rb

@@ -1,65 +1,71 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/mixins/inherited_attributes'
 require 'build-tool/errors'
 
+
+
 module BuildTool
 
     # Encapsulates a source code repository.
     class Repository
 
+        include MJ::Mixins::InheritedAttributes
+
         # Repository name
         attr_reader   :name
 
-        # The server this repository is hosted
-        attr_accessor :server
+        # The server the repository is located on.
+        # @return [Server] the server.
+        # @macro [attach] inherited_attr_accessor
+        #   @attribute [rw] $1
+        inherited_attr_accessor :server
 
-        # The relative path on the server
-        attr_accessor :path
+        # The path on the server.
+        # @return [String] the path.
+        inherited_attr_accessor :path
 
-        # The relative path on the server
-        attr_accessor :user
+        # The user required to connect to the repository.
+        # @return [String] the user name.
+        inherited_attr_accessor :user
 
-        # The associated ssh-key
+        # Return the ssh key needed to access this repository. If the repository has no key we
+        # check the associated server. After that the parent.
+        def sshkey
+            # 1. Our SSH-Key
+            return @sshkey if @sshkey
+            # 2. Our Servers SSH-Key
+            return server.sshkey if @server
+            # 3. Our Parents SSH-Key
+            return parent.sshkey if @parent
+            # 4. Nothing
+            return nil
+        end
         attr_writer :sshkey
 
-        # Create a repository
+        # Create a repository object
+        # @param [String] name The unique name to use for this repository.
         def initialize(name)
+            super
             if name.nil?
                 raise StandardError, "The repository name has to be set"
             end
             @name = name
             @server = nil
             @sshkey = nil
+            @path = nil
+            @user = nil
         end
 
-        # Return the ssh key needed to access this repository. If the repository has no key we
-        # check the associated server.
-        def sshkey
-            return @sshkey if @sshkey
-
-            if !server
-                return nil
-            end
-
-            return server.sshkey
-        end
-
+        # Returns the url for this repository.
+        # @return [String] the url
+        # @raise [ConfigurationError] if no server is set configured.
         def url
             if !server
                 raise ConfigurationError, "No server specified for repository #{name}"
             end
-            if !server.host
-                raise ConfigurationError, "No host specified for server #{server.name}"
-            end
 
-            url = server.host
-            if server.path
-                url = "#{url}/#{server.path}"
-            end
-            if user
-                url = "#{user}@#{url}"
-            end
-            if server.protocol
-                url = "#{server.protocol}://#{url}"
-            end
+            url = server.url( user )
             if path
                 url = "#{url}/#{path}"
             end

data/lib/build-tool/server.rb

@@ -1,3 +1,7 @@
+# -*- coding: UTF-8 -*-
+
+require 'uri'
+
 module BuildTool
 
     class Server
@@ -18,24 +22,44 @@ class Server
         attr_accessor :sshkey
 
         # Create a repository
-        def initialize(name)
+        def initialize( name, theurl = nil )
+            @host = nil
+            @name = nil
+            @path = nil
+            @protocol = nil
+            @sshkey = nil
             if name.nil?
                 raise StandardError, "The server name has to be set"
             end
             @name = name
+            if theurl
+                uri = URI.parse( theurl )
+                @host = uri.host
+                @protocol = uri.scheme
+                if not uri.path.empty?
+                    @path = uri.path
+                end
+            end
         end
 
-        def url
+        def url( user = nil )
             if !host
                 raise ConfigurationError, "No host specified for server #{name}"
             end
 
             url = host
+            if user
+                url = "#{user}@#{url}"
+            end
             if protocol
                 url = "#{protocol}://#{url}"
             end
             if path
-                url = "#{url}/#{path}"
+                if path[0] == '/'
+                    url = "#{url}#{path}"
+                else
+                    url = "#{url}/#{path}"
+                end
             end
             url
         end

data/lib/build-tool/singleton.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 module BuildTool
 
     class Singleton

data/lib/build-tool/sshkey.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 module BuildTool
     #
     # Encapsulates a ssh key

data/lib/build-tool/state_helper.rb

@@ -0,0 +1,64 @@
+# -*- coding: UTF-8 -*-
+
+require 'ansi'
+
+module BuildTool
+
+        module StateHelper
+
+            # Needed for both Module and Command History
+            STARTED = 0
+            CANCELED_BY_USER = 1
+            FINISHED_SUCCESSFUL = 2
+            FINISHED_WITH_ERRORS = 3
+
+            def state_str
+                self.class.state_str( self.state )
+            end
+
+            def state_char
+                self.class.state_char( self.state )
+            end
+
+            module ClassMethods
+
+                def state_str( state )
+                    case state
+                    when STARTED
+                        "STARTED"
+                    when CANCELED_BY_USER
+                        ANSI::Code.red { "CANCELED" }
+                    when FINISHED_SUCCESSFUL
+                        ANSI::Code.green { "SUCCESS" }
+                    when FINISHED_WITH_ERRORS
+                        ANSI::Code.red { "ERRORS" }
+                    else
+                        "#{state.to_s}?"
+                    end
+                end
+
+                def state_char( state )
+                    case state
+                    when STARTED
+                        "R"
+                    when CANCELED_BY_USER
+                        ANSI::Code.red { "C" }
+                    when FINISHED_SUCCESSFUL
+                        ANSI::Code.green { "S" }
+                    when FINISHED_WITH_ERRORS
+                        ANSI::Code.red { "E" }
+                    else
+                        "#{state.to_s}?"
+                    end
+                end
+            end
+
+            def self.included( klass )
+                klass.extend ClassMethods
+            end
+
+        end
+
+
+end # module BuildTool
+

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'open-uri'
 
 require 'build-tool/vcs/base'
@@ -159,7 +161,7 @@ def guess_top_level_directory
             return topdir
         end
 
-        def rebase
+        def rebase( verbose = false )
 
             # Check if the archive is already downloaded
             if !File.exist? archive_local_path

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

@@ -1,13 +1,26 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess.rb'
+require 'mj/tools/ssh.rb'
 
 require 'build-tool/errors'
 
 module BuildTool; module VCS
 
+    # Base class for version control system configurations.
+    #
+    # @abstract
+    # @attr_reader [String] name returns the name of the vcs.
     class BaseConfiguration
 
+        # The associated module of this configuration object.
         attr_reader :module
 
+        # The name of the version control system
+        def name
+            raise StandardError, "#{self.class}: override name!"
+        end
+
         def initialize
             @module = nil
         end

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/vcs/svn'
 require 'build-tool/vcs/git'
 
@@ -15,6 +17,13 @@ def name
         def initialize
             super
             @externals = {}
+            @repository = nil
+            @remote_path = nil
+        end
+
+        def merged_externals
+            return parent.merged_externals.merge( @externals ) if @parent         # We have a parent. Merge with it
+            return @externals                                                     # No parent, no global. Just us
         end
 
         def vcs( mod )
@@ -34,22 +43,22 @@ def copy_configuration( other )
 
         attr_writer :repository
         def repository
-            if @repository.nil?
-                 raise ConfigurationError, "No repository configured for module #{self.module.name}."
-            end
-            @repository
+            return @repository if @repository             # Our repository
+            return parent.repository if @parent       # Our parents repository
+            raise ConfigurationError, "No repository configured for module #{self.module ? self.module.name : 'unknown' }."
         end
 
         attr_writer :remote_path
         def remote_path
-            if @remote_path.nil?
-                return @module.name
-            end
-            @remote_path
+            return @remote_path if @remote_path
+            return parent.remote_path if @parent
+            return @module.name
         end
 
-        def track_branch
-            "git-svn"
+        def track
+            return @track if @track             # Our track
+            return parent.track if @parent      # Out parents track
+            "remotes/git-svn"
         end
     end
 
@@ -111,6 +120,7 @@ def clone
             if 0 != ( git_svn "init #{config.repository.url}/#{remote_path}" )
                 raise GitSvnError, "Error while initializing the repo `git svn init '#{config.repository}/#{remote_path}'`: #{$?}"
             end
+
             fetch( "HEAD" )
         end
 
@@ -124,6 +134,9 @@ def configure
         def fetch( 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}"
@@ -157,9 +170,18 @@ def prepare_for_fetch
             return check_for_sshkey( config.repository.sshkey )
         end
 
-        def rebase
-            if 0 != ( git.git "rebase #{config.track_branch}" )
-                raise GitSvnError, "Error while rebasing the repo with `#{config.track_branch}': #{$?}"
+        def rebase( verbose = false )
+            git.check_config
+            remote_branch = "#{config.track_branch}"
+
+            if verbose
+                git.git('log --first-parent HEAD..%s' % remote_branch ) do |line|
+                    logger.info( line )
+                end
+            end
+
+            if 0 != ( git.git "rebase #{remote_branch}" )
+                raise GitSvnError, "Error while rebasing the repo with `#{remote_branch}': #{$?}"
             end
         end
 
@@ -179,7 +201,7 @@ def remote_path
         end
 
         def update_externals
-            config.externals.each do |local, remote|
+            config.merged_externals.each do |local, remote|
                 VCS::Svn::svn( "checkout #{remote}@HEAD #{local}", wd = local_path  )
             end
         end