autoproj 2.0.0.rc11 → 2.0.0.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6381f80415323f5ad799fe1c75765244b7a363e
-  data.tar.gz: efebe68499b6ca24e0e21ad6d7753b9cad36f11c
+  metadata.gz: 3783d15f79e9891de1d0aad451928d94ba3f5868
+  data.tar.gz: 8cd5d53de5bc10304e7327de923739c69b2f7311
 SHA512:
-  metadata.gz: baf063f359e48c6b64276409753c8cae38544a144597558640c45a8962b9cfbceed3e9d617697e3988dfb5f30b543416398024758447d55cff9947c548a7e575
-  data.tar.gz: c0859c77140d14dfcbaf3c18b280d49ad25f50336e2e18b30c9c895757a2a7f9a3394ace2fd1aa4b7f5a1a6ae5c5433ecadb9784f19e837a7eae1d7f3a441caf
+  metadata.gz: d21fb154c3098bf0455dcf38d0b243907497dfa30039a03d67e219ef8b1f94fc3d79ebc1f2f86ba42228d1c2fad3585b7cbf2e78abb83020a3c9b1be651cc40a
+  data.tar.gz: 2c729c154c16dccca56ca4eaeed705758302eacb7e6e9b49228bc687ad3579942f8dbbe1e0f01d41b4b4ea470dcc189094270b6632149e892d01f4c413d4319b

data/Rakefile

@@ -13,12 +13,9 @@ desc "generate the bootstrap script"
 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].each do |text|
-        text.gsub! /\\/, '\\\\\\\\'
-    end
+    autoproj_ops_install.gsub! /\\/, '\\\\\\\\'
 
     %w{bootstrap install}.each do |install_script|
         bootstrap_code = File.read(File.join(Dir.pwd, 'bin', "autoproj_#{install_script}.in")).

data/autoproj.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency "utilrb", ">= 2.0"
     s.add_runtime_dependency "thor", '~> 0.19.0', '>= 0.19.1'
     s.add_runtime_dependency 'concurrent-ruby'
+    s.add_runtime_dependency 'tty-screen', '>= 0.4.0'
     s.add_development_dependency "flexmock", ">= 2.0.0"
     s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
     s.add_development_dependency "fakefs"

data/bin/autoproj_bootstrap

@@ -3,6 +3,9 @@
 if RUBY_VERSION < "2.0.0"
     STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
+elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
+    STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"
+    exit 1
 end
 
 require 'pathname'
@@ -28,6 +31,9 @@ module Autoproj
             attr_reader :env
             # The configuration hash
             attr_reader :config
+            # A set of options that should be passed to autoproj when calling it
+            # in a subprocess
+            attr_reader :autoproj_options
 
             def initialize(root_dir)
                 @root_dir = root_dir
@@ -37,6 +43,8 @@ module Autoproj
                     @gemfile = default_gemfile_contents
                 end
 
+                @autoproj_options = Array.new
+
                 @env = Hash.new
                 env['RUBYLIB'] = []
                 env['GEM_PATH'] = []
@@ -45,6 +53,10 @@ module Autoproj
                 env['BUNDLE_GEMFILE'] = []
 
                 load_config
+                if config['ruby_executable'] != Gem.ruby
+                    raise "this autoproj installation was already bootstrapped using #{config['ruby_executable']}, but you are currently running under #{Gem.ruby}. Changing the ruby interpreter in a given workspace is not supported"
+                end
+
                 @local = false
             end
 
@@ -200,8 +212,19 @@ module Autoproj
                     opt.on '--prefer-os-independent-packages', 'prefer OS-independent packages (such as a RubyGem) over their OS-packaged equivalent (e.g. the thor gem vs. the ruby-thor debian package)' do
                         @prefer_indep_over_os_packages = true
                     end
+                    opt.on '--[no-]color', 'do not use colored output (enabled by default if the terminal supports it)' do |color|
+                        if color then autoproj_options << "--color"
+                        else autoproj_options << '--no-color'
+                        end
+                    end
+                    opt.on '--[no-]progress', 'do not use progress output (enabled by default if the terminal supports it)' do |color|
+                        if color then autoproj_options << "--progress"
+                        else autoproj_options << '--no-progress'
+                        end
+                    end
                 end
-                options.parse(ARGV)
+                args = options.parse(ARGV)
+                autoproj_options + args
             end
 
             def install_bundler
@@ -446,7 +469,7 @@ module Autoproj
 
             def run_autoproj(*args)
                 system env_for_child.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, autoproj_path, *args
+                    Gem.ruby, autoproj_path, *args, *autoproj_options
             end
 
             def stage1
@@ -468,8 +491,10 @@ module Autoproj
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                puts "calling autoproj envsh"
-                system(Gem.ruby, autoproj_path, 'envsh')
+                puts "calling autoproj envsh #{autoproj_options}"
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                    exit 1
+                end
             end
         end
     end

data/bin/autoproj_bootstrap.in

@@ -3,6 +3,9 @@
 if RUBY_VERSION < "2.0.0"
     STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
+elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
+    STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"
+    exit 1
 end
 
 AUTOPROJ_OPS_INSTALL

data/bin/autoproj_install

@@ -3,6 +3,9 @@
 if RUBY_VERSION < "2.0.0"
     STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
+elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
+    STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"
+    exit 1
 end
 
 require 'pathname'
@@ -28,6 +31,9 @@ module Autoproj
             attr_reader :env
             # The configuration hash
             attr_reader :config
+            # A set of options that should be passed to autoproj when calling it
+            # in a subprocess
+            attr_reader :autoproj_options
 
             def initialize(root_dir)
                 @root_dir = root_dir
@@ -37,6 +43,8 @@ module Autoproj
                     @gemfile = default_gemfile_contents
                 end
 
+                @autoproj_options = Array.new
+
                 @env = Hash.new
                 env['RUBYLIB'] = []
                 env['GEM_PATH'] = []
@@ -45,6 +53,10 @@ module Autoproj
                 env['BUNDLE_GEMFILE'] = []
 
                 load_config
+                if config['ruby_executable'] != Gem.ruby
+                    raise "this autoproj installation was already bootstrapped using #{config['ruby_executable']}, but you are currently running under #{Gem.ruby}. Changing the ruby interpreter in a given workspace is not supported"
+                end
+
                 @local = false
             end
 
@@ -200,8 +212,19 @@ module Autoproj
                     opt.on '--prefer-os-independent-packages', 'prefer OS-independent packages (such as a RubyGem) over their OS-packaged equivalent (e.g. the thor gem vs. the ruby-thor debian package)' do
                         @prefer_indep_over_os_packages = true
                     end
+                    opt.on '--[no-]color', 'do not use colored output (enabled by default if the terminal supports it)' do |color|
+                        if color then autoproj_options << "--color"
+                        else autoproj_options << '--no-color'
+                        end
+                    end
+                    opt.on '--[no-]progress', 'do not use progress output (enabled by default if the terminal supports it)' do |color|
+                        if color then autoproj_options << "--progress"
+                        else autoproj_options << '--no-progress'
+                        end
+                    end
                 end
-                options.parse(ARGV)
+                args = options.parse(ARGV)
+                autoproj_options + args
             end
 
             def install_bundler
@@ -446,7 +469,7 @@ module Autoproj
 
             def run_autoproj(*args)
                 system env_for_child.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, autoproj_path, *args
+                    Gem.ruby, autoproj_path, *args, *autoproj_options
             end
 
             def stage1
@@ -468,8 +491,10 @@ module Autoproj
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                puts "calling autoproj envsh"
-                system(Gem.ruby, autoproj_path, 'envsh')
+                puts "calling autoproj envsh #{autoproj_options}"
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                    exit 1
+                end
             end
         end
     end

data/bin/autoproj_install.in

@@ -3,6 +3,9 @@
 if RUBY_VERSION < "2.0.0"
     STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
+elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
+    STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"
+    exit 1
 end
 
 AUTOPROJ_OPS_INSTALL

data/lib/autoproj/cli/base.rb

@@ -9,7 +9,7 @@ class Base
             attr_reader :ws
 
             def initialize(ws = nil)
-                @ws = (ws || Workspace.from_environment)
+                @ws = (ws || Workspace.default)
             end
 
             # Normalizes the arguments given by the user on the command line
@@ -126,11 +126,14 @@ def self.validate_options(args, options)
                     silent: false,
                     verbose: false,
                     debug: false,
-                    color: true,
-                    progress: true,
+                    color: TTY::Screen.color?,
+                    progress: TTY::Screen.color?,
                     parallel: nil
 
                 Autoproj.silent = options[:silent]
+                Autobuild.color = options[:color]
+                Autobuild.progress_display_enabled = options[:progress]
+
                 if options[:verbose]
                     Autoproj.verbose  = true
                     Autobuild.verbose = true
@@ -145,13 +148,12 @@ def self.validate_options(args, options)
                     Autobuild.debug = true
                 end
 
-                Autobuild.color = options[:color]
+
                 if level = options[:parallel]
                     Autobuild.parallel_build_level = Integer(level)
                     remaining[:parallel] = Integer(level)
                 end
 
-                Autobuild.progress_display_enabled = options[:progress]
                 return args, remaining
             end
         end

data/lib/autoproj/cli/main.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'tty-screen'
 require 'autoproj/cli/main_test'
 
 module Autoproj
@@ -18,9 +19,12 @@ class Main < Thor
             class_option :silent, type: :boolean,
                 desc: 'tell autoproj to not display anything',
                 default: false
+            class_option :color, type: :boolean,
+                desc: 'enables or disables colored display (enabled by default if the terminal supports it)',
+                default: TTY::Screen.color?
             class_option :progress, type: :boolean,
-                desc: 'enables or disables progress display (enabled by default)',
-                default: true
+                desc: 'enables or disables progress display (enabled by default if the terminal supports it)',
+                default: TTY::Screen.color?
 
             no_commands do
                 def run_autoproj_cli(filename, classname, report_options, *args)
@@ -338,7 +342,14 @@ def upgrade
                 hide: true
             def install_stage2(root_dir, *vars)
                 require 'autoproj/ops/install'
-                Autoproj::Ops::Install.new(root_dir).stage2(*vars)
+                ops = Autoproj::Ops::Install.new(root_dir)
+                if options[:color] then ops.autoproj_options << "--color"
+                else ops.autoproj_options << "--no-color"
+                end
+                if options[:progress] then ops.autoproj_options << "--progress"
+                else ops.autoproj_options << "--no-progress"
+                end
+                ops.stage2(*vars)
             end
         end
     end

data/lib/autoproj/configuration.rb

@@ -254,7 +254,7 @@ def validate_ruby_executable
             if has_value_for?('ruby_executable')
                 expected = get('ruby_executable')
                 if expected != actual
-                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{actual}. This is usually caused by manually calling a wrong gem program (for instance, gem2.1 instead of gem2.0)"
+                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{actual}. Changing the Ruby executable for in an existing autoproj workspace is unsupported"
                 end
             else
                 set('ruby_executable', actual, true)

data/lib/autoproj/find_workspace.rb

@@ -3,21 +3,21 @@
 
 module Autoproj
     # The base path from which we search for workspaces
-    def self.defaulT_find_base_dir
+    def self.default_find_base_dir
         ENV['AUTOPROJ_CURRENT_ROOT'] || Dir.pwd
     end
 
     # Looks for the autoproj workspace that is related to a given directory
     #
     # @return [String,nil]
-    def self.find_workspace_dir(base_dir = defaulT_find_base_dir)
+    def self.find_workspace_dir(base_dir = default_find_base_dir)
         find_v2_workspace_dir(base_dir)
     end
 
     # Looks for the autoproj prefix that contains a given directory
     #
     # @return [String,nil]
-    def self.find_prefix_dir(base_dir = defaulT_find_base_dir)
+    def self.find_prefix_dir(base_dir = default_find_base_dir)
         find_v2_prefix_dir(base_dir)
     end
 
@@ -57,19 +57,19 @@ def self.find_v2_root_dir(base_dir, config_field_name)
     end
 
     # {#find_workspace_dir} for v2 workspaces
-    def self.find_v2_workspace_dir(base_dir = defaulT_find_base_dir)
+    def self.find_v2_workspace_dir(base_dir = default_find_base_dir)
         find_v2_root_dir(base_dir, 'workspace')
     end
 
     # {#find_prefix_dir} for v2 workspaces
-    def self.find_v2_prefix_dir(base_dir = defaulT_find_base_dir)
+    def self.find_v2_prefix_dir(base_dir = default_find_base_dir)
         find_v2_root_dir(base_dir, 'prefix')
     end
 
     # {#find_workspace_dir} for v1 workspaces
     #
     # Note that for v1 workspaces {#find_prefix_dir} cannot be implemented
-    def self.find_v1_workspace_dir(base_dir = defaulT_find_base_dir)
+    def self.find_v1_workspace_dir(base_dir = default_find_base_dir)
         path = Pathname.new(base_dir)
         while !path.root?
             if (path + "autoproj").exist?

data/lib/autoproj/ops/install.rb

@@ -21,6 +21,9 @@ class UnexpectedBinstub < RuntimeError; end
             attr_reader :env
             # The configuration hash
             attr_reader :config
+            # A set of options that should be passed to autoproj when calling it
+            # in a subprocess
+            attr_reader :autoproj_options
 
             def initialize(root_dir)
                 @root_dir = root_dir
@@ -30,6 +33,8 @@ def initialize(root_dir)
                     @gemfile = default_gemfile_contents
                 end
 
+                @autoproj_options = Array.new
+
                 @env = Hash.new
                 env['RUBYLIB'] = []
                 env['GEM_PATH'] = []
