autoproj 2.8.4 → 2.8.5.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651f60fc325d3c89f2c228b21cba6fbb4e59f6ef265519c886cc902ea7b447c5
-  data.tar.gz: 6c5444bb162212e02591fc44103c590ebf32cd57e71ac404b126f7ff81464d21
+  metadata.gz: c07bd3ea7d39baa65fee835e47fcefa3b0d1eb2e54b386734b736b529b7fca67
+  data.tar.gz: 1beb2540b5f04deca745b843a7ac9e88b984ae80e28a81ae581a579eaa5805b2
 SHA512:
-  metadata.gz: eb567f162a65b45a85bfe6ec630cdc60dc47d599466a362f1af6f74cc887805273acd30e2bc91841c895fe2cef77422caba8ab44151aad7501757de8c78517eb
-  data.tar.gz: 43d29cde118d224707c4fed2b40662277a745a9a98a8e768f574d3cf83292afa6dac9aed427a8631f36068a81bd2bbf33f75d3fc1044608f7b3052f0beb32d98
+  metadata.gz: 24175df94d84ec5ea34576466fdaadfa166d8e0b277eb2364efbee971c79cad62f2a20449243a9fddbdc10375f524681d96fb8ed7a4c67e56f251c941bb87cc4
+  data.tar.gz: cb1935cdfb1c399fba76160f7c6e6b8a13cc118c3e347597acbac295ec8986662fb05836d89d7a3cc109334ae1c98b85900497074308449cfecd75717be1a07e

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -170,7 +170,9 @@ def backup_clean(mapping)
                 end
             end
 
-            def self.run_bundler_install(ws, gemfile, *options, update: true, binstubs: nil, gem_path: ws.config.gems_install_path)
+            def self.run_bundler_install(ws, gemfile, *options, update: true, binstubs: nil,
+			gem_home: ws.config.gems_gem_home,
+			gem_path: ws.config.gems_install_path)
                 if update && File.file?("#{gemfile}.lock")
                     FileUtils.rm "#{gemfile}.lock"
                 end
@@ -182,7 +184,7 @@ def self.run_bundler_install(ws, gemfile, *options, update: true, binstubs: nil,
                 end
 
                 connections = Set.new
-                run_bundler(ws, 'install', *options, gemfile: gemfile) do |line|
+                run_bundler(ws, 'install', *options, gem_home: gem_home, gemfile: gemfile) do |line|
                     case line
                     when /Installing (.*)/
                         Autobuild.message "  bundler: installing #{$1}"
@@ -196,18 +198,18 @@ def self.run_bundler_install(ws, gemfile, *options, update: true, binstubs: nil,
                 end
             end
 
-            def self.bundle_gem_path(ws, gem_name, gemfile: nil)
+            def self.bundle_gem_path(ws, gem_name, gem_home: nil, gemfile: nil)
                 path = String.new
-                PackageManagers::BundlerManager.run_bundler(ws, 'show', gem_name, gemfile: gemfile) do |line|
+                PackageManagers::BundlerManager.run_bundler(ws, 'show', gem_name, gem_home: gem_home, gemfile: gemfile) do |line|
                     path << line
                 end
                 path.chomp
             end
 
-            def self.run_bundler(ws, *commandline, gemfile: nil)
+            def self.run_bundler(ws, *commandline, gem_home: nil, gemfile: nil)
                 Bundler.with_clean_env do
                     target_env = Hash[
-                        'GEM_HOME' => nil,
+                        'GEM_HOME' => gem_home,
                         'GEM_PATH' => nil,
                         'BUNDLE_GEMFILE' => gemfile,
                         'RUBYOPT' => nil,

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.8.4"
+    VERSION = "2.8.5.b1"
 end

data/lib/autoproj/workspace.rb

@@ -385,7 +385,7 @@ def update_autoproj(restart_on_update: true)
             binstubs = File.join(dot_autoproj_dir, 'bin')
             if restart_on_update
                 old_autoproj_path = PackageManagers::BundlerManager.bundle_gem_path(
-                    self, 'autoproj', gemfile: gemfile)
+                    self, 'autoproj', gem_home: config.gems_gem_home, gemfile: gemfile)
             end
             begin
                 Autoproj.message "  updating autoproj"
@@ -396,7 +396,7 @@ def update_autoproj(restart_on_update: true)
             end
             if restart_on_update
                 new_autoproj_path = PackageManagers::BundlerManager.bundle_gem_path(
-                    self, 'autoproj', gemfile: gemfile)
+                    self, 'autoproj', gem_home: config.gems_gem_home, gemfile: gemfile)
             end
 
             # First things first, see if we need to update ourselves

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.5.b1
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -437,9 +437,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6