autoproj 1.9.3.rc4 → 1.9.3.rc5

data/lib/autoproj/cmdline.rb

@@ -1538,6 +1538,25 @@ where 'mode' is one of:
             Autoproj.root_dir = Dir.pwd
             Autobuild.logdir = File.join(Autoproj.prefix, 'log')
 
+            # Check if GEM_HOME is set. If it is the case, assume that we are
+            # bootstrapping from another autoproj directory. We start by
+            # forcefully installing autoproj/autobuild so that the installation
+            # is self-contained.
+            #
+            # We don't use Autoproj.gem_home there as we might not be in an
+            # autoproj directory at all
+            gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, ".gems")
+            if ENV['GEM_HOME'] || ENV['GEM_PATH']
+                ENV.delete('GEM_HOME')
+                ENV.delete('GEM_PATH')
+                Autoproj.message "reset the RubyGems environment, restarting bootstrapping from #{Dir.pwd}"
+
+                require 'rbconfig'
+                ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+                ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps.osdeps_mode
+                exec ruby, $0, 'bootstrap', *ARGV
+            end
+
             reuse = []
             parser = OptionParser.new do |opt|
                 opt.on '--reuse DIR', 'reuse the given autoproj installation (can be given multiple times)' do |path|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.3.rc4"
+    VERSION = "1.9.3.rc5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.3.rc4
+  version: 1.9.3.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &7521820 !ruby/object:Gem::Requirement
+  requirement: &15028720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *7521820
+  version_requirements: *15028720
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &7520300 !ruby/object:Gem::Requirement
+  requirement: &15027120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *7520300
+  version_requirements: *15027120
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &7518880 !ruby/object:Gem::Requirement
+  requirement: &15025720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *7518880
+  version_requirements: *15025720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7535660 !ruby/object:Gem::Requirement
+  requirement: &15042520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *7535660
+  version_requirements: *15042520
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7534760 !ruby/object:Gem::Requirement
+  requirement: &15041600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: *7534760
+  version_requirements: *15041600
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.