autoproj 2.0.0.rc28 → 2.0.0.rc29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff2813bce521361e3a276e51e0216c18d8b1c00
-  data.tar.gz: 78a98d21be75cc93a22aac09620237764eb72601
+  metadata.gz: df72ee5143eac811dae59abcd51d096c68a871c7
+  data.tar.gz: f4280d34083809d89ebe8a2bb57bf910d19c8dd0
 SHA512:
-  metadata.gz: 413db816723732af3a77178b5cfdad3af88b68fc2444378f1202f4ce914b8370bb887067b0d7d12b0cb89d61508cfddc1a7122354441ff6562fedc033a263ab4
-  data.tar.gz: a3666e0265f2c94ef9616610bcbd78d474384360ff73c8fe56e86b3427927840b97365d3be33406d000f90ab3bc90396b35b734c9bb86935dd64b61af5bc722c
+  metadata.gz: 370d5a707092dd140e537a0dfc1401c57048344284aa5dd96a9fa01bc9afb20b4a3f547d540b0d33f438552bae7558032e3ca59068e1f801d2a8129c41bb6391
+  data.tar.gz: 30c5948277dca1c98622b368974227312b42e5fcc5511f7d775152706fa3bf5515b178383f0f79c5f276333bc3befd0e88be54ad7da4f27f1a6445acea43217c

data/bin/autoproj_bootstrap

@@ -255,9 +255,6 @@ module Autoproj
                 bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
-                else
-                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
-                    nil
                 end
             end
 

data/bin/autoproj_install

@@ -255,9 +255,6 @@ module Autoproj
                 bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
-                else
-                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
-                    nil
                 end
             end
 

data/lib/autoproj/configuration.rb

@@ -227,7 +227,7 @@ def private_gems?
         end
 
         # The path provided to bundler to install the gems
-        def gems_bundler_path
+        def gems_bundler_path(ws)
             value = get('private_gems', false)
             if value.respond_to?(:to_str)
                 value
@@ -243,8 +243,8 @@ def gems_bundler_path
         # RubyGems and Bundler install gems in a subdirectory specific to the
         # Ruby platform and version. This adds the relevant suffix to
         # {#gems_bundler_path}
-        def gems_gem_home
-            base_path = gems_bundler_path || File.join(Gem.user_dir, '.gem')
+        def gems_gem_home(ws)
+            base_path = gems_bundler_path(ws) || File.join(Gem.user_dir, '.gem')
             path_suffix = Pathname.new(Gem.user_dir).
                 relative_path_from(Pathname.new(File.join(Gem.user_home, '.gem'))).
                 to_s

data/lib/autoproj/ops/install.rb

@@ -245,9 +245,6 @@ def find_bundler(gem_program)
                 bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
                 if File.exist?(bundler_path)
                     bundler_path
-                else
-                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
-                    nil
                 end
             end
 

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -33,9 +33,9 @@ def initialize_environment
 
                 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, '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.set 'GEM_HOME', config.gems_gem_home
+                env.set 'GEM_HOME', config.gems_gem_home(ws)
                 env.set 'GEM_PATH', config.bundler_gem_home
 
                 root_dir     = File.join(ws.prefix_dir, 'gems')
@@ -277,7 +277,7 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
 
                 options = Array.new
                 if ws.config.private_gems?
-                    options << "--path" << ws.config.gems_bundler_path
+                    options << "--path" << ws.config.gems_bundler_path(ws)
                 end
 
                 binstubs_path = File.join(root_dir, 'bin')

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc28"
+    VERSION = "2.0.0.rc29"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc28
+  version: 2.0.0.rc29
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -298,3 +298,4 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
+has_rdoc: