autoproj 2.12.0 → 2.15.0

data/Gemfile

@@ -1,14 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'autobuild', git: 'https://github.com/rock-core/autobuild', branch: 'master'
+gem "autobuild", git: "https://github.com/rock-core/autobuild", branch: "master"
 
 group :vscode do
-    gem 'pry'
-    gem 'pry-byebug'
-    gem 'rubocop', '>= 0.6.0'
-    gem 'rubocop-rock'
-    gem 'ruby-debug-ide', '>= 0.6.0'
-    gem 'debase', '>= 0.2.2.beta10'
-    gem 'solargraph'
+    gem "debase", ">= 0.2.2.beta10"
+    gem "pry"
+    gem "pry-byebug"
+    gem "rubocop", ">= 0.6.0"
+    gem "rubocop-rock"
+    gem "ruby-debug-ide", ">= 0.6.0"
+    gem "solargraph"
 end
 gemspec

data/Rakefile

@@ -1,45 +1,45 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task 'default'
-task 'gem' => 'build'
+task "default"
+task "gem" => "build"
 
 Rake::TestTask.new(:test) do |t|
     t.libs << "lib" << Dir.pwd
-    t.test_files = FileList['test/**/test_*.rb']
+    t.test_files = FileList["test/**/test_*.rb"]
 end
 
 desc "generate the bootstrap script"
-task 'bootstrap' do
-    require 'yaml'
-    autoproj_ops_install = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'ops', 'install.rb'))
+task "bootstrap" do
+    require "yaml"
+    autoproj_ops_install = File.read(File.join(Dir.pwd, "lib", "autoproj", "ops", "install.rb"))
     # Since we are using gsub to replace the content in the bootstrap file,
     # we have to quote all \
-    autoproj_ops_install.gsub! /\\/, '\\\\\\\\'
+    autoproj_ops_install.gsub!(/\\/, "\\\\\\\\")
 
-    %w{bootstrap install}.each do |install_script|
-        bootstrap_code = File.read(File.join(Dir.pwd, 'bin', "autoproj_#{install_script}.in")).
-            gsub("require 'autoproj/ops/install'", autoproj_ops_install)
-        File.open(File.join(Dir.pwd, 'bin', "autoproj_#{install_script}"), 'w') do |io|
+    %w[bootstrap install].each do |install_script|
+        bootstrap_code = File.read(File.join(Dir.pwd, "bin", "autoproj_#{install_script}.in"))
+                             .gsub("require 'autoproj/ops/install'", autoproj_ops_install)
+        File.open(File.join(Dir.pwd, "bin", "autoproj_#{install_script}"), "w") do |io|
             io.write bootstrap_code
         end
     end
 end
 
-require 'autoproj/bash_completion'
-require 'autoproj/zsh_completion'
+require "autoproj/bash_completion"
+require "autoproj/zsh_completion"
 
-shells = [['bash', Autoproj::BashCompletion], ['zsh', Autoproj::ZshCompletion]]
+shells = [["bash", Autoproj::BashCompletion], ["zsh", Autoproj::ZshCompletion]]
 clis = [%w[alocate locate], %w[alog log], %w[amake build], %w[aup update],
-        ['autoproj', nil]]
+        ["autoproj", nil]]
 
-shell_dir = File.join(Dir.pwd, 'shell')
-completion_dir = File.join(shell_dir, 'completion')
+shell_dir = File.join(Dir.pwd, "shell")
+completion_dir = File.join(shell_dir, "completion")
 
-desc 'generate the shell helpers scripts'
-task 'helpers' do
-    require 'erb'
-    templates_dir = File.join(Dir.pwd, 'lib', 'autoproj', 'templates')
+desc "generate the shell helpers scripts"
+task "helpers" do
+    require "erb"
+    templates_dir = File.join(Dir.pwd, "lib", "autoproj", "templates")
     FileUtils.mkdir_p(completion_dir)
 
     shells.each do |shell|
@@ -47,13 +47,13 @@ task 'helpers' do
             completion = shell[1].new(cli[0], command: cli[1])
             completion_file = File.join(completion_dir, "#{cli[0]}_#{shell[0]}")
 
-            IO.write(completion_file, completion.generate)
+            File.write(completion_file, completion.generate)
         end
         erb = File.read(File.join(templates_dir, "helpers.#{shell[0]}.erb"))
         helper_file = File.join(shell_dir, "autoproj_#{shell[0]}")
 
-        IO.write(helper_file, ::ERB.new(erb, nil, '-').result(binding))
+        File.write(helper_file, ::ERB.new(erb, nil, "-").result(binding))
     end
 end
 
-file 'bin/autoproj_bootstrap' => 'bootstrap'
+file "bin/autoproj_bootstrap" => "bootstrap"

data/autoproj.gemspec

@@ -1,15 +1,16 @@
 # coding: utf-8
-require 'rbconfig'
 
-lib = File.expand_path('../lib', __FILE__)
+require "rbconfig"
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'autoproj/version'
+require "autoproj/version"
 
 Gem::Specification.new do |s|
     s.name = "autoproj"
     # The envvar is here for the benefit of tests that require to create gems
     # with a "fake" version
-    s.version = ENV['__AUTOPROJ_TEST_FAKE_VERSION'] || Autoproj::VERSION
+    s.version = ENV["__AUTOPROJ_TEST_FAKE_VERSION"] || Autoproj::VERSION
     s.authors = ["Sylvain Joyeux"]
     s.email = "sylvain.joyeux@m4x.org"
     s.summary = "Easy installation and management of sets of software packages"
@@ -17,29 +18,28 @@ Gem::Specification.new do |s|
     s.homepage = "http://rock-robotics.org"
     s.licenses = ["BSD"]
 
-    s.required_ruby_version = '>= 2.1.0'
-    s.bindir = 'bin'
-    s.executables = ['autoproj', 'aup', 'amake', 'alocate', 'alog']
+    s.required_ruby_version = ">= 2.5.0"
+    s.bindir = "bin"
+    s.executables = %w[autoproj aup amake alocate alog]
     s.require_paths = ["lib"]
     s.extensions = []
-    s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
+    s.add_runtime_dependency "autobuild", ">= 1.21.0"
+    s.add_runtime_dependency "backports", "~> 3.0"
     s.add_runtime_dependency "bundler"
-    s.add_runtime_dependency "autobuild", ">= 1.19.0"
-    s.add_runtime_dependency "backports", '~> 3.0'
-    s.add_runtime_dependency "utilrb", '~> 3.0.0', ">= 3.0.0"
-    s.add_runtime_dependency "thor", '~> 0.20.0'
-    s.add_runtime_dependency 'concurrent-ruby', '~> 1.0.0', '>= 1.0.0'
-    s.add_runtime_dependency 'tty-color', '~> 0.4.0', '>= 0.4.0'
-    s.add_runtime_dependency 'tty-prompt', '~> 0.15.0'
-    s.add_runtime_dependency 'tty-spinner', '~> 0.8.0'
-    s.add_runtime_dependency 'rb-inotify' if RbConfig::CONFIG['target_os'] =~ /linux/
-    s.add_runtime_dependency 'xdg', '= 2.2.5'
-    s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"
+    s.add_runtime_dependency "concurrent-ruby", "~> 1.1"
+    s.add_runtime_dependency "rb-inotify" if RbConfig::CONFIG["target_os"] =~ /linux/
+    s.add_runtime_dependency "thor", "~> 1.0"
+    s.add_runtime_dependency "tty-color", "~> 0.5.0"
+    s.add_runtime_dependency "tty-prompt", "~> 0.21.0"
+    s.add_runtime_dependency "tty-spinner", "~> 0.9.0"
+    s.add_runtime_dependency "utilrb", "~> 3.0.0", ">= 3.0.0"
+    s.add_runtime_dependency "xdg", "= 2.2.5"
+    s.add_development_dependency "aruba"
+    s.add_development_dependency "flexmock", "~> 2.0", ">= 2.0.0"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "simplecov"
-    s.add_development_dependency "aruba"
-    s.add_development_dependency "tty-cursor"
     s.add_development_dependency "timecop"
+    s.add_development_dependency "tty-cursor"
 end
-

data/bin/alocate

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require 'autoproj/cli/main'
+require "autoproj/cli/main"
 argv = Autoproj::CLI.basic_setup
 
 class Alocate < Autoproj::CLI::Main
@@ -10,10 +10,10 @@ class Alocate < Autoproj::CLI::Main
 end
 
 begin
-    if argv.include?('--help') || argv.include?('help')
-        Alocate.start(['help', 'locate'])
+    if argv.include?("--help") || argv.include?("help")
+        Alocate.start(%w[help locate])
     else
-        Alocate.start(['locate', *argv])
+        Alocate.start(["locate", *argv])
     end
 rescue Interrupt
     # Already notified in the reporting infrastructure

data/bin/alog

@@ -1,10 +1,10 @@
 #! /usr/bin/env ruby
 
-require 'autoproj/cli/main'
-require 'autoproj/cli/locate'
+require "autoproj/cli/main"
+require "autoproj/cli/locate"
 
 argv = Autoproj::CLI.basic_setup
-if argv.include?('--help') || argv.include?('help')
+if argv.include?("--help") || argv.include?("help")
     puts "Usage:"
     puts "  alog [package]"
     puts
@@ -16,13 +16,12 @@ Autoproj.report(silent: true) do
     cli = Autoproj::CLI::Locate.new
 
     arg = argv.first || Dir.pwd
-    if File.directory?(arg)
-        arg = "#{File.expand_path(arg)}/"
-    end
+    arg = "#{File.expand_path(arg)}/" if File.directory?(arg)
     log_files = cli.logs_of(arg, log: nil)
 
     if log_files.size == 1
         logfile = log_files.first
+        puts File.read(logfile)
     elsif log_files.size > 1
         begin
             logfile = cli.select_log_file(log_files)
@@ -30,6 +29,6 @@ Autoproj.report(silent: true) do
         rescue Interrupt
         end
     elsif log_files.empty?
-        raise "no logs found for #{string}"
+        raise "no logs found for #{arg}"
     end
 end

data/bin/amake

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require 'autoproj/cli/main'
+require "autoproj/cli/main"
 
 argv = Autoproj::CLI.basic_setup
 class Amake < Autoproj::CLI::Main
@@ -10,10 +10,10 @@ class Amake < Autoproj::CLI::Main
 end
 
 begin
-    if argv.include?('--help') || argv.include?('help')
-        Amake.start(['help', 'build'])
+    if argv.include?("--help") || argv.include?("help")
+        Amake.start(%w[help build])
     else
-        Amake.start(['build', '--amake', *argv])
+        Amake.start(["build", "--amake", *argv])
     end
 rescue Interrupt
     # Already notified in the reporting infrastructure

data/bin/aup

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require 'autoproj/cli/main'
+require "autoproj/cli/main"
 
 argv = Autoproj::CLI.basic_setup
 
@@ -11,10 +11,10 @@ class Aup < Autoproj::CLI::Main
 end
 
 begin
-    if argv.include?('--help') || argv.include?('help')
-        Aup.start(['help', 'update'])
+    if argv.include?("--help") || argv.include?("help")
+        Aup.start(%w[help update])
     else
-        Aup.start(['update', *argv, '--aup'])
+        Aup.start(["update", *argv, "--aup"])
     end
 rescue Interrupt
     # Already notified in the reporting infrastructure

data/bin/autoproj

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
-require 'autoproj/cli'
-require 'autoproj/cli/main'
+require "autoproj/cli"
+require "autoproj/cli/main"
 argv = Autoproj::CLI.basic_setup
 
 begin