build-tool 0.5.5 → 0.5.6

data/History.txt

@@ -1,4 +1,4 @@
-== 0.5.5 ==
+== 0.5.6 ==
 
 - Features
     - None
@@ -14,6 +14,10 @@
         git "server" "path/to"
         git "full/url"
 
+== 0.5.5 ==
+
+Release had problems. Skip it.
+
 == 0.5.4 ==
 
 - Features

data/lib/build-tool.rb

@@ -2,6 +2,6 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BuildTool
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end
 

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

@@ -154,6 +154,27 @@ def prepend( var, value )
             end
         end
 
+        # This method checks if the build-system is prepared for installation. Do not check if the
+        # module is configured, this will be done by Module. Only check stuff that is outside of
+        # the scope of build-tool.
+        def prepare_for_installation
+            return check_install_prefix
+        end
+
+        # Check that the installation prefix exists and is writable
+        def check_install_prefix
+            prefix = @module.install_prefix_required
+            if !prefix.exist? or !prefix.writable?
+                begin
+                    FileUtils.mkdir_p prefix.to_s
+                rescue Errno::EACCES => e
+                    logger.error "#{name}: The directory #{prefix.to_s} is not writable! Installation will fail!"
+                    return false
+                end
+            end
+            return true
+        end
+
         def install_prefix
             return @module.install_prefix_required if @module
             raise ConfigurationError, "No module set for build-system"

data/lib/build-tool/build-system/none.rb

@@ -37,6 +37,11 @@ def reconfigure()
             0
         end
 
+        # We have no buildsystem so we need no install prefix
+        def check_install_prefix
+            true
+        end
+
         # Execute a cmake command in the context of the build directory
         def cmake( command, wd = build_directory )
             0

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

@@ -344,13 +344,19 @@ def visit_GitRemoteUrlNode( node )
         end
 
         def visit_GitRemotePushNode( node )
-            @remote.push_server = configuration.server( node.values[0] )
-            if @remote.push_server.nil?
-                raise ConfigurationError, "Unknown server #{node.values[0]} configured."
+            if node.values.length == 2
+                @remote.push_server = configuration.server( node.values[0] )
+                if @remote.push_server.nil?
+                    raise ConfigurationError, "Unknown server #{node.values[0]} configured."
+                end
+                @remote.push_path = node.values[1]
+            else
+                @remote.push_server = BuildTool::Server.new( "unnamed" )
+                @remote.push_server.host = node.values[0]
             end
-            @remote.push_path = node.values[1]
         end
 
+
     end # class GitRemoteDeclarationNodeVisitor
 
 

data/lib/build-tool/commands.rb

@@ -418,7 +418,7 @@ def complete_modules( name, include_templates = false )
 
             # Raise an error if the result should be unique but is not.
             if should_be_unique and res.size > 1
-                raise UsageError, "#{name} is ambiguos #{res}. Please be more specific."
+                raise UsageError, "#{name} is ambiguous (#{res.map { |m| m.name }.join( ', ' ) })."
             end
 
             # Give a warning if all modules where 

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

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

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

@@ -41,10 +41,10 @@ def print_file_list
             recipe = Application::instance.recipe
             files_dir = recipe.files_path
             if !files_dir.exist?
-                say "No files supplied with this recipe"
+                logger.error "No files supplied with this recipe"
                 return 0
             end
-            Dir.new(files_dir).each do |entry|
+            Dir.new(files_dir).sort.each do |entry|
                 next if entry == "."
                 next if entry == ".."
                 say entry
@@ -56,12 +56,13 @@ def print_file( filename )
             recipe = Application::instance.recipe
             files_dir = recipe.files_path
             if !files_dir.exist?
-                say "No files supplied with this recipe"
+                logger.error "No files supplied with this recipe"
                 return 0
             end
             file = files_dir.join( filename )
-            if !files_dir.exist?
-                say "That file does not exist"
+            if !file.exist?
+                logger.error "File '#{filename}' not found! Found those:"
+                print_file_list
                 return -1
             end
 

data/lib/build-tool/configuration.rb

@@ -28,7 +28,11 @@ def log_directory
             raise BuildTool::ConfigurationError, "No log directory configured"
         end
         def log_directory=( path )
-            @log_directory = Pathname.new( File.expand_path( path, "~" ) )
+            path = Pathname.new( path.sub( /\$HOME/, '~' ) )
+            if path.to_s[0] != '~' and path.relative?
+                raise ConfigurationError, "Log directory '#{path}' is relative!"
+            end
+            @log_directory = path.expand_path
         end
 
         def environment( name )

data/lib/build-tool/module.rb

@@ -60,7 +60,11 @@ def build_directory
 
         def build_prefix=( path )
             if path
-                @build_prefix = Pathname.new( File.expand_path( path ) )
+                path = Pathname.new( path.sub( /\$HOME/, '~' ) )
+                if path.to_s[0] != '~' and path.relative?
+                    raise ConfigurationError, "Build-prefix '#{path}' is relative!"
+                end
+                @build_prefix = path.expand_path
             else
                 @build_prefix = nil
             end
@@ -151,7 +155,11 @@ def gc
         # Installation prefix
         def install_prefix=( path )
             if path
