autobuild 1.10.0.b2 → 1.10.0.b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c87629da5179c5b58f195daf8679f53bfc4054
-  data.tar.gz: af790ea0bf7210db55344839c79455b650d1e915
+  metadata.gz: 28218a1fe204bc6efd9ae8a5ca2635067dd1aa8f
+  data.tar.gz: dc5ea70ceb40b5798c5cbcfdbc53000dc1b0507d
 SHA512:
-  metadata.gz: 504fec6fac6c095d815d7541ba6828dc55a62032ae8bfeea548e8c23ae3f29bb4dd2f945a80720fc8110ab0d3e3c2695e26fc3dd05729f94bf102c630cfd73ab
-  data.tar.gz: 20292807e5da7f402da75132e4ed808e1b89f05eda485b371b7b03c1156827d6886dc4cd31be4a6da46b079c01e7db941b5b74fe5f2ad2a67d37eecbff83bfde
+  metadata.gz: a43bb95fbd578877a7559ea37323bdfaedc0a3197bf47a3b283667eb99b3c83d8079bdd4a2627c03ade5802a475e140c93bdf5aadcc075d8f42cb0fec3689c1d
+  data.tar.gz: b18e69dfe1aa5373a538d277ba30f455c94555b6de1c8a2335216545f0b37d8761920d1bd454bc9148f8ffed335aaf23e7e4225215ca2073fbbf2a24d770587c

data/lib/autobuild/config.rb

@@ -275,7 +275,10 @@ module Autobuild
             utilities.keys
     end
 
-    def self.apply(packages, buildname = "autobuild", phases = [])
+    def self.apply(packages, buildname = "autobuild", phases = [], options = Hash.new)
+        options = Kernel.validate_options options,
+            parallel: Autobuild.parallel_build_level
+
         if Autobuild.mail[:to]
             if !Autobuild::HAS_RMAIL
                 Autobuild.warn "RMail is not available. Mail notification is disabled"
@@ -322,7 +325,7 @@ module Autobuild
         end
 
         begin
-            invoker = Autobuild::RakeTaskParallelism.new
+            invoker = Autobuild::RakeTaskParallelism.new(options[:parallel])
             Autobuild.parallel_task_manager = invoker
             phases.each do |phase|
                 invoker.invoke_parallel([Rake::Task["#{buildname}-#{phase}"]])

data/lib/autobuild/import/git.rb

@@ -364,11 +364,37 @@ module Autobuild
             end
         end
 
+        # Resolve a commit ref to a tag or commit ID
+        def describe_rev(package, rev)
+            tag = run_git_bare(package, 'describe', '--tags', '--exact-match', rev).first.strip
+            return true, tag.encode('UTF-8')
+        rescue Autobuild::SubcommandFailed
+            commit = rev_parse(package, rev)
+            return false, commit.encode('UTF-8')
+        end
+
+        # Enumerates the ref that are present on the remote
+        #
+        # @yieldparam [String] ref_name the ref name
+        # @yieldparam [String] commit_id the ref's commit ID
+        def each_remote_ref(package)
+            return enum_for(__method__, package) if !block_given?
+            run_git_bare(package, 'ls-remote', repository).each do |line|
+                commit_id, ref_name = line.split(/\s+/)
+                if ref_name !~ /\^/
+                    yield(ref_name, commit_id)
+                end
+            end
+        end
+
         # Fetches updates from the remote repository. Returns the remote commit
         # ID on success, nil on failure. Expects the current directory to be the
         # package's source directory.
-        def fetch_remote(package)
+        def fetch_remote(package, options = Hash.new)
             validate_importdir(package)
+            options = Kernel.validate_options options,
+                refspec: remote_branch || tag
+
             git_dir = git_dir(package, false)
 
             # If we are checking out a specific commit, we don't know which
@@ -381,7 +407,7 @@ module Autobuild
             # Doing it now is better as it makes sure that we replace the
             # configuration parameters only if the repository and branch are
             # OK (i.e. we keep old working configuration instead)
-            refspec = [branch || tag].compact
+            refspec = Array(options[:refspec])
             run_git_bare(package, 'fetch', '--tags', repository, *refspec, retry: true)
 
             update_remotes_configuration(package)
@@ -397,7 +423,7 @@ module Autobuild
             end
 
             # Update the remote tag if needs be
-            if branch && commit_id
+            if remote_branch && commit_id
                 run_git_bare(package, 'update-ref', "-m", "updated by autobuild", "refs/remotes/#{remote_name}/#{remote_branch}", commit_id)
             end
 
@@ -445,6 +471,13 @@ module Autobuild
             remote_commit = current_remote_commit(package, only_local)
             status = merge_status(package, remote_commit)
             status.uncommitted_code = self.class.has_uncommitted_changes?(package)
+            if current_branch = self.current_branch(package)
+                if current_branch != "refs/heads/#{local_branch}"
+                    status.unexpected_working_copy_state << "working copy is on branch #{current_branch}, the autoproj configuration expected it to be on #{local_branch}"
+                end
+            else
+                status.unexpected_working_copy_state << "working copy is on a detached HEAD"
+            end
             status
         end
 
@@ -553,7 +586,7 @@ module Autobuild
         # Tests whether a commit is already present in a given history
         #
         # @param [Package] the package we are working on
-        # @param [String] commit the commit ID we want to verify the presence of
+        # @param [String] rev what we want to verify the presence of
         # @param [String] reference the reference commit. The method tests that
         #   'commit' is present in the history of 'reference'
         #
@@ -569,6 +602,71 @@ module Autobuild
             end
         end
 
+        # Finds a remote reference that contains a commit
+        #
+        # It will favor the configured {#remote_branch} if it matches
+        #
+        # @param [Autobuild::Package] package the package we are working on
+        # @param [String] commit_id the commit ID (can be a rev)
+        # @return [String] a remote ref
+        # @raise [PackageException] if there is no such commit on the remote
+        def describe_commit_on_remote(package, rev = 'HEAD', options = Hash.new)
+            rev = rev.to_str
+            options = Kernel.validate_options options,
+                tags: true
+
+            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_id = remote_refs.delete(remote_branch_ref)
+            begin
+                if commit_present_in?(package, commit_id, remote_branch_id)
+                    return remote_branch
+                end
+            rescue PackageException # We have to fetch. Fetch all branches at once
+                fetch_remote(package, refspec: [remote_branch_ref, *remote_refs.keys])
+                if commit_present_in?(package, commit_id, remote_branch_id)
+                    return remote_branch
+                end
+            end
+
+            if !options[:tags]
+                remote_refs.delete_if { |r| r =~ /^refs\/tags\// }
+            end
+
+            # Prefer tags, then heads, then the rest (e.g. github pull requests)
+            remote_refs = remote_refs.sort_by do |rev_name, rev_id|
+                case rev_name
+                when /^refs\/tags\// then 0
+                when /^refs\/heads\// then 1
+                else 2
+                end
+            end
+
+            remote_refs.delete_if do |rev_name, rev_id|
+                begin
+                    if commit_present_in?(package, commit_id, rev_id)
+                        return rev_name
+                    end
+                    true
+                rescue PackageException
+                    false
+                end
+            end
+
+            if !remote_refs.empty?
+                fetch_remote(package, refspec: remote_refs.map(&:first))
+                remote_refs.each do |rev_name, rev_id|
+                    if commit_present_in?(package, commit_id, rev_id)
+                        return rev_name
+                    end
+                end
+            end
+
+            raise PackageException.new(package), "current HEAD (#{commit_id}) does not seem to be present on the remote"
+        end
+
         # Computes the update status to update a branch whose tip is at
         # reference_commit (which can be a symbolic reference) using the
         # fetch_commit commit
@@ -798,8 +896,18 @@ module Autobuild
 
         # Changes the repository this importer is pointing to
         def relocate(repository, options = Hash.new)
+            options = Hash[options.map { |k, v| [k.to_sym, v] }]
+
             @push_to = options[:push_to] || @push_to
-            @branch = options[:branch] || @branch || 'master'
+            @branch = @local_branch = @remote_branch = nil
+            local_branch  = options[:local_branch]  || options[:branch] || local_branch || 'master'
+            remote_branch = options[:remote_branch] || options[:branch] || remote_branch || 'master'
+            if local_branch == remote_branch
+                @branch = local_branch
+            else
+                @local_branch = local_branch
+                @remote_branch = remote_branch
+            end
             @tag    = options[:tag] || @tag
             @commit = options[:commit] || @commit
 
@@ -807,7 +915,7 @@ module Autobuild
             @repository_id = options[:repository_id] ||
                 "git:#{@repository}"
             @source_id = options[:source_id] ||
-                "#{@repository_id} branch=#{self.branch} tag=#{self.tag} commit=#{self.commit}"
+                "#{@repository_id} branch=#{remote_branch} tag=#{self.tag} commit=#{self.commit}"
         end
 
         # Tests whether the given directory is a git repository

data/lib/autobuild/importer.rb

@@ -45,6 +45,14 @@ class Importer
         attr_accessor :status
         # True if there is code in the working copy that is not committed
         attr_accessor :uncommitted_code
+        # A list of messages describing differences between the local working
+        # copy and its expected state
+        #
+        # On git, it would for instance mention that currently checked out
+        # branch is not the one autoproj expects
+        #
+        # @return [Array<String>]
+        attr_reader :unexpected_working_copy_state
 
         # An array of strings that represent commits that are in the remote
         # repository and not in this one (would be merged by an update)
@@ -55,6 +63,7 @@ class Importer
 
         def initialize(status = -1)
             @status = status
+            @unexpected_working_copy_state = Array.new
             @uncommitted_code = false
             @remote_commits = Array.new
             @local_commits  = Array.new

data/lib/autobuild/reporting.rb

@@ -102,11 +102,12 @@ module Autobuild
 
         if block_given?
             begin
-                yield
+                result = yield
                 if options[:done_message] && has_progress_for?(key)
                     progress(key, *options[:done_message])
                 end
                 progress_done(key, true)
+                result
             rescue Exception
                 progress_done(key, false)
                 raise

data/lib/autobuild/subcommand.rb

@@ -197,14 +197,15 @@ module Autobuild::Subprocess
         STDOUT.sync = true
 
         input_streams = []
-        options = Hash[retry: false, env: ENV.to_hash, env_inherit: true]
+        options = Hash[retry: false, env: ENV.to_hash, env_inherit: true, encoding: 'BINARY']
         if command.last.kind_of?(Hash)
             options = command.pop
             options = Kernel.validate_options options,
                 input: nil, working_directory: nil, retry: false,
                 input_streams: [],
                 env: ENV.to_hash,
-                env_inherit: true
+                env_inherit: true,
+                encoding: 'BINARY'
 
             if options[:input]
                 input_streams << File.open(options[:input])
@@ -246,9 +247,7 @@ module Autobuild::Subprocess
                     elsif Autobuild.registered_logfile?(logname) then 'a'
                     else 'w'
                     end
-        if defined? Encoding
-            open_flag << ":BINARY"
-        end
+        open_flag << ":BINARY"
 
         Autobuild.register_logfile(logname)
         subcommand_output = Array.new
@@ -385,7 +384,7 @@ module Autobuild::Subprocess
             # line-by-line.
             outwrite.close
             outread.each_line do |line|
-                line.force_encoding('BINARY')
+                line.force_encoding(options[:encoding])
                 line = line.chomp
                 subcommand_output << line
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.0.b2" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.b3" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.10.0.b2
+  version: 1.10.0.b3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake