Skip to content

Commit

Permalink
Merge pull request #312 from rock-core/update_ask
Browse files Browse the repository at this point in the history 
implement autoproj update --ask
  • Loading branch information
@doudou
doudou authored Jul 1, 2020
2 parents 8fa1b0c + 1cc67e9 commit 0b1c16d
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 22 deletions.
2 changes: 2 additions & 0 deletions lib/autoproj/cli/main.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ def status(*packages)
desc: "compare to the given baseline. if 'true', the comparison will ignore any override, otherwise it will take into account overrides only up to the given package set"
option :auto_exclude, type: :boolean,
desc: 'if true, packages that fail to import will be excluded from the build'
option :ask, type: :boolean, default: false,
desc: 'ask whether each package should or should not be updated'
def update(*packages)
report_options = Hash[silent: false, on_package_failures: default_report_on_package_failures]
if options[:auto_exclude]
Expand Down
24 changes: 15 additions & 9 deletions lib/autoproj/cli/status.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def snapshot_overrides_vcs?(importer, vcs, snapshot)
end
end

def report_exception(package_status, msg, e)
def self.report_exception(package_status, msg, e)
package_status.msg << Autoproj.color(" #{msg} (#{e})", :red)
if Autobuild.debug
package_status.msg.concat(e.backtrace.map do |line|
Expand All @@ -82,8 +82,8 @@ def report_exception(package_status, msg, e)
end
end

PackageStatus = Struct.new :msg, :sync, :uncommitted, :local, :remote
def status_of_package(package_description, only_local: false, snapshot: false)
PackageStatus = Struct.new :msg, :sync, :unexpected, :uncommitted, :local, :remote
def self.status_of_package(package_description, only_local: false, snapshot: false)
pkg = package_description.autobuild
importer = pkg.importer
package_status = PackageStatus.new(Array.new, false, false, false, false)
Expand All @@ -96,7 +96,7 @@ def status_of_package(package_description, only_local: false, snapshot: false)
else
begin status = importer.status(pkg, only_local: only_local)
rescue StandardError => e
report_exception(package_status, "failed to fetch status information", e)
self.report_exception(package_status, "failed to fetch status information", e)
return package_status
end

Expand All @@ -108,7 +108,7 @@ def status_of_package(package_description, only_local: false, snapshot: false)
rescue Autobuild::PackageException
Hash.new
rescue StandardError => e
report_exception(package_status, "failed to fetch snapshotting information", e)
self.report_exception(package_status, "failed to fetch snapshotting information", e)
return package_status
end
if snapshot_overrides_vcs?(importer, package_description.vcs, snapshot_version)
Expand All @@ -122,6 +122,7 @@ def status_of_package(package_description, only_local: false, snapshot: false)
end

status.unexpected_working_copy_state.each do |msg|
package_status.unexpected = true
package_status.msg << Autoproj.color(" #{msg}", :red, :bold)
end

Expand Down Expand Up @@ -173,13 +174,15 @@ def each_package_status(packages, parallel: ws.config.parallel_import_level, sna
end
noninteractive = noninteractive.map do |pkg|
future = Concurrent::Future.execute(executor: executor) do
status_of_package(pkg, snapshot: snapshot, only_local: only_local)
Status.status_of_package(
pkg, snapshot: snapshot, only_local: only_local
)
end
[pkg, future]
end

(noninteractive + interactive).each do |pkg, future|
if future
if future
if progress
wait_timeout = 1
while true
Expand All @@ -196,7 +199,10 @@ def each_package_status(packages, parallel: ws.config.parallel_import_level, sna
if !(status = future.value)
raise future.reason
end
else status = status_of_package(pkg, snapshot: snapshot, only_local: only_local)
else
status = Status.status_of_package(
pkg, snapshot: snapshot, only_local: only_local
)
end

result.uncommitted ||= status.uncommitted
Expand Down Expand Up @@ -263,7 +269,7 @@ def display_status(packages, parallel: ws.config.parallel_import_level, snapshot
sync_packages = ""
end

STDERR.print
STDERR.print

if status.msg.size == 1
Autoproj.message "#{pkg_name}: #{status.msg.first}"
Expand Down
74 changes: 65 additions & 9 deletions lib/autoproj/cli/update.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'autoproj/cli'
require 'autoproj/cli/base'
require 'autoproj/cli/status'
require 'autoproj/ops/import'

module Autoproj
Expand Down Expand Up @@ -66,25 +67,29 @@ def validate_options(selection, options)
return selection, options
end

def run(selected_packages, run_hook: false, report: true, **options)
def run(selected_packages, run_hook: false, report: true, ask: false, **options)
ws.manifest.accept_unavailable_osdeps = !options[:osdeps]
ws.setup
ws.autodetect_operating_system(force: true)
if options[:bundler]
ws.update_bundler
end
if options[:autoproj]
ws.update_autoproj

if ask
prompt = TTY::Prompt.new
options[:bundler] &&= prompt.yes?("Update bundler ?")
options[:autoproj] &&= prompt.yes?("Update autoproj ?")
end

ws.update_bundler if options[:bundler]
ws.update_autoproj if options[:autoproj]

begin
ws.load_package_sets(
mainline: options[:mainline],
only_local: options[:only_local],
checkout_only: !options[:config] || options[:checkout_only],
reset: options[:reset],
keep_going: options[:keep_going],
retry_count: options[:retry_count])
retry_count: options[:retry_count]
)
rescue ImportFailed => configuration_import_failure
if !options[:keep_going]
raise
Expand Down Expand Up @@ -122,6 +127,7 @@ def run(selected_packages, run_hook: false, report: true, **options)
parallel: options[:parallel] || ws.config.parallel_import_level,
retry_count: options[:retry_count],
auto_exclude: options[:auto_exclude],
ask: ask,
report: report)

ws.finalize_setup
Expand Down Expand Up @@ -193,14 +199,63 @@ def normalize_osdeps_options(
osdeps_options
end

class AskUpdateFilter
def initialize(prompt, parallel: 1, only_local: false)
@prompt = prompt
@only_local = only_local
@executor = Concurrent::FixedThreadPool.new(parallel, max_length: 0)

@parallel = parallel
@futures = {}
@lookahead_queue = []
end

def call(pkg)
unless (status = @futures.delete(pkg).value)
raise v.reason
end

clean = !status.unexpected &&
(status.sync || (status.local && !status.remote))
if clean
msg = Autobuild.color('already up-to-date', :green)
pkg.autobuild.message "#{msg} %s"
return false
end

Autobuild.progress_display_synchronize do
status.msg.each { |m| puts m }
@prompt.yes?("Update #{pkg.name} ?")
end
end

def lookahead(pkg)
@futures[pkg] = Concurrent::Future.execute(executor: @executor) do
Status.status_of_package(
pkg, snapshot: false, only_local: @only_local
)
end
end
end

def update_packages(selected_packages,
from: nil, checkout_only: false, only_local: false, reset: false,
deps: true, keep_going: false, parallel: 1,
retry_count: 0, osdeps: true, auto_exclude: false, osdeps_options: Hash.new,
report: true)
report: true, ask: false)

setup_update_from(from) if from

filter =
if ask
prompt = TTY::Prompt.new
filter = AskUpdateFilter.new(
prompt, parallel: parallel, only_local: only_local
)
else
->(pkg) { true }
end

ops = Autoproj::Ops::Import.new(
ws, report_path: (ws.import_report_path if report))
source_packages, osdep_packages =
Expand All @@ -213,7 +268,8 @@ def update_packages(selected_packages,
parallel: parallel,
retry_count: retry_count,
install_vcs_packages: (osdeps_options if osdeps),
auto_exclude: auto_exclude)
auto_exclude: auto_exclude,
filter: filter)
[source_packages, osdep_packages, nil]
rescue ExcludedSelection => e
raise CLIInvalidSelection, e.message, e.backtrace
Expand Down
15 changes: 14 additions & 1 deletion lib/autoproj/ops/import.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ def import_selected_packages(selection,
install_vcs_packages: Hash.new,
non_imported_packages: :checkout,
auto_exclude: auto_exclude?,
filter: ->(package) { true },
**import_options)

unless %i[checkout ignore return].include?(non_imported_packages)
Expand Down Expand Up @@ -235,6 +236,11 @@ def import_selected_packages(selection,
missing_vcs = Array.new
installed_vcs_packages = Set['none', 'local']
while failures.empty? || keep_going
# Allow 'filter' to parallelize as well
if filter.respond_to?(:lookahead)
package_queue.each { |pkg| filter.lookahead(pkg) }
end

# Queue work for all packages in the queue
package_queue.each do |pkg|
# Remove packages that have already been processed
Expand All @@ -255,6 +261,11 @@ def import_selected_packages(selection,
end
all_processed_packages << pkg

unless filter.call(pkg)
completion_queue << [pkg, Time.now]
next
end

importer = pkg.autobuild.importer
if !pre_package_import(selection, manifest, pkg.autobuild,
reverse_dependencies)
Expand All @@ -272,8 +283,8 @@ def import_selected_packages(selection,
next
end

pending_packages << pkg
begin
pending_packages << pkg
queue_import_work(
executor, completion_queue, pkg,
retry_count: retry_count,
Expand Down Expand Up @@ -432,6 +443,7 @@ def import_packages(selection,
keep_going: false,
install_vcs_packages: Hash.new,
auto_exclude: auto_exclude?,
filter: ->(pkg) { true },
**import_options)

manifest = ws.manifest
Expand All @@ -443,6 +455,7 @@ def import_packages(selection,
recursive: recursive,
install_vcs_packages: install_vcs_packages,
auto_exclude: auto_exclude,
filter: filter,
**import_options)

raise failures.first if !keep_going && !failures.empty?
Expand Down
4 changes: 2 additions & 2 deletions lib/autoproj/ops/tools.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def initialize(text_name, srcdir, importer = nil)
@@packages.delete(text_name)
end

def import(options = Hash.new)
importer.import(self, options)
def import(**options)
importer.import(self, **options)
end

def add_stat(*args)
Expand Down
2 changes: 1 addition & 1 deletion lib/autoproj/package_set.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def snapshot(target_dir, options = Hash.new)
else
package = create_autobuild_package
if package.importer.respond_to?(:snapshot)
package.importer.snapshot(package, target_dir, options)
package.importer.snapshot(package, target_dir, **options)
end
end
end
Expand Down

0 comments on commit 0b1c16d

Please sign in to comment.