autobuild 1.6.0.rc3 → 1.6.0.rc4

data/lib/autobuild/configurable.rb

@@ -44,8 +44,8 @@ module Autobuild
         @builddir = 'build'
         
         def builddir=(new)
-            raise ConfigException, "absolute builddirs are not supported" if (Pathname.new(new).absolute?)
-            raise ConfigException, "builddir must be non-empty" if new.empty?
+            raise ConfigException.new(self), "absolute builddirs are not supported" if (Pathname.new(new).absolute?)
+            raise ConfigException.new(self), "builddir must be non-empty" if new.empty?
             @builddir = new
         end
         # Returns the absolute builddir
@@ -109,7 +109,7 @@ module Autobuild
         # Configure the builddir directory before starting make
         def configure
             if File.exists?(builddir) && !File.directory?(builddir)
-                raise ConfigException, "#{builddir} already exists but is not a directory"
+                raise ConfigException.new(self, 'configure'), "#{builddir} already exists but is not a directory"
             end
             FileUtils.mkdir_p builddir if !File.directory?(builddir)
 

data/lib/autobuild/exceptions.rb

@@ -15,10 +15,22 @@ module Autobuild
 
         alias :exception_message :to_s 
         def to_s
+            dir =
+                if target.respond_to?(:srcdir)
+                    "(#{target.srcdir})"
+                else
+                    puts target.inspect
+                end
+            target_name =
+                if target.respond_to?(:name)
+                    target.name
+                else target.to_str
+                end
+
             if target && phase
-                "#{target}: failed in #{phase} phase\n    #{super}"
+                "#{target_name}#{dir}: failed in #{phase} phase\n    #{super}"
             elsif target
-                "#{target}: #{super}"
+                "#{target_name}#{dir}: #{super}"
             else
                 super
             end

data/lib/autobuild/import/cvs.rb

@@ -41,7 +41,7 @@ module Autobuild
         def update(package) # :nodoc:
             Dir.chdir(package.srcdir) do
 		if !File.exists?("#{package.srcdir}/CVS/Root")
-		    raise ConfigException, "#{package.srcdir} is not a CVS working copy"
+		    raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a CVS working copy"
 		end
 
 		root = File.open("#{package.srcdir}/CVS/Root") { |io| io.read }.chomp
@@ -55,7 +55,7 @@ module Autobuild
 		expected_root = expected_root.gsub /:/, ''
 
 		if root != expected_root || mod != @module
-		    raise ConfigException, "checkout in #{package.srcdir} is from #{root}:#{mod}, was expecting #{expected_root}:#{@module}"
+		    raise ConfigException.new(package, 'import'), "checkout in #{package.srcdir} is from #{root}:#{mod}, was expecting #{expected_root}:#{@module}"
 		end
                 Subprocess.run(package, :import, @program, 'up', *@options_up)
 	    end

data/lib/autobuild/import/darcs.rb

@@ -24,7 +24,7 @@ module Autobuild
 
         def update(package) # :nodoc:
 	    if !File.directory?( File.join(package.srcdir, '_darcs') )
