vagrant-solidus 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2UzNzc4ZDIzMTk2MGRkNDg3MjgzMDcxODMxMzA5OTliYmQ0ZGFhOQ==
+    ZWZhZTFkNWJmNGMxY2ZmZGIxNmJlYTY1MzljMDY0NjY2MWU1N2M0NA==
   data.tar.gz: !binary |-
-    MmYyY2NlYTgwZmI2ODcxZWIzZDNjOTFlMjNjZjk0NjA3ZDNmZjA4Nw==
+    MWM5Y2Y4NGY3ZDRkZjg5NGRiNjA4NTg3OWFmNzlkMjU5YmJiOGE3Yg==
 SHA512:
   metadata.gz: !binary |-
-    YzYxZGY3MWM5MTdhOTg5NzZjZmQ1Njg1NWFiMjNkOTQ3ZGUzYzY4NmU1Mzgy
-    YjMzNWNlMTNlMjVmN2ExMmYyM2E1NDVlMzMwMzA0OTE3NTg5NWM0MmRjODZk
-    MTE5NjUwOTMzYjA4NjQzZjljOGNhMWI0MGQ1YzgxODFiM2VhNGM=
+    NTczZjRlYmEzMDMwNjEyMjFlNjhiMTU0MTQ2ZTkwNzI5NDg4NTRhMjk5NjFi
+    MzMyZWNhNTc3ZDM3N2ZhZmNmMTgxMmViNWRlZjNiN2UxODUzNzkxY2M5NDMz
+    NmY2ZDQwYjRlZjhmYWYwMjk2NDVkNjNmN2UwMGZmYjE1NTg1MGE=
   data.tar.gz: !binary |-
-    OWI1YzAzMDVlY2IyNTIyOWZhNDJmZmJiMjU5Njc0ZjE4NzYzODMyNTlhNDgw
-    YzMxZWYzYjk0YThjNjlkYzRmM2QzYWFmMjE1ZjQ0MjJjZTg2MWJkMjJjNjY5
-    ZjgwMDQxN2E4OGJkYTRkOWJjNzlmZjg3NjZhYWIxNmYzNWZlZTY=
+    ZmY2YzhiOTI0NjE0MDM0Y2I5MmNiOTMwMzhmY2M1MzQ0ZGU5NTNmZGVkYzll
+    ZTgyYzE1NzlkYmMxNmI5OTQ1ZWE2MGMxY2QwZjE0OWI2OWQ0OTVkMDYxNWQ2
+    MTc2MDY4ZjNlNTJlODk2Nzg2NmU2YzAwOWY3YmY3M2JmZjQ4YTk=

data/README.md

@@ -188,7 +188,7 @@ $ vagrant up
 [vagrant]: http://www.vagrantup.com
 [vagrantfile]: https://docs.vagrantup.com/v2/vagrantfile/
 [vagrant-provider]: http://docs.vagrantup.com/v2/providers
-[vagrant-install]: http://www.vagrantup.com/downloads.html
+[vagrant-install]: http://www.vagrantup.com/download-archive/v1.5.4.html
 [vagrant-synced-folders]: http://docs.vagrantup.com/v2/synced-folders/index.html
 [vagrant-networking]: http://docs.vagrantup.com/v2/networking/index.html
 [vagrant-provisioning]: http://docs.vagrantup.com/v2/provisioning/index.html

data/lib/vagrant-solidus/provisioner.rb

@@ -9,8 +9,10 @@ module VagrantPlugins
           port = VagrantPlugins::Solidus::SiteHelpers::BASE_PORT + i
           root_config.vm.network :forwarded_port, guest: port, host: port
 
-          port = VagrantPlugins::Solidus::SiteHelpers::BASE_LIVERELOAD_PORT + i
-          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_helpers.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Solidus
     module SiteHelpers
       BASE_PORT = 8081
-      BASE_LIVERELOAD_PORT = 35730
+      BASE_UTILS_PORT = 35730
       SITE_TEMPLATE_GIT_URL = "https://github.com/solidusjs/solidus-site-template.git"
       SITE_STATUS_WATCHER_POLLING_FREQUENCY = 1
       PROVISION_ID = 20140502
@@ -73,14 +73,16 @@ module VagrantPlugins
         if config = sites[@site_name]
           @site_port            = config['port']
           @site_livereload_port = config['livereload-port']
+          @site_log_server_port = config['log-server-port']
         end
 
-        @site_port            ||= find_next_available_port('port', BASE_PORT)
-        @site_livereload_port ||= find_next_available_port('livereload-port', BASE_LIVERELOAD_PORT)
+        @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)
       end
 
-      def find_next_available_port(type, port)
-        ports = sites.values.map {|config| config[type]}
+      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
@@ -94,7 +96,7 @@ module VagrantPlugins
       end
 
       def save_site
-        config = {'port' => @site_port, 'livereload-port' => @site_livereload_port}
+        config = {'port' => @site_port, 'livereload-port' => @site_livereload_port, 'log-server-port' => @site_log_server_port}
         File.open(SITES_CONFIGS_FILE_HOST_PATH, 'w') do |file|
           file.write(JSON.pretty_generate(sites.merge(@site_name => config)))
         end
@@ -153,7 +155,7 @@ module VagrantPlugins
       #########################################################################
 
       def install_site_service
-        conf = "exec su - vagrant -c 'cd #{@site_guest_path} && grunt dev -port #{@site_port} -livereloadport #{@site_livereload_port} >> #{@site_log_file_guest_path} 2>&1'"
+        conf = "exec su - vagrant -c 'cd #{@site_guest_path} && grunt dev -port #{@site_port} -livereloadport #{@site_livereload_port} -logserverport #{@site_log_server_port} -loglevel 3 >> #{@site_log_file_guest_path} 2>&1'"
         guest_exec(:log_on_error, "echo \"#{conf}\" > /etc/init/#{site_service_name}.conf", sudo: true)
       end
 

data/lib/vagrant-solidus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solidus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Joannic Laborde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler