autoproj 2.0.0.rc8 → 2.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddd3ede1fe4f58fe3cc3c9b7e37b05a06c3c3cb
-  data.tar.gz: 300374bfb1cb43ed90200d5d19c049cf1b001a3f
+  metadata.gz: c1df5021c43b37d6c5518d493f79fbbaea9f2521
+  data.tar.gz: 0d9eed9c7fa03564259281202ecaba4bf984ef75
 SHA512:
-  metadata.gz: 6ec06a35be38735bf8b45ea5eb29a0e48a3dba7ea52be07b0ff32d76e3267aa2a423ad4b978f1c9aabfc1a68011a3d881cbf235342b210a69068dfec9a68bbd6
-  data.tar.gz: 327f067eac8418c5829c1ebb054eb9e06d7518f23d7626263009eff45f62d3cd1bac7353753f26e800b6467d42ea53d2236212c21b47655f7ecaa99c2b146c07
+  metadata.gz: 6acb320695ee6c3991275a4aec2c89a8a5e445888a74d2f0bea7b520f62894f3f7721b6a32fcb1112cf7cf301393f47db0a39b1adda41597ba3026b3ba948e38
+  data.tar.gz: 3fffc2abaa6b8b5eff4bd4e14f9b6c0884f1e6f3a1c27bd272062319cd1c4446cc1f673c656703c985e4a51286fb3fe30b5a065cc8937c0a5da59c51445c5763

data/bin/autoproj_bootstrap

@@ -240,7 +240,7 @@ module Autoproj
             def install_autoproj(bundler)
                 # Force bundler to update. If the user does not want this, let him specify a
                 # Gemfile with tighter version constraints
-                lockfile = File.join(File.dirname(autoproj_install_dir), 'Gemfile.lock')
+                lockfile = File.join(autoproj_install_dir, 'Gemfile.lock')
                 if File.exist?(lockfile)
                     FileUtils.rm lockfile
                 end
@@ -437,7 +437,7 @@ end
 ENV.delete('BUNDLE_GEMFILE')
 ENV.delete('RUBYLIB')
 ops = Autoproj::Ops::Install.new(Dir.pwd)
-ops.parse_options(ARGV)
+bootstrap_options = ops.parse_options(ARGV)
 ops.stage1
 
 # we assume that Install#run loads bundler and autobuild. Load autoproj and run

data/bin/autoproj_bootstrap.in

@@ -10,7 +10,7 @@ AUTOPROJ_OPS_INSTALL
 ENV.delete('BUNDLE_GEMFILE')
 ENV.delete('RUBYLIB')
 ops = Autoproj::Ops::Install.new(Dir.pwd)
-ops.parse_options(ARGV)
+bootstrap_options = ops.parse_options(ARGV)
 ops.stage1
 
 # we assume that Install#run loads bundler and autobuild. Load autoproj and run

data/bin/autoproj_install

@@ -240,7 +240,7 @@ module Autoproj
             def install_autoproj(bundler)
                 # Force bundler to update. If the user does not want this, let him specify a
                 # Gemfile with tighter version constraints
-                lockfile = File.join(File.dirname(autoproj_install_dir), 'Gemfile.lock')
+                lockfile = File.join(autoproj_install_dir, 'Gemfile.lock')
                 if File.exist?(lockfile)
                     FileUtils.rm lockfile
                 end

data/lib/autoproj/ops/install.rb

@@ -233,7 +233,7 @@ def find_bundler
             def install_autoproj(bundler)
                 # Force bundler to update. If the user does not want this, let him specify a
                 # Gemfile with tighter version constraints
-                lockfile = File.join(File.dirname(autoproj_install_dir), 'Gemfile.lock')
+                lockfile = File.join(autoproj_install_dir, 'Gemfile.lock')
                 if File.exist?(lockfile)
                     FileUtils.rm lockfile
                 end

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -1,3 +1,4 @@
+require 'bundler'
 module Autoproj
     module PackageManagers
         # Package manager interface for the RubyGems system
@@ -32,7 +33,7 @@ def initialize_environment
                 env.init_from_env 'GEM_PATH'
                 env.system_env['GEM_PATH'] = Gem.default_path
 
-                if env.original_env['GEM_HOME'].empty?
+                if (env.original_env['GEM_HOME'] || '').empty?
                     env.unset('GEM_HOME')
                 end
 
@@ -200,6 +201,7 @@ def install(gems)
             end
 
             def discover_rubylib
+                require 'bundler'
                 Tempfile.open 'autoproj-rubylib' do |io|
                     result = Bundler.clean_system(
                         Hash['RUBYLIB' => nil],
@@ -213,6 +215,7 @@ def discover_rubylib
             end
 
             def discover_bundle_rubylib
+                require 'bundler'
                 gemfile = File.join(ws.prefix_dir, 'gems', 'Gemfile')
                 Tempfile.open 'autoproj-rubylib' do |io|
                     result = Bundler.clean_system(

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc8"
+    VERSION = "2.0.0.rc9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc8
+  version: 2.0.0.rc9
 platform: ruby
 authors:
 - Sylvain Joyeux