autoproj 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6d1d36a0d083b3d1b2e36e03fc6cc30844ee81ff9e059fa5f02b56436256b3
-  data.tar.gz: ed32703bbd7587d542efa5f046dbf94fb6457d0c8138b9e2314ef87a665c4573
+  metadata.gz: 1254fdb26e9589090bf68081006f181d779aea88b2e41d866d240571577d3206
+  data.tar.gz: d10d4df38231e95bddddef14255b6251a115ac6b75f6228ca77816d10298f1ad
 SHA512:
-  metadata.gz: fd2e91fcd355e19b2cf9b1f0bedde1cf28ac0ba8aca1239eec23dfd45a848007a335efe6745a3948e2613a81f844b6778ed7a4bdb268b587ca2c45c2b64d7f0c
-  data.tar.gz: 2ddd52ea6026339b5b3139e1b0d87d041fcef06c084338485e7a99ceda5d3a7b203b5741b50d14c22522cc2e6baa5afb9831844a21d5691d984b596c493ce957
+  metadata.gz: 33841beedafa7dd02fc64763a004d0326824c90ee0187895c4b8fefba7b7be615f61bc48decff52e9d63c0b5bb9cba9d671619bcdfe8b68482e7d395088e5e2b
+  data.tar.gz: 3bfacbe63c2d5f1f46a00dd1f2c82d79cd2ca8a64e0ba9a334651ca201a93f8f0c5f65786fdb224cce4c2b2c29a274b2f5cd3722dc0ce5d0bf5bb0a716b6dcb8

data/bin/autoproj_bootstrap

@@ -294,7 +294,7 @@ module Autoproj
                     out: '/dev/null')
                 return if !result
 
-                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
                 if File.exist?(bundler_path)
                     bundler_path
                 end
@@ -314,14 +314,14 @@ module Autoproj
                         '--env-shebang', '--no-document', '--no-format-executable',
                         '--clear-sources', '--source', gem_source,
                         *local, "--bindir=#{File.join(gems_gem_home, 'bin')}",
-                        'bundler', **redirection)
+                        'bundle', **redirection)
 
                 if !result
                     STDERR.puts "FATAL: failed to install bundler in #{gems_gem_home}"
                     nil
                 end
 
-                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
                 if File.exist?(bundler_path)
                     bundler_path
                 else
@@ -419,7 +419,7 @@ if defined?(Bundler)
         exec($0, *ARGV)
     end
 end
-ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
                 RESTART_BUNDLER
                 script_lines.join
             end

data/bin/autoproj_install

@@ -294,7 +294,7 @@ module Autoproj
                     out: '/dev/null')
                 return if !result
 
-                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
                 if File.exist?(bundler_path)
                     bundler_path
                 end
@@ -314,14 +314,14 @@ module Autoproj
                         '--env-shebang', '--no-document', '--no-format-executable',
                         '--clear-sources', '--source', gem_source,
                         *local, "--bindir=#{File.join(gems_gem_home, 'bin')}",
-                        'bundler', **redirection)
+                        'bundle', **redirection)
 
                 if !result
                     STDERR.puts "FATAL: failed to install bundler in #{gems_gem_home}"
                     nil
                 end
 
-                bundler_path = File.join(gems_gem_home, 'bin', 'bundler')
+                bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
                 if File.exist?(bundler_path)
                     bundler_path
                 else
@@ -419,7 +419,7 @@ if defined?(Bundler)
         exec($0, *ARGV)
     end
 end
-ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
                 RESTART_BUNDLER
                 script_lines.join
             end

data/lib/autoproj/ops/install.rb

@@ -409,7 +409,7 @@ def self.shim_bundler(script_lines, ruby_executable, autoproj_gemfile_path, gems
         exec($0, *ARGV)
     end
 end
-ENV['BUNDLE_GEMFILE'] = '#{autoproj_gemfile_path}'
+ENV['BUNDLE_GEMFILE'] ||= '#{autoproj_gemfile_path}'
                 RESTART_BUNDLER
                 script_lines.join
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.8.1"
+    VERSION = "2.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Sylvain Joyeux