autobuild 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7ade4cfb6600c6240d0e6cbb23ed19340e7c3a43b7811aab49236e1d81b1f0
-  data.tar.gz: 72fade1f3c6de16fd4988c9d132452aed5a7684f4e1978872ea3e18933c8c0ac
+  metadata.gz: 43869aed86ff761f4f091a8c5dbd4d27cdb481cd2b60bf4843bd259366d2a88b
+  data.tar.gz: c62531880b13b4401323193c8bbbc1d095ae1f0201aecf16646c5f316f7aff03
 SHA512:
-  metadata.gz: 3b63871e342d7a5b7bdf7bb0ab28c1aa6bb4e808f95a08ada2c9d56ba74c2ce95207883348b8e5727bfac65932d6c8f5cd2473f62bf2445ed6b4110d95331a17
-  data.tar.gz: 1a53537790164887e430742c5314e1f22685f2b50102874b33556f2153fa03e4d69f68cf95d89602c799bda420c878985c2f5600122077b84917221f8408ac89
+  metadata.gz: 47a3d57e94becd1e6e96ccf36902e5cb908d56d3faf0ee0f18904c041caae1940eaa959b51ae641c9de826c6cf211a42953a81268a61d4bf60efce9173bf373f
+  data.tar.gz: e6edd90897e22b8dd0e89e490027ebb2c2632bc3c201355a787bf83413b8958a5ee97a3aab6da0e6dbe96fde093d453032244fcca7145af99f578ad3c425874d

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

@@ -1,9 +1,13 @@
-# Disable git-lfs at checkout time, we run install --local and pull later 
+# Disable git-lfs at checkout time, we run install --local and pull later
 Autobuild::Git.default_config['filter.lfs.smudge'] = 'git-lfs smudge --skip -- %f'
 Autobuild::Git.default_config['filter.lfs.required'] = 'false'
 
 module Autobuild
     Git.add_post_hook(always: true) do |importer, package|
+        if importer.options[:lfs] != false && importer.uses_lfs?(package) && !Git.lfs_installed?
+            Autobuild.warn "#{package.name} uses git LFS but it is not installed, files may be missing from checkout"
+        end
+
         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

@@ -2,6 +2,7 @@
 require 'autobuild/subcommand'
 require 'autobuild/importer'
 require 'utilrb/kernel/options'
+require 'open3'
 
 module Autobuild
     class Git < Importer
@@ -54,7 +55,7 @@ def self.version
         # Helper method to compare two (partial) versions represented as array
         # of integers
         #
-        # @return [Integer] -1 if actual is greater than required, 
+        # @return [Integer] -1 if actual is greater than required,
         #   0 if equal, and 1 if actual is smaller than required
         def self.compare_versions(actual, required)
             if actual.size > required.size
@@ -82,7 +83,7 @@ def self.at_least_version(*version)
         # Creates an importer which tracks a repository and branch.
         #
         # This importer uses the 'git' tool to perform the import. It defaults
-        # to 'git' and can be configured by doing 
+        # to 'git' and can be configured by doing
         #
         #   Autobuild.programs['git'] = 'my_git_tool'
         #
@@ -128,6 +129,8 @@ def initialize(repository, branch = nil, options = {})
             gitopts, common = Kernel.filter_options options,
                 push_to: nil,
                 branch: nil,
+                local_branch: nil,
+                remote_branch: nil,
                 tag: nil,
                 commit: nil,
                 repository_id: nil,
@@ -370,7 +373,7 @@ def delta_between_tags(package, from_tag, to_tag)
         # @param [Package] package
         # @option options [Boolean] only_local (false) whether the tags should
         #   be fetch from the remote first, or if one should only list tags that
-        #   are already known locally 
+        #   are already known locally
         # @return [Hash<String,String>] a mapping from a tag name to its commit
         #   ID
         def tags(package, options = Hash.new)
@@ -443,7 +446,7 @@ def setup_remote(package, remote_name, repository, push_to = repository)
             run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.fetch",  "+refs/heads/*:refs/remotes/#{remote_name}/*")
 
             if remote_branch && local_branch
-                run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.push",  "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
+                run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.push",  "refs/heads/#{local_branch}:#{remote_branch_to_ref(remote_branch)}")
             else
                 run_git_bare(package, 'config', '--replace-all', "remote.#{remote_name}.push",  "refs/heads/*:refs/heads/*")
             end
@@ -471,7 +474,7 @@ def update_remotes_configuration(package)
 
             if local_branch
                 run_git_bare(package, 'config', '--replace-all', "branch.#{local_branch}.remote",  remote_name)
-                run_git_bare(package, 'config', '--replace-all', "branch.#{local_branch}.merge", "refs/heads/#{local_branch}")
+                run_git_bare(package, 'config', '--replace-all', "branch.#{local_branch}.merge", remote_branch_to_ref(local_branch))
             end
         end
 
@@ -578,12 +581,16 @@ def current_remote_commit(package, options = Hash.new)
             end
             only_local = options.delete(:only_local)
 
-
             if only_local
                 refspec = options[:refspec] ||
                     ("refs/tags/#{tag}" if tag) ||
-                    "refs/remotes/#{remote_name}/#{remote_branch}"
-                refspec = Array(refspec).first
+                    ("refs/remotes/#{remote_name}/#{remote_branch}" \
+                        unless remote_branch.start_with?("refs/"))
+                unless (refspec = Array(refspec).first)
+                    raise ArgumentError, "cannot use only_local with no tag,"\
+                      " and an absolute remote ref"
+                end
+
                 begin
                     run_git_bare(package, 'show-ref', '-s', refspec).first.strip
                 rescue SubcommandFailed
@@ -592,7 +599,7 @@ def current_remote_commit(package, options = Hash.new)
             else
                 refspec = options[:refspec] ||
                     ("refs/tags/#{tag}" if tag) ||
-                    "refs/heads/#{remote_branch}"
+                    remote_branch_to_ref(remote_branch)
                 begin fetch_remote(package, refspec: refspec)
                 rescue Exception => e
                     return fallback(e, package, :status, package, only_local)
@@ -635,7 +642,7 @@ def has_commit?(package, commit_id)
         end
 
         def has_branch?(package, branch_name)
-            run_git_bare(package, 'show-ref', '-q', '--verify', "refs/heads/#{branch_name}")
+            run_git_bare(package, 'show-ref', '-q', '--verify', remote_branch_to_ref(branch_name))
             true
         rescue SubcommandFailed => e
             if e.status == 1
@@ -652,6 +659,14 @@ def detached_head?(package)
             current_branch(package).nil?
         end
 
+        private def remote_branch_to_ref(branch)
+            if branch.start_with?("refs/")
+                branch
+            else
+                "refs/heads/#{branch}"
+            end
+        end
+
         # Returns the branch HEAD is pointing to
         #
         # @return [String,nil] the full ref HEAD is pointing to (i.e.
@@ -733,7 +748,7 @@ def rev_parse(package, name, object_type = "commit")
             raise PackageException.new(package, 'import'), "failed to resolve #{name}. Are you sure this commit, branch or tag exists ?"
         end
 
-        # Returns the file's conents at a certain commit 
+        # Returns the file's conents at a certain commit
         #
         # @param [Package] package
         # @param [String] commit
@@ -758,7 +773,7 @@ def commit_present_in?(package, rev, reference)
             begin
                 merge_base = run_git_bare(package, 'merge-base', commit, reference).first
                 merge_base == commit
-                
+
             rescue Exception
                 raise PackageException.new(package, 'import'), "failed to find the merge-base between #{rev} and #{reference}. Are you sure these commits exist ?"
             end
@@ -780,7 +795,7 @@ def describe_commit_on_remote(package, rev = 'HEAD', options = Hash.new)
             commit_id = rev_parse(package, rev)
 
             remote_refs = Hash[*each_remote_ref(package).to_a.flatten]
-            remote_branch_ref = "refs/heads/#{remote_branch}"
+            remote_branch_ref = remote_branch_to_ref(remote_branch)
             remote_branch_id = remote_refs.delete(remote_branch_ref)
             begin
                 if commit_present_in?(package, commit_id, remote_branch_id)
@@ -932,7 +947,14 @@ def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.ne
                 # repository. We'll refuse resetting if there are uncommitted
                 # changes
                 if !commit_present_in?(package, current_head, fetch_commit)
-                    raise ImporterCannotReset.new(package, 'import'), "branch #{local_branch} of #{package.name} contains commits that do not seem to be present on the branch #{remote_branch} of the remote repository. I can't go on as it could make you loose some stuff. Update the remote branch in your overrides, push your changes or reset to the remote commit manually before trying again"
+                    raise ImporterCannotReset.new(package, 'import'),
+                        "branch #{local_branch} of #{package.name} contains"\
+                        " commits that do not seem to be present on the branch"\
+                        " #{remote_branch} of the remote repository. I can't"\
+                        " go on as it could make you lose some stuff. Update"\
+                        " the remote branch in your overrides, push your"\
+                        " changes or reset to the remote commit manually"\
+                        " before trying again"
                 end
             end
 
@@ -951,7 +973,7 @@ def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.ne
             rescue ::Exception
                 run_git(package, 'symbolic-ref', "HEAD", target_commit)
                 run_git(package, 'update-ref', "refs/heads/#{local_branch}", current_head)
-                run_git(package, 'checkout', local_branch)
+                run_git(package, 'checkout', "refs/heads/#{local_branch}")
                 raise
             end
             true
@@ -968,7 +990,7 @@ def determine_target_state(package, only_local: false)
                     fetch_commit = current_remote_commit(
                         package,
                         only_local: only_local,
-                        refspec: [remote_branch, tag])
+                        refspec: [remote_branch_to_ref(remote_branch), tag])
                 end
                 target_commit = pinned_state = rev_parse(package, pinned_state)
             else
@@ -985,7 +1007,7 @@ def update(package, options = Hash.new)
             validate_importdir(package)
             only_local = options.fetch(:only_local, false)
             reset = options.fetch(:reset, false)
-            
+
             # This is really really a hack to workaround how broken the
             # importdir thing is
             if package.importdir == package.srcdir
@@ -1005,7 +1027,8 @@ def update(package, options = Hash.new)
 
             unless pin_is_uptodate
                 fetch_commit ||= current_remote_commit(
-                    package, only_local: only_local, refspec: [remote_branch, tag])
+                    package, only_local: only_local,
+                    refspec: [remote_branch_to_ref(remote_branch), tag])
                 did_update =
                     if reset
                         reset_head_to_commit(package, target_commit, fetch_commit,
@@ -1073,6 +1096,22 @@ def each_alternate_path(package)
             nil
         end
 
+        def uses_lfs?(package)
+            git_files = run_git(package, 'ls-files').join("\n")
+            git_attrs = run_git(
+                package, 'check-attr', '--all', '--stdin',
+                input_streams: [StringIO.new(git_files)]
+            ).join("\n")
+
+            /(.*): filter: lfs/.match(git_attrs)
+        end
+
+        def self.lfs_installed?
+            return @lfs_installed unless @lfs_installed.nil?
+            _, _, status = Open3.capture3('git lfs env')
+            @lfs_installed = status.success?
+        end
+
         def checkout(package, options = Hash.new)
             base_dir = File.expand_path('..', package.importdir)
             if !File.directory?(base_dir)
@@ -1084,6 +1123,10 @@ def checkout(package, options = Hash.new)
                 clone_options << '--recurse-submodules'
             end
             if single_branch?
+                if remote_branch.start_with?("refs/")
+                    raise ArgumentError, "you cannot provide a full ref for"\
+                        " the remote branch while cloning a single branch"
+                end
                 clone_options << "--branch=#{remote_branch}" << "--single-branch"
             end
             each_alternate_path(package) do |path|
@@ -1096,7 +1139,7 @@ def checkout(package, options = Hash.new)
                 Autobuild.tool('git'), 'clone', '-o', remote_name, *clone_options, repository, package.importdir, retry: true)
 
             update_remotes_configuration(package)
-            update(package, only_local: true, reset: true)
+            update(package, only_local: !remote_branch.start_with?("refs/"), reset: true)
             if with_submodules?
                 run_git(package, "submodule", "update", '--init')
             end
@@ -1106,9 +1149,14 @@ def checkout(package, options = Hash.new)
         def relocate(repository, options = Hash.new)
             options = Hash[options.map { |k, v| [k.to_sym, v] }]
 
-            @push_to = options[:push_to] || @push_to
             local_branch  = options[:local_branch]  || options[:branch] || self.local_branch || 'master'
             remote_branch = options[:remote_branch] || options[:branch] || self.remote_branch || 'master'
+            if local_branch.start_with?("refs/")
+                raise ArgumentError, "you cannot provide a full ref for"\
+                  " the local branch, only for the remote branch"
+            end
+
+            @push_to = options[:push_to] || @push_to
             @branch = @local_branch = @remote_branch = nil
             if local_branch == remote_branch
                 @branch = local_branch

data/lib/autobuild/package.rb

@@ -132,6 +132,9 @@ def initialize(spec = Hash.new)
             @in_dir_stack = Array.new
             @utilities = Hash.new
             @env = Array.new
+            @imported = false
+            @prepared = false
+            @built = false
 
             if Hash === spec
                 name, depends = spec.to_a.first
@@ -153,18 +156,20 @@ def initialize(spec = Hash.new)
             # Define the default tasks
             task "#{name}-import" do
                 isolate_errors { import }
+                @imported = true
             end
             task :import => "#{name}-import"
 
             # Define the prepare task
             task "#{name}-prepare" => "#{name}-import" do
                 isolate_errors { prepare }
+                @prepared = true
             end
             task :prepare => "#{name}-prepare"
 
             task "#{name}-build"
-            task :build => "#{name}-build"
 
+            task :build => "#{name}-build"
             task(name) do
                 Rake::Task["#{name}-import"].invoke
                 Rake::Task["#{name}-prepare"].invoke
@@ -185,6 +190,30 @@ def checked_out?
             File.directory?(srcdir)
         end
 
+        def prepare_invoked?
+            task("#{name}-prepare").already_invoked?
+        end
+
+        def prepared?
+            @prepared
+        end
+
+        def import_invoked?
+            task("#{name}-import").already_invoked?
+        end
+
+        def imported?
+            @imported
+        end
+
+        def build_invoked?
+            task("#{name}-build").already_invoked?
+        end
+
+        def built?
+            @built
+        end
+
         def to_s
             "#<#{self.class} name=#{name}>"
         end
@@ -422,6 +451,7 @@ def import(options = Hash.new)
 
             if @importer
                 result = @importer.import(self, options)
+                @imported = true
             elsif update?
                 message "%s: no importer defined, doing nothing"
             end
@@ -443,6 +473,8 @@ def prepare
                 isolate_errors { install }
             end
             task "#{name}-build" => installstamp
+
+            @prepared = true
         end
 
         def process_formatting_string(msg, *prefix_style)
@@ -522,6 +554,8 @@ def install
             progress_done
 
             Autobuild.touch_stamp(installstamp)
+
+            @built = true
         end
 
         def run(*args, &block)

data/lib/autobuild/subcommand.rb

@@ -348,12 +348,17 @@ def self.run(target, phase, *command)
                 end
             end
 
+            readbuffer = StringIO.new
+
             # Feed the input
             if !input_streams.empty?
                 pread.close
                 begin
                     input_streams.each do |instream|
-                        instream.each_line { |line| pwrite.write(line) }
+                        instream.each_line do |line|
+                            readbuffer.write(outread.readpartial(128)) while IO.select([outread], nil, nil, 0)
+                            pwrite.write(line)
+                        end
                     end
                 rescue Errno::ENOENT => e
                     raise Failed.new(nil, false),
@@ -387,6 +392,14 @@ def self.run(target, phase, *command)
             # If the caller asked for process output, provide it to him
             # line-by-line.
             outwrite.close
+
+            if !input_streams.empty?
+                readbuffer.write(outread.read)
+                readbuffer.seek(0)
+                outread.close
+                outread = readbuffer
+            end
+
             outread.each_line do |line|
                 line.force_encoding(options[:encoding])
                 line = line.chomp

data/lib/autobuild/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake