autobuild 1.6.2.b12 → 1.6.2.rc1

data/lib/autobuild/import/git.rb

@@ -203,7 +203,7 @@ module Autobuild
                     end
                 end
 
-                status = merge_status(package, remote_commit)
+                status = merge_status(remote_commit)
                 `git diff --quiet`
                 if $?.exitstatus != 0
                     status.uncommitted_code = true
@@ -279,16 +279,7 @@ module Autobuild
             end
         end
 
-        # Computes the update status to update a branch whose tip is at
-        # reference_commit (which can be a symbolic reference) using the
-        # fetch_commit commit
-        #
-        # I.e. this compute what happens if one would do
-        #
-        #   git checkout reference_commit
-        #   git merge fetch_commit
-        #
-        def merge_status(package, fetch_commit, reference_commit = "HEAD")
+        def merge_status(fetch_commit, reference_commit = "HEAD")
             common_commit = `git merge-base #{reference_commit} #{fetch_commit}`.chomp
             if $?.exitstatus != 0
                 raise PackageException.new(package, 'import'), "failed to find the merge-base between #{reference_commit} and #{fetch_commit}. Are you sure these commits exist ?"
@@ -323,12 +314,12 @@ module Autobuild
                 # If we are tracking a commit/tag, just check it out and return
                 if commit || tag
                     target_commit = (commit || tag)
-                    status_to_head = merge_status(package, target_commit, "HEAD")
+                    status_to_head = merge_status(target_commit, "HEAD")
                     if status_to_head.status == Status::UP_TO_DATE
                         # Check if by any chance we could switch back to a
                         # proper branch instead of having a detached HEAD
                         if detached_head?
-                            status_to_remote = merge_status(package, target_commit, fetch_commit)
+                            status_to_remote = merge_status(target_commit, fetch_commit)
                             if status_to_remote.status != Status::UP_TO_DATE
                                 package.message "  the package is on a detached HEAD because of commit pinning"
                                 return
@@ -340,11 +331,11 @@ module Autobuild
                         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(package, target_commit, fetch_commit)
+                    status_to_remote = merge_status(target_commit, fetch_commit)
                     if status_to_remote.status != Status::UP_TO_DATE
                         # Try very hard to avoid creating a detached HEAD
                         if local_branch
-                            status_to_branch = merge_status(package, target_commit, local_branch)
+                            status_to_branch = merge_status(target_commit, local_branch)
                             if status_to_branch.status == Status::UP_TO_DATE # Checkout the branch
                                 package.message "  checking out specific commit %s for %s. It will checkout branch %s." % [target_commit.to_s, package.name, local_branch]
                                 Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', local_branch)
@@ -373,7 +364,7 @@ module Autobuild
                     end
                 end
 
