autobuild 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3203bb516411ada5796ebf11313d0be7731f6068361ac526424938700c886bf
-  data.tar.gz: 5b988ac45c9c2cc3216e73d7917a61555a0171d830e94fe4d59edb95938ed49d
+  metadata.gz: ba0c35a9d6c2a15141684c9836ca9b5763b90dfdc46832a31d0f343a6837ef4d
+  data.tar.gz: 3d5b3c22bdd6b3c082e9ed209a656b637274bd2054c8e211260ff28f8d058cd9
 SHA512:
-  metadata.gz: 46805b87b14989037a618067c414b046945e586a138f9dfb56c3ab80d34132c233f9df28a55860cf41f69b799ffe98b0d22bdcbe6d86aea7c788f4783bfc1838
-  data.tar.gz: b3afdff0d56e867853f4d440eb758c9866885efedea1099cedaf19271653d8680646d5efeca895aa814024e09e58cef7cbe5966116ef02337d1d546582319f86
+  metadata.gz: 12cd8fb953e0ce63ba4679dce12ab0e8fb46678815c6baab0db97c44097fd74fe5c684f43a2e6f0de04630cf0ee6cb70a9a34fbe94b88e390a062de65cf335fc
+  data.tar.gz: aee8a423d0b011b6d17b70554a79527e67280a2004aa7b0709a4bce740d7ff3d6df4a5c2923f9f26e9d12971d8c2657cfda989952a7cfdfbda5e6516f0c82005

data/.travis.yml

@@ -1,8 +1,6 @@
 sudo: true
 language: ruby
 rvm:
-  - '2.1'
-  - '2.2'
   - '2.3'
   - '2.4'
   - '2.5'
@@ -12,6 +10,7 @@ matrix:
         - rvm: 'jruby-9.1.15.0'
 
 install:
+  - sudo apt-get install build-essential
   - gem install bundler
   - bundle install --path vendor/bundle
 

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

@@ -44,7 +44,7 @@ def self.lfs_setup(importer, package)
                 "files may be missing from checkout"
         end
 
-        lfs_dir = File.join(package.srcdir, '.git', 'lfs')
+        lfs_dir = File.join(package.importdir, '.git', 'lfs')
         Autobuild.lfs_setup(importer, package) if File.directory?(lfs_dir)
     end
 end

data/lib/autobuild/import/git.rb

@@ -1160,7 +1160,7 @@ def uses_lfs?(package)
         def self.lfs_installed?
             return @lfs_installed unless @lfs_installed.nil?
 
-            _, _, status = Open3.capture3('git lfs env')
+            _, _, status = Open3.capture3('git lfs')
             @lfs_installed = status.success?
         end
 

data/lib/autobuild/package.rb

@@ -664,10 +664,10 @@ def post_install(*args, &block)
         # fingerprint the result will be nil
         # @return [String]
         def fingerprint(recursive: true, memo: {})
+            return memo[name] if memo.key?(name)
+
             self_fingerprint = importer.fingerprint(self)
             return unless self_fingerprint
-
-            memo[name] = self_fingerprint
             return self_fingerprint if !recursive || dependencies.empty?
 
             dependency_fingerprints = dependencies.sort.map do |pkg_name|
@@ -675,12 +675,12 @@ def fingerprint(recursive: true, memo: {})
                 unless (fingerprint = memo[pkg.name])
                     fingerprint = pkg.fingerprint(recursive: true, memo: memo)
                     return unless fingerprint
-                    memo[pkg.name] = fingerprint
                 end
                 fingerprint
             end
 
-            Digest::SHA1.hexdigest(self_fingerprint + dependency_fingerprints.join(""))
+            memo[name] = Digest::SHA1.hexdigest(
+                self_fingerprint + dependency_fingerprints.join(""))
         end
 
         # Returns the name of all the packages +self+ depends on

data/lib/autobuild/packages/gnumake.rb

@@ -1,19 +1,46 @@
 require 'rubygems/version'
 
 module Autobuild
-    def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
+    def self.reset_gnumake_detection
+        @make_is_gnumake = Hash.new
+        @gnumake_version = Hash.new
+    end
+
+    def self.ensure_gnumake_detected(pkg, path = Autobuild.tool(:make))
         @make_is_gnumake ||= Hash.new
         @gnumake_version ||= Hash.new
-        if @make_is_gnumake.key?(path)
-            @make_is_gnumake[path]
+        return @make_is_gnumake[path] if @make_is_gnumake.key?(path)
+
+        begin
+            gnumake_version_string = pkg.run('prepare', path, '--version')
+        rescue Autobuild::SubcommandFailed
+            @make_is_gnumake[path] = false
+            return
+        end
+
+        gnumake_match = /^GNU Make[^\d]+(\d[\d.]+)/.match(gnumake_version_string.first)
+        unless gnumake_match
+            @make_is_gnumake[path] = false
+            return
+        end
+
+        @gnumake_version[path] = Gem::Version.new(gnumake_match[1])
+        @make_is_gnumake[path] = true
+    end
+
+    def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
+        ensure_gnumake_detected(pkg, path)
+    end
+
+    class NotGNUMake < RuntimeError
+    end
+
+    def self.gnumake_version(pkg, path = Autobuild.tool(:make))
+        if ensure_gnumake_detected(pkg, path)
+            @gnumake_version.fetch(path)
         else
-            begin
-                result = pkg.run('prepare', path, '--version')
-                @make_is_gnumake[path] = (result.first =~ /GNU Make/)
-                @gnumake_version[path] = Gem::Version.new(result.first.scan(/[\d.]+/)[0])
-            rescue Autobuild::SubcommandFailed
-                @make_is_gnumake[path] = false
-            end
+            raise NotGNUMake, "either #{path} is not a GNU Make or it does not have "\
+                              "the expected version string"
         end
     end
 
@@ -25,34 +52,44 @@ def self.make_has_gnumake_jobserver?(pkg, path = Autobuild.tool(:make))
         make_is_gnumake?(pkg, path)
     end
 
+    GNUMAKE_JOBSERVER_AUTH_VERSION = Gem::Version.new("4.2.0")
+
+    def self.gnumake_jobserver_option(job_server, pkg, path = Autobuild.tool(:make))
+        jobserver_fds_arg = "#{job_server.rio.fileno},#{job_server.wio.fileno}"
+
+        version = gnumake_version(pkg, path)
+        if version >= GNUMAKE_JOBSERVER_AUTH_VERSION
+            ["--jobserver-auth=#{jobserver_fds_arg}"]
+        else
+            ["--jobserver-fds=#{jobserver_fds_arg}", "-j"]
+        end
+    end
+
     def self.invoke_make_parallel(pkg, cmd_path = Autobuild.tool(:make))
         reserved = nil
-        if make_has_j_option?(pkg, cmd_path) && pkg.parallel_build_level != 1
-            if (manager = Autobuild.parallel_task_manager)
-                job_server = manager.job_server
-
-                specific_parallel_level = (pkg.parallel_build_level !=
-                    Autobuild.parallel_build_level)
-                if !make_has_gnumake_jobserver?(pkg, cmd_path) || specific_parallel_level
-                    reserved = pkg.parallel_build_level
-                    # Account for the one token autobuild uses
-                    job_server.get(reserved - 1)
-                    yield("-j#{pkg.parallel_build_level}")
-                end
-
-                jobserver_fds_arg = "#{job_server.rio.fileno},#{job_server.wio.fileno}"
-
-                if @gnumake_version[cmd_path] >= Gem::Version.new("4.2.0")
-                    yield("--jobserver-auth=#{jobserver_fds_arg}", "-j")
-                else
-                    yield("--jobserver-fds=#{jobserver_fds_arg}", "-j")
-                end
+        return yield unless make_has_j_option?(pkg, cmd_path)
+
+        manager = Autobuild.parallel_task_manager
+        return yield("-j#{pkg.parallel_build_level}") unless manager
+
+        job_server = manager.job_server
+
+        specific_parallel_level = (
+            pkg.parallel_build_level != Autobuild.parallel_build_level
+        )
+        if !make_has_gnumake_jobserver?(pkg, cmd_path) || specific_parallel_level
+            reserved = pkg.parallel_build_level
+            # Account for the one token autobuild uses
+            begin
+                job_server.get(reserved - 1)
+                return yield("-j#{pkg.parallel_build_level}")
+            ensure
+                job_server.put(reserved - 1)
             end
-            yield("-j#{pkg.parallel_build_level}")
-        else yield
         end
-    ensure
-        job_server.put(reserved) if reserved
+
+        options = gnumake_jobserver_option(job_server, pkg, cmd_path)
+        yield(*options)
     end
 
     def self.make_subcommand(pkg, phase, *options, &block)

data/lib/autobuild/progress_display.rb

@@ -20,8 +20,8 @@ def silent?
         end
 
         def silent
-            @silent = true
             silent = @silent
+            @silent = true
             yield
         ensure
             @silent = silent

data/lib/autobuild/test.rb

@@ -57,6 +57,7 @@ def teardown
 
             Autobuild::Package.clear
             Rake::Task.clear
+            Autobuild.reset_gnumake_detection
 
             @temp_dirs.each do |dir|
                 FileUtils.rm_rf dir

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.18.0".freeze unless defined? Autobuild::VERSION
+    VERSION = "1.18.1".freeze unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms