From 6a1b24aaaccc3a96c22c7badc11041bc17f908fe Mon Sep 17 00:00:00 2001
From: Fabio Rehm <fgrehm@gmail.com>
Date: Thu, 14 Mar 2013 19:44:39 -0300
Subject: [PATCH] Remove vendored vagrant code and gem dependencies

---
 .gitmodules             |  3 ---
 Gemfile                 | 33 +++++++++++++++++++--------------
 Gemfile.lock            | 15 ++++++++++-----
 bin/vagrant-lxc         |  9 ---------
 lib/vagrant-lxc.rb      |  2 --
 lib/vendored_vagrant.rb |  9 ---------
 vagrant-lxc.gemspec     | 15 +--------------
 vendor/.gitkeep         |  0
 vendor/vagrant          |  1 -
 9 files changed, 30 insertions(+), 57 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100755 bin/vagrant-lxc
 delete mode 100644 lib/vendored_vagrant.rb
 delete mode 100644 vendor/.gitkeep
 delete mode 160000 vendor/vagrant

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 1ed2367..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vendor/vagrant"]
-	path = vendor/vagrant
-	url = git://github.com/mitchellh/vagrant.git
diff --git a/Gemfile b/Gemfile
index 3b6d969..b976401 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,18 +2,23 @@ source 'https://rubygems.org'
 
 gemspec
 
-# TODO: Group gems
+group :development do
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+  gem 'guard-ctags-bundler'
+  gem 'rb-inotify'
+  gem 'simplecov', require: false
+end
 
-gem 'rake'
-# TODO: setup rake-notes
-gem 'net-ssh'
-gem 'rspec'
-gem 'rspec-fire', require: 'rspec/fire'
-gem 'rspec-spies', require: false
-gem 'simplecov', require: false
-gem 'guard'
-gem 'guard-rspec'
-gem 'guard-bundler'
-gem 'guard-ctags-bundler'
-gem 'rb-inotify'
-gem 'log4r'
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec-fire',  require: 'rspec/fire'
+  gem 'rspec-spies', require: false
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3354804..b6c57a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,8 @@
-PATH
-  remote: .
+GIT
+  remote: https://github.com/mitchellh/vagrant.git
+  revision: 327ca544efdd6a0d0988509152a369fdb09c904d
   specs:
-    vagrant-lxc (0.0.1)
+    vagrant (1.1.1.dev)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
@@ -10,6 +11,11 @@ PATH
       net-scp (~> 1.0.4)
       net-ssh (~> 2.2.2)
 
+PATH
+  remote: .
+  specs:
+    vagrant-lxc (0.0.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -78,12 +84,11 @@ DEPENDENCIES
   guard-bundler
   guard-ctags-bundler
   guard-rspec
-  log4r
-  net-ssh
   rake
   rb-inotify
   rspec
   rspec-fire
   rspec-spies
   simplecov
+  vagrant!
   vagrant-lxc!
diff --git a/bin/vagrant-lxc b/bin/vagrant-lxc
deleted file mode 100755
index da2f41d..0000000
--- a/bin/vagrant-lxc
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-if File.exists?(File.join(File.expand_path('../../', __FILE__), '.git'))
-  $:.unshift(File.expand_path('../../lib', __FILE__))
-end
-
-require 'vagrant-lxc'
-
-load Vagrant.source_root.join('bin/vagrant').to_s
diff --git a/lib/vagrant-lxc.rb b/lib/vagrant-lxc.rb
index 5a6e6d3..b6257db 100644
--- a/lib/vagrant-lxc.rb
+++ b/lib/vagrant-lxc.rb
@@ -1,5 +1,3 @@
-require "vendored_vagrant"
-
 require "vagrant-lxc/version"
 require "vagrant-lxc/plugin"
 
diff --git a/lib/vendored_vagrant.rb b/lib/vendored_vagrant.rb
deleted file mode 100644
index b005d18..0000000
--- a/lib/vendored_vagrant.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Tks to: https://github.com/carlhuda/bundler/blob/master/lib/bundler/vendored_thor.rb
-
-if defined?(Vagrant) && Vagrant.respond_to?(:in_installer?)
-  puts "vagrant has already been required. This may cause vagrant-lxc to malfunction in unexpected ways."
-end
-vendor = File.expand_path('../../vendor/vagrant/lib', __FILE__)
-$:.unshift(vendor) unless $:.include?(vendor)
-
-require 'vagrant'
diff --git a/vagrant-lxc.gemspec b/vagrant-lxc.gemspec
index 360c94a..19fb440 100644
--- a/vagrant-lxc.gemspec
+++ b/vagrant-lxc.gemspec
@@ -12,21 +12,8 @@ Gem::Specification.new do |gem|
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/fgrehm/vagrant-lxc"
 
-  gem.files = `git ls-files`.split($/)
-  gem.files << `cd vendor/vagrant && git ls-files`.split($/).map{|file| "vendor/vagrant/#{file}"}
-
+  gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-
-  gem.add_development_dependency "rake"
-
-  # Vagrant's dependencies
-  gem.add_dependency "childprocess", "~> 0.3.7"
-  gem.add_dependency "erubis", "~> 2.7.0"
-  gem.add_dependency "i18n", "~> 0.6.0"
-  gem.add_dependency "json", ">= 1.5.1", "< 1.8.0"
-  gem.add_dependency "log4r", "~> 1.1.9"
-  gem.add_dependency "net-ssh", "~> 2.2.2"
-  gem.add_dependency "net-scp", "~> 1.0.4"
 end
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/vagrant b/vendor/vagrant
deleted file mode 160000
index fc95944..0000000
--- a/vendor/vagrant
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fc95944631a9adeed1c2b01f5b35c34ed8b59ff5