-                status = merge_status(package, fetch_commit)
+                status = merge_status(fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
                         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"
@@ -404,7 +395,7 @@ module Autobuild
 
                 # If we are tracking a commit/tag, just check it out
                 if commit || tag
-                    status = merge_status(package, commit || tag)
+                    status = merge_status(commit || tag)
                     if status.status != Status::UP_TO_DATE
                         package.message "  checking out specific commit for %s. This will create a detached HEAD." % [package.name]
                         Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', commit || tag)

data/lib/autobuild/package.rb

@@ -101,7 +101,7 @@ module Autobuild
         # false.
         def updated?; !!@updated end
 
-	def initialize(spec = Hash.new)
+	def initialize(spec)
 	    @dependencies   = Array.new
 	    @provides       = Array.new
             @parallel_build_level = nil
@@ -374,31 +374,27 @@ module Autobuild
         # In general, specific package types define a meaningful #with_doc
         # method which calls this method internally.
         def doc_task
-            @doc_task = task "#{name}-doc" do
-                # This flag allows to disable documentation generation
-                # once doc_task has been called
-                if generates_doc?
-                    @installed_doc = false
-                    catch(:doc_disabled) do
-                        begin
-                            yield if block_given?
-
-                            unless @installed_doc
-                                install_doc
-                            end
+            task "#{name}-doc" do
+                @installed_doc = false
+                catch(:doc_disabled) do
+                    begin
+                        yield if block_given?
+
+                        unless @installed_doc
+                            install_doc
+                        end
 
-                        rescue Interrupt
+                    rescue Interrupt
+                        raise
+                    rescue ::Exception => e
+                        if Autobuild.doc_errors
                             raise
-                        rescue ::Exception => e
-                            if Autobuild.doc_errors
-                                raise
+                        else
+                            warn "%s: failed to generate documentation"
+                            if e.kind_of?(SubcommandFailed)
+                                warn "%s: see #{e.logfile} for more details"
                             else
-                                warn "%s: failed to generate documentation"
-                                if e.kind_of?(SubcommandFailed)
-                                    warn "%s: see #{e.logfile} for more details"
-                                else
-                                    warn "%s: #{e.message}"
-                                end
+                                warn "%s: #{e.message}"
                             end
                         end
                     end
@@ -408,30 +404,6 @@ module Autobuild
             task :doc => "#{name}-doc"
         end
 
-        # True if some documentation will be generated and false otherwise.
-        #
-        # This will return true only if a documentation task has been defined by
-        # calling #doc_task _and_ #disable_doc has not been called (or if
-        # #enable_doc has been called after the last call to #disable_doc).
-        def generates_doc?
-            if @doc_disabled
-                return false
-            else
-                return !!@doc_task
-            end
-        end
-
-        # Re-enables documentation generation after #disable_doc has been called
-        def enable_doc
-            @doc_disabled = false
-        end
-
-        # Disables any documentation generation, regardless of whether doc_task
-        # has been called or not.
-        def disable_doc
-            @doc_disabled = true
-        end
-
         def install_doc
             if !File.directory?(self.doc_dir)
                 raise "#{self.doc_dir} was expected to be a directory, but it is not. Check the package's documentation generation, the generated documentation should be in #{self.doc_dir}"

data/lib/autobuild/subcommand.rb

@@ -129,6 +129,7 @@ module Autobuild::Subprocess
 
     CONTROL_COMMAND_NOT_FOUND = 1
     CONTROL_UNEXPECTED = 2
+    CONTROL_INTERRUPT = 3
     def self.run(target, phase, *command)
         STDOUT.sync = true
 
@@ -208,11 +209,12 @@ module Autobuild::Subprocess
             cwrite.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
             pid = fork do
-                if options[:working_directory] && (options[:working_directory] != Dir.pwd)
-                    Dir.chdir(options[:working_directory])
-                end
-                logfile.puts "in directory #{Dir.pwd}"
                 begin
+                    if options[:working_directory] && (options[:working_directory] != Dir.pwd)
+                        Dir.chdir(options[:working_directory])
+                    end
+                    logfile.puts "in directory #{Dir.pwd}"
+
                     cwrite.sync = true
                     if Autobuild.nice
                         Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
@@ -235,10 +237,13 @@ module Autobuild::Subprocess
                     exec(*command)
                 rescue Errno::ENOENT
                     cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
-                    raise
+                    exit(100)
+                rescue Interrupt
+                    cwrite.write([CONTROL_INTERRUPT].pack('I'))
+                    exit(100)
                 rescue ::Exception
                     cwrite.write([CONTROL_UNEXPECTED].pack('I'))
-                    raise
+                    exit(100)
                 end
             end
 
@@ -265,6 +270,8 @@ module Autobuild::Subprocess
                 value = value.unpack('I').first
                 if value == CONTROL_COMMAND_NOT_FOUND
                     raise Failed.new, "command '#{command.first}' not found"
+                elsif value == CONTROL_INTERRUPT
+                    raise Interrupt, "command '#{command.first}': interrupted by user"
                 else
                     raise Failed.new, "something unexpected happened"
                 end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.6.2.b12" unless defined? Autobuild::VERSION
+    VERSION = "1.6.2.rc1" unless defined? Autobuild::VERSION
 end
 
 

data/test/test_subcommand.rb

@@ -3,12 +3,10 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 require 'test/unit'
 require 'tools'
 
-require 'autobuild/config'
-require 'autobuild/subcommand'
+require 'autobuild'
 require 'tmpdir'
 require 'fileutils'
-
-include Autobuild
+require 'flexmock/test_unit'
 
 class TC_Subcommand < Test::Unit::TestCase
 EXAMPLE_1 = <<EOF
@@ -31,29 +29,25 @@ EOF
         @source2 = File.join(tmpdir, '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_logfiles
-        assert_raise(SubcommandFailed) { || Subprocess.run('test', 'copy', 'cat', 'bla') }
-        
-        Subprocess.run('test', 'simple', 'cat', nil, '', source1)
-	result_content = File.readlines(File.join(tmpdir, 'test-simple.log'))[1..-1].join
-        assert_equal(EXAMPLE_1, result_content)
-
-        Subprocess.run('test', 'use-lt', 'cat', "<#{source1}")
-	result_content = File.readlines(File.join(tmpdir, 'test-use-lt.log'))[1..-1].join
-        assert_equal(EXAMPLE_1, result_content)
-
-        Subprocess.run('test', 'use-both', 'cat', source1, '-', "<#{source2}")
-        result = File.open( File.join(tmpdir, 'test-use-both.log') ) do |f|
-            f.readlines
-        end
-	result = result[1..-1].join
-        assert_equal(EXAMPLE_1 + EXAMPLE_2, result)
+    def test_behaviour_on_unexpected_error
+        flexmock(Autobuild::Subprocess).should_receive(:exec).and_raise(::Exception)
+        assert_raises(Autobuild::SubcommandFailed) { Autobuild::Subprocess.run('test', 'test', 'does_not_exist') }
+    end
+    def test_behaviour_on_inexistent_command
+        assert_raises(Autobuild::SubcommandFailed) { Autobuild::Subprocess.run('test', 'test', 'does_not_exist') }
+    end
+    def test_behaviour_on_interrupt
+        flexmock(Autobuild::Subprocess).should_receive(:exec).and_raise(Interrupt)
+        assert_raises(Interrupt) { Autobuild::Subprocess.run('test', 'test', 'does_not_exist') }
     end
 end
 

metadata

@@ -1,97 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autobuild
-version: !ruby/object:Gem::Version 
-  hash: 4225852661
+version: !ruby/object:Gem::Version
+  version: 1.6.2.rc1
   prerelease: 6
-  segments: 
-  - 1
-  - 6
-  - 2
-  - b
-  - 12
-  version: 1.6.2.b12
 platform: ruby
-authors: 
+authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17308940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17308940
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: &17308360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *17308360
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &17306940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *17306940
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &17321240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id004
-description: Collection of classes to handle build systems (CMake, autotools, ...) and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj) integrated software project management tool.
+  prerelease: false
+  version_requirements: *17321240
+description: Collection of classes to handle build systems (CMake, autotools, ...)
+  and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
+  to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
+  integrated software project management tool.
 email: rock-dev@dfki.de
-executables: 
+executables:
 - autobuild
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Changes.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -134,47 +110,35 @@ files:
 - test/test_import_tar.rb
 - test/test_subcommand.rb
 - test/tools.rb
-- test/test_package.rb
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: autobuild
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
-test_files: 
+test_files:
+- test/test_import_cvs.rb
+- test/test_subcommand.rb
 - test/test_import_svn.rb
 - test/test_import_tar.rb
-- test/test_subcommand.rb
-- test/test_package.rb
-- test/test_import_cvs.rb

data/test/test_package.rb

@@ -1,21 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
-$LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
-require 'test/unit'
-require 'test/tools'
-require 'autobuild'
-
-class TC_Package < Test::Unit::TestCase
-    include Autobuild
-
-    def test_generates_doc_p
-        pkg = Autobuild::Package.new
-        assert !pkg.generates_doc?
-        pkg.doc_task
-        assert pkg.generates_doc?
-        pkg.disable_doc
-        assert !pkg.generates_doc?
-        pkg.enable_doc
-        assert pkg.generates_doc?
-    end
-end
-