autoproj 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74382a8f78adb1bf83f20565bccc8c76972780b497bdd047559d520ed5486b09
-  data.tar.gz: 55bcf45cd3caa0fa840ef9b70dc8679b476669f27362b2181a5cb424005d0b63
+  metadata.gz: 6e6d1d36a0d083b3d1b2e36e03fc6cc30844ee81ff9e059fa5f02b56436256b3
+  data.tar.gz: ed32703bbd7587d542efa5f046dbf94fb6457d0c8138b9e2314ef87a665c4573
 SHA512:
-  metadata.gz: d407340e19a489609da4e291bcb09f271db61e917ff345d94160e4546c10222cbaf67158f6c59ed0b2c093520011f7c156acbcaaf7c059e52cc89c7100a5b0cb
-  data.tar.gz: 68975b05b8470110377ac2b3519759351fc8c03d6df8c088e9712da35beca5a5305b699134189a83cf844ed94664d9b9825bb6b5195598a1efdbcb41b8dd4400
+  metadata.gz: fd2e91fcd355e19b2cf9b1f0bedde1cf28ac0ba8aca1239eec23dfd45a848007a335efe6745a3948e2613a81f844b6778ed7a4bdb268b587ca2c45c2b64d7f0c
+  data.tar.gz: 2ddd52ea6026339b5b3139e1b0d87d041fcef06c084338485e7a99ceda5d3a7b203b5741b50d14c22522cc2e6baa5afb9831844a21d5691d984b596c493ce957

data/lib/autoproj/ops/install.rb

@@ -284,7 +284,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
@@ -304,14 +304,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

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -51,7 +51,7 @@ module Autoproj
                     env.set('BUNDLE_GEMFILE', gemfile_path)
                 end
 
-                Autobuild.programs['bundler'] = File.join(ws.dot_autoproj_dir, 'bin', 'bundler')
+                Autobuild.programs['bundler'] = File.join(ws.dot_autoproj_dir, 'bin', 'bundle')
 
                 env.init_from_env 'RUBYLIB'
                 env.inherit 'RUBYLIB'
@@ -363,7 +363,10 @@ module Autoproj
                 backup_restore(backups)
                 raise
             ensure
-                FileUtils.rm_f File.join(binstubs_path, 'bundler') if binstubs_path
+                if binstubs_path
+                    FileUtils.rm_f File.join(binstubs_path, 'bundle') 
+                    FileUtils.rm_f File.join(binstubs_path, 'bundler')
+                end
                 backup_clean(backups)
             end
 

data/lib/autoproj/version.rb

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

metadata

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