-                @install_prefix = Pathname.new( File.expand_path( path.to_s ) )
+                path = Pathname.new( path.sub( /\$HOME/, '~' ) )
+                if path.to_s[0] != '~' and path.relative?
+                    raise ConfigurationError, "Install-prefix '#{path}' is relative!"
+                end
+                @install_prefix = path.expand_path
             else
                 @install_prefix = nil
             end
@@ -345,16 +353,7 @@ def ready_for_rebase
 
 
         def prepare_for_installation
-            prefix = install_prefix_required
-            if !prefix.exist? or !prefix.writable?
-                begin
-                    FileUtils.mkdir_p prefix.to_s
-                rescue Errno::EACCES => e
-                    logger.error "#{name}: The directory #{prefix.to_s} is not writable! Installation will fail!"
-                    return false
-                end
-            end
-            return true
+            return build_system_required.prepare_for_installation
         end
 
         def to_s

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

@@ -64,6 +64,20 @@ def initialize( *args )
             super( *args )
         end
 
+        class << self
+
+            git_svn_available = nil
+
+            # Is the git executable available?
+            def git_svn_available
+                return @git_svn_available unless @git_svn_available.nil?
+                %x( git svn --help 2>&1 )
+                @git_svn_available = $?.success?
+                return @git_svn_available
+            end
+
+        end
+
         #
         ### ATTRIBUTES
         #
@@ -150,7 +164,10 @@ def rebase
         end
 
         def ready_for_fetch
-            git.ready_for_fetch
+            if not GitSvn.git_svn_available
+                logger.info( "#{config.module.name}: Calling `git svn` failed!" )
+            end
+            return GitSvn.git_svn_available && git.ready_for_fetch
         end
 
         def ready_for_rebase

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

@@ -140,6 +140,20 @@ def initialize( config )
             @vcs = nil
         end
 
+        class << self
+
+            git_available = nil
+
+            # Is the git executable available?
+            def git_available
+                return @git_available unless @git_available.nil?
+                %x( git --version 2>&1 )
+                @git_available = $?.success?
+                return @git_available
+            end
+
+        end
+
         #
         ### ATTRIBUTES
         #
@@ -261,6 +275,13 @@ def ready_for_access
             end
         end
 
+        def ready_for_fetch
+            if not Git.git_available
+                logger.info( "#{config.module.name}: Calling `git` failed!" )
+            end
+            return Git.git_available
+        end
+
         # Check if the module is ready for a rebase.
         def ready_for_rebase
 

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

@@ -61,6 +61,21 @@ class SvnError < BuildTool::Error; end
         #     super( *args )
         # end
 
+        class << self
+
+            svn_available = nil
+
+            # Is the git executable available?
+            def svn_available
+                return @svn_available unless @svn_available.nil?
+                %x( svn --version 2>&1 )
+                @svn_available = $?.success?
+                return @svn_available
+            end
+
+        end
+
+
         #
         ### ATTRIBUTES
         #
@@ -107,6 +122,13 @@ def clone
             end
         end
 
+        def ready_for_fetch
+            if not Svn.svn_available
+                logger.info( "#{config.module.name}: Calling `svn` failed!" )
+            end
+            return Svn.svn_available
+        end
+
         def fetch()
             if !checkedout?
                clone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-tool
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &6489880 !ruby/object:Gem::Requirement
+  requirement: &6487260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *6489880
+  version_requirements: *6487260
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &6489300 !ruby/object:Gem::Requirement
+  requirement: &6486640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *6489300
+  version_requirements: *6486640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &6488560 !ruby/object:Gem::Requirement
+  requirement: &6486000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *6488560
+  version_requirements: *6486000
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &6487940 !ruby/object:Gem::Requirement
+  requirement: &6485380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *6487940
+  version_requirements: *6485380
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &6487280 !ruby/object:Gem::Requirement
+  requirement: &6484800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *6487280
+  version_requirements: *6484800
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &6486660 !ruby/object:Gem::Requirement
+  requirement: &6484300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.7
   type: :development
   prerelease: false
-  version_requirements: *6486660
+  version_requirements: *6484300
 - !ruby/object:Gem::Dependency
   name: hoe-debugging
-  requirement: &6486100 !ruby/object:Gem::Requirement
+  requirement: &6483680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *6486100
+  version_requirements: *6483680
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
-  requirement: &6485500 !ruby/object:Gem::Requirement
+  requirement: &6483080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *6485500
+  version_requirements: *6483080
 - !ruby/object:Gem::Dependency
   name: hoe-git
-  requirement: &6484900 !ruby/object:Gem::Requirement
+  requirement: &6467480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *6484900
+  version_requirements: *6467480
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &6484260 !ruby/object:Gem::Requirement
+  requirement: &6467000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *6484260
+  version_requirements: *6467000
 - !ruby/object:Gem::Dependency
   name: rexical
-  requirement: &6469180 !ruby/object:Gem::Requirement
+  requirement: &6466480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *6469180
+  version_requirements: *6466480
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &6468740 !ruby/object:Gem::Requirement
+  requirement: &6465900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *6468740
+  version_requirements: *6465900
 description: ! 'This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].