autoproj 2.4.0 → 2.5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c12d40c6ed5bf39360d3f3e39b3a602841f5f8
-  data.tar.gz: c2f379b779b1f5ba68ec9a3b00add4e90142fdfc
+  metadata.gz: cb1e051f18d65cbf0b5d3d2b57efd6f31e84b711
+  data.tar.gz: b2471080ab735a3bc2820de40c287d01b2bb11b9
 SHA512:
-  metadata.gz: db6011b85a68c112ce7fa950c8c33dbf3a7229d3538d23fdf0093d72b3d74fe593cbe4d68c434a7231d937e21852a7ceb985f3dbacaa451db55c89e87a4c58fe
-  data.tar.gz: 3197a556775041572721f3a9bb4e6c84bf058deee78b5bc0f8a031e32d8ab5b87dc723a30991779cb85e41cea9bc404460367ea8062ffa39d077563fdc5f7055
+  metadata.gz: 658959ed15d63a6b1b9cffb0eebc11e5be6ee4edda4f472dc4f5c4440726adc6e146cbf4f885cc52906385654c87414630d424add128d000c21a409cd8b6c503
+  data.tar.gz: 4a311895224ae16098f47e587a0dac2d1b0b9de50653f6a287b0a3c8e7d53036e2451315a441850c0faa1454240a0c1dc14c713cffd50f0e20b4c40e9926d4d2

data/.gitignore

@@ -8,3 +8,4 @@ pkg/
 /coverage/
 /.yardoc/
 test/gem_home
+tmp/

data/.travis.yml

@@ -3,8 +3,8 @@ language: ruby
 rvm:
   - 2.1.10
   - 2.2.5
-  - 2.3.1
-  - 2.4.1
+  - 2.3.6
+  - 2.4.3
   - 2.5.0
   - jruby-9.1.15.0
 matrix:
@@ -18,7 +18,7 @@ install:
     - git config --global user.email "autoproj@travis"
     - gem install bundler
     # Some tests expect gems to be present in vendor/bundle
-    - bundler install --path vendor/bundle
+    - bundle install --path vendor/bundle
 script:
-    - bundler exec rake
-    - AUTOPROJ_SKIP_LONG_TESTS=1 bundler exec rake test
+    - bundle exec rake
+    - AUTOPROJ_SKIP_LONG_TESTS=1 bundle exec rake test

data/README.md

@@ -237,15 +237,17 @@ bypassing any check. Great for CI environments.
 The best way to use autoproj 2.x from git is to checkout autoproj and
 autobuild manually, and write a Gemfile.autoproj-2.0 containing
 
+```
    source "https://rubygems.org"
    gem "autoproj", path: '/home/doudou/dev/gems/autoproj'
    gem "autobuild", path: '/home/doudou/dev/gems/autobuild'
    gem "utilrb", ">= 3.0.0.a"
-
+```
 Then, pass this gemfile to the --gemfile argument to autoproj_install
 or autoproj_bootstrap. Note that one can re-run autoproj_install in an
 already bootstrapped autoproj workspace, e.g.
 
+```
    wget https://raw.githubusercontent.com/rock-core/autoproj/master/bin/autoproj_install
    ruby autoproj_install --gemfile=../Gemfile.autoproj-2.0
-
+```

data/autoproj.gemspec

@@ -1,4 +1,6 @@
 # coding: utf-8
+require 'rbconfig'
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'autoproj/version'
@@ -23,15 +25,18 @@ Gem::Specification.new do |s|
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "bundler"
-    s.add_runtime_dependency "autobuild", ">= 1.12.0"
+    s.add_runtime_dependency "autobuild", ">= 1.13.0.a"
+    s.add_runtime_dependency "backports", '~> 3.0'
     s.add_runtime_dependency "utilrb", '~> 3.0.0', ">= 3.0.0"
-    s.add_runtime_dependency "thor", '~> 0.19.0', '>= 0.19.1'
+    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.12.0', '>= 0.12.0'
-    s.add_runtime_dependency 'tty-spinner', '~> 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_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"
 end
 

data/bin/autoproj_bootstrap

@@ -23,7 +23,7 @@ module Autoproj
         class Install
             class UnexpectedBinstub < RuntimeError; end
 
-            # The directory in which to install autoproj
+            # The created workspace's root directory
             attr_reader :root_dir
             # Content of the Gemfile generated to install autoproj itself
             attr_accessor :gemfile
@@ -316,12 +316,12 @@ module Autoproj
                     exit 1
                 end
             ensure
-                self.class.rewrite_shims(shims_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
+                self.class.rewrite_shims(shims_path, ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home)
             end
 
             EXCLUDED_FROM_SHIMS = %w{rake thor}
 
-            def self.rewrite_shims(shim_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
+            def self.rewrite_shims(shim_path, ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home)
                 FileUtils.mkdir_p shim_path
                 File.open(File.join(shim_path, 'ruby'), 'w') do |io|
                     io.puts "#! /bin/sh"
@@ -347,7 +347,7 @@ module Autoproj
                             io.puts shim_bundler(ruby_executable, autoproj_gemfile_path, gems_gem_home)
                         else
                             load_line = bin_script_lines.grep(/load Gem.bin_path/).first
-                            io.puts shim_script(ruby_executable, autoproj_gemfile_path, gems_gem_home, load_line)
+                            io.puts shim_script(ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home, load_line)
                         end
                     end
                     FileUtils.chmod 0755, bin_shim
@@ -371,7 +371,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 load Gem.bin_path('bundler', 'bundler')"
             end
             
-            def self.shim_script(ruby_executable, autoproj_gemfile_path, gems_gem_home, load_line)
+            def self.shim_script(ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home, load_line)
 "#! #{ruby_executable}
 
 if defined?(Bundler)
@@ -383,6 +383,7 @@ elsif ENV['RUBYLIB']
 end
 
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 require 'rubygems'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 require 'bundler/setup'
@@ -431,7 +432,7 @@ require 'bundler/setup'
                     "config_path = File.join(__dir__, 'config.yml')",
                     "if File.file?(config_path)",
                     "    require 'yaml'",
-                    "    config = YAML.load(File.read(config_path))",
+                    "    config = YAML.load(File.read(config_path)) || Hash.new",
                     "    (config['plugins'] || Hash.new).each do |plugin_name, (version, options)|",
                     "        gem plugin_name, version, **options",
                     "    end",
@@ -500,6 +501,7 @@ require 'bundler/setup'
                 self.class.rewrite_shims(
                     File.join(dot_autoproj, 'bin'),
                     ruby_executable,
+                    root_dir,
                     autoproj_gemfile_path,
                     gems_gem_home)
                 env['PATH'].unshift File.join(dot_autoproj, 'bin')
@@ -514,10 +516,10 @@ require 'bundler/setup'
                 
                 config = Hash.new
                 if File.file?(v1_config_path)
-                    config.merge!(YAML.load(File.read(v1_config_path)))
+                    config.merge!(YAML.load(File.read(v1_config_path)) || Hash.new)
                 end
                 if File.file?(autoproj_config_path)
-                    config.merge!(YAML.load(File.read(autoproj_config_path)))
+                    config.merge!(YAML.load(File.read(autoproj_config_path)) || Hash.new)
                 end
 
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']

data/bin/autoproj_install

@@ -23,7 +23,7 @@ module Autoproj
         class Install
             class UnexpectedBinstub < RuntimeError; end
 
-            # The directory in which to install autoproj
+            # The created workspace's root directory
             attr_reader :root_dir
             # Content of the Gemfile generated to install autoproj itself
             attr_accessor :gemfile
@@ -316,12 +316,12 @@ module Autoproj
                     exit 1
                 end
             ensure
-                self.class.rewrite_shims(shims_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
+                self.class.rewrite_shims(shims_path, ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home)
             end
 
             EXCLUDED_FROM_SHIMS = %w{rake thor}
 
-            def self.rewrite_shims(shim_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
+            def self.rewrite_shims(shim_path, ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home)
                 FileUtils.mkdir_p shim_path
                 File.open(File.join(shim_path, 'ruby'), 'w') do |io|
                     io.puts "#! /bin/sh"
@@ -347,7 +347,7 @@ module Autoproj
                             io.puts shim_bundler(ruby_executable, autoproj_gemfile_path, gems_gem_home)
                         else
                             load_line = bin_script_lines.grep(/load Gem.bin_path/).first
-                            io.puts shim_script(ruby_executable, autoproj_gemfile_path, gems_gem_home, load_line)
+                            io.puts shim_script(ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home, load_line)
                         end
                     end
                     FileUtils.chmod 0755, bin_shim
@@ -371,7 +371,7 @@ Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 load Gem.bin_path('bundler', 'bundler')"
             end
             
-            def self.shim_script(ruby_executable, autoproj_gemfile_path, gems_gem_home, load_line)
+            def self.shim_script(ruby_executable, root_dir, autoproj_gemfile_path, gems_gem_home, load_line)
 "#! #{ruby_executable}
 
 if defined?(Bundler)
@@ -383,6 +383,7 @@ elsif ENV['RUBYLIB']
 end
 
 ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['AUTOPROJ_CURRENT_ROOT'] = '#{root_dir}'
 require 'rubygems'
 Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
 require 'bundler/setup'
@@ -431,7 +432,7 @@ require 'bundler/setup'
                     "config_path = File.join(__dir__, 'config.yml')",
                     "if File.file?(config_path)",
                     "    require 'yaml'",
-                    "    config = YAML.load(File.read(config_path))",
+                    "    config = YAML.load(File.read(config_path)) || Hash.new",
                     "    (config['plugins'] || Hash.new).each do |plugin_name, (version, options)|",
                     "        gem plugin_name, version, **options",
                     "    end",
@@ -500,6 +501,7 @@ require 'bundler/setup'
                 self.class.rewrite_shims(
                     File.join(dot_autoproj, 'bin'),
                     ruby_executable,
+                    root_dir,
                     autoproj_gemfile_path,
                     gems_gem_home)
                 env['PATH'].unshift File.join(dot_autoproj, 'bin')
@@ -514,10 +516,10 @@ require 'bundler/setup'
                 
                 config = Hash.new
                 if File.file?(v1_config_path)
-                    config.merge!(YAML.load(File.read(v1_config_path)))
+                    config.merge!(YAML.load(File.read(v1_config_path)) || Hash.new)
                 end
                 if File.file?(autoproj_config_path)
-                    config.merge!(YAML.load(File.read(autoproj_config_path)))
+                    config.merge!(YAML.load(File.read(autoproj_config_path)) || Hash.new)
                 end
 
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']

data/lib/autoproj.rb

@@ -3,6 +3,13 @@
 require 'utilrb/module/attr_predicate'
 require 'pathname'
 require 'concurrent'
+
+require 'backports/2.4.0/float/dup'
+require 'backports/2.4.0/fixnum/dup'
+require 'backports/2.4.0/nil_class/dup'
+require 'backports/2.4.0/false_class/dup'
+require 'backports/2.4.0/true_class/dup'
+
 require 'autobuild'
 require 'autoproj/autobuild'
 require 'autoproj/base'
@@ -35,9 +42,13 @@
 require 'autoproj/source_package_query'
 require 'autoproj/os_package_query'
 
+require 'autoproj/ops/install'
 require 'autoproj/ops/tools'
 require 'autoproj/ops/loader'
 require 'autoproj/ops/configuration'
+require 'autoproj/ops/cached_env'
+require 'autoproj/ops/which'
+require 'autoproj/ops/atomic_write'
 
 require 'autoproj/workspace'
 

data/lib/autoproj/aruba_minitest.rb

@@ -0,0 +1,66 @@
+require 'aruba/api'
+
+module Autoproj
+    # Minitest-usable Aruba wrapper
+    #
+    # Aruba 0.14 is incompatible with Minitest because of their definition
+    # of the #run method This change hacks around the problem, by moving
+    # the Aruba API to a side stub object.
+    #
+    # The run methods are renamed as they have been renamed in Aruba 1.0
+    # alpha, run -> run_command and run_simple -> run_command_and_stop
+    module ArubaMinitest
+        class API
+            include ::Aruba::Api
+        end
+
+        def setup
+            super
+            @aruba_api = API.new
+            @aruba_api.setup_aruba
+        end
+
+        def teardown
+            stop_all_commands
+            super
+        end
+
+        def run_command_and_stop(*args, fail_on_error: true)
+            cmd = run_command(*args)
+            cmd.stop
+            if fail_on_error
+                assert_command_finished_successfully(cmd)
+            end
+            cmd
+        end
+
+        def run_command(*args)
+            @aruba_api.run(*args)
+        end
+
+        def chmod(*args) # also defined by Rake
+            @aruba_api.chmod(*args)
+        end
+
+        def method_missing(m, *args, &block)
+            if @aruba_api.respond_to?(m)
+                return @aruba_api.send(m, *args, &block)
+            else
+                super
+            end
+        end
+
+        def assert_command_stops(cmd, fail_on_error: true)
+            cmd.stop
+            if fail_on_error
+                assert_command_finished_successfully(cmd)
+            end
+        end
+
+        def assert_command_finished_successfully(cmd)
+            refute cmd.timed_out?, "#{cmd} timed out on stop"
+            assert_equal 0, cmd.exit_status, "#{cmd} finished with a non-zero exit status (#{cmd.exit_status})\n-- STDOUT\n#{cmd.stdout}\n-- STDERR\n#{cmd.stderr}"
+        end
+    end
+end
+

data/lib/autoproj/autobuild_extensions/git.rb

@@ -99,17 +99,18 @@ def snapshot_local(package, options = Hash.new)
                 else
                     info['branch'] = branch
                 end
-                
+
                 if options[:exact_state]
                     has_tag, described = describe_rev(package, 'HEAD')
                     if has_tag
-                        info.merge('tag' => described, 'commit' => nil)
+                        info['tag'] = described
+                        info['commit'] = nil
                     else
-                        info.merge('tag' => nil, 'commit' => described)
+                        info['tag'] = nil
+                        info['commit'] = described
                     end
-                else
-                    info
                 end
+                info
             end
         end
     end

data/lib/autoproj/cli/commit.rb

@@ -5,34 +5,49 @@
 module Autoproj
     module CLI
         class Commit < InspectionTool
-            def run(*user_selection, options = Hash.new)
-                pkg = manifest.main_package_set.create_autobuild_package
+            def default_message(tag_name)
+                if tag_name
+                    "autoproj created tag #{tag_name}"
+                else
+                    'autoproj created version commit'
+                end
+            end
+
+            def run(user_selection, options = Hash.new)
+                tag_name = options[:tag]
+                ws.load_config
+                pkg = ws.manifest.main_package_set.create_autobuild_package
                 importer = pkg.importer
                 if !importer || !importer.kind_of?(Autobuild::Git)
-                    raise CLIInvalidArguments, "cannot use autoproj tag if the main configuration is not managed by git"
+                    raise CLIInvalidArguments, "cannot use autoproj commit if the main configuration is not managed by git"
                 end
 
-                versions_file = File.join(
-                    ws.config_dir,
-                    Workspace::OVERRIDES_DIR,
-                    Versions::DEFAULT_VERSIONS_FILE_BASENAME)
+                if tag_name
+                    begin
+                        importer.rev_parse(pkg, "refs/tags/#{tag_name}")
+                        raise CLIInvalidArguments, "tag #{tag_name} already exists"
+                    rescue Autobuild::PackageException
+                    end
+                end
 
-                initialize_and_load
+                versions_file = File.join(ws.config_dir,
+                                          Workspace::OVERRIDES_DIR,
+                                          Versions::DEFAULT_VERSIONS_FILE_BASENAME)
 
                 versions = CLI::Versions.new(ws)
                 Autoproj.message "creating versions file, this may take a while"
                 versions.run(user_selection,
-                             save: File.join(ws.config_dir, versions_file),
+                             save: versions_file,
                              package_sets: options[:package_sets],
-                             output_file: io.path,
                              replace: true,
-                             keep_going: options[:keep_going])
+                             keep_going: options[:keep_going],
+                             deps: options[:deps])
 
                 importer.run_git(pkg, 'add', versions_file)
-                message = options[:message] ||
-                    "autoproj created tag #{tag_name}"
+                message = options[:message] || default_message(tag_name)
 
                 importer.run_git(pkg, 'commit', '-m', message)
+                importer.run_git(pkg, 'tag', tag_name) unless tag_name.nil?
             end
         end
     end

data/lib/autoproj/cli/exec.rb

@@ -1,21 +1,56 @@
-require 'autoproj/cli/inspection_tool'
+require 'autoproj/find_workspace'
+require 'autoproj/ops/cached_env'
+require 'autoproj/ops/which'
+require 'autoproj/ops/watch'
+
 module Autoproj
     module CLI
-        class Exec < InspectionTool
-            def run(cmd, *args)
-                initialize_and_load
-                finalize_setup(Array.new)
+        class Exec
+            def initialize
+                @root_dir = Autoproj.find_workspace_dir
+                if !@root_dir
+                    require 'autoproj/workspace'
+                    # Will do all sorts of error reporting,
+                    # or may be able to resolve
+                    @root_dir = Workspace.default.root_dir
+                end
+            end
+
+            def load_cached_env
+                env = Ops.load_cached_env(@root_dir)
+                return if !env
+
+                Autobuild::Environment.
+                    environment_from_export(env, ENV)
+            end
+
+            def run(cmd, *args, use_cached_env: Ops.watch_running?(@root_dir))
+                if use_cached_env
+                    env = load_cached_env
+                end
+
+                if !env
+                    require 'autoproj'
+                    require 'autoproj/cli/inspection_tool'
+                    ws = Workspace.from_dir(@root_dir)
+                    loader = InspectionTool.new(ws)
+                    loader.initialize_and_load
+                    loader.finalize_setup(Array.new)
+                    env = ws.full_env.resolved_env
+                end
 
+                path = env['PATH'].split(File::PATH_SEPARATOR)
                 program = 
-                    begin ws.which(cmd)
+                    begin Ops.which(cmd, path_entries: path)
                     rescue ::Exception => e
+                        require 'autoproj'
                         raise CLIInvalidArguments, e.message, e.backtrace
                     end
-                env = ws.full_env.resolved_env
 
                 begin
                     ::Process.exec(env, program, *args)
                 rescue ::Exception => e
+                    require 'autoproj'
                     raise CLIInvalidArguments, e.message, e.backtrace
                 end
             end