autobuild 0.6.3 → 0.6.4

data/Changes.txt

@@ -1,3 +1,13 @@
+== Version 0.6.4
+
+This is a bugfix release
+
+* More checks for working copy sanity: check that the target working copy
+  has been created by the right tools before doing anything. Update test
+  suite so that these parts of the importers is tested
+* Since we grep 'svn info' output, make sure that its output will be in 
+  english by setting LC_ALL to C
+
 == Version 0.6.3
 
 * CVS and SVN importing plugins check that the current working copy comes from

data/Manifest.txt

@@ -1,13 +1,18 @@
-bin/autobuild
 Changes.txt
+Manifest.txt
+README.txt
+Rakefile
+TODO
+bin/autobuild
+lib/autobuild.rb
 lib/autobuild/config.rb
 lib/autobuild/environment.rb
 lib/autobuild/exceptions.rb
 lib/autobuild/import/cvs.rb
 lib/autobuild/import/darcs.rb
 lib/autobuild/import/svn.rb
-lib/autobuild/importer.rb
 lib/autobuild/import/tar.rb
+lib/autobuild/importer.rb
 lib/autobuild/package.rb
 lib/autobuild/packages/autotools.rb
 lib/autobuild/packages/genom.rb
@@ -15,13 +20,9 @@ lib/autobuild/packages/import.rb
 lib/autobuild/packages/pkgconfig.rb
 lib/autobuild/packages/ruby.rb
 lib/autobuild/pkgconfig.rb
-lib/autobuild.rb
 lib/autobuild/reporting.rb
 lib/autobuild/subcommand.rb
 lib/autobuild/timestamps.rb
-Manifest.txt
-Rakefile
-README.txt
 samples/demo.rb
 test/data/cvsroot.tar
 test/data/svnroot.tar
@@ -31,4 +32,3 @@ test/test_import_svn.rb
 test/test_import_tar.rb
 test/test_subcommand.rb
 test/tools.rb
-TODO

data/README.txt

@@ -1,11 +1,10 @@
 Autobuild
     http://autobuild.rubyforge.org
 
-= Introduction
+Copyright (c) 2006-2007
+    Sylvain Joyeux <sylvain.joyeux@m4x.org>
 
-== WARNING for 0.5 users
-Old configuration files used with autobuild 0.5 aren't accepted by Autobuild 0.6. Since 0.6, Autobuild 
-uses Ruby for configuration (just like rake does)
+This work is licensed under the GPLv2 license. See License.txt for details
 
 == What's autobuild ?
 Autobuild imports, configures, builds and installs various kinds of software packages.
@@ -13,14 +12,20 @@ It can be used in software development to make sure that nothing is broken in th
 build process of a set of packages, or can be used as an automated installation tool.
 
 Autobuild config files are Ruby scripts which configure rake to
-* import the package from a SCM or (optionnaly) updates it
-* configures it. This phase can handle code generation, configuration (for instance for autotools-based
-packages), ...
+* imports the package from a SCM or (optionnaly) updates it
+* configures it. This phase can handle code generation, configuration (for
+  instance for autotools-based packages), ...
 * build
 * install
 
-It takes the dependencies between packages into account in its build process, updates the needed environment
-variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
+It takes the dependencies between packages into account in its build process,
+updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+,
++LD_LIBRARY_PATH+, ...)
+
+
+== WARNING for 0.5 users
+Old configuration files used with autobuild 0.5 aren't accepted by Autobuild
+0.6. Since 0.6, Autobuild uses Ruby for configuration (just like rake does)
 
 == Available packages
 === Common usage

data/Rakefile

@@ -1,16 +1,17 @@
 require 'hoe'
-require './lib/autobuild'
+require 'lib/autobuild'
 
 Hoe.new('autobuild', Autobuild::VERSION) do |p|
     p.author = "Sylvain Joyeux"
     p.email = "sylvain.joyeux@m4x.org"
 
     p.summary = 'Rake-based utility to build and install multiple packages with dependencies'
-    p.url	  = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
     p.description = p.paragraphs_of('README.txt', 3..5).join("\n\n")
-    p.changes     = p.paragraphs_of("Changes.txt", 1).join("\n\n")
-    p.extra_deps = [['rake', '>= 0.7.0']]
-    p.extra_deps << ['rmail']
-    p.extra_deps << ['daemons']
+    p.url         = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+    p.changes     = p.paragraphs_of('Changes.txt', 0..2).join("\n\n")
+
+    p.extra_deps << ['rake', '>= 0.7.0']
+    p.extra_deps << 'rmail'
+    p.extra_deps << 'daemons'
 end
 

data/lib/autobuild.rb

@@ -1,7 +1,8 @@
-module Autobuild
-    VERSION = "0.6.3"
-end
-
 require 'autobuild/config'
 require 'autobuild/reporting'
 require 'autobuild/package'
+
+module Autobuild
+    VERSION = "0.6.4" unless defined? Autobuild::VERSION
+end
+

data/lib/autobuild/import/cvs.rb

@@ -25,7 +25,7 @@ module Autobuild
         def update(package)
             Dir.chdir(package.srcdir) do
 		if !File.exists?("#{package.srcdir}/CVS/Root")
-		    raise ConfigException, "#{package.srcdir} does not look like a CVS checkout"
+		    raise ConfigException, "#{package.srcdir} is not a CVS working copy"
 		end
 
 		root = File.open("#{package.srcdir}/CVS/Root") { |io| io.read }.chomp

data/lib/autobuild/import/darcs.rb

