autobuild 1.8.3 → 1.9.0.b1

data/test/import/test_svn.rb

@@ -0,0 +1,144 @@
+require 'autobuild/test'
+
+describe Autobuild::SVN do
+    attr_reader :svnrepo, :svnroot, :pkg_svn
+
+    before do
+        untar('svnroot.tar')
+        @svnrepo = File.join(tempdir, 'svnroot')
+        @svnroot = "file://#{svnrepo}/svn"
+        @pkg_svn = Autobuild::Package.new 'svn'
+        pkg_svn.srcdir = File.join(tempdir, 'svn')
+    end
+
+    describe "checkout" do
+        it "checks out the repository if the working copy does not exist" do
+            importer = Autobuild.svn(svnroot)
+            importer.import(pkg_svn)
+            assert File.exist?(File.join(pkg_svn.srcdir, 'test'))
+        end
+
+        it "fails if the repository does not exist" do
+            importer = Autobuild.svn("file:///does/not/exist")
+            assert_raises(Autobuild::SubcommandFailed) { importer.import(pkg_svn) }
+        end
+
+        it "checks out a specific revision" do
+            importer = Autobuild.svn(svnroot, revision: 1)
+            importer.import(pkg_svn)
+            assert_equal 1, importer.svn_revision(pkg_svn)
+        end
+    end
+
+    describe "update" do
+        it "fails with SubcommandFailed if the repository does not exist" do
+            importer = Autobuild.svn(svnroot)
+            importer.import(pkg_svn)
+            FileUtils.rm_rf svnrepo
+            assert_raises(Autobuild::SubcommandFailed) { importer.import(pkg_svn) }
+        end
+
+        it "fails if the working copy is not a svn working copy" do
+            importer = Autobuild.svn(svnroot)
+            FileUtils.mkdir_p pkg_svn.srcdir
+            assert_raises(Autobuild::SubcommandFailed) { importer.import(pkg_svn) }
+        end
+
+        it "updates the working copy" do
+            importer = Autobuild.svn(svnroot, revision: 1)
+            importer.import(pkg_svn)
+            importer.relocate(importer.svnroot, revision: nil)
+            importer.import(pkg_svn)
+            assert_equal 3, importer.svn_revision(pkg_svn)
+        end
+
+        it "updates if the target revision is not present even if reset is false" do
+            importer = Autobuild.svn(svnroot, revision: 1)
+            importer.import(pkg_svn)
+            importer.relocate(importer.svnroot, revision: 2)
+            importer.import(pkg_svn, reset: false)
+            assert_equal 2, importer.svn_revision(pkg_svn)
+        end
+
+        it "does nothing if the target revision is present and reset is false" do
+            importer = Autobuild.svn(svnroot, revision: 2)
+            importer.import(pkg_svn)
+            importer.relocate(importer.svnroot, revision: 1)
+            importer.import(pkg_svn, reset: false)
+            assert_equal 2, importer.svn_revision(pkg_svn)
+        end
+
+        it "resets to the specified revision if reset is true" do
+            importer = Autobuild.svn(svnroot, revision: 2)
+            importer.import(pkg_svn)
+            importer.relocate(importer.svnroot, revision: 1)
+            importer.import(pkg_svn, reset: true)
+            assert_equal 1, importer.svn_revision(pkg_svn)
+        end
+
+        it "fails if the svnroot is not the same than the WC's svnroot" do
+            importer = Autobuild.svn(svnroot, revision: 1)
+            importer.import(pkg_svn)
+            FileUtils.mv svnrepo, "#{svnrepo}.2"
+            importer = Autobuild.svn("file://#{svnrepo}.2/svn")
+            assert_raises(Autobuild::ConfigException) { importer.import(pkg_svn) }
+        end
+    end
+
+    describe "svn_revision" do
+        it "returns the current checkout revision" do
+            importer = Autobuild.svn(svnroot, revision: 2)
+            importer.import(pkg_svn)
+            assert_equal 2, importer.svn_revision(pkg_svn)
+        end
+    end
+
+    describe "status" do
+        it "lists the log entries that are on the remote but not locally" do
+            importer = Autobuild.svn(svnroot, revision: 1)
+            importer.import(pkg_svn)
+            importer.relocate(importer.svnroot, revision: nil)
+            status = importer.status(pkg_svn)
+            assert_equal 2, status.remote_commits.size
+            assert(/second revision/ === status.remote_commits[0], status.remote_commits[0])
+        end
+
+        it "indicates if there are no local modifications" do
+            importer = Autobuild.svn(svnroot, revision: 1)
+            importer.import(pkg_svn)
+            assert !importer.status(pkg_svn).uncommitted_code
+        end
+
+        it "indicates if there are modified files" do
+            importer = Autobuild.svn(svnroot)
+            importer.import(pkg_svn)
+            File.open(File.join(pkg_svn.srcdir, "test"), 'a') do |io|
+                io.puts "newline"
+            end
+            assert importer.status(pkg_svn).uncommitted_code
+        end
+
+        it "indicates if there are added files" do
+            importer = Autobuild.svn(svnroot)
+            importer.import(pkg_svn)
+            FileUtils.touch File.join(pkg_svn.srcdir, "test3")
+            importer.run_svn(pkg_svn, "add", "test3")
+            assert importer.status(pkg_svn).uncommitted_code
+        end
+
+        it "indicates if there are removed files" do
+            importer = Autobuild.svn(svnroot)
+            importer.import(pkg_svn)
+            importer.run_svn(pkg_svn, "rm", "test")
+            assert importer.status(pkg_svn).uncommitted_code
+        end
+
+        it "indicates if there are moved files" do
+            importer = Autobuild.svn(svnroot)
+            importer.import(pkg_svn)
+            importer.run_svn(pkg_svn, "mv", "test", 'test3')
+            assert importer.status(pkg_svn).uncommitted_code
+        end
+    end
+end
+ 

