diff --git a/plugins/commands/serve/service/proto/gen/plugin/core_pb.rb b/lib/proto/gen/plugin/core_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/plugin/core_pb.rb rename to lib/proto/gen/plugin/core_pb.rb diff --git a/plugins/commands/serve/service/proto/gen/plugin/core_services_pb.rb b/lib/proto/gen/plugin/core_services_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/plugin/core_services_pb.rb rename to lib/proto/gen/plugin/core_services_pb.rb diff --git a/plugins/commands/serve/service/proto/gen/plugin/plugin_pb.rb b/lib/proto/gen/plugin/plugin_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/plugin/plugin_pb.rb rename to lib/proto/gen/plugin/plugin_pb.rb diff --git a/plugins/commands/serve/service/proto/gen/plugin/plugin_services_pb.rb b/lib/proto/gen/plugin/plugin_services_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/plugin/plugin_services_pb.rb rename to lib/proto/gen/plugin/plugin_services_pb.rb diff --git a/plugins/commands/serve/service/proto/gen/plugin/protostructure_pb.rb b/lib/proto/gen/plugin/protostructure_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/plugin/protostructure_pb.rb rename to lib/proto/gen/plugin/protostructure_pb.rb diff --git a/plugins/commands/serve/service/proto/gen/ruby-server_pb.rb b/lib/proto/gen/ruby-server_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/ruby-server_pb.rb rename to lib/proto/gen/ruby-server_pb.rb diff --git a/plugins/commands/serve/service/proto/gen/ruby-server_services_pb.rb b/lib/proto/gen/ruby-server_services_pb.rb similarity index 100% rename from plugins/commands/serve/service/proto/gen/ruby-server_services_pb.rb rename to lib/proto/gen/ruby-server_services_pb.rb diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb index f18ae318a..c49114acf 100644 --- a/lib/vagrant/machine.rb +++ b/lib/vagrant/machine.rb @@ -1,6 +1,8 @@ require_relative "util/ssh" require_relative "action/builtin/mixin_synced_folders" +require 'proto/gen/plugin/core_pb' + require "digest/md5" require "thread" diff --git a/plugins/commands/serve/service/plugin_service.rb b/plugins/commands/serve/service/plugin_service.rb index f6309e366..d05818715 100644 --- a/plugins/commands/serve/service/plugin_service.rb +++ b/plugins/commands/serve/service/plugin_service.rb @@ -1,7 +1,7 @@ require "vagrant/plugin/v2/plugin" -require_relative 'proto/gen/ruby-server_pb' -require_relative 'proto/gen/ruby-server_services_pb' +require 'proto/gen/ruby-server_pb' +require 'proto/gen/ruby-server_services_pb' module VagrantPlugins module CommandServe diff --git a/plugins/commands/serve/service/provider_service.rb b/plugins/commands/serve/service/provider_service.rb index 3af46c439..63b69d816 100644 --- a/plugins/commands/serve/service/provider_service.rb +++ b/plugins/commands/serve/service/provider_service.rb @@ -1,6 +1,6 @@ -require_relative 'proto/gen/plugin/plugin_pb' -require_relative 'proto/gen/plugin/plugin_services_pb' +require 'proto/gen/plugin/plugin_pb' +require 'proto/gen/plugin/plugin_services_pb' require 'logger' module VagrantPlugins @@ -42,7 +42,7 @@ module VagrantPlugins end def machine_arg_to_machine(req) - + end def action_up_spec(req, _unused_call)