autoproj 2.0.0.rc36 → 2.0.0.rc37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3051262e3145e954b246bb65af46c3f933c559a
-  data.tar.gz: 95d31f3a23bc51706f5dfb810d27ba36723d254e
+  metadata.gz: 38dcaa9a937d33e87b1d4136c4bc0befb3fc255f
+  data.tar.gz: 635803a80d25313398842cc66d7a94ab993c613a
 SHA512:
-  metadata.gz: 8a82835c379309530d2e8e5009aa3ccc4e6bab65d399b5add8c70522679a31b63772afdf836d0c2af442e73e08747689db4dae2cab555e0ada619d14e162ac81
-  data.tar.gz: 990a003ef1bbbf852cf1f64daae492c6660bf5d769b95acad70fd2ffb4dc171b110204e6908c3316a145427c469b576f8788e4b28883d695e99fe07a8fb172ea
+  metadata.gz: 758be08ef7c75ab3df49d9c89c87563da1c4652b3c872afab3f2524d204a40d3683b21b7027959a62b43ad34b719496faf8d62b63c7eb27bce75e6f8e9a261a3
+  data.tar.gz: c72e8c168365e6fba79aa9c36ff832a1c5b27cd9d7e94e76bf2e2913ff110fe815ffc9d8348fdbe3593e502661cf223e49ad3560d9ed078e9f2c35ca9deb6f1c

data/lib/autoproj/ops/install.rb

@@ -293,6 +293,8 @@ def install_autoproj(bundler)
                 self.class.rewrite_shims(shims_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
             end
 
+            EXCLUDED_FROM_SHIMS = %w{rake thor}
+
             def self.rewrite_shims(shim_path, ruby_executable, autoproj_gemfile_path, gems_gem_home)
                 FileUtils.mkdir_p shim_path
                 File.open(File.join(shim_path, 'ruby'), 'w') do |io|
@@ -306,6 +308,10 @@ def self.rewrite_shims(shim_path, ruby_executable, autoproj_gemfile_path, gems_g
                 Dir.glob(File.join(shim_path, '*')) do |bin_script|
                     next if !File.file?(bin_script)
                     bin_name = File.basename(bin_script)
+                    if EXCLUDED_FROM_SHIMS.include?(bin_name)
+                        FileUtils.rm_f bin_script
+                        next
+                    end
                     next if bin_name == 'ruby'
 
                     bin_shim = File.join(shim_path, bin_name)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc36"
+    VERSION = "2.0.0.rc37"
 end

data/lib/autoproj/workspace.rb

@@ -244,6 +244,7 @@ def setup_os_package_installer
         def setup
             migrate_bundler_and_autoproj_gem_layout
             load_config
+            rewrite_shims
             autodetect_operating_system
             config.validate_ruby_executable
             config.apply_autobuild_configuration
@@ -299,6 +300,12 @@ def install_ruby_shims
             end
         end
 
+        def rewrite_shims
+            gemfile  = File.join(dot_autoproj_dir, 'Gemfile')
+            binstubs = File.join(dot_autoproj_dir, 'bin')
+            Ops::Install.rewrite_shims(binstubs, config.ruby_executable, gemfile, config.gems_gem_home)
+        end
+
         def update_autoproj(restart_on_update: true)
             config.validate_ruby_executable
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc36
+  version: 2.0.0.rc37
 platform: ruby
 authors:
 - Sylvain Joyeux