Merge pull request #2583 from hennevogel/dist

[dist] Use binstubs for executeables

Vagrantfile

@@ -23,6 +23,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
     # Execute commands in the frontend directory
     fe.exec.commands %w(rails rake rspec bundle), directory: '/vagrant/src/api'
+    fe.exec.commands %w(rails rake rspec bundle), env: {'PATH' => './bin:$PATH'}
     fe.exec.commands 'script/start_test_backend', directory: '/vagrant/src/api'
     fe.exec.commands 'contrib/start_development_backend', directory: '/vagrant'
     fe.exec.commands '*', directory: '/vagrant'

contrib/common.sh

@@ -49,27 +49,15 @@ function install_common_packages() {
   grub2-install /dev/sda
 }
 
-function setup_ruby() {
-  echo -e "\nsetup ruby binaries...\n"
-  [ -f /usr/bin/ruby ] ||ln -s /usr/bin/ruby.ruby2.4 /usr/bin/ruby
-  for bin in rake rdoc ri; do
-     /usr/sbin/update-alternatives --set $bin /usr/bin/$bin.ruby.ruby2.4
-  done
-}
-
 function setup_ruby_gem() {
   echo -e "\ndisabling versioned gem binary names...\n"
   echo 'install: --no-format-executable' >> /etc/gemrc
 }
 
-function install_bundler_package() {
-  echo -e "\ninstalling bundler...\n"
-  gem install bundler
-}
-
 function install_bundle() {
   echo -e "\ninstalling your bundle...\n"
   su - vagrant -c "cd /vagrant/src/api/; bundle install --quiet"
+  bundle binstubs railties rake rdoc rspec-core --force
 }
 
 function setup_mariadb() {

src/api/bin/pry

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby.ruby2.4
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")

src/api/bin/rdoc

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby.ruby2.4
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rdoc", "rdoc")

src/api/bin/ri

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby.ruby2.4
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'ri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rdoc", "ri")

src/api/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby.ruby2.4
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

src/api/bin/rubocop

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby.ruby2.4
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")