haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2641 from arthurnn/docker_rename 

Rename docker_client and docker_installer
This commit is contained in:
Fabio Rehm 2013-12-12 17:37:11 -08:00
parent 8a0241f2b4 c57073da7b
commit e70a6e2563
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/docker/docker_client.rb → plugins/provisioners/docker/client.rb
View File

@ -2,7 +2,7 @@ require 'digest/sha1'
module VagrantPlugins module VagrantPlugins
module Docker module Docker
class DockerClient class Client
def initialize(machine) def initialize(machine)
@machine = machine @machine = machine
end end

2
plugins/provisioners/docker/docker_installer.rb → plugins/provisioners/docker/installer.rb
View File

@ -1,6 +1,6 @@
module VagrantPlugins module VagrantPlugins
module Docker module Docker
class DockerInstaller class Installer
def initialize(machine, version) def initialize(machine, version)
@machine = machine @machine = machine
@version = version @version = version

9
plugins/provisioners/docker/provisioner.rb
View File

@ -1,5 +1,5 @@
require_relative "docker_client" require_relative "client"
require_relative "docker_installer" require_relative "installer"
module VagrantPlugins module VagrantPlugins
module Docker module Docker
@ -13,9 +13,8 @@ module VagrantPlugins
def initialize(machine, config, installer = nil, client = nil) def initialize(machine, config, installer = nil, client = nil)
super(machine, config) super(machine, config)
# TODO: Rename to installer / client (drop docker suffix) @installer = installer || Installer.new(@machine, config.version)
@installer = installer || DockerInstaller.new(@machine, config.version) @client = client || Client.new(@machine)
@client = client || DockerClient.new(@machine)
end end
def provision def provision