@@ -15,6 +15,10 @@ module Autobuild
         private
 
         def update(package)
+	    if !File.directory?( File.join(package.srcdir, '_darcs') )
+		raise ConfigException, "#{package.srcdir} is not a Darcs repository"
+	    end
+
 	    Subprocess.run(package.name, :import, @program, 
 	       'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull)
         end

data/lib/autobuild/import/svn.rb

@@ -15,8 +15,17 @@ module Autobuild
 
         def update(package)
             Dir.chdir(package.srcdir) {
-		url = IO.popen("svn info") { |io| io.readlines }.grep(/^URL: /).first.chomp
-		url =~ /URL: (.+)/
+		old_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
+		svninfo = IO.popen("svn info") { |io| io.readlines }
+		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"
+		    else
+			raise ConfigException, "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}"

data/test/test_import_cvs.rb

@@ -32,13 +32,27 @@ class TC_CVSImport < Test::Unit::TestCase
         # Make an update
         importer.import(pkg_cvs)
 
-        # Make an update fail
+        # Make an update fail because the repository does not exist anymore
         FileUtils.rm_rf cvsroot
         assert_raise(Autobuild::SubcommandFailed) { importer.import pkg_cvs }
 
-        # Make a checkout fail
+        # Make a checkout fail because the repository does not exist anymore
         FileUtils.rm_rf pkg_cvs.srcdir
         assert_raise(Autobuild::SubcommandFailed) { importer.import pkg_cvs }
+
+	# Recreate the repository, and make a checkout fail because the 
+	# WC is not a CVS WC
+        TestTools.untar('cvsroot.tar')
+        FileUtils.mkdir pkg_cvs.srcdir
+        assert_raise(Autobuild::ConfigException) { importer.import pkg_cvs }
+
+	# Create two repositories, and make the update fail because the
+	# WC is of the wrong source
+	FileUtils.rm_rf pkg_cvs.srcdir
+        importer.import(pkg_cvs)
+	FileUtils.mv cvsroot, "#{cvsroot}.2"
+        importer = Autobuild.cvs("#{cvsroot}.2", 'cvs')
+        assert_raise(Autobuild::ConfigException) { importer.import pkg_cvs }
     end
 end
 

data/test/test_import_svn.rb

@@ -31,13 +31,25 @@ class TC_SVNImport < Test::Unit::TestCase
         # Make an update
         importer.import(pkg_svn)
 
-        # Make an update fail
+        # Make an update fail because the repository does not exist
         FileUtils.rm_rf svnrepo
         assert_raise(SubcommandFailed) { importer.import(pkg_svn) }
 
-        # Make a checkout fail
+        # Make a checkout fail because the repository does not exist
         FileUtils.rm_rf pkg_svn.srcdir
         assert_raise(SubcommandFailed) { importer.import(pkg_svn) }
+
+	# Recreate the repository and try to update a non-svn directory
+        TestTools.untar('svnroot.tar')
+	FileUtils.mkdir pkg_svn.srcdir
+        assert_raise(ConfigException) { importer.import(pkg_svn) }
+
+	# Try to update a WC which is of a different repository
+	FileUtils.rmdir pkg_svn.srcdir
+	importer.import(pkg_svn)
+	FileUtils.mv svnrepo, "#{svnrepo}.2"
+        importer = Autobuild.svn("file://#{svnrepo}.2/svn")
+        assert_raise(ConfigException) { importer.import(pkg_svn) }
     end
 
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2006-11-22 00:00:00 +01:00
+  version: 0.6.4
+date: 2007-02-12 00:00:00 +01:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
 - lib
 email: sylvain.joyeux@m4x.org
 homepage: "    http://autobuild.rubyforge.org"
 rubyforge_project: autobuild
-description: == What's autobuild ? Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.  Autobuild config files are Ruby scripts which configure rake to * import the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
+description: == What's autobuild ? Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.  Autobuild config files are Ruby scripts which configure rake to * imports the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
 autorequire: 
 default_executable: 
 bindir: bin
@@ -29,16 +29,21 @@ post_install_message:
 authors: 
 - Sylvain Joyeux
 files: 
-- bin/autobuild
 - Changes.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
+- bin/autobuild
+- lib/autobuild.rb
 - lib/autobuild/config.rb
 - lib/autobuild/environment.rb
 - lib/autobuild/exceptions.rb
 - lib/autobuild/import/cvs.rb
 - lib/autobuild/import/darcs.rb
 - lib/autobuild/import/svn.rb
-- lib/autobuild/importer.rb
 - lib/autobuild/import/tar.rb
+- lib/autobuild/importer.rb
 - lib/autobuild/package.rb
 - lib/autobuild/packages/autotools.rb
 - lib/autobuild/packages/genom.rb
@@ -46,13 +51,9 @@ files:
 - lib/autobuild/packages/pkgconfig.rb
 - lib/autobuild/packages/ruby.rb
 - lib/autobuild/pkgconfig.rb
-- lib/autobuild.rb
 - lib/autobuild/reporting.rb
 - lib/autobuild/subcommand.rb
 - lib/autobuild/timestamps.rb
-- Manifest.txt
-- Rakefile
-- README.txt
 - samples/demo.rb
 - test/data/cvsroot.tar
 - test/data/svnroot.tar
@@ -62,7 +63,6 @@ files:
 - test/test_import_tar.rb
 - test/test_subcommand.rb
 - test/tools.rb
-- TODO
 test_files: 
 - test/test_import_tar.rb
 - test/test_subcommand.rb
@@ -106,3 +106,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.7
+    version: