vagrant-solidus 0.2.1 → 1.0.0.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTE3ZmExN2U3NGI0NWExNTM0YzY3NjkyZjA1Nzc4NGM2Yjg1YTZmYQ==
+    M2UwNDQxYTFhODI2MTdjMjRhYjk4ZjYyNjVmMTg3NDYyMDFiMDc4ZA==
   data.tar.gz: !binary |-
-    M2Q1OGY3NjYyN2M5NzMxMjFkNjJmZTc2MDZkMzFhODI0MmNmNDZmNg==
+    MzRiM2UzMTc4NTc0NjYwMTRhOGFjNDE2YjcxM2QyNDgxNmMyNWNjNw==
 SHA512:
   metadata.gz: !binary |-
-    ZGZiMGYyODg3OWJmNTM0ODI4M2ViNDYyOTRhOTJmNGRjYmI2OTEyZTcwNzI5
-    ODcxODk1MThiNzkxMzI1NDhkOWU5NzMzOTEzNWVkNDI5OTk2MTIzYTk2NmEx
-    OGZlMGM3ZjhmMGUxYWJlMGFhYmUyNDE4ZjVjZDVkY2I5ZmNhYjc=
+    YzY1YjU0YjA2N2RmZTgxNDhjN2Y1MGNiYmQ2OTQ5YmIwMjBlMWI0MDllN2Yz
+    ZjlkY2Q0NTYzODQ5YmQ5YmU3YWNiOWU1MWQ0YmIzNGE5OGU0MzdkMzQ3MTVj
+    N2Q5OGQ0M2NlMWMxOGFmZDVmMmYzNzJlN2NkOWVjOTkyNDc3NTI=
   data.tar.gz: !binary |-
-    NGM2MTg2MjdkZWUxYTFmMmU1MTA5NTBhNTAyMWUyNmJmYjJiMDg1ZjU3NTI5
-    OWVhY2MyNmRhN2E4ZmVkYjc0NDNhYmRhODY4NWVkODI4YWVhMTBlMDU5Y2Yz
-    MTAyYjVkYTI1ZDJlODc3Mjg0ZWQ1MWYyNGM4MDFmMjNmNWEwYmQ=
+    MjM1MzVhYmEyMjc0YTNmZDllM2MzMmM1YzVhYWIyZTk2YjVlZTgwNGQ3NjVj
+    ZmFlYTI3YzlmYjg2ZmMyYWE5NjRlODNlNzg2NzNjZWFhYTdiY2RhMjg3NDY3
+    OGEyOTE4NjIzOWIzY2NiMTdmYTVmYmUxNmY5ZGM2OGYyYjQ5ODA=

data/lib/vagrant-solidus/provisioner.rb

@@ -39,8 +39,7 @@ module VagrantPlugins
         execute('nvm use 0.10.22')
         execute('nvm alias default 0.10.22')
 
-        @env.ui.info('Installing grunt.js')
-        execute('npm install grunt-cli@"~0.1.13" -g')
+        @env.ui.info('Installing grunt-init')
         execute('npm install grunt-init@"~0.3.1" -g')
 
         @env.ui.info('Configuring rubygems')
@@ -54,6 +53,12 @@ module VagrantPlugins
         execute('rvm rvmrc warning ignore allGemfiles')
         execute('rvm use --default ruby-1.9.3-p545')
 
+        @env.ui.info('Updating libstdc++')
+        execute('apt-get -y install python-software-properties', sudo: true)
+        execute('add-apt-repository -y ppa:ubuntu-toolchain-r/test', sudo: true)
+        execute('apt-get update', sudo: true)
+        execute('DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade', sudo: true)
+
         @env.ui.info('Configuring bash')
         @machine.communicate.upload(File.expand_path('provisioner/.bashrc', File.dirname(__FILE__)), '/home/vagrant/.bashrc-vagrant-solidus')
         execute('dos2unix -o ~/.bashrc-vagrant-solidus')

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

@@ -24,7 +24,10 @@ module VagrantPlugins
             fail("Site could not be installed") unless install_site_service
             install_pow_site if pow_installed?
 
-            @env.ui.info("Starting dev server...")
+            @env.ui.info("Compiling assets...")
+            fail("Assets could not be compiled") unless compile_site_assets
+
+            @env.ui.info("Starting dev server and assets watcher...")
             fail("Site could not be started") unless start_site_service
 
             if site_responding?
@@ -34,7 +37,8 @@ module VagrantPlugins
               @env.ui.success("#{@site_name} is started, accessible here:")
               log_site_urls
             else
-              log_site_log_tail(10)
+              @env.ui.info("...")
+              log_site_log_tail(50)
               fail("Site could not be started")
             end
           end

data/lib/vagrant-solidus/site_helpers.rb

@@ -83,7 +83,7 @@ module VagrantPlugins
         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
+        return true
       end
 
       def find_port(current_port, all_ports, used_ports)
@@ -91,9 +91,7 @@ module VagrantPlugins
       end
 
       def validate_site
-        gruntfile = File.join(@site_host_path, 'Gruntfile.js')
-        package   = File.join(@site_host_path, 'package.json')
-        File.exists?(gruntfile) && File.exists?(package) && File.read(package).index('solidus')
+        JSON.load(File.new(File.join(@site_host_path, 'package.json')))['dependencies']['solidus'] rescue false
       end
 
       def save_site
@@ -156,12 +154,33 @@ module VagrantPlugins
       #########################################################################
 
       def install_site_service
-        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)
+        command = "exec su - vagrant -c 'cd #{@site_guest_path} &&"
+        logging = ">> #{@site_log_file_guest_path} 2>&1'"
+
+        conf = ""
+        return unless guest_exec(:log_on_error, "echo \"#{conf}\" > /etc/init/#{site_service_name}.conf", sudo: true)
+
+        conf = "start on starting #{site_service_name}
+                stop on stopping #{site_service_name}
+                #{command} npm #{site_commands_arguments} run watch-assets #{logging}"
+        return unless guest_exec(:log_on_error, "echo \"#{conf}\" > /etc/init/#{assets_watcher_service_name}.conf", sudo: true)
+
+        conf = "start on starting #{site_service_name}
+                stop on stopping #{site_service_name}
+                #{command} ./node_modules/.bin/solidus start --dev --loglevel=3 #{site_commands_arguments} #{logging}"
+        return unless guest_exec(:log_on_error, "echo \"#{conf}\" > /etc/init/#{solidus_server_service_name}.conf", sudo: true)
+
+        return true
       end
 
       def uninstall_site_service
         guest_exec(nil, "rm /etc/init/#{site_service_name}.conf", sudo: true)
+        guest_exec(nil, "rm /etc/init/#{assets_watcher_service_name}.conf", sudo: true)
+        guest_exec(nil, "rm /etc/init/#{solidus_server_service_name}.conf", sudo: true)
+      end
+
+      def compile_site_assets
+        guest_exec(:log_on_error, "cd #{@site_guest_path} && npm #{site_commands_arguments} run compile-assets")
       end
 
       def start_site_service
@@ -193,6 +212,18 @@ module VagrantPlugins
         "site-#{@site_name}"
       end
 
+      def assets_watcher_service_name
+        "#{site_service_name}-assets-watcher"
+      end
+
+      def solidus_server_service_name
+        "#{site_service_name}-server"
+      end
+
+      def site_commands_arguments
+        "--port=#{@site_port} --livereloadport=#{@site_livereload_port} --logserverport=#{@site_log_server_port}"
+      end
+
       #########################################################################
       # Pow
       #########################################################################

data/lib/vagrant-solidus/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Solidus
-    VERSION = '0.2.1'
+    VERSION = '1.0.0.rc1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solidus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Joannic Laborde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.4