Commit 514f5e11941d6d1f26394c75be92198f7f130dac

Authored by Georg Hopp
1 parent 35136ad1

renamed classes and moved files to match virtialbox provider

@@ -6,5 +6,5 @@ rescue LoadError @@ -6,5 +6,5 @@ rescue LoadError
6 Bundler.require(:default, :development) 6 Bundler.require(:default, :development)
7 end 7 end
8 8
9 -require 'vagrant/lxd/version'  
10 -require 'vagrant/lxd/plugin' 9 +require 'vagrant-lxd/version'
  10 +require 'vagrant-lxd/plugin'
@@ -3,8 +3,8 @@ require 'log4r' @@ -3,8 +3,8 @@ require 'log4r'
3 3
4 require 'vagrant/action/builder' 4 require 'vagrant/action/builder'
5 5
6 -module Vagrant  
7 - module Lxd 6 +module VagrantPlugins
  7 + module ProviderLxd
8 module Action 8 module Action
9 action_root = Pathname.new(File.expand_path("../action", __FILE__)) 9 action_root = Pathname.new(File.expand_path("../action", __FILE__))
10 autoload :Bootstrap, action_root.join("bootstrap") 10 autoload :Bootstrap, action_root.join("bootstrap")
1 require 'erb' 1 require 'erb'
2 2
3 -module Vagrant  
4 - module Lxd 3 +module VagrantPlugins
  4 + module ProviderLxd
5 module Action 5 module Action
6 class Bootstrap 6 class Bootstrap
7 def initialize(app, env) 7 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class Create 4 class Create
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class Destroy 4 class Destroy
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class EnsureImage 4 class EnsureImage
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class EnsureSsh 4 class EnsureSsh
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class EnsureStarted 4 class EnsureStarted
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class Network 4 class Network
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 module Action 3 module Action
4 class Stop 4 class Stop
5 def initialize(app, env) 5 def initialize(app, env)
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module CommandLxd
3 class Command < Vagrant.plugin('2', :command) 3 class Command < Vagrant.plugin('2', :command)
4 # def initialize(argv, env) 4 # def initialize(argv, env)
5 # super argv, env 5 # super argv, env
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 class Config < Vagrant.plugin("2", :config) 3 class Config < Vagrant.plugin("2", :config)
4 end 4 end
5 end 5 end
@@ -63,8 +63,8 @@ require 'yaml' @@ -63,8 +63,8 @@ require 'yaml'
63 63
64 require 'vagrant/util/retryable' 64 require 'vagrant/util/retryable'
65 65
66 -module Vagrant  
67 - module Lxd 66 +module VagrantPlugins
  67 + module ProviderLxd
68 class Driver 68 class Driver
69 include Vagrant::Util::Retryable 69 include Vagrant::Util::Retryable
70 70
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 # Test with something like: 2 # Test with something like:
3 # ~> bundle exec vagrant ls 3 # ~> bundle exec vagrant ls
4 # 4 #
5 -module Vagrant  
6 - module Lxd 5 +module VagrantPlugins
  6 + module ProviderLxd
7 class Plugin < Vagrant.plugin('2') 7 class Plugin < Vagrant.plugin('2')
8 name "Lxd" 8 name "Lxd"
9 9
@@ -26,10 +26,10 @@ module Vagrant @@ -26,10 +26,10 @@ module Vagrant
26 # SyncedFolder 26 # SyncedFolder
27 #end 27 #end
28 28
29 - command 'ls' do  
30 - require File.expand_path("../command", __FILE__)  
31 - Command  
32 - end 29 + #command 'ls' do
  30 + # require File.expand_path("../command", __FILE__)
  31 + # Command
  32 + #end
33 33
34 autoload :Action, File.expand_path("../action", __FILE__) 34 autoload :Action, File.expand_path("../action", __FILE__)
35 end 35 end
1 require "log4r" 1 require "log4r"
2 2
3 -module Vagrant  
4 - module Lxd 3 +module VagrantPlugins
  4 + module ProviderLxd
5 autoload :Driver, File.expand_path("../driver", __FILE__) 5 autoload :Driver, File.expand_path("../driver", __FILE__)
6 autoload :Action, File.expand_path("../action", __FILE__) 6 autoload :Action, File.expand_path("../action", __FILE__)
7 7
1 -module Vagrant  
2 - module Lxd 1 +module VagrantPlugins
  2 + module ProviderLxd
3 VERSION = "0.0.1" 3 VERSION = "0.0.1"
4 end 4 end
5 end 5 end
1 # coding: utf-8 1 # coding: utf-8
2 lib = File.expand_path('../lib', __FILE__) 2 lib = File.expand_path('../lib', __FILE__)
3 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) 3 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4 -require 'vagrant/lxd/version' 4 +require 'vagrant-lxd/version'
5 5
6 Gem::Specification.new do |spec| 6 Gem::Specification.new do |spec|
7 spec.name = "vagrant-lxd" 7 spec.name = "vagrant-lxd"
8 - spec.version = Vagrant::Lxd::VERSION 8 + spec.version = VagrantPlugins::ProviderLxd::VERSION
9 spec.authors = ["Georg Hopp"] 9 spec.authors = ["Georg Hopp"]
10 spec.email = ["hopp@silpion.de"] 10 spec.email = ["hopp@silpion.de"]
11 11
Please register or login to post a comment