-		raise ConfigException, "#{package.srcdir} is not a Darcs repository"
+		raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a Darcs repository"
 	    end
 
 	    Subprocess.run(package, :import, @program, 

data/lib/autobuild/import/git.rb

@@ -119,7 +119,7 @@ module Autobuild
         # repository
         def validate_srcdir(package)
             if !File.directory?(File.join(package.srcdir, '.git'))
-                raise ConfigException, "while importing #{package.name}, #{package.srcdir} is not a git repository"
+                raise ConfigException.new(package, 'import'), "while importing #{package.name}, #{package.srcdir} is not a git repository"
             end
         end
 
@@ -288,11 +288,11 @@ module Autobuild
         def merge_status(fetch_commit, reference_commit = "HEAD")
             common_commit = `git merge-base #{reference_commit} #{fetch_commit}`.chomp
             if $?.exitstatus != 0
-                raise PackageException, "failed to find the merge-base between #{reference_commit} and #{fetch_commit}. Are you sure these commits exist ?"
+                raise PackageException.new(package, 'import'), "failed to find the merge-base between #{reference_commit} and #{fetch_commit}. Are you sure these commits exist ?"
             end
             head_commit   = `git rev-parse #{reference_commit}`.chomp
             if $?.exitstatus != 0
-                raise PackageException, "failed to resolve #{reference_commit}. Are you sure this commit, branch or tag exists ?"
+                raise PackageException.new(package, 'import'), "failed to resolve #{reference_commit}. Are you sure this commit, branch or tag exists ?"
             end
 
             status = if common_commit != fetch_commit
@@ -334,7 +334,7 @@ module Autobuild
                             return
                         end
                     elsif status_to_head.status != Status::SIMPLE_UPDATE
-                        raise PackageException, "checking out the specified commit #{target_commit} would be a non-simple operation (i.e. the current state of the repository is not a linear relationship with the specified commit), do it manually"
+                        raise PackageException.new(package, 'import'), "checking out the specified commit #{target_commit} would be a non-simple operation (i.e. the current state of the repository is not a linear relationship with the specified commit), do it manually"
                     end
 
                     status_to_remote = merge_status(target_commit, fetch_commit)
@@ -373,7 +373,7 @@ module Autobuild
                 status = merge_status(fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
-                        raise PackageException, "the local branch '#{local_branch}' and the remote branch #{branch} of #{package.name} have diverged, and I therefore refuse to update automatically. Go into #{package.srcdir} and either reset the local branch or merge the remote changes"
+                        raise PackageException.new(package, 'import'), "the local branch '#{local_branch}' and the remote branch #{branch} of #{package.name} have diverged, and I therefore refuse to update automatically. Go into #{package.srcdir} and either reset the local branch or merge the remote changes"
                     end
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                 end

data/lib/autobuild/import/svn.rb

@@ -42,15 +42,15 @@ module Autobuild
 		ENV['LC_ALL'] = old_lang
 		unless url = svninfo.grep(/^URL: /).first
 		    if svninfo.grep(/is not a working copy/).empty?
-			raise ConfigException, "#{package.srcdir} is not a Subversion working copy"
+			raise ConfigException.new(package, 'import'), "#{package.srcdir} is not a Subversion working copy"
 		    else
-			raise ConfigException, "Bug: cannot get SVN information for #{package.srcdir}"
+			raise ConfigException.new(package, 'import'), "Bug: cannot get SVN information for #{package.srcdir}"
 		    end
 		end
 		url.chomp =~ /URL: (.+)/
 		source = $1
 		if source != @source
-		    raise ConfigException, "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
+		    raise ConfigException.new(package, 'import'), "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
 		end
                 Subprocess.run(package, :import, @program, 'up', "--non-interactive", *@options_up)
             }

data/lib/autobuild/importer.rb

@@ -162,7 +162,7 @@ class Importer
             end
 
         elsif File.exists?(srcdir)
-            raise ConfigException, "#{srcdir} exists but is not a directory"
+            raise ConfigException.new(package, 'import'), "#{srcdir} exists but is not a directory"
         else
             perform_checkout(package)
         end

data/lib/autobuild/package.rb

@@ -454,11 +454,11 @@ module Autobuild
         # and installed.
 	def depends_on(*packages)
 	    packages.each do |p|
-                raise ConfigException, "#{p.inspect} should be a string" if !p.respond_to? :to_str
+                raise ArgumentError, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name
 		unless pkg = Package[p]
-		    raise ConfigException.new(name), "package #{p} not defined"
+		    raise ConfigException.new(self), "package #{p}, listed as a dependency of #{self.name}, is not defined"
 		end
 
                 next if @dependencies.include?(pkg.name)
@@ -478,7 +478,7 @@ module Autobuild
         # listed in +packages+ are aliases for this package.
 	def provides(*packages)
 	    packages.each do |p|
-                raise ConfigException, "#{p.inspect} should be a string" if !p.respond_to? :to_str
+                raise ArgumentError, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name
                 next if @provides.include?(name)

data/lib/autobuild/packages/autotools.rb

@@ -210,7 +210,7 @@ module Autobuild
 	    elsif confext = %w{.ac .in}.find { |ext| File.exists?("#{conffile}#{ext}") }
 		file conffile => "#{conffile}#{confext}"
 	    else
-		raise PackageException.new(name), "neither configure.ac nor configure.in present in #{srcdir}"
+		raise PackageException.new(self, 'prepare'), "neither configure.ac nor configure.in present in #{srcdir}"
 	    end
 
             file conffile do

data/lib/autobuild/packages/cmake.rb

@@ -299,7 +299,7 @@ module Autobuild
             super do
                 in_dir(builddir) do
                     if !File.file?(File.join(srcdir, 'CMakeLists.txt'))
-                        raise ConfigException, "#{srcdir} contains no CMakeLists.txt file"
+                        raise ConfigException.new(self, 'configure'), "#{srcdir} contains no CMakeLists.txt file"
                     end
 
                     command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_MODULE_PATH=#{CMake.module_path.join(";")}" ]

data/lib/autobuild/packages/orogen.rb

@@ -234,9 +234,7 @@ module Autobuild
                 end
 
                 if needs_regen
-                    isolate_errors do
-                        regen
-                    end
+                    isolate_errors { regen }
                 end
             end
 

data/lib/autobuild/subcommand.rb

@@ -306,7 +306,7 @@ module Autobuild::Subprocess
         end
 
     rescue Failed => e
-        error = Autobuild::SubcommandFailed.new(target_name, command.join(" "), logname, e.status)
+        error = Autobuild::SubcommandFailed.new(target, command.join(" "), logname, e.status)
         error.phase = phase
         raise error, e.message
     end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.0.rc3" unless defined? Autobuild::VERSION
+    VERSION = "1.6.0.rc4" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 15424083
+  hash: 15424093
   prerelease: 6
   segments: 
   - 1
   - 6
   - 0
   - rc
-  - 3
-  version: 1.6.0.rc3
+  - 4
+  version: 1.6.0.rc4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-31 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake