vagrant-helpers 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 940a1a6aa656ba637977a45fff007bf624753fd9
-  data.tar.gz: 5512dd49a8267f283029ea75d9602a09d521d4ff
+  metadata.gz: a086365b1b3ec96fb79913620a58196486cdbb85
+  data.tar.gz: 005ee89cfa5976954a1ad95cb11d7e07fa14a06c
 SHA512:
-  metadata.gz: 8e07e680e5bec72530ddd198ffef2da9fd653a72e50676ce8a92241fe89bcadb19fb700b7524b37eb4676d5284952fab07899f0adddce7d5775a55f2b3980805
-  data.tar.gz: 8e3caff0a2a68bc6a4e738fca917518121495b2b8dc958fe8fd867c7ae180130ced2daabcb694481e29c9a16d0ba731eba0f098933949baf649749b616a4c5ae
+  metadata.gz: a99b2e9524140246b27c3da4ddbcc286eee27f665e43821580863ebdeb5fe59e072ae41630b6b2dbc840d097cad57302fe5561a1b5d4d56ec8186c8a271c39a2
+  data.tar.gz: 6ffd87fc0e9b2f7bf7bf6a291e6811d42b0d55f7e2a336118fea68dd7a8f023c9fbc5296a476b37162ea668dc5a5146ddcba91a3414a8aee3d0be8fd0d8a6876

data/lib/vagrant-helpers.rb

@@ -1,6 +1,9 @@
 require 'vagrant'
 require 'yaml'
 require 'dotenv'
+require 'socket'
+require 'ipaddr'
+require 'ip'
 
 
 module VagrantPlugins
@@ -90,12 +93,49 @@ module VagrantPlugins
       end
     end
 
+    def self.get_cidr_mask(mask)
+       Integer(32 - Math.log2((IPAddr.new(mask, Socket::AF_INET).to_i ^ 0xffffffff) + 1))
+    end
+
+    def self.get_host_networks
+      host_networks = []
+
+      Socket.getifaddrs.each do |ifaddr|
+        if ifaddr.addr.ipv4? && ifaddr.addr.ipv4_private?
+          machine_address = IP.new ifaddr.addr.ip_address
+          netmask = IP.new ifaddr.netmask.ip_address
+          network_address = machine_address & netmask
+          host_networks << IP.new("#{network_address}/#{get_cidr_mask ifaddr.netmask.ip_address}")
+        end
+      end
+
+      host_networks
+    end
+
+    def self.host_in_network?(network_addr)
+      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', [])
 
+      network_list = []
+
       vm_public_networks.each do |options|
-        prepared_options = ::Hash[options.map { |(k, v)| [k.to_sym, v] }]
-        config.vm.network :public_network, **prepared_options
+        if options.has_key? 'network'
+          network_addr = IP.new options.delete 'network'
+          if host_in_network? network_addr
+            network_list << options
+            break
+          end
+        else
+          network_list << options
+        end
+      end
+
+      network_list.each do |network_options|
+        options_sym_hash = ::Hash[network_options.map { |(k, v)| [k.to_sym, v] }]
+        config.vm.network :public_network, **options_sym_hash
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexander Pyatkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: ruby-ip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="