autoproj 2.0.0.rc15 → 2.0.0.rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72bfb787ad1c7703f07969b97c019c9fd49dc3ec
-  data.tar.gz: 830d1225e29863caecdbbdea21b40a80975c61c9
+  metadata.gz: 2e8448a1e71d7b3bf6c58254c59380c93e01dae2
+  data.tar.gz: 16bc5d6983bea3fc3a7a40b50ef572cfdb0b25db
 SHA512:
-  metadata.gz: 2558027c520e214fa512cb70efb99d95bc69c342ff864a16c9a23ff64e75972a085f70d62bd95e6cb08282379e15741cdfc22af70fdcc5a7d1f979a37479b392
-  data.tar.gz: 77c978c7afe274015b889a868a1514abb24ec515e6a13a9045b4747f9718120a0f18b293064efa3d2064d1dad626ec7ecbd6c750f8e114789b6b61f3dfda05d9
+  metadata.gz: 2008f60c6e37b71ac9ac35219f7754e7b1396bcbf324b4b890f8c06dd242a7665fff0c257478bfff6c2d8d7aeaf7e0817cb631b0194779b6c1b8f830dabc59b1
+  data.tar.gz: 9b09e7e1a8a9631f452951077ffd249ab2fecf5c701b0b9d014dd26b1a98a4bde52411366944e2bb32bee9faae42294a72b8a47875a4efdde616ab487582660c

data/bin/autoproj_bootstrap

@@ -34,6 +34,8 @@ module Autoproj
             # A set of options that should be passed to autoproj when calling it
             # in a subprocess
             attr_reader :autoproj_options
+            # The Ruby interpreter we use for this install
+            attr_reader :ruby_executable
 
             def initialize(root_dir)
                 @root_dir = root_dir
@@ -54,15 +56,16 @@ module Autoproj
 
                 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"
+                    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, you need to do a clean bootstrap"
                 end
-
+                @ruby_executable = config['ruby_executable']
                 @local = false
             end
 
             def env_for_child
-                result = env.inject(Hash.new) do |h, (k, v)|
-                    h[k] = (v.join(File::PATH_SEPARATOR) if v && !v.empty?)
+                env.inject(Hash.new) do |h, (k, v)|
+                    h[k] = if v && !v.empty? then v.join(File::PATH_SEPARATOR)
+                           end
                     h
                 end
             end
@@ -101,6 +104,8 @@ module Autoproj
             def autoproj_gemfile_path; File.join(autoproj_install_dir, 'Gemfile') end
             def autoproj_config_path; File.join(dot_autoproj, 'config.yml') end
 
+            def shim_path; File.join(dot_autoproj, 'bin') end
+
             # Whether we can access the network while installing
             def local?; !!@local end
             # (see #local?)
@@ -161,7 +166,7 @@ module Autoproj
 
                 candidates = ['gem']
                 if ruby_bin =~ /^ruby(.+)$/
-                    candidates << "gem#{$1}" 
+                    candidates.unshift "gem#{$1}" 
                 end
 
                 candidates.each do |gem_name|
@@ -185,10 +190,20 @@ module Autoproj
 
             # Parse the provided command line options and returns the non-options
             def parse_options(args = ARGV)
+                default_gem_path = File.join(Dir.home, '.autoproj', 'gems')
+                self.private_bundler  = default_gem_path
+                self.private_gems     = default_gem_path
+                self.private_autoproj = default_gem_path
+
                 options = OptionParser.new do |opt|
                     opt.on '--local', 'do not access the network (may fail)' do
                         @local = true
                     end
+                    opt.on '--public', "install gems in the default RubyGems locations. Consider using this if you don't have a v1 install anymore" do
+                        self.private_bundler  = false
+                        self.private_autoproj = false
+                        self.private_gems     = false
+                    end
                     opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace' do |path|
                         self.private_bundler = path || true
                     end
@@ -198,7 +213,7 @@ module Autoproj
                     opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory' do |path|
                         self.private_gems = path || true
                     end
-                    opt.on '--private[=PATH]', 'whether bundler, autoproj and the workspace gems should be installed locally in the workspace' do |path|
+                    opt.on '--private[=PATH]', "whether bundler, autoproj and the workspace gems should be installed locally in the workspace. This is the default, with a path of #{default_gem_path}" do |path|
                         self.private_bundler = path || true
                         self.private_autoproj = path || true
                         self.private_gems = path || true
@@ -235,15 +250,16 @@ module Autoproj
 
                 result = system(
                     env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
-                    gem_program, 'install', '--no-document', '--no-format-executable',
+                    Gem.ruby, gem_program, 'install', '--no-document', '--no-format-executable',
                         *local,
                         "--bindir=#{File.join(bundler_gem_home, 'bin')}", 'bundler')
 
-                if !result
+                if result
+                    File.join(bundler_gem_home, 'bin', 'bundler')
+                else
                     STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
-                    return
+                    nil
                 end
-                File.join(bundler_gem_home, 'bin', 'bundler')
             end
 
             def find_bundler
@@ -259,11 +275,11 @@ module Autoproj
                 if !bundler
                     if ENV['PATH'] != clean_path
                         STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
-                        STDERR.puts "  - if you are running 'autoproj upgrade', please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
-                        STDERR.puts "  - if you are running an install, try again in a console where the env.sh is not loaded"
+                        STDERR.puts "  - if you are upgrading a v1 install, please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
+                        STDERR.puts "  - if you are running a fresh install, try again in a console where the env.sh is not loaded"
                         exit 1
                     else
-                        STDERR.puts "  the recommended action is to install it manually first by running 'gem install bundler'"
+                        STDERR.puts "  you might want to try and install it manually first by running 'gem install bundler'"
                         STDERR.puts "  or call this command again with --private-bundler to have it installed in the workspace"
                         exit 1
                     end
@@ -292,7 +308,7 @@ module Autoproj
                 if private_autoproj?
                     clean_env['GEM_PATH'] = bundler_gem_home
                     clean_env['GEM_HOME'] = nil
-                    opts << "--clean" << "--path=#{autoproj_gem_home}"
+                    opts << "--path=#{autoproj_gem_home}"
                 end
                 binstubs_path = File.join(autoproj_install_dir, 'bin')
                 result = system(clean_env.merge('GEM_HOME' => autoproj_gem_home),
@@ -311,7 +327,7 @@ module Autoproj
             end
 
             def self.clean_binstubs(binstubs_path)
-                %w{bundler bundle}.each do |bundler_bin|
+                %w{bundler bundle rake thor}.each do |bundler_bin|
                     path = File.join(binstubs_path, bundler_bin)
                     if File.file?(path)
                         FileUtils.rm path
@@ -409,6 +425,20 @@ module Autoproj
                 end
             end
 
+            def save_ruby_and_bundler_shims(bundler_path)
+                FileUtils.mkdir_p shim_path
+                File.open(File.join(shim_path, 'bundler'), 'w') do |io|
+                    io.puts "#! /bin/sh"
+                    io.puts "exec #{ruby_executable} #{bundler_path} \"$@\""
+                end
+                FileUtils.chmod 0755, File.join(shim_path, 'bundler')
+                File.open(File.join(shim_path, 'ruby'), 'w') do |io|
+                    io.puts "#! /bin/sh"
+                    io.puts "exec #{ruby_executable} \"$@\""
+                end
+                FileUtils.chmod 0755, File.join(shim_path, 'ruby')
+            end
+
             def install
                 if private_bundler?
                     puts "Installing bundler in #{bundler_gem_home}"
@@ -420,6 +450,8 @@ module Autoproj
                 else
                     exit 1
                 end
+                save_ruby_and_bundler_shims(bundler)
+                env['PATH'].unshift shim_path
                 save_gemfile
                 puts "Installing autoproj in #{dot_autoproj}"
                 install_autoproj(bundler)
@@ -470,10 +502,21 @@ module Autoproj
                     Gem.ruby, autoproj_path, *args, *autoproj_options
             end
 
+            def v1_workspace?
+                File.file?(File.join(root_dir, 'autoproj', 'config.yml')) &&
+                    !File.directory?(File.join(root_dir, '.autoproj'))
+            end
+
             def stage1
+                if v1_workspace? && File.file?(v1_envsh = File.join(root_dir, 'env.sh'))
+                    FileUtils.cp v1_envsh, 'env.sh-autoproj-v1'
+                end
                 FileUtils.mkdir_p dot_autoproj
                 save_config
                 install
+            rescue Exception
+                FileUtils.rm_rf dot_autoproj
+                raise
             end
 
             def call_stage2
@@ -492,6 +535,11 @@ module Autoproj
                 if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     exit 1
                 end
+                # This is really needed on an existing install to install the
+                # gems that were present in the v1 layout
+                if !system(Gem.ruby, autoproj_path, 'osdeps')
+                    exit 1
+                end
             end
         end
     end

data/bin/autoproj_install

@@ -34,6 +34,8 @@ module Autoproj
             # A set of options that should be passed to autoproj when calling it
             # in a subprocess
             attr_reader :autoproj_options
+            # The Ruby interpreter we use for this install
+            attr_reader :ruby_executable
 
             def initialize(root_dir)
                 @root_dir = root_dir
@@ -54,15 +56,16 @@ module Autoproj
 
                 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"
+                    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, you need to do a clean bootstrap"
                 end
-
+                @ruby_executable = config['ruby_executable']
                 @local = false
             end
 
             def env_for_child
-                result = env.inject(Hash.new) do |h, (k, v)|
-                    h[k] = (v.join(File::PATH_SEPARATOR) if v && !v.empty?)
+                env.inject(Hash.new) do |h, (k, v)|
+                    h[k] = if v && !v.empty? then v.join(File::PATH_SEPARATOR)
+                           end
                     h
                 end
             end
@@ -101,6 +104,8 @@ module Autoproj
             def autoproj_gemfile_path; File.join(autoproj_install_dir, 'Gemfile') end
             def autoproj_config_path; File.join(dot_autoproj, 'config.yml') end
 
+            def shim_path; File.join(dot_autoproj, 'bin') end
+
             # Whether we can access the network while installing
             def local?; !!@local end
             # (see #local?)
@@ -161,7 +166,7 @@ module Autoproj
 
                 candidates = ['gem']
                 if ruby_bin =~ /^ruby(.+)$/
-                    candidates << "gem#{$1}" 
+                    candidates.unshift "gem#{$1}" 
                 end
 
                 candidates.each do |gem_name|
@@ -185,10 +190,20 @@ module Autoproj
 
             # Parse the provided command line options and returns the non-options
             def parse_options(args = ARGV)
+                default_gem_path = File.join(Dir.home, '.autoproj', 'gems')
+                self.private_bundler  = default_gem_path
+                self.private_gems     = default_gem_path
+                self.private_autoproj = default_gem_path
+
                 options = OptionParser.new do |opt|
                     opt.on '--local', 'do not access the network (may fail)' do
                         @local = true
                     end
+                    opt.on '--public', "install gems in the default RubyGems locations. Consider using this if you don't have a v1 install anymore" do
+                        self.private_bundler  = false
+                        self.private_autoproj = false
+                        self.private_gems     = false
+                    end
                     opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace' do |path|
                         self.private_bundler = path || true
                     end
@@ -198,7 +213,7 @@ module Autoproj
                     opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory' do |path|
                         self.private_gems = path || true
                     end
-                    opt.on '--private[=PATH]', 'whether bundler, autoproj and the workspace gems should be installed locally in the workspace' do |path|
+                    opt.on '--private[=PATH]', "whether bundler, autoproj and the workspace gems should be installed locally in the workspace. This is the default, with a path of #{default_gem_path}" do |path|
                         self.private_bundler = path || true
                         self.private_autoproj = path || true
                         self.private_gems = path || true
@@ -235,15 +250,16 @@ module Autoproj
 
                 result = system(
                     env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
-                    gem_program, 'install', '--no-document', '--no-format-executable',
+                    Gem.ruby, gem_program, 'install', '--no-document', '--no-format-executable',
                         *local,
                         "--bindir=#{File.join(bundler_gem_home, 'bin')}", 'bundler')
 
-                if !result
+                if result
+                    File.join(bundler_gem_home, 'bin', 'bundler')
+                else
                     STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
-                    return
+                    nil
                 end
-                File.join(bundler_gem_home, 'bin', 'bundler')
             end
 
             def find_bundler
@@ -259,11 +275,11 @@ module Autoproj
                 if !bundler
                     if ENV['PATH'] != clean_path
                         STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
-                        STDERR.puts "  - if you are running 'autoproj upgrade', please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
-                        STDERR.puts "  - if you are running an install, try again in a console where the env.sh is not loaded"
+                        STDERR.puts "  - if you are upgrading a v1 install, please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
+                        STDERR.puts "  - if you are running a fresh install, try again in a console where the env.sh is not loaded"
                         exit 1
                     else
-                        STDERR.puts "  the recommended action is to install it manually first by running 'gem install bundler'"
+                        STDERR.puts "  you might want to try and install it manually first by running 'gem install bundler'"
                         STDERR.puts "  or call this command again with --private-bundler to have it installed in the workspace"
                         exit 1
                     end
@@ -292,7 +308,7 @@ module Autoproj
                 if private_autoproj?
                     clean_env['GEM_PATH'] = bundler_gem_home
                     clean_env['GEM_HOME'] = nil
-                    opts << "--clean" << "--path=#{autoproj_gem_home}"
+                    opts << "--path=#{autoproj_gem_home}"
                 end
                 binstubs_path = File.join(autoproj_install_dir, 'bin')
                 result = system(clean_env.merge('GEM_HOME' => autoproj_gem_home),
@@ -311,7 +327,7 @@ module Autoproj
             end
 
             def self.clean_binstubs(binstubs_path)
-                %w{bundler bundle}.each do |bundler_bin|
+                %w{bundler bundle rake thor}.each do |bundler_bin|
                     path = File.join(binstubs_path, bundler_bin)
                     if File.file?(path)
                         FileUtils.rm path
@@ -409,6 +425,20 @@ module Autoproj
                 end
             end
 
+            def save_ruby_and_bundler_shims(bundler_path)
+                FileUtils.mkdir_p shim_path
+                File.open(File.join(shim_path, 'bundler'), 'w') do |io|
+                    io.puts "#! /bin/sh"
+                    io.puts "exec #{ruby_executable} #{bundler_path} \"$@\""
+                end
+                FileUtils.chmod 0755, File.join(shim_path, 'bundler')
+                File.open(File.join(shim_path, 'ruby'), 'w') do |io|
+                    io.puts "#! /bin/sh"
+                    io.puts "exec #{ruby_executable} \"$@\""
+                end
+                FileUtils.chmod 0755, File.join(shim_path, 'ruby')
+            end
+
             def install
                 if private_bundler?
                     puts "Installing bundler in #{bundler_gem_home}"
@@ -420,6 +450,8 @@ module Autoproj
                 else
                     exit 1
                 end
+                save_ruby_and_bundler_shims(bundler)
+                env['PATH'].unshift shim_path
                 save_gemfile
                 puts "Installing autoproj in #{dot_autoproj}"
                 install_autoproj(bundler)
@@ -470,10 +502,21 @@ module Autoproj
                     Gem.ruby, autoproj_path, *args, *autoproj_options
             end
 
+            def v1_workspace?
+                File.file?(File.join(root_dir, 'autoproj', 'config.yml')) &&
+                    !File.directory?(File.join(root_dir, '.autoproj'))
+            end
+
             def stage1
+                if v1_workspace? && File.file?(v1_envsh = File.join(root_dir, 'env.sh'))
+                    FileUtils.cp v1_envsh, 'env.sh-autoproj-v1'
+                end
                 FileUtils.mkdir_p dot_autoproj
                 save_config
                 install
+            rescue Exception
+                FileUtils.rm_rf dot_autoproj
+                raise
             end
 
             def call_stage2
@@ -492,6 +535,11 @@ module Autoproj
                 if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     exit 1
                 end
+                # This is really needed on an existing install to install the
+                # gems that were present in the v1 layout
+                if !system(Gem.ruby, autoproj_path, 'osdeps')
+                    exit 1
+                end
             end
         end
     end

data/lib/autoproj/cli/main.rb

@@ -320,24 +320,6 @@ def query(query_string = nil)
                 run_autoproj_cli(:query, :Query, Hash[], *Array(query_string))
             end
 
-            desc 'upgrade', "upgrade autoproj itself, and the workspace layout"
-            option :local, type: :boolean, default: false,
-                desc: 'do not access the network (will fail if some gems are missing)'
-            option :gemfile, type: :string,
-                desc: 'path to a gemfile that should be used to install autoproj'
-            def upgrade
-                require 'autoproj/ops/install'
-                installer = Autoproj::Ops::Install.new(Dir.pwd)
-
-                if options.has_key?('local')
-                    installer.local = options['local']
-                end
-                if options[:gemfile]
-                    installer.gemfile = File.read(options[:gemfile])
-                end
-                installer.stage1
-            end
-
             desc 'install_stage2 ROOT_DIR [ENVVAR=VALUE ...]', 'used by autoproj_install to finalize the installation',
                 hide: true
             def install_stage2(root_dir, *vars)

data/lib/autoproj/cli/osdeps.rb

@@ -9,9 +9,13 @@ def run(user_selection, options = Hash.new)
                     finalize_setup(user_selection,
                                    ignore_non_imported_packages: true)
 
+                options = Kernel.validate_options options,
+                    update: true,
+                    shell_helpers: ws.config.shell_helpers?
                 ws.install_os_packages(
                     osdep_packages,
                     install_only: !options[:update])
+                ws.export_env_sh(shell_helpers: options[:shell_helpers])
             end
         end
     end

data/lib/autoproj/configuration.rb

@@ -226,19 +226,32 @@ def private_gems?
             !!get('private_gems', false)
         end
 
-        def gems_gem_home
+        # The path provided to bundler to install the gems
+        def gems_bundler_path
             value = get('private_gems', false)
             if value.respond_to?(:to_str)
-                return value
+                value
             elsif value
                 default = File.join(ws.prefix_dir, 'gems')
                 set('private_gems', default)
                 default
-            else
-                Gem.user_dir
             end
         end
 
+        # The GEM_HOME derived from {#gems_bundler_path}
+        #
+        # RubyGems and Bundler install gems in a subdirectory specific to the
+        # Ruby platform and version. This adds the relevant suffix to
+        # {#gems_bundler_path}
+        def gems_gem_home
+            base_path = gems_bundler_path || File.join(Gem.user_dir, '.gem')
+            path_suffix = Pathname.new(Gem.user_dir).
+                relative_path_from(Pathname.new(File.join(Gem.user_home, '.gem'))).
+                to_s
+            File.join(base_path, path_suffix)
+        end
+
+        # The full path to the expected ruby executable
         def ruby_executable
             if path = get('ruby_executable', nil)
                 path
@@ -249,6 +262,8 @@ def ruby_executable
             end
         end
 
+        # Verify that the Ruby executable that is being used to run autoproj
+        # matches the one expected in the configuration
         def validate_ruby_executable
             actual   = OSPackageResolver.autodetect_ruby_program
             if has_value_for?('ruby_executable')

data/lib/autoproj/find_workspace.rb

@@ -82,7 +82,9 @@ def self.find_v1_workspace_dir(base_dir = default_find_base_dir)
         path = Pathname.new(base_dir)
         while !path.root?
             if (path + "autoproj").exist?
-                return path.to_s
+                if !(path + ".autoproj").exist?
+                    return path.to_s
+                end
             end
             path = path.parent
         end

data/lib/autoproj/ops/install.rb

@@ -24,6 +24,8 @@ class UnexpectedBinstub < RuntimeError; end
             # A set of options that should be passed to autoproj when calling it
             # in a subprocess
             attr_reader :autoproj_options
+            # The Ruby interpreter we use for this install
+            attr_reader :ruby_executable
 
             def initialize(root_dir)
                 @root_dir = root_dir
@@ -44,15 +46,16 @@ def initialize(root_dir)
 
                 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"
+                    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, you need to do a clean bootstrap"
                 end
-
+                @ruby_executable = config['ruby_executable']
                 @local = false
             end
 
             def env_for_child
-                result = env.inject(Hash.new) do |h, (k, v)|
-                    h[k] = (v.join(File::PATH_SEPARATOR) if v && !v.empty?)
+                env.inject(Hash.new) do |h, (k, v)|
+                    h[k] = if v && !v.empty? then v.join(File::PATH_SEPARATOR)
+                           end
                     h
                 end
             end
@@ -91,6 +94,8 @@ def autoproj_install_dir; File.join(dot_autoproj, 'autoproj') end
             def autoproj_gemfile_path; File.join(autoproj_install_dir, 'Gemfile') end
             def autoproj_config_path; File.join(dot_autoproj, 'config.yml') end
 
+            def shim_path; File.join(dot_autoproj, 'bin') end
+
             # Whether we can access the network while installing
             def local?; !!@local end
             # (see #local?)
@@ -151,7 +156,7 @@ def guess_gem_program
 
                 candidates = ['gem']
                 if ruby_bin =~ /^ruby(.+)$/
-                    candidates << "gem#{$1}" 
+                    candidates.unshift "gem#{$1}" 
                 end
 
                 candidates.each do |gem_name|
@@ -175,10 +180,20 @@ def default_gemfile_contents(autoproj_version = ">= 2.0.0.a")
 
             # Parse the provided command line options and returns the non-options
             def parse_options(args = ARGV)
+                default_gem_path = File.join(Dir.home, '.autoproj', 'gems')
+                self.private_bundler  = default_gem_path
+                self.private_gems     = default_gem_path
+                self.private_autoproj = default_gem_path
+
                 options = OptionParser.new do |opt|
                     opt.on '--local', 'do not access the network (may fail)' do
                         @local = true
                     end
+                    opt.on '--public', "install gems in the default RubyGems locations. Consider using this if you don't have a v1 install anymore" do
+                        self.private_bundler  = false
+                        self.private_autoproj = false
+                        self.private_gems     = false
+                    end
                     opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace' do |path|
                         self.private_bundler = path || true
                     end
@@ -188,7 +203,7 @@ def parse_options(args = ARGV)
                     opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory' do |path|
                         self.private_gems = path || true
                     end
-                    opt.on '--private[=PATH]', 'whether bundler, autoproj and the workspace gems should be installed locally in the workspace' do |path|
+                    opt.on '--private[=PATH]', "whether bundler, autoproj and the workspace gems should be installed locally in the workspace. This is the default, with a path of #{default_gem_path}" do |path|
                         self.private_bundler = path || true
                         self.private_autoproj = path || true
                         self.private_gems = path || true
@@ -225,15 +240,16 @@ def install_bundler
 
                 result = system(
                     env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
-                    gem_program, 'install', '--no-document', '--no-format-executable',
+                    Gem.ruby, gem_program, 'install', '--no-document', '--no-format-executable',
                         *local,
                         "--bindir=#{File.join(bundler_gem_home, 'bin')}", 'bundler')
 
-                if !result
+                if result
+                    File.join(bundler_gem_home, 'bin', 'bundler')
+                else
                     STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
-                    return
+                    nil
                 end
-                File.join(bundler_gem_home, 'bin', 'bundler')
             end
 
             def find_bundler
@@ -249,11 +265,11 @@ def find_bundler
                 if !bundler
                     if ENV['PATH'] != clean_path
                         STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
-                        STDERR.puts "  - if you are running 'autoproj upgrade', please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
-                        STDERR.puts "  - if you are running an install, try again in a console where the env.sh is not loaded"
+                        STDERR.puts "  - if you are upgrading a v1 install, please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
+                        STDERR.puts "  - if you are running a fresh install, try again in a console where the env.sh is not loaded"
                         exit 1
                     else
-                        STDERR.puts "  the recommended action is to install it manually first by running 'gem install bundler'"
+                        STDERR.puts "  you might want to try and install it manually first by running 'gem install bundler'"
                         STDERR.puts "  or call this command again with --private-bundler to have it installed in the workspace"
                         exit 1
                     end
@@ -282,7 +298,7 @@ def install_autoproj(bundler)
                 if private_autoproj?
                     clean_env['GEM_PATH'] = bundler_gem_home
                     clean_env['GEM_HOME'] = nil
-                    opts << "--clean" << "--path=#{autoproj_gem_home}"
+                    opts << "--path=#{autoproj_gem_home}"
                 end
                 binstubs_path = File.join(autoproj_install_dir, 'bin')
                 result = system(clean_env.merge('GEM_HOME' => autoproj_gem_home),
@@ -301,7 +317,7 @@ def install_autoproj(bundler)
             end
 
             def self.clean_binstubs(binstubs_path)
-                %w{bundler bundle}.each do |bundler_bin|
+                %w{bundler bundle rake thor}.each do |bundler_bin|
                     path = File.join(binstubs_path, bundler_bin)
                     if File.file?(path)
                         FileUtils.rm path
@@ -399,6 +415,20 @@ def gem_bindir
                 end
             end
 
+            def save_ruby_and_bundler_shims(bundler_path)
+                FileUtils.mkdir_p shim_path
+                File.open(File.join(shim_path, 'bundler'), 'w') do |io|
+                    io.puts "#! /bin/sh"
+                    io.puts "exec #{ruby_executable} #{bundler_path} \"$@\""
+                end
+                FileUtils.chmod 0755, File.join(shim_path, 'bundler')
+                File.open(File.join(shim_path, 'ruby'), 'w') do |io|
+                    io.puts "#! /bin/sh"
+                    io.puts "exec #{ruby_executable} \"$@\""
+                end
+                FileUtils.chmod 0755, File.join(shim_path, 'ruby')
+            end
+
             def install
                 if private_bundler?
                     puts "Installing bundler in #{bundler_gem_home}"
@@ -410,6 +440,8 @@ def install
                 else
                     exit 1
                 end
+                save_ruby_and_bundler_shims(bundler)
+                env['PATH'].unshift shim_path
                 save_gemfile
                 puts "Installing autoproj in #{dot_autoproj}"
                 install_autoproj(bundler)
@@ -460,10 +492,21 @@ def run_autoproj(*args)
                     Gem.ruby, autoproj_path, *args, *autoproj_options
             end
 
+            def v1_workspace?
+                File.file?(File.join(root_dir, 'autoproj', 'config.yml')) &&
+                    !File.directory?(File.join(root_dir, '.autoproj'))
+            end
+
             def stage1
+                if v1_workspace? && File.file?(v1_envsh = File.join(root_dir, 'env.sh'))
+                    FileUtils.cp v1_envsh, 'env.sh-autoproj-v1'
+                end
                 FileUtils.mkdir_p dot_autoproj
                 save_config
                 install
+            rescue Exception
+                FileUtils.rm_rf dot_autoproj
+                raise
             end
 
             def call_stage2
@@ -482,6 +525,11 @@ def stage2(*vars)
                 if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     exit 1
                 end
+                # This is really needed on an existing install to install the
+                # gems that were present in the v1 layout
+                if !system(Gem.ruby, autoproj_path, 'osdeps')
+                    exit 1
+                end
             end
         end
     end

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -31,11 +31,11 @@ def initialize_environment
 
                 config = ws.config
 
-                env.add_path 'PATH', File.join(Gem.user_dir, 'bin')
                 env.add_path 'PATH', File.join(ws.prefix_dir, 'gems', 'bin')
                 env.add_path 'PATH', File.join(config.bundler_gem_home, 'bin')
                 env.add_path 'PATH', File.join(ws.dot_autoproj_dir, 'autoproj', 'bin')
                 env.set 'GEM_HOME', config.gems_gem_home
+                env.set 'GEM_PATH', config.bundler_gem_home
 
                 root_dir     = File.join(ws.prefix_dir, 'gems')
                 gemfile_path = File.join(root_dir, 'Gemfile')
@@ -46,11 +46,10 @@ def initialize_environment
                 if !config.private_bundler? || !config.private_autoproj? || !config.private_gems?
                     env.set('GEM_PATH', *Gem.default_path)
                 end
+                Autobuild.programs['bundler'] = File.join(ws.dot_autoproj_dir, 'bin', 'bundler')
+
                 if config.private_bundler?
-                    Autobuild.programs['bundler'] = File.join(config.bundler_gem_home, 'bin', 'bundler')
                     env.add_path 'GEM_PATH', config.bundler_gem_home
-                else
-                    Autobuild.programs['bundler'] = env.find_in_path('bundler')
                 end
 
                 env.init_from_env 'RUBYLIB'
@@ -64,6 +63,11 @@ def initialize_environment
                     end
                 # And discover the system's rubylib
                 if system_rubylib = discover_rubylib
+                    # Do not explicitely add the system rubylib to the
+                    # environment, the interpreter will do it for us.
+                    #
+                    # This allows to use a binstub generated for one of ruby
+                    # interpreter version on our workspace
                     env.system_env['RUBYLIB'] = []
                     env.original_env['RUBYLIB'] = (original_rubylib - system_rubylib).join(File::PATH_SEPARATOR)
                 end
@@ -160,6 +164,63 @@ def self.run_bundler_install(ws, gemfile, *options, update: true, binstubs: nil)
                 end
             end
 
+            # Parse the contents of a gemfile into a set of 
+            def merge_gemfiles(*path, unlock: [])
+                gems_remotes = Set.new
+                dependencies = Hash.new do |h, k|
+                    h[k] = Hash.new do |h, k|
+                        h[k] = Hash.new do |a, b|
+                            a[b] = Array.new
+                        end
+                    end
+                end
+                path.each do |gemfile|
+                    bundler_def = Bundler::Dsl.evaluate(gemfile, nil, [])
+                    gems_remotes |= bundler_def.send(:sources).rubygems_remotes.to_set
+                    bundler_def.dependencies.each do |d|
+                        d.groups.each do |group_name|
+                            if !d.platforms.empty?
+                                d.platforms.each do |platform_name|
+                                    dependencies[group_name][platform_name][d.name] = d
+                                end
+                            else
+                                dependencies[group_name][''][d.name] = d
+                            end
+                        end
+                    end
+                end
+
+                contents = []
+                gems_remotes.each do |g|
+                    g = g.to_s
+                    if g.end_with?('/')
+                        g = g[0..-2]
+                    end
+                    contents << "source '#{g.to_s}'"
+                end
+                dependencies.each do |group_name, by_platform|
+                    contents << "group :#{group_name} do"
+                    by_platform.each do |platform_name, deps|
+                        deps = deps.values.sort_by(&:name)
+                        if !platform_name.empty?
+                            contents << "  platform :#{platform_name} do"
+                            platform_indent = "  "
+                        end
+                        deps.each do |d|
+                            if d.source
+                                options = d.source.options.map { |k, v| "#{k}: \"#{v}\"" }
+                            end
+                            contents << ["  #{platform_indent}gem \"#{d.name}\", \"#{d.requirement}\"", *options].join(", ")
+                        end
+                        if !platform_name.empty?
+                            contents << "  end"
+                        end
+                    end
+                    contents << "end"
+                end
+                contents.join("\n")
+            end
+
             def install(gems, filter_uptodate_packages: false, install_only: false)
                 root_dir     = File.join(ws.prefix_dir, 'gems')
                 gemfile_path = File.join(root_dir, 'Gemfile')
@@ -188,20 +249,21 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
                 Dir.glob(File.join(ws.overrides_dir, "*.gemfile")) do |gemfile_path|
                     gemfiles << gemfile_path
                 end
-
-                # Generate the gemfile and remove the lockfile
-                gemfile_lines = gems.map do |name|
-                    name, version = parse_package_entry(name)
-                    "gem \"#{name}\", \"#{version || ">= 0"}\""
-                end
-                gemfiles.each do |gemfile|
-                    gemfile_lines.concat(File.readlines(gemfile).map(&:chomp))
+                gemfiles << File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')
+
+                # Save the osdeps entries in a temporary gemfile and finally
+                # merge the whole lot of it
+                gemfile_contents = Tempfile.open 'autoproj-gemfile' do |io|
+                    osdeps_gemfile_lines = gems.sort.map do |name|
+                        name, version = parse_package_entry(name)
+                        io.puts "gem \"#{name}\", \"#{version || ">= 0"}\""
+                    end
+                    io.flush
+                    gemfiles.unshift io.path
+                    # The autoproj gemfile needs to be last, we really don't
+                    # want to mess it up
+                    merge_gemfiles(*gemfiles)
                 end
-                gemfile_lines = gemfile_lines.sort.uniq
-                gemfile_contents = [
-                    "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')}\"",
-                    *gemfile_lines
-                ].join("\n")
 
                 FileUtils.mkdir_p root_dir
                 if updated = (!File.exist?(gemfile_path) || File.read(gemfile_path) != gemfile_contents)
@@ -212,7 +274,7 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
 
                 options = Array.new
                 if ws.config.private_gems?
-                    options << "--path" << ws.config.gems_gem_home
+                    options << "--path" << ws.config.gems_bundler_path
                 end
 
                 binstubs_path = File.join(root_dir, 'bin')
@@ -233,7 +295,7 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
                 backup_restore(backups)
                 raise
             ensure
-                FileUtils.rm_f File.join(binstubs_path, 'bundler')
+                FileUtils.rm_f File.join(binstubs_path, 'bundler') if binstubs_path
                 backup_clean(backups)
             end
 
@@ -246,6 +308,7 @@ def discover_rubylib
                         out: io,
                         err: '/dev/null')
                     if result
+                        io.rewind
                         io.readlines.map { |l| l.chomp }.find_all { |l| !l.empty? }
                     end
                 end
@@ -260,11 +323,12 @@ def discover_bundle_rubylib(silent_errors: false)
                 end
                 Tempfile.open 'autoproj-rubylib' do |io|
                     result = Bundler.clean_system(
-                        Hash['BUNDLE_GEMFILE' => gemfile],
-                        Autobuild.tool('bundler'), 'exec', 'ruby', '-e', 'puts $LOAD_PATH',
+                        Hash['BUNDLE_GEMFILE' => gemfile, 'RUBYLIB' => nil],
+                        Autobuild.tool('bundler'), 'exec', Autobuild.tool('ruby'), '-rbundler/setup', '-e', 'puts $LOAD_PATH',
                         out: io, **silent_redirect)
                         
                     if result
+                        io.rewind
                         io.readlines.map { |l| l.chomp }.find_all { |l| !l.empty? }
                     end
                 end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc15"
+    VERSION = "2.0.0.rc16"
 end

data/lib/autoproj/workspace.rb

@@ -64,10 +64,10 @@ def self.from_dir(dir)
         def self.from_environment
             if path = Autoproj.find_workspace_dir
                 from_dir(path)
-            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"
+            elsif envvar = ENV['AUTOPROJ_CURRENT_ROOT']
+                raise NotWorkspace, "AUTOPROJ_CURRENT_ROOT is currently set to #{envvar}, but that is not an Autoproj workspace"
             else
                 raise NotWorkspace, "not in an Autoproj installation, and no env.sh has been loaded so far"
             end
@@ -342,9 +342,6 @@ def run(*args, &block)
             end
             options_env = options.fetch(:env, Hash.new)
             options[:env] = env.resolved_env.merge(options_env)
-            if options_env['BUNDLE_GEMFILE']
-                raise
-            end
             Autobuild::Subprocess.run(*args, options, &block)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc15
+  version: 2.0.0.rc16
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild