From 238b5cd681cb758107b6171b2136381750291515 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Sun, 10 Mar 2013 00:45:27 -0300 Subject: [PATCH] Move vendored_vagrant require to the right place --- lib/vagrant-lxc/container.rb | 2 -- lib/vagrant-lxc/provider.rb | 4 ++-- spec/unit/container_spec.rb | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/vagrant-lxc/container.rb b/lib/vagrant-lxc/container.rb index 2ed05e4..883a782 100644 --- a/lib/vagrant-lxc/container.rb +++ b/lib/vagrant-lxc/container.rb @@ -1,7 +1,6 @@ # FIXME: Ruby 1.8 users dont have SecureRandom require 'securerandom' -require "vendored_vagrant" require "vagrant/util/retryable" require "vagrant/util/subprocess" @@ -9,7 +8,6 @@ require "vagrant-lxc/errors" module Vagrant module LXC - # REFACTOR: Encapsulate lxc commands with name class Container # Include this so we can use `Subprocess` more easily. include Vagrant::Util::Retryable diff --git a/lib/vagrant-lxc/provider.rb b/lib/vagrant-lxc/provider.rb index a4d8d3b..38629cb 100644 --- a/lib/vagrant-lxc/provider.rb +++ b/lib/vagrant-lxc/provider.rb @@ -1,9 +1,9 @@ +require "log4r" + require "vagrant-lxc/action" require "vagrant-lxc/container" require "vagrant-lxc/machine_state" -require "log4r" - module Vagrant module LXC class Provider < Vagrant.plugin("2", :provider) diff --git a/spec/unit/container_spec.rb b/spec/unit/container_spec.rb index 5dff6f2..0293943 100644 --- a/spec/unit/container_spec.rb +++ b/spec/unit/container_spec.rb @@ -1,5 +1,6 @@ require 'unit_helper' +require "vendored_vagrant" require 'vagrant-lxc/container' describe Vagrant::LXC::Container do