autobuild 1.7.3.rc2 → 1.7.3.rc3

data/lib/autobuild/import/archive.rb

@@ -44,6 +44,18 @@ module Autobuild
             end
         end
 
+        # Tells the importer that the checkout should be automatically deleted
+        # on update, without asking the user
+        # @return [Boolean] true if the archive importer should automatically
+        #   delete the current checkout when the archive changed, false
+        #   otherwise. The default is to set it to true if the
+        #   AUTOBUILD_ARCHIVE_AUTOUPDATE environment variable is set to 1, and
+        #   to false in all other cases
+        def self.auto_update?
+            @auto_update
+        end
+        @auto_update = (ENV['AUTOBUILD_ARCHIVE_AUTOUPDATE'] == '1')
+
         def update_cached_file?; @options[:update_cached_file] end
 
 		
@@ -233,20 +245,26 @@ module Autobuild
             # Check whether the archive file changed, and if that is the case
             # then ask the user about deleting the folder
             if File.file?(checkout_digest_stamp(package)) && archive_changed?(package)
-                package.progress_done
-                package.message "The archive #{@url.to_s} is different from the one currently checked out at #{package.srcdir}", :bold
-                package.message "  I will have to delete the current folder to go on with the update"
-                response = HighLine.new.ask "  Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems.", String do |q|
-                    q.overwrite = true
-                    q.in = ['yes', 'no']
-                    q.default = 'yes'
-                    q.case = :downcase
+                if ArchiveImporter.auto_update?
+                    response = 'yes'
+                else
+                    package.progress_done
+                    package.message "The archive #{@url.to_s} is different from the one currently checked out at #{package.srcdir}", :bold
+                    package.message "I will have to delete the current folder to go on with the update"
+                    response = HighLine.new.ask "  Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems.", String do |q|
+                        q.overwrite = true
+                        q.in = ['yes', 'no']
+                        q.default = 'yes'
+                        q.case = :downcase
+                    end
                 end
+
                 if response == "no"
-                    package.message "  Not updating #{package.srcdir}"
+                    package.message "not updating #{package.srcdir}"
+                    package.progress_done
                     return
                 else
-                    package.message "  Deleting #{package.srcdir}"
+                    package.message "deleting #{package.srcdir} to update to new archive"
                     FileUtils.rm_rf package.srcdir
                     package.progress "checking out %s"
                 end

data/lib/autobuild/import/git.rb

@@ -223,16 +223,22 @@ module Autobuild
             return ($?.exitstatus != 0)
         end
 
-        # Checks if the current branch is the target branch. Expects that the
-        # current directory is the package's directory
-        def on_target_branch?
+        def current_branch
             current_branch = `git symbolic-ref HEAD -q`.chomp
             if $?.exitstatus != 0
-                # HEAD cannot be resolved as a symbol. Assume that we are on a
+                # HEAD cannot be resolved as a symbol. We are probably on a
                 # detached HEAD
-                return false
+                return
+            end
+            return current_branch
+        end
+
+        # Checks if the current branch is the target branch. Expects that the
+        # current directory is the package's directory
+        def on_target_branch?
+            if current_branch = self.current_branch
+                current_branch == "refs/heads/#{local_branch}"
             end
-            current_branch == "refs/heads/#{local_branch}"
         end
 
         class Status < Importer::Status

data/lib/autobuild/package.rb

@@ -338,7 +338,7 @@ module Autobuild
         end
 
         def progress_done(done_message = nil)
-            if done_message
+            if done_message && Autobuild.has_progress_for?(self)
                 progress(process_formatting_string(done_message))
             end
             Autobuild.progress_done(self)

data/lib/autobuild/packages/autotools.rb

@@ -156,14 +156,7 @@ module Autobuild
 
 		# Add the --prefix option to the configureflags array
 		testflags = ["--prefix=#{prefix}"] + Array[*configureflags]
-		old_opt = options.find do |o|
-                    if testflags.include?(o)
-                        false
-                    else
-                        name, value = o.split("=")
-                        ENV[name] != value
-                    end
-                end
+		old_opt = options.find { |o| !testflags.include?(o) }
 		new_opt = testflags.find { |o| !options.include?(o) }
 		if old_opt || new_opt
                     if Autobuild.verbose

data/lib/autobuild/reporting.rb

@@ -87,6 +87,11 @@ module Autobuild
         Autobuild.message("  WARN: #{message}", :magenta, *style)
     end
 
+    # @return [Boolean] true if there is some progress messages for the given
+    #   key
+    def self.has_progress_for?(key)
+        progress_messages.any? { |msg_key, _| msg_key == key }
+    end
 
     def self.progress_start(key, *args)
         if args.last.kind_of?(Hash)
@@ -108,7 +113,7 @@ module Autobuild
         if block_given?
             begin
                 yield
-                if options[:done_message]
+                if options[:done_message] && has_progress_for?(key)
                     progress(key, *options[:done_message])
                 end
                 progress_done(key, true)

data/lib/autobuild/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.3.rc2
+  version: 1.7.3.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16804000 !ruby/object:Gem::Requirement
+  requirement: &13610200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *16804000
+  version_requirements: *13610200
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &16803220 !ruby/object:Gem::Requirement
+  requirement: &13609360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *16803220
+  version_requirements: *13609360
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &16802320 !ruby/object:Gem::Requirement
+  requirement: &13608820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,29 +43,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16802320
+  version_requirements: *13608820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16801420 !ruby/object:Gem::Requirement
+  requirement: &13607660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *16801420
+  version_requirements: *13607660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &16800600 !ruby/object:Gem::Requirement
+  requirement: &13606280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *16800600
+  version_requirements: *13606280
 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)