@@ -38,6 +43,10 @@ def initialize(root_dir)
                 env['BUNDLE_GEMFILE'] = []
 
                 load_config
+                if config['ruby_executable'] != Gem.ruby
+                    raise "this autoproj installation was already bootstrapped using #{config['ruby_executable']}, but you are currently running under #{Gem.ruby}. Changing the ruby interpreter in a given workspace is not supported"
+                end
+
                 @local = false
             end
 
@@ -193,8 +202,19 @@ def parse_options(args = ARGV)
                     opt.on '--prefer-os-independent-packages', 'prefer OS-independent packages (such as a RubyGem) over their OS-packaged equivalent (e.g. the thor gem vs. the ruby-thor debian package)' do
                         @prefer_indep_over_os_packages = true
                     end
+                    opt.on '--[no-]color', 'do not use colored output (enabled by default if the terminal supports it)' do |color|
+                        if color then autoproj_options << "--color"
+                        else autoproj_options << '--no-color'
+                        end
+                    end
+                    opt.on '--[no-]progress', 'do not use progress output (enabled by default if the terminal supports it)' do |color|
+                        if color then autoproj_options << "--progress"
+                        else autoproj_options << '--no-progress'
+                        end
+                    end
                 end
-                options.parse(ARGV)
+                args = options.parse(ARGV)
+                autoproj_options + args
             end
 
             def install_bundler
@@ -439,7 +459,7 @@ def autoproj_path
 
             def run_autoproj(*args)
                 system env_for_child.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, autoproj_path, *args
+                    Gem.ruby, autoproj_path, *args, *autoproj_options
             end
 
             def stage1
@@ -461,8 +481,10 @@ def stage2(*vars)
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                puts "calling autoproj envsh"
-                system(Gem.ruby, autoproj_path, 'envsh')
+                puts "calling autoproj envsh #{autoproj_options}"
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                    exit 1
+                end
             end
         end
     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc11"
+    VERSION = "2.0.0.rc12"
 end

data/lib/autoproj/workspace.rb

@@ -53,11 +53,6 @@ def self.from_pwd
         # @raise [NotWorkspace] if dir is not within an autoproj workspace
         def self.from_dir(dir)
             if path = Autoproj.find_workspace_dir(dir)
-                # Make sure that the currently loaded env.sh is actually us
-                env = autoproj_current_root
-                if env && env != path
-                    raise MismatchingWorkspace, "the current environment is for #{env}, but you are in #{path}, make sure you are loading the right #{ENV_FILENAME} script !"
-                end
                 Workspace.new(path)
             elsif find_v1_workspace_dir(dir)
                 raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, run autoproj upgrade before continuing"
@@ -69,7 +64,9 @@ def self.from_dir(dir)
         def self.from_environment
             if path = Autoproj.find_workspace_dir
                 from_dir(path)
-            elsif Autoproj.find_v1_workspace_dir(dir = Autoproj.defaulT_find_base_dir)
+            elsif envvar = ENV['AUTOPROJ_CURRENT_ROOT']
+                raise NotWorkspace, "AUTOPROJ_CURRENT_ROOT is currently set to #{envvar}, but that is not an Autoproj workspace"
+            elsif Autoproj.find_v1_workspace_dir(dir = Autoproj.default_find_base_dir)
                 raise OutdatedWorkspace, "#{dir} looks like a v1 workspace, run autoproj upgrade before continuing"
             else
                 raise NotWorkspace, "not in an Autoproj installation, and no env.sh has been loaded so far"
@@ -82,6 +79,22 @@ def self.in_autoproj_project?(path)
             !!Autoproj.find_workspace_dir(path)
         end
 
+        # Returns the default workspace
+        #
+        # It uses the AUTOPROJ_CURRENT_ROOT environment variable if available,
+        # falling back to the current directory
+        #
+        # @raise MismatchingWorkspace if the workspace pointed by
+        # AUTOPROJ_CURRENT_ROOT does not match the one containing the current
+        # directory
+        def self.default
+            ws = from_environment
+            if (from_pwd = Autoproj.find_workspace_dir(Dir.pwd)) && (from_pwd != ws.root_dir)
+                raise MismatchingWorkspace, "the current environment points to #{ws.root_dir}, but you are in #{from_pwd}, make sure you are loading the right #{ENV_FILENAME} script !"
+            end
+            ws
+        end
+
         def load(*args)
             set_as_main_workspace
             flag, Autoproj.warn_deprecated_level = Autoproj.warn_deprecated_level, 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc11
+  version: 2.0.0.rc12
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
@@ -273,9 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
-has_rdoc: