autoproj 2.0.0.rc32 → 2.0.0.rc33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb40d3c2a7fa377b8faa4077b9d31ba82be80603
-  data.tar.gz: 36970528dc5d9a53b2fc8231929819c2d41164bc
+  metadata.gz: a1bbd3c8a0a54c4344fc5865309106b3869d16bf
+  data.tar.gz: 84ba1ca1161c05483ab51c3239a59c48e8cfcea4
 SHA512:
-  metadata.gz: c3b173ea5faf24871a46ab1c7ad91bf6e6e5cc59e3e9e1b78850ca5f03f9e86f0fd4abef4a97ef05e2124d8e56deb12da012ccb7b270ce5b45e2d1abb2d712a3
-  data.tar.gz: a01958ed2d32916b5219656557215feb66a9a508cc00bed42419cba9fdecdfe13a1360b1c7463ae632b60d604742da9774c41b9e801e9f23d35cc69888bed09c
+  metadata.gz: 311b9232ca6168cb33c3a2ee97cdfe793be6d29904f82e1a78cb863c84dce4e5992d8d529b6ac0c9d47d58aec3417902a50053a1490629f99d3b554f79e05278
+  data.tar.gz: 671e7b5fceb741dac1ef521f985bf352e83fabe6a9a79030baf9fbb865eba0c0c69e26103a063a47933def4fb71f6f731bf42abb5c89441bc41d06e67308a283

data/.gitignore

@@ -7,3 +7,4 @@ pkg/
 /.bundle
 /coverage/
 /.yardoc/
+test/gem_home

data/.travis.yml

@@ -9,6 +9,11 @@ rvm:
 matrix:
     allow_failures:
         - rvm: 'jruby-9.1.2.0'
+
+cache: bundler
+
+# Some tests expect gems to be present in vendor/bundle
+install: bundler install --path vendor/bundle
 script:
     - bundler exec rake
     - bundler exec rake test

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'pry'
+gem 'pry-byebug'
 gem 'autobuild', github: 'rock-core/autobuild', branch: 'master'
 gemspec

data/autoproj.gemspec

@@ -5,7 +5,9 @@ require 'autoproj/version'
 
 Gem::Specification.new do |s|
     s.name = "autoproj"
-    s.version = Autoproj::VERSION
+    # 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.authors = ["Sylvain Joyeux"]
     s.email = "sylvain.joyeux@m4x.org"
     s.summary = "Easy installation and management of sets of software packages"

data/bin/autoproj_bootstrap

@@ -41,12 +41,8 @@ module Autoproj
 
             def initialize(root_dir)
                 @root_dir = root_dir
-                if File.file?(autoproj_gemfile_path)
-                    @gemfile = File.read(autoproj_gemfile_path)
-                else
-                    @gemfile = default_gemfile_contents
-                end
                 @gem_source = "https://rubygems.org"
+                @gemfile = nil
 
                 @autoproj_options = Array.new
 
@@ -66,7 +62,6 @@ module Autoproj
 
                 default_gem_path = File.join(Dir.home, '.autoproj', 'gems')
                 @gems_install_path     = default_gem_path
-                @autoproj_install_path = default_gem_path
             end
 
             def env_for_child
@@ -136,33 +131,10 @@ module Autoproj
                     relative_path_from(Pathname.new(dot_gem_dir)).to_s
             end
 
-            # The path into which autoproj and its dependencies should be installed
-            #
-            # They are installed in a versioned subdirectory of this path, e.g.
-            # {#gem_path_suffix}. It is always absolute.
-            #
-            # @return [String]
-            attr_reader :autoproj_install_path
-            # The GEM_HOME into which the autoproj gems should be installed
-            def autoproj_gem_home; File.join(autoproj_install_path, gem_path_suffix) end
-            # Sets the place where autoproj should be installed
-            #
-            # @param [String] path Sets the path given to bundler, i.e. the
-            #   gems will be installed under the {#gem_path_suffix}
-            def autoproj_install_path=(path)
-                @autoproj_install_path = File.expand_path(path)
-            end
-            # Install autoproj in Gem's default user dir
-            def install_autoproj_in_gem_user_dir
-                @autoproj_install_path = File.join(Gem.user_home, '.gem')
-            end
-
             # The path into which the workspace's gems should be installed
             #
             # They are installed in a versioned subdirectory of this path, e.g.
-            # {#gem_path_suffix}. Unlike {#autoproj_install_path}, it can be
-            # relative, in which case it is relative to the workspace's prefix
-            # directory.
+            # {#gem_path_suffix}.
             # 
             # @return [String]
             attr_reader :gems_install_path
@@ -190,7 +162,7 @@ module Autoproj
             # (see #prefer_index_over_os_packages?)
             def prefer_indep_over_os_packages=(flag); @prefer_indep_over_os_packages = !!flag end
 
-            def guess_gem_program
+            def self.guess_gem_program
                 ruby_bin = RbConfig::CONFIG['RUBY_INSTALL_NAME']
                 ruby_bindir = RbConfig::CONFIG['bindir']
 
@@ -225,25 +197,24 @@ module Autoproj
                         @local = true
                     end
                     opt.on '--gem-source=URL', String, "use this source for RubyGems instead of rubygems.org" do |url|
-                        self.gem_source = url
+                        @gem_source = url
                     end
-                    opt.on '--shared-gems[=PATH]', "install gems in a shared location. By default,  uses the default RubyGems locations" do |path|
-                        if path
-                            self.autoproj_install_path = path
-                            self.gems_install_path     = path
-                        else
-                            self.install_autoproj_in_gem_user_dir
-                            self.install_gems_in_gem_user_dir
-                        end
+                    opt.on '--gems-path=PATH', "install gems under this path instead of ~/.autoproj/gems" do |path|
+                        self.gems_install_path     = path
                     end
-                    opt.on '--private-gems', "install bundler, autoproj and the workspace gems in dedicated locations within the workspace" do |path|
-                        self.autoproj_install_path = File.join(dot_autoproj, 'gems')
-                        self.gems_install_path     = 'gems'
+                    opt.on '--public-gems', "install gems in the default gem location" do
+                        self.install_gems_in_gem_user_dir
                     end
                     opt.on '--version=VERSION_CONSTRAINT', String, 'use the provided string as a version constraint for autoproj' do |version|
+                        if @gemfile
+                            raise "cannot give both --version and --gemfile"
+                        end
                         @gemfile = default_gemfile_contents(version)
                     end
                     opt.on '--gemfile=PATH', String, 'use the given Gemfile to install autoproj instead of the default' do |path|
+                        if @gemfile
+                            raise "cannot give both --version and --gemfile"
+                        end
                         @gemfile = File.read(path)
                     end
                     opt.on '--seed-config=PATH', String, 'path to a seed file that should be used to initialize the configuration' do |path|
@@ -274,7 +245,7 @@ module Autoproj
                     out: '/dev/null')
                 return if !result
 
-                bundler_path = File.join(autoproj_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
                 end
@@ -287,14 +258,14 @@ module Autoproj
                     env_for_child,
                     Gem.ruby, gem_program, 'install', '--env-shebang', '--no-document', '--no-format-executable', '--clear-sources', '--source', gem_source,
                         *local,
-                        "--bindir=#{File.join(autoproj_gem_home, 'bin')}", 'bundler')
+                        "--bindir=#{File.join(gems_gem_home, 'bin')}", 'bundler')
 
                 if !result
-                    STDERR.puts "FATAL: failed to install bundler in #{autoproj_gem_home}"
+                    STDERR.puts "FATAL: failed to install bundler in #{gems_gem_home}"
                     nil
                 end
 
-                bundler_path = File.join(autoproj_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
                 else
@@ -315,7 +286,7 @@ module Autoproj
 
                 opts = Array.new
                 opts << '--local' if local?
-                opts << "--path=#{autoproj_install_path}"
+                opts << "--path=#{gems_install_path}"
                 shims_path = File.join(dot_autoproj, 'bin')
                 result = system(clean_env,
                     Gem.ruby, bundler, 'install',
@@ -329,39 +300,69 @@ module Autoproj
                     exit 1
                 end
             ensure
-                self.class.clean_binstubs(shims_path, ruby_executable, bundler)
+                self.class.rewrite_shims(shims_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
             end
 
-            def self.clean_binstubs(shim_path, ruby_executable, bundler_path)
-                %w{bundler bundle rake thor ruby}.each do |bundler_bin|
-                    path = File.join(shim_path, bundler_bin)
-                    if File.file?(path)
-                        FileUtils.rm path
-                    end
+            def self.rewrite_shims(shim_path, ruby_executable, 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"
+                    io.puts "exec #{ruby_executable} \"$@\""
                 end
+                FileUtils.chmod 0755, File.join(shim_path, 'ruby')
 
-                # Now tune the binstubs to force the usage of the autoproj
-                # gemfile. Otherwise, they get BUNDLE_GEMFILE from the
-                # environment by default
-                Dir.glob(File.join(shim_path, '*')) do |path|
-                    next if !File.file?(path)
-
-                    lines = File.readlines(path)
-                    matched = false
-                    filtered = lines.map do |l|
-                        matched ||= (ENV_BUNDLE_GEMFILE_RX === l)
-                        l.gsub(ENV_BUNDLE_GEMFILE_RX, '\\1=')
-                    end
-                    if !matched
-                        raise UnexpectedBinstub, "expected #{path} to contain a line looking like ENV['BUNDLE_GEMFILE'] ||= but could not find one"
-                    end
-                    File.open(path, 'w') do |io|
-                        io.write filtered.join("")
+                FileUtils.touch File.join(shim_path, 'bundler')
+                FileUtils.touch File.join(shim_path, 'bundle')
+                Dir.glob(File.join(shim_path, '*')) do |bin_script|
+                    next if !File.file?(bin_script)
+                    bin_name = File.basename(bin_script)
+                    next if bin_name == 'ruby'
+
+                    bin_shim = File.join(shim_path, bin_name)
+                    bin_script_lines = File.readlines(bin_script)
+                    File.open(bin_shim, 'w') do |io|
+                        if bin_name == 'bundler' || bin_name == 'bundle'
+                            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)
+                        end
                     end
+                    FileUtils.chmod 0755, bin_shim
                 end
+            end
 
-            ensure
-                save_ruby_and_bundler_shims(shim_path, ruby_executable, bundler_path)
+            def self.shim_bundler(ruby_executable, autoproj_gemfile_path, gems_gem_home)
+"#! #{ruby_executable}
+
+if defined?(Bundler)
+    Bundler.with_clean_env do
+        exec($0, *ARGV)
+    end
+end
+
+ENV.delete('BUNDLE_GEMFILE')
+ENV['GEM_HOME'] = '#{gems_gem_home}'
+ENV.delete('GEM_PATH')
+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)
+"#! #{ruby_executable}
+
+if defined?(Bundler)
+    Bundler.with_clean_env do
+        exec($0, *ARGV)
+    end
+end
+
+ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+require 'rubygems'
+Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
+require 'bundler/setup'
+#{load_line}"
             end
 
             def save_env_sh(*vars)
@@ -392,6 +393,15 @@ module Autoproj
             end
 
             def save_gemfile
+                gemfile =
+                    if @gemfile
+                        @gemfile
+                    elsif File.file?(autoproj_gemfile_path)
+                        File.read(autoproj_gemfile_path)
+                    else
+                        default_gemfile_contents
+                    end
+
                 FileUtils.mkdir_p File.dirname(autoproj_gemfile_path)
                 File.open(autoproj_gemfile_path, 'w') do |io|
                     io.write gemfile
@@ -434,46 +444,32 @@ module Autoproj
                 end
             end
 
-            def self.save_ruby_and_bundler_shims(shim_path, ruby_executable, bundler_path)
-                FileUtils.mkdir_p shim_path
-                bundler_rubylib = File.expand_path(File.join('..', '..', 'lib'), bundler_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 ENV['BUNDLER_GEMFILE']
                     raise "cannot run autoproj_install or autoproj_bootstrap while under a 'bundler exec' subcommand or having loaded an env.sh. Open a new console and try again"
                 end
 
-                gem_program  = guess_gem_program
+                gem_program  = self.class.guess_gem_program
                 puts "Detected 'gem' to be #{gem_program}"
-                env['GEM_HOME'] = [autoproj_gem_home]
+                env['GEM_HOME'] = [gems_gem_home]
 
                 if bundler = find_bundler(gem_program)
                     puts "Detected bundler at #{bundler}"
                 else
-                    puts "Installing bundler in #{autoproj_gem_home}"
+                    puts "Installing bundler in #{gems_gem_home}"
                     if !(bundler = install_bundler(gem_program))
                         exit 1
                     end
                 end
-                self.class.save_ruby_and_bundler_shims(
+                self.class.rewrite_shims(
                     File.join(dot_autoproj, 'bin'),
                     ruby_executable,
-                    bundler)
+                    autoproj_gemfile_path,
+                    gems_gem_home)
                 env['PATH'].unshift File.join(dot_autoproj, 'bin')
                 save_gemfile
 
-                puts "Installing autoproj in #{autoproj_gem_home}"
+                puts "Installing autoproj in #{gems_gem_home}"
                 install_autoproj(bundler)
             end
 
@@ -500,13 +496,12 @@ module Autoproj
                 end
 
                 @config = config
-                %w{autoproj_install_path gems_install_path prefer_indep_over_os_packages}.each do |flag|
+                %w{gems_install_path prefer_indep_over_os_packages}.each do |flag|
                     instance_variable_set "@#{flag}", config.fetch(flag, false)
                 end
             end
 
             def save_config
-                config['autoproj_install_path'] = autoproj_install_path
                 config['gems_install_path']     = gems_install_path
                 config['prefer_indep_over_os_packages'] = prefer_indep_over_os_packages?
                 File.open(autoproj_config_path, 'w') { |io| YAML.dump(config, io) }
@@ -551,13 +546,13 @@ module Autoproj
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options, '--debug')
                     STDERR.puts "failed to run autoproj envsh on the newly installed autoproj (#{autoproj_path})"
                     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')
+                if !system(Gem.ruby, autoproj_path, 'osdeps', '--debug')
                     STDERR.puts "failed to run autoproj osdeps on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end

data/bin/autoproj_install

@@ -41,12 +41,8 @@ module Autoproj
 
             def initialize(root_dir)
                 @root_dir = root_dir
-                if File.file?(autoproj_gemfile_path)
-                    @gemfile = File.read(autoproj_gemfile_path)
-                else
-                    @gemfile = default_gemfile_contents
-                end
                 @gem_source = "https://rubygems.org"
+                @gemfile = nil
 
                 @autoproj_options = Array.new
 
@@ -66,7 +62,6 @@ module Autoproj
 
                 default_gem_path = File.join(Dir.home, '.autoproj', 'gems')
                 @gems_install_path     = default_gem_path
-                @autoproj_install_path = default_gem_path
             end
 
             def env_for_child
@@ -136,33 +131,10 @@ module Autoproj
                     relative_path_from(Pathname.new(dot_gem_dir)).to_s
             end
 
-            # The path into which autoproj and its dependencies should be installed
-            #
-            # They are installed in a versioned subdirectory of this path, e.g.
-            # {#gem_path_suffix}. It is always absolute.
-            #
-            # @return [String]
-            attr_reader :autoproj_install_path
-            # The GEM_HOME into which the autoproj gems should be installed
-            def autoproj_gem_home; File.join(autoproj_install_path, gem_path_suffix) end
-            # Sets the place where autoproj should be installed
-            #
-            # @param [String] path Sets the path given to bundler, i.e. the
-            #   gems will be installed under the {#gem_path_suffix}
-            def autoproj_install_path=(path)
-                @autoproj_install_path = File.expand_path(path)
-            end
-            # Install autoproj in Gem's default user dir
-            def install_autoproj_in_gem_user_dir
-                @autoproj_install_path = File.join(Gem.user_home, '.gem')
-            end
-
             # The path into which the workspace's gems should be installed
             #
             # They are installed in a versioned subdirectory of this path, e.g.
-            # {#gem_path_suffix}. Unlike {#autoproj_install_path}, it can be
-            # relative, in which case it is relative to the workspace's prefix
-            # directory.
+            # {#gem_path_suffix}.
             # 
             # @return [String]
             attr_reader :gems_install_path
@@ -190,7 +162,7 @@ module Autoproj
             # (see #prefer_index_over_os_packages?)
             def prefer_indep_over_os_packages=(flag); @prefer_indep_over_os_packages = !!flag end
 
-            def guess_gem_program
+            def self.guess_gem_program
                 ruby_bin = RbConfig::CONFIG['RUBY_INSTALL_NAME']
                 ruby_bindir = RbConfig::CONFIG['bindir']
 
@@ -225,25 +197,24 @@ module Autoproj
                         @local = true
                     end
                     opt.on '--gem-source=URL', String, "use this source for RubyGems instead of rubygems.org" do |url|
-                        self.gem_source = url
+                        @gem_source = url
                     end
-                    opt.on '--shared-gems[=PATH]', "install gems in a shared location. By default,  uses the default RubyGems locations" do |path|
-                        if path
-                            self.autoproj_install_path = path
-                            self.gems_install_path     = path
-                        else
-                            self.install_autoproj_in_gem_user_dir
-                            self.install_gems_in_gem_user_dir
-                        end
+                    opt.on '--gems-path=PATH', "install gems under this path instead of ~/.autoproj/gems" do |path|
+                        self.gems_install_path     = path
                     end
-                    opt.on '--private-gems', "install bundler, autoproj and the workspace gems in dedicated locations within the workspace" do |path|
-                        self.autoproj_install_path = File.join(dot_autoproj, 'gems')
-                        self.gems_install_path     = 'gems'
+                    opt.on '--public-gems', "install gems in the default gem location" do
+                        self.install_gems_in_gem_user_dir
                     end
                     opt.on '--version=VERSION_CONSTRAINT', String, 'use the provided string as a version constraint for autoproj' do |version|
+                        if @gemfile
+                            raise "cannot give both --version and --gemfile"
+                        end
                         @gemfile = default_gemfile_contents(version)
                     end
                     opt.on '--gemfile=PATH', String, 'use the given Gemfile to install autoproj instead of the default' do |path|
+                        if @gemfile
+                            raise "cannot give both --version and --gemfile"
+                        end
                         @gemfile = File.read(path)
                     end
                     opt.on '--seed-config=PATH', String, 'path to a seed file that should be used to initialize the configuration' do |path|
@@ -274,7 +245,7 @@ module Autoproj
                     out: '/dev/null')
                 return if !result
 
-                bundler_path = File.join(autoproj_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
                 end
@@ -287,14 +258,14 @@ module Autoproj
                     env_for_child,
                     Gem.ruby, gem_program, 'install', '--env-shebang', '--no-document', '--no-format-executable', '--clear-sources', '--source', gem_source,
                         *local,
-                        "--bindir=#{File.join(autoproj_gem_home, 'bin')}", 'bundler')
+                        "--bindir=#{File.join(gems_gem_home, 'bin')}", 'bundler')
 
                 if !result
-                    STDERR.puts "FATAL: failed to install bundler in #{autoproj_gem_home}"
+                    STDERR.puts "FATAL: failed to install bundler in #{gems_gem_home}"
                     nil
                 end
 
-                bundler_path = File.join(autoproj_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
                 else
@@ -315,7 +286,7 @@ module Autoproj
 
                 opts = Array.new
                 opts << '--local' if local?
-                opts << "--path=#{autoproj_install_path}"
+                opts << "--path=#{gems_install_path}"
                 shims_path = File.join(dot_autoproj, 'bin')
                 result = system(clean_env,
                     Gem.ruby, bundler, 'install',
@@ -329,39 +300,69 @@ module Autoproj
                     exit 1
                 end
             ensure
-                self.class.clean_binstubs(shims_path, ruby_executable, bundler)
+                self.class.rewrite_shims(shims_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
             end
 
-            def self.clean_binstubs(shim_path, ruby_executable, bundler_path)
-                %w{bundler bundle rake thor ruby}.each do |bundler_bin|
-                    path = File.join(shim_path, bundler_bin)
-                    if File.file?(path)
-                        FileUtils.rm path
-                    end
+            def self.rewrite_shims(shim_path, ruby_executable, 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"
+                    io.puts "exec #{ruby_executable} \"$@\""
                 end
+                FileUtils.chmod 0755, File.join(shim_path, 'ruby')
 
-                # Now tune the binstubs to force the usage of the autoproj
-                # gemfile. Otherwise, they get BUNDLE_GEMFILE from the
-                # environment by default
-                Dir.glob(File.join(shim_path, '*')) do |path|
-                    next if !File.file?(path)
-
-                    lines = File.readlines(path)
-                    matched = false
-                    filtered = lines.map do |l|
-                        matched ||= (ENV_BUNDLE_GEMFILE_RX === l)
-                        l.gsub(ENV_BUNDLE_GEMFILE_RX, '\\1=')
-                    end
-                    if !matched
-                        raise UnexpectedBinstub, "expected #{path} to contain a line looking like ENV['BUNDLE_GEMFILE'] ||= but could not find one"
-                    end
-                    File.open(path, 'w') do |io|
-                        io.write filtered.join("")
+                FileUtils.touch File.join(shim_path, 'bundler')
+                FileUtils.touch File.join(shim_path, 'bundle')
+                Dir.glob(File.join(shim_path, '*')) do |bin_script|
+                    next if !File.file?(bin_script)
+                    bin_name = File.basename(bin_script)
+                    next if bin_name == 'ruby'
+
+                    bin_shim = File.join(shim_path, bin_name)
+                    bin_script_lines = File.readlines(bin_script)
+                    File.open(bin_shim, 'w') do |io|
+                        if bin_name == 'bundler' || bin_name == 'bundle'
+                            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)
+                        end
                     end
+                    FileUtils.chmod 0755, bin_shim
                 end
+            end
 
-            ensure
-                save_ruby_and_bundler_shims(shim_path, ruby_executable, bundler_path)
+            def self.shim_bundler(ruby_executable, autoproj_gemfile_path, gems_gem_home)
+"#! #{ruby_executable}
+
+if defined?(Bundler)
+    Bundler.with_clean_env do
+        exec($0, *ARGV)
+    end
+end
+
+ENV.delete('BUNDLE_GEMFILE')
+ENV['GEM_HOME'] = '#{gems_gem_home}'
+ENV.delete('GEM_PATH')
+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)
+"#! #{ruby_executable}
+
+if defined?(Bundler)
+    Bundler.with_clean_env do
+        exec($0, *ARGV)
+    end
+end
+
+ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+require 'rubygems'
+Gem.paths = Hash['GEM_HOME' => '#{gems_gem_home}', 'GEM_PATH' => '']
+require 'bundler/setup'
+#{load_line}"
             end
 
             def save_env_sh(*vars)
@@ -392,6 +393,15 @@ module Autoproj
             end
 
             def save_gemfile
+                gemfile =
+                    if @gemfile
+                        @gemfile
+                    elsif File.file?(autoproj_gemfile_path)
+                        File.read(autoproj_gemfile_path)
+                    else
+                        default_gemfile_contents
+                    end
+
                 FileUtils.mkdir_p File.dirname(autoproj_gemfile_path)
                 File.open(autoproj_gemfile_path, 'w') do |io|
                     io.write gemfile
@@ -434,46 +444,32 @@ module Autoproj
                 end
             end
 
-            def self.save_ruby_and_bundler_shims(shim_path, ruby_executable, bundler_path)
-                FileUtils.mkdir_p shim_path
-                bundler_rubylib = File.expand_path(File.join('..', '..', 'lib'), bundler_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 ENV['BUNDLER_GEMFILE']
                     raise "cannot run autoproj_install or autoproj_bootstrap while under a 'bundler exec' subcommand or having loaded an env.sh. Open a new console and try again"
                 end
 
-                gem_program  = guess_gem_program
+                gem_program  = self.class.guess_gem_program
                 puts "Detected 'gem' to be #{gem_program}"
-                env['GEM_HOME'] = [autoproj_gem_home]
+                env['GEM_HOME'] = [gems_gem_home]
 
                 if bundler = find_bundler(gem_program)
                     puts "Detected bundler at #{bundler}"
                 else
-                    puts "Installing bundler in #{autoproj_gem_home}"
+                    puts "Installing bundler in #{gems_gem_home}"
                     if !(bundler = install_bundler(gem_program))
                         exit 1
                     end
                 end
-                self.class.save_ruby_and_bundler_shims(
+                self.class.rewrite_shims(
                     File.join(dot_autoproj, 'bin'),
                     ruby_executable,
-                    bundler)
+                    autoproj_gemfile_path,
+                    gems_gem_home)
                 env['PATH'].unshift File.join(dot_autoproj, 'bin')
                 save_gemfile
 
-                puts "Installing autoproj in #{autoproj_gem_home}"
+                puts "Installing autoproj in #{gems_gem_home}"
                 install_autoproj(bundler)
             end
 
@@ -500,13 +496,12 @@ module Autoproj
                 end
 
                 @config = config
-                %w{autoproj_install_path gems_install_path prefer_indep_over_os_packages}.each do |flag|
+                %w{gems_install_path prefer_indep_over_os_packages}.each do |flag|
                     instance_variable_set "@#{flag}", config.fetch(flag, false)
                 end
             end
 
             def save_config
-                config['autoproj_install_path'] = autoproj_install_path
                 config['gems_install_path']     = gems_install_path
                 config['prefer_indep_over_os_packages'] = prefer_indep_over_os_packages?
                 File.open(autoproj_config_path, 'w') { |io| YAML.dump(config, io) }
@@ -551,13 +546,13 @@ module Autoproj
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options, '--debug')
                     STDERR.puts "failed to run autoproj envsh on the newly installed autoproj (#{autoproj_path})"
                     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')
+                if !system(Gem.ruby, autoproj_path, 'osdeps', '--debug')
                     STDERR.puts "failed to run autoproj osdeps on the newly installed autoproj (#{autoproj_path})"
                     exit 1
                 end