autoproj 2.0.0.rc31 → 2.0.0.rc32

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -37,27 +37,17 @@ def initialize_environment
                 config = ws.config
 
                 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(config.gems_gem_home(ws), 'bin')
-                env.add_path 'PATH', File.join(ws.dot_autoproj_dir, 'autoproj', 'bin')
+                env.add_path 'PATH', File.join(ws.dot_autoproj_dir, 'bin')
                 env.set 'GEM_HOME', config.gems_gem_home(ws)
-                env.set 'GEM_PATH', config.bundler_gem_home
+                env.set 'GEM_PATH', config.autoproj_gem_home
 
-                root_dir     = File.join(ws.prefix_dir, 'gems')
-                gemfile_path = File.join(root_dir, 'Gemfile')
+                gemfile_path = File.join(ws.prefix_dir, 'gems', 'Gemfile')
                 if File.file?(gemfile_path)
                     env.set('BUNDLE_GEMFILE', gemfile_path)
                 end
 
-                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?
-                    env.add_path 'GEM_PATH', config.bundler_gem_home
-                end
-
                 env.init_from_env 'RUBYLIB'
                 env.inherit 'RUBYLIB'
                 # Sanitize the rubylib we get from the environment by removing
@@ -88,7 +78,7 @@ def initialize_environment
                 gemfile = File.join(prefix_gems, 'Gemfile')
                 if !File.exist?(gemfile)
                     File.open(gemfile, 'w') do |io|
-                        io.puts "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')}\""
+                        io.puts "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'Gemfile')}\""
                     end
                 end
 
@@ -243,7 +233,7 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
                 backup_files(backups)
                 if !File.file?("#{gemfile_path}.orig")
                     File.open("#{gemfile_path}.orig", 'w') do |io|
-                        io.puts "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')}\""
+                        io.puts "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'Gemfile')}\""
                     end
                 end
 
@@ -257,7 +247,7 @@ 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
-                gemfiles << File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')
+                gemfiles << File.join(ws.dot_autoproj_dir, 'Gemfile')
 
                 # Save the osdeps entries in a temporary gemfile and finally
                 # merge the whole lot of it
@@ -281,10 +271,6 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
                 end
 
                 options = Array.new
-                if ws.config.private_gems?
-                    options << "--path" << ws.config.gems_bundler_path(ws)
-                end
-
                 binstubs_path = File.join(root_dir, 'bin')
                 if updated || !install_only || !File.file?("#{gemfile_path}.lock")
                     self.class.run_bundler_install ws, gemfile_path, *options,

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc31"
+    VERSION = "2.0.0.rc32"
 end

data/lib/autoproj/workspace.rb

@@ -20,6 +20,7 @@ def os_package_resolver; manifest.os_package_resolver end
 
         def initialize(root_dir)
             @root_dir = root_dir
+
             @loader = loader
             @env = Environment.new
             env.source_before(File.join(dot_autoproj_dir, 'env.sh'))
@@ -240,6 +241,7 @@ def setup_os_package_installer
         end
 
         def setup
+            migrate_bundler_and_autoproj_gem_layout
             load_config
             autodetect_operating_system
             config.validate_ruby_executable
@@ -305,13 +307,13 @@ def update_autoproj(restart_on_update: true)
                 return
             end
 
-            gemfile  = File.join(dot_autoproj_dir, 'autoproj', 'Gemfile')
-            binstubs = File.join(dot_autoproj_dir, 'autoproj', 'bin')
+            gemfile  = File.join(dot_autoproj_dir, 'Gemfile')
+            binstubs = File.join(dot_autoproj_dir, 'bin')
             begin
                 PackageManagers::BundlerManager.run_bundler_install(
                     self, gemfile, binstubs: binstubs)
             ensure
-                Ops::Install.clean_binstubs(binstubs)
+                Ops::Install.clean_binstubs(binstubs, config.ruby_executable, File.join(config.autoproj_gem_home, 'bin', 'bundler'))
             end
 
             # Find out what version of autoproj bundler locked on
@@ -350,6 +352,22 @@ def run(*args, &block)
             Autobuild::Subprocess.run(*args, options, &block)
         end
 
+        def migrate_bundler_and_autoproj_gem_layout
+            if !File.directory?(File.join(dot_autoproj_dir, 'autoproj'))
+                return
+            else
+                config = YAML.load(File.read(File.join(dot_autoproj_dir, 'config.yml')))
+                return if config['autoproj_install_path']
+            end
+
+            Autoproj.silent = false
+            Autoproj.warn "The way bundler and autoproj are installed changed"
+            Autoproj.warn "You must download"
+            Autoproj.warn "   https://raw.githubusercontent.com/rock-core/autoproj/master/bin/autoproj_install"
+            Autoproj.warn "and run it at the root of this workspace"
+            exit 2
+        end
+
         def set_as_main_workspace
             Autoproj.workspace = self
             Autoproj.root_dir = root_dir

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc31
+  version: 2.0.0.rc32
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autobuild
   requirement: !ruby/object:Gem::Requirement