vagrant-solidus 1.0.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmVjMjg2NGI4OWM5MTVhMjJlZDk1YWExZjBkMjQ5OGQyNDJlNzlkOQ==
+    OGM4NTM2NWUyNzY2MDljN2RiZmNhNzIwMGJkOTYwODlhYjEzNzQzOQ==
   data.tar.gz: !binary |-
-    MjllZDQ4ZWIxYmQxMTIwZTY4MjI2YmMxOWI1YzBhMjI4NGRmZDY3Ng==
+    MWJjZmNjNmM0NTlkZjhmYzk4ODcyMzZmZGVlYjdjMDM3MWIxZDJhYg==
 SHA512:
   metadata.gz: !binary |-
-    ZWEwMmE5YTFlMmY0NWNkNjliYWI2NDIxYjIwY2NmYjA2NTQ4NjEyOGVkN2Y2
-    MjU2MjU3N2VkNDk3MzY5MjhjMTg0ZTMxOGU1MTY2MzU1MTlmNGM0MDA1OTc0
-    NTU4ODk5NDAxYjM2NjMxMmUyNDI1MGZkM2Q1ZWZlYzI5OGJlNWQ=
+    ZDg5MmFmMzY0YjkwNmZmMjZhYmVhZDQ2OTNlODhjYTRkZTljZTA4NTE4NzMw
+    YjdjZmZiYjRmNTgzMWI0OTIzZmViNmEzZGFhYTA0NjcwZWNmZTBhOTQyZDg5
+    MGM1ZTg0YTkzN2YwZWY0ZmZhMGRjZjZhNmMyOWJjY2JmMmNlODM=
   data.tar.gz: !binary |-
-    OTk5YjY2ZTIzM2YxNjJhZTdhNDVlZWFkZDNjMGY0ZmY5OWQ5MzJmZTE3ZjE2
-    ZDJmNDM4N2QzZWIxZWJjYTlmOWMxOTFkMDY2NDQ0ZTZjZmU3MTA4ODZkNzJl
-    YWVjODQ5ZDUyNzNkODNhZmM1MTc4ZjdiMGJiZTgyYWVjNDc4MmE=
+    ZWIzMTE5MDVmNzkwZGJiYzk5NjExMWM4OWYxYzUzZjcwMDExNTBmMjBlZjdh
+    ZGRlMzVlMmQ2NGJlYjNhYzJjZjcyNDM0ZmZjZmM3ZWU3Yzk0YWJhODcxNGU1
+    YTlmZmY0Y2FjMTk3ODg5ZDI2NDQ0NDQ1YzNjM2ZmZjkzNGY2MGQ=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.0 (May 7, 2015)
+
+ - Update start messages to reflect new script names [[565ac76](https://github.com/solidusjs/vagrant-solidus/commit/565ac76e72bc1a13413ebb62d331fd172c199932)]
+ - Use site's node and npm versions from package.json [[a3f4c19](https://github.com/solidusjs/vagrant-solidus/commit/a3f4c19a50766623c26209012c59d219223e298c)]
+
+BREAKING CHANGES:
+
+ - The default Node version goes from `0.10.22` to `stable`
+ - The default npm version goes from `1.3.14` to `^2.0.0`
+
 ## 1.0.0 (Jan 14, 2015)
 
  - Use npm scripts instead of grunt [[a626484](https://github.com/solidusjs/vagrant-solidus/commit/a626484dbd6a17122c4d5dd0d4afb39b62ce38ed)]

data/README.md

@@ -90,6 +90,10 @@ In order for a site to be started by this plugin, it only needs one thing: a `pa
 
 See the [solidus-site-template's `package.json`](https://github.com/solidusjs/solidus-site-template/blob/master/root/package.json) for an example.
 
+#### Node and npm versions
+
+By default, vagrant-solidus will use Node version `stable` and npm version `^2.0.0`. To use different versions, specify them in the `package.json` [`engines` field](https://docs.npmjs.com/files/package.json#engines).
+
 #### Site installation steps
 
 When a site is started with `vagrant site start`, the following steps are executed:

data/lib/vagrant-solidus/provisioner.rb

@@ -32,12 +32,18 @@ module VagrantPlugins
         @env.ui.info('Installing dos2unix')
         execute('apt-get -y install dos2unix', sudo: true)
 
-        @env.ui.info('Installing nvm, node.js and npm')
-        execute('curl -s https://raw.githubusercontent.com/creationix/nvm/v0.5.1/install.sh | sh')
+        @env.ui.info('Installing nvm')
+        execute('curl -s https://raw.githubusercontent.com/creationix/nvm/v0.25.1/install.sh | sh')
         execute('source ~/.nvm/nvm.sh')
-        execute('nvm install 0.10.22')
-        execute('nvm use 0.10.22')
-        execute('nvm alias default 0.10.22')
+
+        # Install a default node.js version, it will be used for grunt-init and when ssh'ing into the box
+        @env.ui.info('Installing node.js')
+        execute("nvm install #{DEFAULT_NODE_VERSION}")
+        execute("nvm use #{DEFAULT_NODE_VERSION}")
+        execute("nvm alias default #{DEFAULT_NODE_VERSION}")
+
+        @env.ui.info('Installing npm')
+        execute("npm install npm@'#{DEFAULT_NPM_VERSION}' -g")
 
         @env.ui.info('Installing grunt-init')
         execute('npm install grunt-init@"~0.3.1" -g')

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

@@ -17,7 +17,7 @@ module VagrantPlugins
 
         def execute
           with_running_vm do
-            guest_exec(:log_all, "cd #{@site_guest_path} && #{@guest_command}")
+            guest_exec(:log_all, "cd #{@site_guest_path} && #{node_command} #{@guest_command}")
           end
 
           # Command's exit status

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

@@ -18,16 +18,16 @@ module VagrantPlugins
 
             @env.ui.info("Installing site...")
             unless @fast
-              fail("Site could not be installed") unless install_site_dependencies && install_site_node_packages
+              fail("Site could not be installed") unless install_site_dependencies && install_site_node && 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("Out of available ports, add more to the Vagrantfile or remove unused sites from #{SITES_CONFIGS_FILE_HOST_PATH}\nSee https://github.com/solidusjs/vagrant-solidus#adding-or-changing-the-forwarded-ports") unless set_site_ports
             fail("Site could not be installed") unless install_site_service
             install_pow_site if pow_installed?
 
-            @env.ui.info("Compiling assets...")
-            fail("Assets could not be compiled") unless compile_site_assets
+            @env.ui.info("Building site...")
+            fail("Site could not be built") unless build_site
 
-            @env.ui.info("Starting dev server and assets watcher...")
+            @env.ui.info("Starting site server and watcher...")
             fail("Site could not be started") unless start_site_service
 
             if site_responding?

data/lib/vagrant-solidus/site_helpers.rb

@@ -7,6 +7,8 @@ module VagrantPlugins
       SITE_TEMPLATE_GIT_TAG = "v1.0.0"
       SITE_STATUS_WATCHER_POLLING_FREQUENCY = 1
       PROVISION_ID = 20140502
+      DEFAULT_NODE_VERSION = 'stable'
+      DEFAULT_NPM_VERSION = '^2.0.0'
 
       #########################################################################
       # System Calls
@@ -92,7 +94,7 @@ module VagrantPlugins
       end
 
       def validate_site
-        JSON.load(File.new(File.join(@site_host_path, 'package.json')))['dependencies']['solidus'] rescue false
+        !package['dependencies']['solidus'].empty? rescue false
       end
 
       def save_site
@@ -135,8 +137,8 @@ module VagrantPlugins
 
         # Bower packages
         if File.exists?(File.join(@site_host_path, 'bower.json'))
-          return unless guest_exec(:log_on_error, "npm install bower -g")
-          return unless guest_exec(:log_on_error, "cd #{@site_guest_path} && bower install")
+          return unless guest_exec(:log_on_error, "#{node_command} npm install bower -g")
+          return unless guest_exec(:log_on_error, "cd #{@site_guest_path} && #{node_command} bower install")
         end
 
         return true
@@ -146,8 +148,36 @@ module VagrantPlugins
       # Node.js
       #########################################################################
 
+      def install_site_node
+        guest_exec(:log_on_error, "nvm install #{node_version} && #{node_command} npm install npm@'#{npm_version}' -g")
+      end
+
       def install_site_node_packages
-        guest_exec(:log_on_error, "cd #{@site_guest_path} && npm install")
+        guest_exec(:log_on_error, "cd #{@site_guest_path} && #{node_command} npm install")
+      end
+
+      def node_version
+        unless @node_version
+          @node_version = package['engines']['node'] if package['engines']
+          @node_version = DEFAULT_NODE_VERSION if !@node_version || @node_version.empty?
+        end
+        @node_version
+      end
+
+      def node_command
+        "nvm exec #{node_version}"
+      end
+
+      def npm_version
+        unless @npm_version
+          @npm_version = package['engines']['npm'] if package['engines']
+          @npm_version = DEFAULT_NPM_VERSION if !@npm_version || @npm_version.empty?
+        end
+        @npm_version
+      end
+
+      def package
+        @package ||= JSON.load(File.new(File.join(@site_host_path, 'package.json')))
       end
 
       #########################################################################
@@ -163,12 +193,12 @@ module VagrantPlugins
 
         conf = "start on starting #{site_service_name}
                 stop on stopping #{site_service_name}
-                #{command} npm #{site_commands_arguments} run watch #{logging}"
-        return unless guest_exec(:log_on_error, "echo \"#{conf}\" > /etc/init/#{assets_watcher_service_name}.conf", sudo: true)
+                #{command} #{node_command} npm #{site_commands_arguments} run watch #{logging}"
+        return unless guest_exec(:log_on_error, "echo \"#{conf}\" > /etc/init/#{site_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}"
+                #{command} #{node_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
@@ -176,12 +206,12 @@ module VagrantPlugins
 
       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/#{site_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 build")
+      def build_site
+        guest_exec(:log_on_error, "cd #{@site_guest_path} && #{node_command} npm #{site_commands_arguments} run build")
       end
 
       def start_site_service
@@ -213,7 +243,7 @@ module VagrantPlugins
         "site-#{@site_name}"
       end
 
-      def assets_watcher_service_name
+      def site_watcher_service_name
         "#{site_service_name}-assets-watcher"
       end
 

data/lib/vagrant-solidus/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Solidus
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solidus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Joannic Laborde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: This plugin provides a provisioner and a `site` command that allows Solidus