Revert previous commit and fix the loading of Drupal VM ruby lib

Author: oxyc

Vagrantfile

@@ -1,18 +1,21 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require_relative 'lib/drupalvm/vagrant'
-
 drupalvm_env = ENV['DRUPALVM_ENV'] || 'vagrant'
 
 # Default paths when the project is based on Drupal VM.
 host_project_dir = host_drupalvm_dir = host_config_dir = __dir__
 guest_project_dir = guest_drupalvm_dir = guest_config_dir = '/vagrant'
 
 if File.exist?("#{host_project_dir}/composer.json")
-  cconfig = load_composer_config("#{host_project_dir}/composer.json")
+  cconfig = {}
+  composer_conf = JSON.parse(File.read("#{host_project_dir}/composer.json"))
+  if composer_conf['extra'] && composer_conf['extra']['drupalvm']
+    cconfig = composer_conf['extra']['drupalvm']
+  end
 
   # If Drupal VM is a Composer dependency set the correct path.
+  vendor_dir = composer_conf.fetch('extra', {}).fetch('vendor-dir', 'vendor')
   drupalvm_path = "#{vendor_dir}/geerlingguy/drupal-vm"
   if Dir.exist?("#{host_project_dir}/#{drupalvm_path}")
     host_drupalvm_dir = "#{host_project_dir}/#{drupalvm_path}"
@@ -26,6 +29,8 @@ if File.exist?("#{host_project_dir}/composer.json")
   end
 end
 
+require "#{host_drupalvm_dir}/lib/drupalvm/vagrant"
+
 default_config_file = "#{host_drupalvm_dir}/default.config.yml"
 unless File.exist?(default_config_file)
   raise_message "Configuration file not found! Expected in #{default_config_file}"

lib/drupalvm/vagrant.rb

@@ -34,16 +34,6 @@ def resolve_jinja_variables(vconfig)
   end
 end
 
-# Return the drupalvm extra-field from the passed composer.json
-def load_composer_config(path)
-  cconfig = {}
-  composer_conf = JSON.parse(File.read(path))
-  if composer_conf['extra'] && composer_conf['extra']['drupalvm']
-    cconfig = composer_conf['extra']['drupalvm']
-  end
-  cconfig
-end
-
 # Return the combined configuration content all files provided.
 def load_config(files)
   vconfig = {}
@@ -66,16 +56,6 @@ def ansible_version
   /^[^\s]+ (.+)$/.match(`#{ansible_bin} --version`) { |match| return match[1] }
 end
 
-# Return the path to the composer executable
-def composer_bin
-  @composer_bin ||= which('composer')
-end
-
-# Return Composer's vendor directory.
-def vendor_dir
-  @vendor_dir ||= composer_bin ? `#{composer_bin} config vendor-dir`.strip : 'vendor'
-end
-
 # Require that if installed, the ansible version meets the requirements.
 def require_ansible_version(requirement)
   return unless ansible_bin