autobuild 1.12.1 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ce3568c8ac2227a5496cedd32858be2b6b9771
-  data.tar.gz: 5ab665b1155ffa2f15490eaeca333a4b82c82e14
+  metadata.gz: a6623e40c3f107c71c1f9637be0c944a3ffe2a2d
+  data.tar.gz: 7e3298cad9cb1215943573c57a0d70c29b36b676
 SHA512:
-  metadata.gz: 186dda2d01191d23ca7ab44da613c71f1d772ac27192029691284748044c92d72c41dd5e7e741307f3f1dcb073c68d2975a5bf2f05cfb6d70a237b0920084e7e
-  data.tar.gz: adbc3984308b9a06cd15851859944dd1a2f67ef625a56459f20b2876fcba4e480a9e9af82710e9ebe957fa4da2eb0449ad916de6f57649fefa772a0573ad464b
+  metadata.gz: 405285def822d6a26bc51bd7d336e76e20ba74d434dbb68c67b41b90d8cdbe13f2bbbd0512a81d3575a6f9283a2968d516d3f899eba2ef13dd74cd26a26d0211
+  data.tar.gz: 20b5ebff2c2df256013c51e30064509ff7c99da00034de90816307cc163ca7af65d1593501b74e102b4f24252f5dc760a61520cb01622d09e7e4c1805f87b7e2

data/.gitignore

@@ -4,3 +4,5 @@ doc/
 vendor/
 .bundle
 coverage/
+
+.yardoc/

data/.travis.yml

@@ -1,11 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - '2.0'
   - '2.1'
   - '2.2'
-  - '2.3.1'
-  - 'jruby-9.1.2.0'
+  - '2.3'
+  - '2.4'
+  - '2.5'
+  - 'jruby-9.1.15.0'
 matrix:
     allow_failures:
-        - rvm: 'jruby-9.1.2.0'
+        - rvm: 'jruby-9.1.15.0'

data/Gemfile

@@ -1,3 +1,12 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :vscode do
+    gem 'pry'
+    gem 'pry-byebug'
+    gem 'rubocop', '>= 0.6.0'
+    gem 'ruby-debug-ide', '>= 0.6.0'
+    gem 'debase', '>= 0.2.2.beta10'
+    gem 'solargraph'
+end

data/Rakefile

@@ -6,6 +6,11 @@ task 'gem' => 'build'
 
 Rake::TestTask.new(:test) do |t|
     t.libs << "lib" << Dir.pwd
-    t.test_files = ['test/suite.rb']
+
+    test_files = Rake::FileList['test/**/test_*.rb']
+    if !File.executable?('/usr/bin/cvs')
+        test_files.exclude('test/import/test_cvs.rb')
+    end
+    t.test_files = test_files
 end
 

data/autobuild.gemspec

@@ -6,6 +6,7 @@ require 'autobuild/version'
 Gem::Specification.new do |s|
     s.name = "autobuild"
     s.version = Autobuild::VERSION
+    s.required_ruby_version = '>= 2.1.0'
     s.authors = ["Sylvain Joyeux"]
     s.email = "sylvain.joyeux@m4x.org"
     s.summary = "Library to handle build systems and import mechanisms"

data/lib/autobuild/environment.rb

@@ -281,10 +281,10 @@ def init_from_env(name)
         def push(name, *values)
             if current = environment[name]
                 current = current.dup
-                env_set(name, *values)
-                env_add(name, *current)
+                set(name, *values)
+                add(name, *current)
             else
-                env_add(name, *values)
+                add(name, *values)
             end
         end
 
@@ -669,12 +669,28 @@ def add_prefix(newprefix, includes = nil)
             end
         end
 
+        def find_executable_in_path(file, path_var = 'PATH')
+            (value(path_var) || Array.new).each do |dir|
+                full = File.join(dir, file)
+                begin
+                    stat = File.stat(full)
+                    if stat.file? && stat.executable?
+                        return full
+                    end
+                rescue ::Exception
+                end
+            end
+            nil
+        end
+
         def find_in_path(file, path_var = 'PATH')
-            path = (value(path_var) || Array.new).
-                find { |dir| File.exist?(File.join(dir, file)) }
-            if path
-                return File.join(path, file)
+            (value(path_var) || Array.new).each do |dir|
+                full = File.join(dir, file)
+                if File.file?(full)
+                    return full
+                end
             end
+            nil
         end
 
         def isolate

data/lib/autobuild/exceptions.rb

@@ -100,18 +100,14 @@ def to_s
             # launching process. More importantly, it means we already have a
             # proper explanation for it. Don't display the logfile at all.
             if status 
-                if File.file?(logfile)
-                    lines = File.readlines(logfile)
-                    logsize = Autobuild.displayed_error_line_count
-                    if logsize != Float::INFINITY && lines.size > logsize
-                        lines = lines[-logsize, logsize]
-                    end
-                    msg << "\n    last #{lines.size} lines are:\n\n"
-                    lines.each do |l|
-                        msg << "    #{l}"
-                    end
-                else
-                    msg << "\n    the log file does not seem to be present on disk anymore"
+                lines = @output
+                logsize = Autobuild.displayed_error_line_count
+                if logsize != Float::INFINITY && lines.size > logsize
+                    lines = lines[-logsize, logsize]
+                end
+                msg << "\n    last #{lines.size} lines are:\n\n"
+                lines.each do |l|
+                    msg << "    #{l}\n"
                 end
             end
             msg

data/lib/autobuild/import/git-lfs.rb

@@ -3,7 +3,7 @@
 Autobuild::Git.default_config['filter.lfs.required'] = 'false'
 
 module Autobuild
-    Git.add_post_hook do |importer, package|
+    Git.add_post_hook(always: true) do |importer, package|
         lfs_dir = File.join(package.srcdir, '.git', 'lfs')
         if File.directory?(lfs_dir)
             importer.run_git(package, 'lfs', 'install', '--force', '--local', '--skip-smudge')

data/lib/autobuild/import/git.rb

@@ -1130,7 +1130,7 @@ def self.vcs_definition_for(path, remote_name = 'autobuild')
             end
 
             Dir.chdir(path) do
-                vars = `git config -l`.
+                vars = `#{Autobuild.tool(:git)} config -l`.
                     split("\n").
                     inject(Hash.new) do |h, line|
                         k, v = line.strip.split('=', 2)

data/lib/autobuild/importer.rb

@@ -248,26 +248,35 @@ def update_retry_count(original_error, retry_count)
     # globally for all importers of a given type with {Importer.add_post_hook}
     attr_reader :post_hooks
 
+    Hook = Struct.new :always, :callback
+
     # Define a post-import hook for all instances of this class
     #
     # @yieldparam [Importer] importer the importer that finished
     # @yieldparam [Package] package the package we're acting on
     # @see Importer#add_post_hook
-    def self.add_post_hook(&hook)
+    def self.add_post_hook(always: false, &hook)
         @post_hooks ||= Array.new
-        @post_hooks << hook
+        @post_hooks << Hook.new(always, hook)
+        nil
     end
 
     # Enumerate the post-import hooks defined for all instances of this class
-    def self.each_post_hook(&hook)
-        (@post_hooks ||= Array.new).each(&hook)
+    def self.each_post_hook(error: false)
+        return enum_for(__method__) if !block_given?
+
+        (@post_hooks ||= Array.new).each do |hook|
+            if hook.always || !error
+                yield(hook.callback)
+            end
+        end
     end
 
     # @api private
     #
     # Call the post-import hooks added with {#add_post_hook}
-    def execute_post_hooks(package)
-        each_post_hook.each do |block|
+    def execute_post_hooks(package, error: false)
+        each_post_hook(error: error) do |block|
             block.call(self, package)
         end
     end
@@ -278,16 +287,20 @@ def execute_post_hooks(package)
     # @yieldparam [Importer] importer the importer that finished
     # @yieldparam [Package] package the package we're acting on
     # @see Importer.add_post_hook
-    def add_post_hook(&hook)
-        post_hooks << hook
+    def add_post_hook(always: false, &hook)
+        post_hooks << Hook.new(always, hook)
     end
 
     # Enumerate the post-import hooks for this importer
-    def each_post_hook(&hook)
+    def each_post_hook(error: false, &hook)
         return enum_for(__method__) if !block_given?
 
-        self.class.each_post_hook(&hook)
-        post_hooks.each(&hook)
+        self.class.each_post_hook(error: error, &hook)
+        post_hooks.each do |hook|
+            if hook.always || !error
+                yield(hook.callback)
+            end
+        end
     end
 
     def perform_update(package,only_local=false)
@@ -301,8 +314,14 @@ def perform_update(package,only_local=false)
         retry_count = 0
         package.progress_start "updating %s"
         begin
-            did_update = update(package,only_local)
-            execute_post_hooks(package)
+            begin
+                did_update = update(package,only_local)
+                execute_post_hooks(package, error: false)
+            rescue ::Exception
+                execute_post_hooks(package, error: true)
+                raise
+            end
+
             message = if did_update == false
                           Autobuild.color('already up-to-date', :green)
                       else

data/lib/autobuild/packages/autotools.rb

@@ -168,9 +168,12 @@ def prepare
             # If it is not the case, remove it to force reconfiguration
 	    configureflags.flatten!
 	    if File.exist?(configurestamp)
-		output = IO.popen("#{configurestamp} --version").readlines.grep(/with options/).first.chomp
-		raise "invalid output of config.status --version" unless output =~ /with options "(.*)"$/
-		options = Shellwords.shellwords($1)
+		output = run('prepare', configurestamp, '--version').
+                    grep(/with options/).first.chomp
+                if !output
+                    raise "invalid output of config.status --version, expected a line starting with `with options`"
+                end
+                options = Shellwords.shellwords(output.scan(/with options "(.*)"$/).join(" "))
 
 		# Add the --prefix option to the configureflags array
 		testflags = ["--prefix=#{prefix}"] + Array[*configureflags]

data/lib/autobuild/packages/gnumake.rb

@@ -1,29 +1,32 @@
 module Autobuild
-    def self.make_is_gnumake?(path = Autobuild.tool(:make))
+    def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
         @make_is_gnumake ||= Hash.new
         if @make_is_gnumake.has_key?(path)
             @make_is_gnumake[path]
         else
-            result = `#{path} --version`
-            @make_is_gnumake[path] = $?.success? &&
-                (result.split("\n").first =~ /GNU Make/)
+            begin
+                result = pkg.run('prepare', path, '--version')
+                @make_is_gnumake[path] = (result.first =~ /GNU Make/)
+            rescue Autobuild::SubcommandFailed
+                @make_is_gnumake[path] = false
+            end
         end
     end
 
-    def self.make_has_j_option?(path = Autobuild.tool(:make))
-        make_is_gnumake?(path)
+    def self.make_has_j_option?(pkg, path = Autobuild.tool(:make))
+        make_is_gnumake?(pkg, path)
     end
 
-    def self.make_has_gnumake_jobserver?(path = Autobuild.tool(:make))
-        make_is_gnumake?(path)
+    def self.make_has_gnumake_jobserver?(pkg, path = Autobuild.tool(:make))
+        make_is_gnumake?(pkg, path)
     end
 
     def self.invoke_make_parallel(pkg, cmd_path = Autobuild.tool(:make))
         reserved = nil
-        if make_has_j_option?(cmd_path) && pkg.parallel_build_level != 1
+        if make_has_j_option?(pkg, cmd_path) && pkg.parallel_build_level != 1
             if manager = Autobuild.parallel_task_manager
                 job_server = manager.job_server
-                if !make_has_gnumake_jobserver?(cmd_path) || (pkg.parallel_build_level != Autobuild.parallel_build_level)
+                if !make_has_gnumake_jobserver?(pkg, cmd_path) || (pkg.parallel_build_level != Autobuild.parallel_build_level)
                     reserved = pkg.parallel_build_level
                     job_server.get(reserved - 1) # We already have one token taken by autobuild itself
                     yield("-j#{pkg.parallel_build_level}")

data/lib/autobuild/reporting.rb

@@ -172,7 +172,7 @@ def self.find_common_prefix(msg, other_msg)
                 return prefix
             end
         end
-        return msg
+        return msg.join(" ")
     end
 
     def self.format_progress_message(messages)
@@ -217,7 +217,7 @@ def self.format_progress_message(messages)
                     grouped_messages << messages[index][(prefix.size)..-1]
                 end
                 if !grouped_messages.empty?
-                    result << "#{prefix}#{grouped_messages.join(", ")}"
+                    result << "#{prefix}#{grouped_messages.uniq.join(", ")}"
                 end
             end
         end

data/lib/autobuild/subcommand.rb

@@ -231,10 +231,13 @@ def self.run(target, phase, *command)
         command.reject!  { |o| o.nil? || (o.respond_to?(:empty?) && o.empty?) }
         command.collect! { |o| o.to_s }
 
-        target_name = if target.respond_to?(:name)
-                          target.name
-                      else target.to_str
-                      end
+        if target.respond_to?(:name)
+            target_name = target.name
+            target_type = target.class
+        else
+            target_name = target.to_str
+            target_type = nil
+        end
         logdir = if target.respond_to?(:logdir)
                      target.logdir
                  else Autobuild.logdir
@@ -324,24 +327,16 @@ def self.run(target, phase, *command)
                         Process.setpriority(Process::PRIO_PROCESS, 0, Autobuild.nice)
                     end
 
-                    if outwrite
-                        outread.close
-                        $stderr.reopen(outwrite.dup)
-                        $stdout.reopen(outwrite.dup)
-                    else
-                        $stderr.reopen(logfile.dup)
-                        $stdout.reopen(logfile.dup)
-                    end
+                    outread.close
+                    $stderr.reopen(outwrite.dup)
+                    $stdout.reopen(outwrite.dup)
 
                     if !input_streams.empty?
                         pwrite.close
                         $stdin.reopen(pread)
                     end
                    
-                    if RUBY_VERSION >= "1.9"
-                        command << Hash[:close_others => false]
-                    end
-                    exec(env, *command)
+                    exec(env, *command, close_others: false)
                 rescue Errno::ENOENT
                     cwrite.write([CONTROL_COMMAND_NOT_FOUND].pack('I'))
                     exit(100)
@@ -385,6 +380,11 @@ def self.run(target, phase, *command)
                 end
             end
 
+            transparent_prefix = "#{target_name}:#{phase}: "
+            if target_type
+                transparent_prefix = "#{target_type}:#{transparent_prefix}"
+            end
+
             # If the caller asked for process output, provide it to him
             # line-by-line.
             outwrite.close
@@ -396,7 +396,7 @@ def self.run(target, phase, *command)
                 logfile.puts line
 
                 if Autobuild.verbose || transparent_mode?
-                    STDOUT.puts "#{target_name}:#{phase}: #{line}"
+                    STDOUT.puts "#{transparent_prefix}#{line}"
                 elsif block_given?
                     # Do not yield 
                     # would mix the progress output with the actual command
@@ -408,6 +408,7 @@ def self.run(target, phase, *command)
             outread.close
 
             _, childstatus = Process.wait2(pid)
+            logfile.puts "Exit: #{childstatus}"
             childstatus
         end
 

data/lib/autobuild/tools.rb

@@ -38,19 +38,13 @@ def tool_in_path(name, env: self.env)
                     # This is already a full path
                     path = current
                 else
-                    path = find_in_path(current)
+                    path = env.find_executable_in_path(current)
                 end
 
                 if !path
-                    raise ArgumentError, "tool #{name}, set to #{current}, can not be found in PATH=#{path_env}"
+                    raise ArgumentError, "tool #{name}, set to #{current}, can not be found in PATH=#{env_PATH}"
                 end
 
-                # Verify that the new value is a file and is executable
-                if !File.file?(path)
-                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not a file"
-                elsif !File.executable?(path)
-                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not executable"
-                end
                 programs_in_path[name] = [path, current, env_PATH]
             end
 

data/lib/autobuild/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake