Remove vendored vagrant code and gem dependencies

This commit is contained in:
Fabio Rehm 2013-03-14 19:44:39 -03:00
parent 2689bcff1a
commit 6a1b24aaac
9 changed files with 30 additions and 57 deletions

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "vendor/vagrant"]
path = vendor/vagrant
url = git://github.com/mitchellh/vagrant.git

33
Gemfile
View file

@ -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

View file

@ -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!

View file

@ -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

View file

@ -1,5 +1,3 @@
require "vendored_vagrant"
require "vagrant-lxc/version"
require "vagrant-lxc/plugin"

View file

@ -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'

View file

@ -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

0
vendor/.gitkeep vendored
View file

1
vendor/vagrant vendored

@ -1 +0,0 @@
Subproject commit fc95944631a9adeed1c2b01f5b35c34ed8b59ff5