data/test/import/test_tar.rb

@@ -0,0 +1,76 @@
+require 'autobuild/test'
+require 'webrick'
+
+class TC_TarImporter < Minitest::Test
+    include Autobuild
+    include WEBrick
+
+    def setup
+        super
+
+        Autobuild.logdir = "#{tempdir}/log"
+        FileUtils.mkdir_p(Autobuild.logdir)
+
+        @datadir = File.join(tempdir, 'data')
+        FileUtils.mkdir_p(@datadir)
+        @tarfile = File.join(@datadir, 'tarimport.tar.gz')
+        FileUtils.cp(File.join(data_dir, 'tarimport.tar.gz'), @tarfile)
+        
+        @cachedir = File.join(tempdir, 'cache')
+    end
+    
+    def test_tar_mode
+        assert_equal(TarImporter::Plain, TarImporter.filename_to_mode('tarfile.tar'))
+        assert_equal(TarImporter::Gzip, TarImporter.filename_to_mode('tarfile.tar.gz'))
+        assert_equal(TarImporter::Bzip, TarImporter.filename_to_mode('tarfile.tar.bz2'))
+    end
+
+    def test_tar_valid_url
+        assert_raises(ConfigException) {
+            TarImporter.new 'ccc://localhost/files/tarimport.tar.gz', :cachedir => @cachedir
+        }
+    end
+
+    def web_server
+        s = HTTPServer.new :Port => 2000, :DocumentRoot => tempdir
+        s.mount("/files", HTTPServlet::FileHandler, tempdir)
+        webrick = Thread.new { s.start }
+
+        yield
+
+    ensure
+        s.shutdown
+    end
+
+    def test_tar_remote
+        web_server do
+            # Try to get the file through the http server
+            pkg = Package.new 'tarimport'
+            pkg.srcdir = File.join(tempdir, 'tarimport')
+            importer = TarImporter.new 'http://localhost:2000/files/data/tarimport.tar.gz',
+                cachedir: @cachedir,
+                update_cached_file: true
+
+            importer.checkout(pkg)
+            assert(File.directory?(pkg.srcdir))
+            assert(!importer.update_cache(pkg))
+
+            sleep 2 # The Time class have a 1-second resolution
+            FileUtils.touch @tarfile
+            assert(importer.update_cache(pkg))
+            assert(!importer.update_cache(pkg))
+        end
+    end
+
+    def test_tar_remote_notfound
+        web_server do
+            # Try to get the file through the http server
+            pkg = Package.new 'tarimport'
+            pkg.srcdir = File.join(tempdir, 'tarimport')
+            importer = TarImporter.new 'http://localhost:2000/files/data/tarimport-nofile.tar.gz', :cachedir => @cachedir
+
+            assert_raises(Autobuild::SubcommandFailed) { importer.checkout(pkg) }
+        end
+    end
+end
+ 

data/test/suite.rb

@@ -0,0 +1,7 @@
+require 'autobuild/test'
+require 'test/test_reporting'
+require 'test/test_subcommand'
+require 'test/import/test_cvs'
+require 'test/import/test_git'
+require 'test/import/test_svn'
+require 'test/import/test_tar'

data/test/test_config.rb

@@ -1,5 +1,4 @@
-require 'minitest/spec'
-require 'autobuild'
+require 'autobuild/test'
 require 'fakefs/safe'
 require 'flexmock'
 
@@ -27,9 +26,6 @@ describe Autobuild do
     end
 
     describe "tool_in_path" do
-        include FlexMock::ArgumentTypes
-        include FlexMock::MockContainer
-
         before do
             FakeFS.activate!
             flexmock(Autobuild).should_receive(:tool).with('bla').and_return('a_test_name').by_default

data/test/test_environment.rb

@@ -0,0 +1,88 @@
+require 'autobuild/test'
+
+describe 'Autobuild environment management' do
+    after do
+        Autobuild.env_reset 'AUTOBUILD_TEST'
+        Autobuild.env_inherit 'AUTOBUILD_TEST', false
+    end
+
+    describe "an inherited environment variable" do
+        before do
+            Autobuild::ORIGINAL_ENV['AUTOBUILD_TEST'] = "val1:val0"
+            Autobuild.env_inherit 'AUTOBUILD_TEST'
+        end
+        describe "#env_push_path" do
+            it "does not re-read the inherited environment" do
+            end
+            it "adds the new path at the beginning of the variable, before the inherited environment" do
+                Autobuild.env_push_path 'AUTOBUILD_TEST', 'newval1'
+                Autobuild.env_push_path 'AUTOBUILD_TEST', 'newval0'
+                assert_equal 'newval1:newval0:val1:val0',
+                    ENV['AUTOBUILD_TEST']
+            end
+        end
+        describe "#env_add_path" do
+            it "does not re-read the inherited environment" do
+                Autobuild::ORIGINAL_ENV['AUTOBUILD_TEST'] = 'val2:val3'
+                Autobuild.env_add_path 'AUTOBUILD_TEST', 'newval'
+                assert_equal 'newval:val1:val0',
+                    ENV['AUTOBUILD_TEST']
+            end
+            it "adds the new path at the end of the variable, before the inherited environment" do
+                Autobuild.env_add_path 'AUTOBUILD_TEST', 'newval0'
+                Autobuild.env_add_path 'AUTOBUILD_TEST', 'newval1'
+                assert_equal 'newval1:newval0:val1:val0',
+                    ENV['AUTOBUILD_TEST']
+            end
+        end
+        describe "#env_set" do
+            it "does not reinitialize the inherited environment" do
+                Autobuild::ORIGINAL_ENV['AUTOBUILD_TEST'] = 'val2:val3'
+                Autobuild.env_set 'AUTOBUILD_TEST', 'newval'
+                assert_equal 'newval:val1:val0', ENV['AUTOBUILD_TEST']
+            end
+            it "resets the current value to the expected one" do
+                Autobuild.env_set 'AUTOBUILD_TEST', 'newval0', 'newval1'
+                assert_equal 'newval0:newval1:val1:val0', ENV['AUTOBUILD_TEST']
+                Autobuild.env_set 'AUTOBUILD_TEST', 'newval2', 'newval3'
+                assert_equal 'newval2:newval3:val1:val0', ENV['AUTOBUILD_TEST']
+            end
+        end
+        describe "#env_clear" do
+            it "completely unsets the variable" do
+                Autobuild.env_clear 'AUTOBUILD_TEST'
+                assert !ENV.include?('AUTOBUILD_TEST')
+            end
+        end
+    end
+
+    describe "a not-inherited environment variable" do
+        before do
+            Autobuild::ORIGINAL_ENV['AUTOBUILD_TEST'] = "val1:val0"
+            Autobuild.env_reset 'AUTOBUILD_TEST'
+        end
+
+        describe "#env_push_path" do
+            it "adds the new path at the beginning of the variable" do
+                Autobuild.env_push_path 'AUTOBUILD_TEST', 'newval1'
+                Autobuild.env_push_path 'AUTOBUILD_TEST', 'newval0'
+                assert_equal 'newval1:newval0',
+                    ENV['AUTOBUILD_TEST']
+            end
+        end
+        describe "#env_add_path" do
+            it "adds the new path at the end of the variable" do
+                Autobuild.env_add_path 'AUTOBUILD_TEST', 'newval0'
+                Autobuild.env_add_path 'AUTOBUILD_TEST', 'newval1'
+                assert_equal 'newval1:newval0',
+                    ENV['AUTOBUILD_TEST']
+            end
+        end
+        describe "#env_clear" do
+            it "completely unsets the variable" do
+                Autobuild.env_clear 'AUTOBUILD_TEST'
+                assert !ENV.include?('AUTOBUILD_TEST')
+            end
+        end
+    end
+end

data/test/test_reporting.rb

@@ -1,18 +1,6 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
-require 'test/unit'
-require 'tools'
-
-require 'autobuild'
-require 'tmpdir'
-require 'fileutils'
-require 'flexmock/test_unit'
-
-class TC_Reporting < Test::Unit::TestCase
-    def teardown
-        Autobuild::Package.clear
-    end
+require 'autobuild/test'
 
+class TC_Reporting < Minitest::Test
     def test_format_progress_message_does_not_touch_messages_without_prefix
         assert_equal "a | b | c",
             Autobuild.format_progress_message(%w{a b c})

data/test/test_subcommand.rb

@@ -1,14 +1,6 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
-require 'test/unit'
-require 'tools'
+require 'autobuild/test'
 
-require 'autobuild'
-require 'tmpdir'
-require 'fileutils'
-require 'flexmock/test_unit'
-
-class TC_Subcommand < Test::Unit::TestCase
+class TC_Subcommand < Minitest::Test
 EXAMPLE_1 = <<EOF
 This is a file
 It will be the first part of the two-part cat
@@ -18,24 +10,17 @@ EXAMPLE_2 = <<EOF
 This is another file
 It will be the second part of the two-part cat
 EOF
-
-    attr_reader :tmpdir
     attr_reader :source1, :source2
     def setup
-        @tmpdir = Autobuild.logdir = TestTools.tempdir
+        super
+
+        Autobuild.logdir = tempdir
 
         # Write example files
-        @source1 = File.join(tmpdir, 'source1')
-        @source2 = File.join(tmpdir, 'source2')
+        @source1 = File.join(tempdir, 'source1')
+        @source2 = File.join(tempdir, 'source2')
         File.open(source1, 'w+') { |f| f.write(EXAMPLE_1) }
         File.open(source2, 'w+') { |f| f.write(EXAMPLE_2) }
-
-        super
-    end
-
-    def teardown
-        super
-        TestTools.clean
     end
 
     def test_behaviour_on_unexpected_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0.b1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,21 +129,29 @@ files:
 - lib/autobuild/rake_task_extension.rb
 - lib/autobuild/reporting.rb
 - lib/autobuild/subcommand.rb
+- lib/autobuild/test.rb
 - lib/autobuild/timestamps.rb
 - lib/autobuild/tools.rb
 - lib/autobuild/utility.rb
 - lib/autobuild/version.rb
 - samples/openrobots.autobuild
 - test/data/cvsroot.tar
+- test/data/gitrepo-with-extra-commit-and-tag.tar
+- test/data/gitrepo.tar
+- test/data/gitrepo/test
+- test/data/gitrepo/test2
+- test/data/gitrepo/test3
 - test/data/svnroot.tar
 - test/data/tarimport.tar.gz
+- test/import/test_cvs.rb
+- test/import/test_git.rb
+- test/import/test_svn.rb
+- test/import/test_tar.rb
+- test/suite.rb
 - test/test_config.rb
-- test/test_import_cvs.rb
-- test/test_import_svn.rb
-- test/test_import_tar.rb
+- test/test_environment.rb
 - test/test_reporting.rb
 - test/test_subcommand.rb
-- test/tools.rb
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses:
 - BSD
@@ -161,9 +169,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -171,9 +179,4 @@ signing_key:
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
 test_files:
-- test/test_config.rb
-- test/test_import_cvs.rb
-- test/test_import_svn.rb
-- test/test_import_tar.rb
-- test/test_reporting.rb
-- test/test_subcommand.rb
+- test/suite.rb