vagrant-solidus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZhZTFkNWJmNGMxY2ZmZGIxNmJlYTY1MzljMDY0NjY2MWU1N2M0NA==
+    ZTBjZWQ1OTAxNDc3NmI5ZDA0MTZiZjBkYTc2ZmU0Nzk3YzRkOWEwNg==
   data.tar.gz: !binary |-
-    MWM5Y2Y4NGY3ZDRkZjg5NGRiNjA4NTg3OWFmNzlkMjU5YmJiOGE3Yg==
+    NjQ4OWVjMzFiMDFlNmNkMzRlODVkZGM1MmQwZDAwMDU4ZjRhMTI3Yg==
 SHA512:
   metadata.gz: !binary |-
-    NTczZjRlYmEzMDMwNjEyMjFlNjhiMTU0MTQ2ZTkwNzI5NDg4NTRhMjk5NjFi
-    MzMyZWNhNTc3ZDM3N2ZhZmNmMTgxMmViNWRlZjNiN2UxODUzNzkxY2M5NDMz
-    NmY2ZDQwYjRlZjhmYWYwMjk2NDVkNjNmN2UwMGZmYjE1NTg1MGE=
+    MmQ3ZTIxNjhiYzc2ZGJmZjU1OTFiN2EyMTAyZDBmM2YzZWVmYTVmZjhkMmIz
+    ODI4ZTk0NDA1NTlhZGI1ODU1NGU5ZDRlMGI3NjFmNGU0MjI4Njg4M2IzYmQ5
+    NmJiZTYxYWFmZWZjZWY2ZThjOTJmZTM3Yjc2NWZjOGFlODFmMWM=
   data.tar.gz: !binary |-
-    ZmY2YzhiOTI0NjE0MDM0Y2I5MmNiOTMwMzhmY2M1MzQ0ZGU5NTNmZGVkYzll
-    ZTgyYzE1NzlkYmMxNmI5OTQ1ZWE2MGMxY2QwZjE0OWI2OWQ0OTVkMDYxNWQ2
-    MTc2MDY4ZjNlNTJlODk2Nzg2NmU2YzAwOWY3YmY3M2JmZjQ4YTk=
+    NzI1YjY5YzQ0NWRhMGFjYTJhOWZjOTkwZWQwNTdhODc3NTgxMTIxOTM2Yzhk
+    MDkxZmZkZjY4NGNiNzZiYzFmNGEyMGFhZjJmNjIxNjk0YTMyMTkzNzljNGU5
+    MDVmNjlhOGQ1MjJlZWJiNDYzN2U0NTA5ZmRmMWVjNDU2ZDU5NjQ=

data/README.md

@@ -183,6 +183,16 @@ $ vagrant destroy
 $ vagrant up
 ```
 
+### Adding or changing the forwarded ports
+
+When a site is started, it requires 3 forwarded ports for the Solidus server, the log server and LiveReload. By default, 45 ports are forwarded when the box is started. Once a site has been started, its used ports will be reserved for later use. If you run out of ports, or if a default port is already used by another application on your machine, you can manage them directly in the Vagrantfile, with the following config variables, which should be arrays of available ports. Note that the box should be reloaded if those values are changed.
+
+* `config.solidus.site_ports`
+* `config.solidus.livereload_ports`
+* `config.solidus.log_server_ports`
+
+It's also possible to remove ports reserved by older unused sites. The reserved ports are listed in this file: `.vagrant-solidus/data/sites.json`.
+
 [virtualbox]: https://www.virtualbox.org
 [virtualbox-install]: https://www.virtualbox.org/wiki/Downloads
 [vagrant]: http://www.vagrantup.com

data/lib/vagrant-solidus.rb

@@ -7,6 +7,11 @@ module VagrantPlugins
       name 'Solidus'
       description 'This plugin provides a provisioner and a `site` command that allows Solidus sites to be managed by Vagrant.'
 
+      config(:solidus) do
+        require_relative 'vagrant-solidus/config'
+        Config
+      end
+
       provisioner(:solidus) do
         require_relative 'vagrant-solidus/provisioner'
         Provisioner

data/lib/vagrant-solidus/config.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module Solidus
+    class Config < Vagrant.plugin('2', :config)
+      attr_accessor :site_ports, :livereload_ports, :log_server_ports
+
+      def initialize
+        @site_ports       = (8081..8095).to_a
+        @livereload_ports = (35730..35744).to_a
+        @log_server_ports = (35745..35759).to_a
+      end
+    end
+  end
+end

data/lib/vagrant-solidus/provisioner.rb

@@ -4,15 +4,8 @@ module VagrantPlugins
       include VagrantPlugins::Solidus::SiteHelpers
 
       def configure(root_config)
-        # TODO: Make this configurable
-        15.times do |i|
-          port = VagrantPlugins::Solidus::SiteHelpers::BASE_PORT + i
+        (root_config.solidus.site_ports + root_config.solidus.livereload_ports + root_config.solidus.log_server_ports).each do |port|
           root_config.vm.network :forwarded_port, guest: port, host: port
-
-          2.times do |j|
-            port = VagrantPlugins::Solidus::SiteHelpers::BASE_UTILS_PORT + (2 * i) + j
-            root_config.vm.network :forwarded_port, guest: port, host: port
-          end
         end
       end
 

data/lib/vagrant-solidus/site/start.rb

@@ -16,11 +16,13 @@ module VagrantPlugins
           with_running_vm do
             stop_site
 
+            @env.ui.info("Installing site...")
             unless @fast
-              @env.ui.info("Installing site...")
-              fail("Site could not be installed") unless install_site
-              install_pow_site if pow_installed?
+              fail("Site could not be installed") unless install_site_dependencies && install_site_node_packages
             end
+            fail("Out of available ports, add more to the Vagrantfile or remove unused sites from #{SITES_CONFIGS_FILE_HOST_PATH}") unless set_site_ports
+            fail("Site could not be installed") unless install_site_service
+            install_pow_site if pow_installed?
 
             @env.ui.info("Starting dev server...")
             fail("Site could not be started") unless start_site_service
@@ -40,12 +42,6 @@ module VagrantPlugins
           # Success, exit status 0
           0
         end
-
-        private
-
-        def install_site
-          install_site_dependencies && install_site_node_packages && install_site_service
-        end
       end
     end
   end

data/lib/vagrant-solidus/site_helpers.rb

@@ -75,18 +75,19 @@ module VagrantPlugins
           @site_livereload_port = config['livereload-port']
           @site_log_server_port = config['log-server-port']
         end
+      end
 
-        @site_port            ||= find_next_available_port(BASE_PORT)
-        @site_livereload_port ||= find_next_available_port(BASE_UTILS_PORT)
-        @site_log_server_port ||= find_next_available_port(BASE_UTILS_PORT)
+      def set_site_ports
+        all  = @machine.config.solidus
+        used = sites.values
+        return unless @site_port            = find_port(@site_port,            all.site_ports,       used.map {|c| c['port']})
+        return unless @site_livereload_port = find_port(@site_livereload_port, all.livereload_ports, used.map {|c| c['livereload-port']})
+        return unless @site_log_server_port = find_port(@site_log_server_port, all.log_server_ports, used.map {|c| c['log-server-port']})
+        true
       end
 
-      def find_next_available_port(port)
-        ports = sites.values.map(&:values).flatten + [@site_port, @site_livereload_port, @site_log_server_port].compact
-        loop do
-          return port unless ports.index(port)
-          port += 1
-        end
+      def find_port(current_port, all_ports, used_ports)
+        all_ports.include?(current_port) ? current_port : (all_ports - used_ports).first
       end
 
       def validate_site
@@ -260,7 +261,7 @@ module VagrantPlugins
 
       def site_start_command_line_options(opts)
         site_name_command_line_option(opts)
-        opts.on("-f", "--fast", "Fast mode. Don't install the site first.") do
+        opts.on("-f", "--fast", "Fast mode. Don't install the site dependencies first.") do
           @fast = true
         end
         opts.on("-d", "--deaf", "Don't automatically launch the `watch` command in background (file events will be much slower).") do

data/lib/vagrant-solidus/solidus-box/Vagrantfile

@@ -27,4 +27,13 @@ Vagrant.configure('2') do |config|
   # The vagrant-solidus plugin handles the rest, see:
   #   https://github.com/solidusjs/vagrant-solidus
   config.vm.provision :solidus
+
+  # List of available ports for the Solidus sites, reload the box if you change this
+  #config.solidus.site_ports = [...]
+
+  # List of available ports for LiveReload, reload the box if you change this
+  #config.solidus.livereload_ports = [...]
+
+  # List of available ports for the Solidus log servers, reload the box if you change this
+  #config.solidus.log_server_ports = [...]
 end

data/lib/vagrant-solidus/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Solidus
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solidus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joannic Laborde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - lib/vagrant-solidus.rb
 - lib/vagrant-solidus/command.rb
+- lib/vagrant-solidus/config.rb
 - lib/vagrant-solidus/provisioner.rb
 - lib/vagrant-solidus/provisioner/.bashrc
 - lib/vagrant-solidus/provisioner/.gemrc