vagrant-helpers 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e64852305521b99058dc5300e24e1dd43cdfaa8
-  data.tar.gz: d4e5bb0d69e1db72beade42dca3980d849370172
+  metadata.gz: c65a2f2f9790f765452287bd0bbd9f77e2b02616
+  data.tar.gz: b458bee7e078148489bb796f10afd4c0340f799b
 SHA512:
-  metadata.gz: 0f375f62fbc2ca760bdd5ac6a5be4ad88eb86806ad3915011df5f72a9b4f91f4d8f7ea6730b5574b0ed6a02d85e2dfd983ce6be93487b0416ab3c2a12a961d6b
-  data.tar.gz: 35383e0f98a2441981c3bc90a305a0d54d6e2d8cf9bcbe018d1226426d55310d76059a39826f3484f59aa72a2ef04f7ec605a6a4b59824b2ec5e3f4976f2a289
+  metadata.gz: 4694e1dd2fb3b51bb6ff4ac1fd1e31a286c957013e427c35184bd090377cdc87c047008f3a60dfa063ca620c2c7d03ccf4d0455251c8dd1051dad2197d765bdf
+  data.tar.gz: 91f2dfd6bc80cdf25c1c66cb25de4c403508b837d246a62bec241994e8757d5f1493016ecc89aef95a180b18b47f21d56811d2f177717c002162126c085d5182

data/lib/vagrant-helpers.rb

@@ -25,12 +25,18 @@ module VagrantPlugins
       end
     end
 
-    class MissingVMNameOptionError < Vagrant::Errors::VagrantError
+    class MissingVMNameOptionError < ::Vagrant::Errors::VagrantError
       def error_message
         "Missing vm.name option in `opts.yaml` file!"
       end
     end
 
+    class AmbiguousConfigurationError < ::Vagrant::Errors::VagrantError
+      def error_message
+        "Ambiguous configuration found in `opts.yaml` file! Specify either `vm` or `vms` key, not both of them!"
+      end
+    end
+
     def self.get_opts(dir)
       filename = ::File.expand_path(ENV['VAGRANT_HELPERS_OPTS'] || 'opts.yaml', dir)
       if ::File.exists? filename
@@ -40,8 +46,7 @@ module VagrantPlugins
       end
     end
 
-    def self.set_vm_box(config, opts)
-      vm_box = opts.fetch('vm', {}).fetch('box', nil)
+    def self.set_vm_box(config, vm_box)
       if vm_box.nil?
         raise MissingVMBoxOptionError.new
       end
@@ -49,44 +54,35 @@ module VagrantPlugins
       config.vm.box = vm_box
     end
 
-    def self.set_vm_name(config, opts)
-      vm_name = opts.fetch('vm', {}).fetch('name', nil)
+    def self.set_vm_name(config, vm_name)
       if vm_name.nil?
         raise MissingVMNameOptionError.new
       end
 
       config.vm.provider :virtualbox do |v|
-          v.name = vm_name
+        v.name = vm_name
       end
     end
 
-    def self.set_vm_memory(config, opts)
-      vm_memory = opts.fetch('vm', {}).fetch('memory', 512)
-
+    def self.set_vm_memory(config, vm_memory)
       config.vm.provider :virtualbox do |v|
         v.memory = vm_memory
       end
     end
 
-    def self.set_vm_cpus(config, opts)
-      vm_cpus = opts.fetch('vm', {}).fetch('cpus', 1)
-
+    def self.set_vm_cpus(config, vm_cpus)
       config.vm.provider :virtualbox do |v|
         v.cpus = vm_cpus
       end
     end
 
-    def self.set_vm_hostname(config, opts)
-      vm_hostname = opts.fetch('vm', {}).fetch('hostname', nil)
-
+    def self.set_vm_hostname(config, vm_hostname)
       unless vm_hostname.nil?
         config.vm.hostname = vm_hostname
       end
     end
 
-    def self.set_vm_forwarded_ports(config, opts)
-      vm_forwarded_ports = opts.fetch('vm', {}).fetch('network', {}).fetch('forwarded_ports', [])
-
+    def self.set_vm_forwarded_ports(config, vm_forwarded_ports)
       vm_forwarded_ports.each do |options|
         prepared_options = ::Hash[options.map { |(k, v)| [k.to_sym, v] }]
         config.vm.network :forwarded_port, **prepared_options
@@ -116,9 +112,7 @@ module VagrantPlugins
       get_host_networks.any? { |host_network| host_network.eql? network_addr }
     end
 
-    def self.set_vm_public_networks(config, opts)
-      vm_public_networks = opts.fetch('vm', {}).fetch('network', {}).fetch('public', [])
-
+    def self.set_vm_public_networks(config, vm_public_networks)
       network_list = []
 
       vm_public_networks.each do |options|
@@ -139,27 +133,21 @@ module VagrantPlugins
       end
     end
 
-    def self.set_vm_private_networks(config, opts)
-      vm_private_networks = opts.fetch('vm', {}).fetch('network', {}).fetch('private', [])
-
+    def self.set_vm_private_networks(config, vm_private_networks)
       vm_private_networks.each do |options|
         prepared_options = ::Hash[options.map { |(k, v)| [k.to_sym, v] }]
         config.vm.network :private_network, **prepared_options
       end
     end
 
-    def self.set_vm_synced_folders(config, opts)
-      vm_synced_folders = opts.fetch('vm', {}).fetch('synced_folders', [])
-
+    def self.set_vm_synced_folders(config, vm_synced_folders)
       vm_synced_folders.each do |entry|
         prepared_options = ::Hash[entry.fetch('opts', {}).map { |(k,v)| [k.to_sym, v] }]
         config.vm.synced_folder entry['host'], entry['guest'], **prepared_options
       end
     end
 
-    def self.set_vm_extra_storage(config, opts)
-      vm_storage_drives = opts.fetch('vm', {}).fetch('storage', [])
-
+    def self.set_vm_extra_storage(config, vm_storage_drives)
       config.vm.provider :virtualbox do |v|
         vm_storage_drives.each_with_index do |entry, ndx|
           unless ::File.exists? entry['filename']
@@ -192,6 +180,36 @@ module VagrantPlugins
       end
     end
 
+    def self.each_vm(opts)
+      if opts.has_key?('vm') and opts.has_key?('vms')
+        raise AmbiguousConfigurationError.new
+      end
+
+      if opts.has_key? 'vm'
+        vm_opts = opts['vm']
+        yield nil, vm_opts
+      end
+
+      if opts.has_key? 'vms'
+        opts['vms'].each do |name, vm_opts|
+          yield name, vm_opts
+        end
+      end
+    end
+
+    def self.setup_instance(config, vm_opts)
+      set_vm_box config, vm_opts.fetch('box', nil)
+      set_vm_name config, vm_opts.fetch('name', nil)
+      set_vm_memory config, vm_opts.fetch('memory', 512)
+      set_vm_cpus config, vm_opts.fetch('cpus', 1)
+      set_vm_hostname config, vm_opts.fetch('hostname', nil)
+      set_vm_forwarded_ports config, vm_opts.fetch('network', {}).fetch('forwarded_ports', [])
+      set_vm_public_networks config, vm_opts.fetch('network', {}).fetch('public', [])
+      set_vm_private_networks config, vm_opts.fetch('network', {}).fetch('private', [])
+      set_vm_synced_folders config, vm_opts.fetch('synced_folders', [])
+      set_vm_extra_storage config, vm_opts.fetch('storage', [])
+    end
+
     def self.setup(dir)
       dotenv_filename = ::File.join dir, '.env'
       ::Dotenv.load
@@ -199,16 +217,17 @@ module VagrantPlugins
       ::Vagrant.configure(2) do |config|
         opts = get_opts dir
 
-        set_vm_box config, opts
-        set_vm_name config, opts
-        set_vm_memory config, opts
-        set_vm_cpus config, opts
-        set_vm_hostname config, opts
-        set_vm_forwarded_ports config, opts
-        set_vm_public_networks config, opts
-        set_vm_private_networks config, opts
-        set_vm_synced_folders config, opts
-        set_vm_extra_storage config, opts
+        each_vm(opts) do |name, vm_opts|
+          if name.nil?
+            # there is one instance only
+            setup_instance config, vm_opts
+          else
+            # there are several instances
+            config.vm.define name do |instance_config|
+              setup_instance instance_config, vm_opts
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexander Pyatkin
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant helpers