autobuild 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 25014dd95ce502bebe2ffe0c7e8247042d4c64c1
-  data.tar.gz: 795990e0fb678cbc772882121735c50e306a1d21
+SHA256:
+  metadata.gz: c5db12f4baef9f5192a60e44c30b9db25301eeada8b07706dc29b07f8a3d72f9
+  data.tar.gz: '078bd5a842db6b28dcc83934074291860998f7688bb8186d7ca1c1b40510054f'
 SHA512:
-  metadata.gz: afefb1dcef0ae0ad2413715f69ec890283ed51b581dae702c1e55a9f32615527d06029c575e8c94f02f18b054c1652a8d46a39a45174c68e4a66cd98db4d4c47
-  data.tar.gz: 7663d891ffc50ad4099daecbfd6af60b2793696e64b9e5bd59aedca72cf417f03bba1cce095023dc12b01b5d9cb951bc604a02ce8bf48cdad1f9b89259720ed9
+  metadata.gz: 86b505fbc092682443ae1cf05403ad72ef2cba0cd5f0c42d9b1e70f352f37221a5304baf2a0b1391ccb9b2d8247580abbbe4ab7c503c1a480c7ded04d01e1314
+  data.tar.gz: a6110dd2e3f714a9213973f4eebbcee346357295e56970b798f413c692c59cfb49ac2b90399890827ffff101d1e564cce3ca715d36d260acbe290096633e18d8

data/.travis.yml

@@ -1,4 +1,4 @@
-sudo: false
+sudo: true
 language: ruby
 rvm:
   - '2.1'
@@ -10,3 +10,11 @@ rvm:
 matrix:
     allow_failures:
         - rvm: 'jruby-9.1.15.0'
+
+install:
+  - gem install bundler
+  - bundle install --path vendor/bundle
+
+script:
+  - bundle exec rake
+  - bundle exec rake test

data/lib/autobuild/environment.rb

@@ -13,7 +13,7 @@ def self.macos?
         @macos
     end
 
-    @freebsd = RbConfig::CONFIG["host_os"].include?('freebsd') 
+    @freebsd = RbConfig::CONFIG["host_os"].include?('freebsd')
     def self.freebsd?
         @freebsd
     end
@@ -77,7 +77,7 @@ class Environment
         #
         # If inherited_environment[varname] is true, the generated shell script
         # will contain
-        #   
+        #
         #   export VARNAME=new_value:new_value:$VARNAME
         #
         # otherwise
@@ -113,7 +113,7 @@ def initialize
 
             @system_env = Hash.new
             @original_env = ORIGINAL_ENV.dup
-            
+
             @default_pkgconfig_search_suffixes = nil
             @arch_names = nil
             @target_arch = nil
@@ -142,8 +142,8 @@ def initialize_copy(old)
                 map_value { |k, v| v.dup if v }
             @environment = @environment.
                 map_value { |k, v| v.dup if v }
-            @source_before = @source_before.dup
-            @source_after = @source_after.dup
+            @source_before = Marshal.load(Marshal.dump(@source_before)) # deep copy
+            @source_after = Marshal.load(Marshal.dump(@source_after)) # deep copy
             @inherited_variables = @inherited_variables.dup
 
             @system_env = @system_env.
@@ -157,7 +157,7 @@ def [](name)
         end
 
         # Resets the value of +name+ to its original value. If it is inherited from
-        # the 
+        # the
         def reset(name = nil)
             if name
                 environment.delete(name)
@@ -174,7 +174,7 @@ def reset(name = nil)
         # value.
         #
         # In a bourne shell, this would be equivalent to doing
-        #   
+        #
         #   unset name
         #
         def clear(name = nil)
@@ -212,7 +212,7 @@ def unset(name)
         # @see env_inherit env_inherit=
         def inherit?(name = nil)
             if @inherit
-                if name 
+                if name
                     @inherited_variables.include?(name)
                 else true
                 end
@@ -248,7 +248,7 @@ def inherit(*names)
                     names.pop
                 else true
                 end
-            
+
             if flag
                 @inherited_variables |= names
                 names.each do |env_name|
@@ -446,10 +446,12 @@ def push_path(name, *values)
         # @overload source_before(path)
         #   @param [String] path a path that should be added to source_before
         #
-        def source_before(file = nil)
+        def source_before(file = nil, shell: 'sh')
             if file
-                @source_before << file
-            else @source_before
+                @source_before << { file: file, shell: shell }
+                source_before(shell: shell) # for backwards compatibility
+            else @source_before.select { |pair| pair[:shell] == shell }
+                               .map { |item| item[:file] }
             end
         end
 
@@ -462,10 +464,12 @@ def source_before(file = nil)
         # @overload source_after(path)
         #   @param [String] path a path that should be added to source_after
         #
-        def source_after(file = nil)
+        def source_after(file = nil, shell: 'sh')
             if file
-                @source_after << file
-            else @source_after
+                @source_after << { file: file, shell: shell }
+                source_after(shell: shell) # for backwards compatibility
+            else @source_after.select { |pair| pair[:shell] == shell }
+                              .map { |item| item[:file] }
             end
         end
 
@@ -502,9 +506,9 @@ def exported_environment
         # Autobuild.inherited_environment.
         #
         # It also sources the files added by source_file
-        def export_env_sh(io)
+        def export_env_sh(io, shell: 'sh')
             export = exported_environment
-            source_before.each do |path|
+            source_before(shell: shell).each do |path|
                 io.puts SHELL_SOURCE_SCRIPT % path
             end
             export.unset.each do |name|
@@ -518,7 +522,7 @@ def export_env_sh(io)
                 io.puts SHELL_CONDITIONAL_SET_COMMAND % [name, with_inheritance.join(File::PATH_SEPARATOR), without_inheritance.join(File::PATH_SEPARATOR)]
                 io.puts SHELL_EXPORT_COMMAND % [name]
             end
-            source_after.each do |path|
+            source_after(shell: shell).each do |path|
                 io.puts SHELL_SOURCE_SCRIPT % [path]
             end
         end
@@ -568,7 +572,7 @@ def self.pathvar(path, varname)
         def each_env_search_path(prefix, patterns)
             arch_names = self.arch_names
             arch_size  = self.arch_size
-            
+
             seen = Set.new
             patterns.each do |base_path|
                 paths = []
@@ -833,16 +837,16 @@ def self.env_push_path(name, *values)
         env.push_path(name, *values)
     end
     # @deprecated, use the API on {env} instead
-    def self.env_source_file(file)
-        env.source_after(file)
+    def self.env_source_file(file, shell: 'sh')
+        env.source_after(file, shell: shell)
     end
     # @deprecated, use the API on {env} instead
-    def self.env_source_before(file = nil)
-        env.source_before(file)
+    def self.env_source_before(file = nil, shell: 'sh')
+        env.source_before(file, shell: shell)
     end
     # @deprecated, use the API on {env} instead
-    def self.env_source_after(file = nil)
-        env.source_after(file)
+    def self.env_source_after(file = nil, shell: 'sh')
+        env.source_after(file, shell: shell)
     end
     # @deprecated, use the API on {env} instead
     def self.export_env_sh(io)
@@ -877,4 +881,3 @@ def self.arch_names
         env.arch_names
     end
 end
-

data/lib/autobuild/import/archive.rb

@@ -2,15 +2,8 @@
 require 'digest/sha1'
 require 'open-uri'
 require 'fileutils'
-
-WINDOWS = RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)! 
-if WINDOWS 
-        require 'net/http' 
-        require 'net/https'
-        require 'rubygems/package'
-        require 'zlib'
-end
-
+require 'net/http'
+require 'net/https'
 
 module Autobuild
     class ArchiveImporter < Importer
@@ -30,7 +23,10 @@ class ArchiveImporter < Importer
         }
 
         # Known URI schemes for +url+
-        VALID_URI_SCHEMES = [ 'file', 'http', 'https', 'ftp' ]
+        VALID_URI_SCHEMES = ['file', 'http', 'https', 'ftp']
+
+        # Known URI schemes for +url+ on windows
+        WINDOWS_VALID_URI_SCHEMES = ['file', 'http', 'https']
 
         class << self
             # The directory in which downloaded files are saved
@@ -100,34 +96,83 @@ def self.filename_to_mode(filename)
         def self.auto_update?
             @auto_update
         end
+        def self.auto_update=(flag)
+            @auto_update = flag
+        end
         @auto_update = (ENV['AUTOBUILD_ARCHIVE_AUTOUPDATE'] == '1')
 
-        def update_cached_file?; @options[:update_cached_file] end
+        attr_writer :update_cached_file
+        def update_cached_file?
+            @update_cached_file
+        end
+
+        def download_http(package, uri, filename, user: nil, password: nil,
+                current_time: nil)
+            request = Net::HTTP::Get.new(uri)
+            if current_time
+                request['If-Modified-Since'] = current_time.rfc2822
+            end
+            if user
+                request.basic_auth user, password
+            end
 
-                
-        def get_url_on_windows(url, filename)
-            uri = URI(url)              
+            Net::HTTP.start(
+                uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
 
-            http = Net::HTTP.new(uri.host,uri.port)
-            http.use_ssl = true if uri.port == 443
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE  #Unsure, critical?, Review this
-            resp = http.get(uri.request_uri)
+                http.request(request) do |resp|
+                    case resp
+                    when Net::HTTPNotModified
+                        return false
+                    when Net::HTTPSuccess
+                        if current_time && (last_modified = resp.header['last-modified'])
+                            return false if current_time >= Time.rfc2822(last_modified)
+                        end
+                        if (length = resp.header['Content-Length'])
+                            length = Integer(length)
+                            expected_size = "/#{Autobuild.human_readable_size(length)}"
+                        end
 
-            if resp.code == "301" or resp.code == "302"
-                get_url_on_windows(resp.header['location'],filename)
-            else
-                if resp.message != 'OK'
-                    raise "Could not get File from url \"#{url}\", got response #{resp.message} (#{resp.code})"
-                end
-                open(filename, "wb") do |file|
-                    file.write(resp.body)
+                        File.open(filename, 'wb') do |io|
+                            size = 0
+                            next_update = Time.now
+                            resp.read_body do |chunk|
+                                io.write chunk
+                                size += chunk.size
+                                if size != 0 && (Time.now > next_update)
+                                    formatted_size = Autobuild.human_readable_size(size)
+                                    package.progress "downloading %s "\
+                                        "(#{formatted_size}#{expected_size})"
+                                    next_update = Time.now + 1
+                                end
+                            end
+                            formatted_size = Autobuild.human_readable_size(size)
+                            package.progress "downloaded %s "\
+                                "(#{formatted_size}#{expected_size})"
+                        end
+                    when Net::HTTPRedirection
+                        if (location = resp.header['location']).start_with?('/')
+                            redirect_uri = uri.dup
+                            redirect_uri.path = resp.header['location']
+                        else
+                            redirect_uri = location
+                        end
+
+                        return download_http(package, URI(redirect_uri), filename,
+                            user: user, password: password, current_time: current_time)
+                    else
+                        raise PackageException.new(package, 'import'),
+                            "failed download of #{package.name} from #{uri}: #{resp.class}"
+                    end
                 end
             end
+            true
         end
-        
-        def extract_tar_on_windows(filename,target)
-            Gem::Package::TarReader.new(Zlib::GzipReader.open(filename)).each do |entry|
-                newname = File.join(target,entry.full_name.slice(entry.full_name.index('/'),entry.full_name.size))
+
+        def extract_tar_gz(io, target)
+            Gem::Package::TarReader.new(io).each do |entry|
+                newname = File.join(
+                    target,
+                    entry.full_name.slice(entry.full_name.index('/'), entry.full_name.size))
                 if(entry.directory?)
                     FileUtils.mkdir_p(newname)
                 end
@@ -142,68 +187,80 @@ def extract_tar_on_windows(filename,target)
                 end
             end
         end
-        
-        # Updates the downloaded file in cache only if it is needed
-        def update_cache(package)
-            do_update = false
-
-            if !File.file?(cachefile)
-                do_update = true
-            elsif self.update_cached_file?
-                cached_size = File.lstat(cachefile).size
-                cached_mtime = File.lstat(cachefile).mtime
-
-                size, mtime = nil
-                if @url.scheme == "file"
-                    size  = File.stat(@url.path).size
-                    mtime = File.stat(@url.path).mtime
-                else
-                    open @url, :content_length_proc => lambda { |v| size = v } do |file| 
-                        mtime = file.last_modified
-                    end
-                end
 
-                if mtime && size
-                    do_update = (size != cached_size || mtime > cached_mtime)
-                elsif mtime
-                    package.warn "%s: archive size is not available for #{@url}, relying on modification time"
-                    do_update = (mtime > cached_mtime)
-                elsif size
-                    package.warn "%s: archive modification time is not available for #{@url}, relying on size"
-                    do_update = (size != cached_size)
-                else
-                    package.warn "%s: neither the archive size nor its modification time available for #{@url}, will always update"
-                    do_update = true
+        def update_needed?(package)
+            return true  unless File.file?(cachefile)
+            return false unless update_cached_file?
+
+            cached_size = File.lstat(cachefile).size
+            cached_mtime = File.lstat(cachefile).mtime
+
+            size, mtime = nil
+            if @url.scheme == "file"
+                size  = File.stat(@url.path).size
+                mtime = File.stat(@url.path).mtime
+            else
+                open @url, :content_length_proc => lambda { |v| size = v } do |file|
+                    mtime = file.last_modified
                 end
             end
 
-            if do_update
-                FileUtils.mkdir_p(cachedir)
-                begin
-                    if(WINDOWS)
-                        get_url_on_windows(@url, "#{cachefile}.partial")
-                    elsif Autobuild.bsd?
-                        package.run(:import, Autobuild.tool('curl'), '-Lso',"#{cachefile}.partial", @url)
-                    else
-                        additional_options = []
-                        if timeout = self.timeout
-                            additional_options << "--timeout" << timeout
-                        end
-                        if retries = self.retries
-                            additional_options << "--tries" << retries
-                        end
-                        package.run(:import, Autobuild.tool('wget'), '-q', '-P', cachedir, *additional_options, @url, '-O', "#{cachefile}.partial", retry: true)
+            if mtime && size
+                return size != cached_size || mtime > cached_mtime
+            elsif mtime
+                package.warn "%s: archive size is not available for #{@url}, relying on modification time"
+                return mtime > cached_mtime
+            elsif size
+                package.warn "%s: archive modification time is not available for #{@url}, relying on size"
+                return size != cached_size
+            else
+                package.warn "%s: neither the archive size nor its modification time available for #{@url}, will always update"
+                return true
+            end
+        end
+
+        def download_from_url(package)
+            FileUtils.mkdir_p(cachedir)
+            begin
+                if %w[http https].include?(@url.scheme)
+                    if File.file?(cachefile)
+                        return false unless update_cached_file?
+                        cached_mtime = File.lstat(cachefile).mtime
+                    end
+                    updated = download_http(package, @url, "#{cachefile}.partial",
+                        user: @user, password: @password,
+                        current_time: cached_mtime)
+                    return false unless updated
+                elsif Autobuild.bsd?
+                    return false unless update_needed?(package)
+                    package.run(:import, Autobuild.tool('curl'),
+                                '-Lso',"#{cachefile}.partial", @url)
+                else
+                    return false unless update_needed?(package)
+                    additional_options = []
+                    if timeout = self.timeout
+                        additional_options << "--timeout" << timeout
+                    end
+                    if retries = self.retries
+                        additional_options << "--tries" << retries
                     end
-                rescue Exception
-                    FileUtils.rm_f "#{cachefile}.partial"
-                    raise
+                    package.run(:import, Autobuild.tool('wget'), '-q', '-P', cachedir, *additional_options, @url, '-O', "#{cachefile}.partial", retry: true)
                 end
-                FileUtils.mv "#{cachefile}.partial", cachefile
+            rescue Exception
+                FileUtils.rm_f "#{cachefile}.partial"
+                raise
             end
+            FileUtils.mv "#{cachefile}.partial", cachefile
+            true
+        end
 
+        # Updates the downloaded file in cache only if it is needed
+        #
+        # @return [Boolean] true if a new file was downloaded, false otherwise
+        def update_cache(package)
+            updated = download_from_url(package)
             @cachefile_digest = Digest::SHA1.hexdigest File.read(cachefile)
-
-            do_update
+            updated
         end
 
         # The source URL
@@ -286,16 +343,15 @@ def has_subdirectory?
         #       usually automatically inferred from the filename
         def initialize(url, options = Hash.new)
             sourceopts, options = Kernel.filter_options options,
-                :source_id, :repository_id, :filename, :mode
+                :source_id, :repository_id, :filename, :mode, :update_cached_file,
+                :user, :password
             super(options)
 
             @filename = nil
-            if !@options.has_key?(:update_cached_file)
-                @options[:update_cached_file] = false
-            end
+            @update_cached_file = false
             @cachedir = @options[:cachedir] || ArchiveImporter.cachedir
-            @retries = @options[:retries] || ArchiveImporter.retries
-            @timeout = @options[:timeout] || ArchiveImporter.timeout
+            @retries  = @options[:retries] || ArchiveImporter.retries
+            @timeout  = @options[:timeout] || ArchiveImporter.timeout
             relocate(url, sourceopts)
         end
 
@@ -304,14 +360,31 @@ def relocate(url, options = Hash.new)
             parsed_url = URI.parse(url).normalize
             @url = parsed_url
             if !VALID_URI_SCHEMES.include?(@url.scheme)
-                raise ConfigException, "invalid URL #{@url} (local files must be prefixed with file://)" 
+                raise ConfigException, "invalid URL #{@url} (local files "\
+                    "must be prefixed with file://)"
+            elsif Autobuild.windows?
+                unless WINDOWS_VALID_URI_SCHEMES.include?(@url.scheme)
+                    raise ConfigException, "downloading from a #{@url.scheme} URL "\
+                        "is not supported on windows"
+                end
             end
+
             @repository_id = options[:repository_id] || parsed_url.to_s
-            @source_id = options[:source_id] || parsed_url.to_s
+            @source_id     = options[:source_id] || parsed_url.to_s
 
             @filename = options[:filename] || @filename || File.basename(url).gsub(/\?.*/, '')
+            @update_cached_file = options[:update_cached_file]
 
             @mode = options[:mode] || ArchiveImporter.find_mode_from_filename(filename) || @mode
+            if Autobuild.windows? && (mode != Gzip)
+                raise ConfigException, "only gzipped tar archives are supported on Windows"
+            end
+            @user = options[:user]
+            @password = options[:password]
+            if @user && !%w[http https].include?(@url.scheme)
+                raise ConfigException, "authentication is only supported for http and https URIs"
+            end
+
             if @url.scheme == 'file'
                 @cachefile = @url.path
             else
@@ -332,10 +405,8 @@ def update(package, options = Hash.new) # :nodoc:
 
             if needs_update || archive_changed?(package)
                 checkout(package, allow_interactive: options[:allow_interactive])
+                true
             end
-            (needs_update || archive_changed?(package))
-        rescue OpenURI::HTTPError
-            raise Autobuild::Exception.new(package.name, :import)
         end
 
         def checkout_digest_stamp(package)
@@ -400,7 +471,7 @@ def checkout(package, options = Hash.new) # :nodoc:
                 FileUtils.mkdir_p base_dir
                 cmd = [ '-o', cachefile, '-d', main_dir ]
                 package.run(:import, Autobuild.tool('unzip'), *cmd)
-                
+
                 archive_dir = (self.archive_dir || File.basename(package.name))
                 if archive_dir != File.basename(package.srcdir)
                     FileUtils.rm_rf File.join(package.srcdir)
@@ -414,17 +485,20 @@ def checkout(package, options = Hash.new) # :nodoc:
                 if !@options[:no_subdirectory]
                     cmd << '--strip-components=1'
                 end
-                                
-                if(WINDOWS)
-                    extract_tar_on_windows(cachefile,package.srcdir)
+
+                if Autobuild.windows?
+                    io = if mode == Plain
+                        File.open(cachefile, 'r')
+                    else
+                        Zlib::GzipReader.open(cachefile)
+                    end
+                    extract_tar_gz(io, package.srcdir)
                 else
                     package.run(:import, Autobuild.tool('tar'), *cmd)
                 end
             end
             write_checkout_digest_stamp(package)
 
-        rescue OpenURI::HTTPError
-            raise Autobuild::PackageException.new(package.name, :import)
         rescue SubcommandFailed
             if cachefile != url.path
                 FileUtils.rm_f cachefile
@@ -447,4 +521,3 @@ def self.tar(source, options = {})
         ArchiveImporter.new(source, options)
     end
 end
-

data/lib/autobuild/packages/orogen.rb

@@ -190,10 +190,11 @@ def prepare
         def genstamp; File.join(srcdir, '.orogen', 'orogen-stamp') end
 
         def add_cmd_to_cmdline(cmd, cmdline)
-            if cmd =~ /^([\w-]+)/
+            if cmd =~ /^([\w-]+)$/
                 cmd_filter = $1
             else
-                raise ArgumentError, "cannot parse the provided command #{cmd}"
+                cmdline << cmd
+                return
             end
 
             cmdline.delete_if { |str| str =~ /^#{cmd_filter}/ }

data/lib/autobuild/progress_display.rb

@@ -33,15 +33,15 @@ def progress_enabled?
             !@silent && @progress_enabled
         end
 
-        def message(message, *args, io: @io)
-            return if silent?
+        def message(message, *args, io: @io, force: false)
+            return if silent? && !force
 
             if args.last.respond_to?(:to_io)
                 io = args.pop
             end
 
             @display_lock.synchronize do
-                io.print "#{@cursor.clear_screen_down}#{@color.call(message, *args)}\n"
+                io.print "#{@cursor.column(1)}#{@cursor.clear_screen_down}#{@color.call(message, *args)}\n"
                 io.flush if @io != io
                 display_progress
                 @io.flush
@@ -119,7 +119,7 @@ def progress_done(key, display_last = true, message: nil)
 
         def display_progress
             return unless progress_enabled?
-            
+
             formatted = format_grouped_messages(@progress_messages.map(&:last), indent: "  ")
             @io.print @cursor.clear_screen_down
             @io.print formatted.join("\n")
@@ -184,26 +184,27 @@ def group_messages(messages)
             end.compact
         end
 
-        def format_grouped_messages(messages, indent: "  ")
-            terminal_w = TTY::Screen.width
+        def format_grouped_messages(messages, indent: "  ", width: TTY::Screen.width)
             groups = group_messages(messages)
             groups.each_with_object([]) do |(prefix, messages), lines|
                 if prefix.empty?
-                    lines << "#{indent}#{messages.shift}"
-                else
-                    lines << "#{indent}#{prefix.dup.strip} #{messages.shift}"
+                    lines.concat(messages.map { |m| "#{indent}#{m.strip}" })
+                    next
                 end
+
+                lines << "#{indent}#{prefix.dup.strip} #{messages.shift}"
                 until messages.empty?
                     msg = messages.shift.strip
-                    if lines.last.size + 2 + msg.size > terminal_w
-                        lines << "#{indent}  #{msg}"
+                    margin = messages.empty? ? 1 : 2
+                    if lines.last.size + margin + msg.size > width
+                        lines << "".dup
+                        lines.last << indent << indent << msg
                     else
-                        lines.last << ", #{msg}"
+                        lines.last << " " << msg
                     end
                 end
-                lines
+                lines.last << "," unless messages.empty?
             end
         end
     end
 end
-

data/lib/autobuild/reporting.rb

@@ -210,4 +210,18 @@ def success
             end
         end
     end
+
+    HUMAN_READABLE_SIZES = [
+        [1_000_000_000.0, "G"],
+        [1_000_000.0, "M"],
+        [1_000.0, "k"],
+        [1.0, ""]
+    ]
+
+    def self.human_readable_size(size)
+        HUMAN_READABLE_SIZES.each do |scale, name|
+            scaled_size = (size / scale)
+            return format("%3.1f%s", scaled_size, name) if scaled_size > 1
+        end
+    end
 end

data/lib/autobuild/subcommand.rb

@@ -45,9 +45,9 @@ class << self
         #
         # See #parallel_build_level for detailed information
         attr_writer :parallel_build_level
-        
+
         # set/get a value how much log lines should be displayed on errors
-        # this may be an integer or 'ALL' (which will be translated to -1) 
+        # this may be an integer or 'ALL' (which will be translated to -1)
         # this is not using an attr_accessor to be able to validate the values
         def displayed_error_line_count=(value)
             @displayed_error_line_count = validate_displayed_error_line_count(value)
@@ -81,7 +81,7 @@ def self.autodetect_processor_count
         if @processor_count
             return @processor_count
         end
-                
+
         if File.file?('/proc/cpuinfo')
             cpuinfo = File.readlines('/proc/cpuinfo')
             physical_ids, core_count, processor_ids = [], [], []
@@ -95,7 +95,7 @@ def self.autodetect_processor_count
                     core_count << Integer($1)
                 end
             end
-            
+
             # Try to count the number of physical cores, not the number of
             # logical ones. If the info is not available, fallback to the
             # logical count
@@ -132,16 +132,15 @@ def self.autodetect_processor_count
 
         @processor_count
     end
-    
-    def self.validate_displayed_error_line_count(lines) 
+
+    def self.validate_displayed_error_line_count(lines)
         if lines == 'ALL'
             return Float::INFINITY
         elsif lines.to_i > 0
             return lines.to_i
         end
-        raise ConfigError, 'Autobuild.displayed_error_line_count can only be a positive integer or \'ALL\'' 
+        raise ConfigException.new, 'Autobuild.displayed_error_line_count can only be a positive integer or \'ALL\''
     end
-
 end
 
 
@@ -294,7 +293,7 @@ def self.run(target, phase, *command)
             logfile.sync = true
 
             if !input_streams.empty?
-                pread, pwrite = IO.pipe # to feed subprocess stdin 
+                pread, pwrite = IO.pipe # to feed subprocess stdin
             end
 
             outread, outwrite = IO.pipe
@@ -335,7 +334,7 @@ def self.run(target, phase, *command)
                         pwrite.close
                         $stdin.reopen(pread)
                     end
-                   
+
                     exec(env, *command, close_others: false)
                 rescue Errno::ENOENT
                     cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
@@ -398,7 +397,7 @@ def self.run(target, phase, *command)
                 if Autobuild.verbose || transparent_mode?
                     STDOUT.puts "#{transparent_prefix}#{line}"
                 elsif block_given?
-                    # Do not yield 
+                    # Do not yield
                     # would mix the progress output with the actual command
                     # output. Assume that if the user wants the command output,
                     # the autobuild progress output is unnecessary
@@ -447,4 +446,3 @@ def self.run(target, phase, *command)
     end
 
 end
-

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.14.1" unless defined? Autobuild::VERSION
+    VERSION = "1.15.0" unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms