vagrant-port-range 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb290ba667171dfe779bd0bd7c0256f8f86bbcc
-  data.tar.gz: 171cdf86d4169bf466fd15c043f226c9143ff566
+  metadata.gz: 5ea234f007fbdd768c4d153ed0a384183d5c9dc1
+  data.tar.gz: 0eee4fa26cd279dd3976297cd2c8eece9f1c1f4b
 SHA512:
-  metadata.gz: 2ad740655459d9fc65c97b441a9e199c8c6b8a6d2d59b93b1f5b79d854d479718ac73da7f52dcb8130e67d727c7984d0ebc4f3a86683b6e174a784d25c44e7cc
-  data.tar.gz: d0144c2850a0af1608b7ad62efe12c198046914975df4c3bc39df5b737832c2160ad54f46f11a30abf6034b676337eec9460bb8c2ca187ac9b85ce57e1d5486f
+  metadata.gz: 5f72ed60d29cd2c577abd091d89adcce449a45d02e04b0daa94794731c0cef3c9e9a9d97610fc373cad47f4adc29e2d704edee76b60da400cdc632ddbedb51a7
+  data.tar.gz: '0328eebddead9d8a5fe67d514630e9de2c99b893738e24994f590d411828a9eb85cb61d6ee379fb1ce2e86cea43785f67941efa6a858e8d4a7282f9bee6b2292'

data/lib/vagrant-port-range.rb

@@ -4,11 +4,8 @@ require 'vagrant-port-range/plugin'
 module VagrantPlugins
     module PortRange
         lib_path = Pathname.new(File.expand_path('../vagrant-port-range', __FILE__))
-        autoload :Action, lib_path.join('action')
 
-        # This returns the path to the source of this plugin
-        #
-        # @return [Pathname]
+        # Returns the path to the source of this plugins
         def self.source_root
             @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
         end

data/lib/vagrant-port-range/action/port_range.rb

@@ -3,7 +3,6 @@ require 'socket'
 module VagrantPlugins
     module PortRange
         module Action
-
             class SetupPorts
                 def initialize(app, env)
                     @app = app
@@ -17,8 +16,19 @@ module VagrantPlugins
                     # setup forwarded ports
                     forwarded_ports = @machine.config.portrange.forwarded_ports
                     forwarded_ports.each do |id, options|
+                        if !options[:host_range]
+                            @ui.error "[vagrant-port-range] Range of host ports not specified ('host_range' option)"
+                            setupped = false
+                            break
+                        end
+                        if !options[:attempts]
+                            @ui.error "[vagrant-port-range] Number of attempts not specified ('attempts' option)"
+                            setupped = false
+                            break
+                        end
+
                         # get free port and add to host
-                        host_port = get_free_port(options[:host_range])
+                        host_port = try_find_free_port(options[:host_range], options[:attempts])
 
                         if host_port == -1
                             setupped = false
@@ -26,10 +36,10 @@ module VagrantPlugins
                         end 
                         
                         options[:host] = host_port
-                        @ui.info("[vagrant-port-range] get free port #{host_port}")
+                        @ui.info("[vagrant-port-range] Free port found: #{host_port}")
                         
-                        # delete port range option
-                        options.tap { |op| op.delete(:host_range) }
+                        # delete our options
+                        options.tap { |op| op.delete(:host_range); op.delete(:attempts); op.delete(:id); }
 
                         # standart way to add forwarded_port
                         @machine.config.vm.network "forwarded_port", options
@@ -41,12 +51,19 @@ module VagrantPlugins
                     end
                 end
 
-                def get_free_port(port_range)
+                # Trys to find free port in specified range
+                # Params:
+                #   port_range   - range of ports (bounds included)
+                #   max_attempts - maximum number of attempts to try
+                # Returns:
+                #   [positive number] - free port
+                #   -1                - maximum number of attempts ended unsuccessfully
+                def try_find_free_port(port_range, max_attempts)
                     min = port_range[0]
                     max = port_range[1]
 
                     if min >= max
-                        @ui.error("[vagrant-port-range] Incorrect host_range option #{port_range.inspect}")
+                        @ui.error("[vagrant-port-range] Incorrect range of host ports #{port_range.inspect}")
                         return -1
                     end
 
@@ -55,8 +72,8 @@ module VagrantPlugins
 
                     begin
                         attempts = attempts + 1
-                        if attempts > 10
-                            @ui.error "[vagrant-port-range] Can't get free port from range #{port_range.inspect}"
+                        if attempts > max_attempts
+                            @ui.error "[vagrant-port-range] Free port from range #{port_range.inspect} not found"
                             return -1
                         end
                         
@@ -68,9 +85,7 @@ module VagrantPlugins
                         retry
                     end
                 end
-
             end
-
         end
     end
 end

data/lib/vagrant-port-range/plugin.rb

@@ -4,14 +4,6 @@ rescue LoadError
     raise 'This plugin must run within Vagrant.'
 end
 
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-if Vagrant::VERSION < '1.2.0'
-    raise 'The vagrant-port-range plugin is only compatible with Vagrant 1.2+'
-end
-
-require_relative 'action/port_range'
-
 module VagrantPlugins
     module PortRange
         class Plugin < Vagrant.plugin('2')
@@ -28,6 +20,7 @@ module VagrantPlugins
             end
 
             action_hook(:portrange, :machine_action_up) do |hook|
+                require_relative 'action/port_range'
                 hook.prepend(Action::SetupPorts)
             end
         end

data/lib/vagrant-port-range/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module PortRange
-        VERSION = '0.1.3'
+        VERSION = '0.1.4'
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-port-range
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alexey Chirukhin