vagrant-solidus 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2UwNDQxYTFhODI2MTdjMjRhYjk4ZjYyNjVmMTg3NDYyMDFiMDc4ZA==
+    NjFjNGZjM2M0M2IyZjU2MzQxN2EyMGNiMTNjYTM4MTRmY2NkODg4Nw==
   data.tar.gz: !binary |-
-    MzRiM2UzMTc4NTc0NjYwMTRhOGFjNDE2YjcxM2QyNDgxNmMyNWNjNw==
+    YmE5ZGEzNWJlNmI4YzhlMmVlOWRiNzY2MDk5NTBkOWQ5NTFlZjYzZA==
 SHA512:
   metadata.gz: !binary |-
-    YzY1YjU0YjA2N2RmZTgxNDhjN2Y1MGNiYmQ2OTQ5YmIwMjBlMWI0MDllN2Yz
-    ZjlkY2Q0NTYzODQ5YmQ5YmU3YWNiOWU1MWQ0YmIzNGE5OGU0MzdkMzQ3MTVj
-    N2Q5OGQ0M2NlMWMxOGFmZDVmMmYzNzJlN2NkOWVjOTkyNDc3NTI=
+    Yzg4NzJhY2U3NjM2Zjg4YTNmNTk2NGQ2ZjQzZmY0MDVjZmY3MDFiM2UwNDEz
+    Nzc3MDE1MjYyZDhkYzQzMzA1YzUxMTk5ODg3ZTViY2JkMzM5YjMzNGZlNzJh
+    NjBmNDljMGE0YWZlN2ZjMmY1ZTNiNWI1YTFmM2ZkMzRhY2Q0NjI=
   data.tar.gz: !binary |-
-    MjM1MzVhYmEyMjc0YTNmZDllM2MzMmM1YzVhYWIyZTk2YjVlZTgwNGQ3NjVj
-    ZmFlYTI3YzlmYjg2ZmMyYWE5NjRlODNlNzg2NzNjZWFhYTdiY2RhMjg3NDY3
-    OGEyOTE4NjIzOWIzY2NiMTdmYTVmYmUxNmY5ZGM2OGYyYjQ5ODA=
+    ZDY5Nzg3YjhiNjQ0Y2FkZWM2MjZhY2NlNTFhYzc0YTM1ZTJlYzY5NDJlMDkw
+    ZDIwNWE1MWY4OGNhNWJhMWUxMzJiNjJhZmYyZGJiOTNlYzEyN2UxZGFiZGIx
+    ZjA4NzU4NWM5ZWJlMTY3MTNkMGQ0ZjUzYzY3OGY0M2QzODU2NDY=

data/CHANGELOG.md

@@ -0,0 +1,51 @@
+## Unreleased
+
+ - Use npm scripts instead of grunt
+
+BREAKING CHANGES:
+
+ - vagrant-solidus no longer manages the Solidus sites using the `grunt` command line. Instead, each site is started directly with its local Solidus bin (`./node_modules/.bin/solidus`). For sites that need to compile assets and run a file watcher, new scripts need to be added to their `package.json` files. For example, existing `grunt` tasks can still be used, but they need to be called directly with the two new special npm scripts:
+
+  ```javascript
+  {
+    "scripts": {
+      "build": "./node_modules/.bin/grunt build",
+      "watch": "./node_modules/.bin/grunt watch"
+    },
+    "devDependencies": {
+      "grunt": "~0.4.1",
+      "grunt-cli": "~0.1.13"
+    }
+  }
+  ```
+
+## 0.2.1 (Nov 19, 2014)
+
+ - Restore Vagrant >1.6.3 support [[460291e](https://github.com/solidusjs/vagrant-solidus/commit/460291e0338e3deefe87873fc1b3e70b6882bd67)]
+
+## 0.2.0 (Sep 11, 2014)
+
+ - Configurable ports [[280de56](https://github.com/solidusjs/vagrant-solidus/commit/280de5624e6f49fd8f56e40c4ab385b922f0169e)]
+
+## 0.1.0 (Aug 4, 2014)
+
+ - Add support for Solidus log server [[8d5ffb8](https://github.com/solidusjs/vagrant-solidus/commit/8d5ffb8a985013f5258676154840e200d9ae4595)]
+
+## 0.0.2 (May 22, 2014)
+
+ - Restrict to Vagrant 1.5.x until this is resolved: https://github.com/mitchellh/vagrant/issues/3769 [[72410cf](https://github.com/solidusjs/vagrant-solidus/commit/72410cfb07ac126be004ce6dd9abc397fbb26806)]
+
+## 0.0.1 (May 22, 2014)
+
+ - Initial release
+
+BREAKING CHANGES:
+
+ - If you have an old version of [solidus-devbox](https://github.com/solidusjs/solidus-devbox), it's simplest to reset the whole box (this will not remove your sites' files):
+
+  ```
+  $ vagrant destroy
+  $ vagrant plugin install vagrant-solidus
+  $ vagrant solidus-box init # Make sure to reapply your custom changes to the new Vagrantfile
+  $ vagrant up
+  ```

data/README.md

@@ -82,6 +82,25 @@ You can now access the website on http://my-site.dev if you installed Pow. If no
 
 Hint: Site files are actually stored on your machine, not in the virtual machine. You can edit them as usual, and the server will load them from your machine. Stopping or deleting the virtual machine will not affect your files.
 
+#### package.json
+
+In order for a site to be started by this plugin, it only needs one thing: a `package.json` file, with a dependency on Solidus. Two optional scripts can also be added to the `package.json` file:
+ - `build`: called when the site is started, for example to compile sass files
+ - `watch`: called when the site is started, to automatically recompile the assets when they change
+
+See the [solidus-site-template's `package.json`](https://github.com/solidusjs/solidus-site-template/blob/master/root/package.json) for an example.
+
+#### Site installation steps
+
+When a site is started with `vagrant site start`, the following steps are executed:
+
+ - If the site has a `Gemfile` file, the bundle is installed, else only the `sass` gem is installed
+ - If the site has a `bower.json` file, the `bower` packages are installed
+ - The site's `npm` packages are installed
+ - The site's assets are compiled (see [package.json](#packagejson)): `npm --port=PORT --livereloadport=PORT --logserverport=PORT run build`
+ - The site's assets are watched (see [package.json](#packagejson)): `npm --port=PORT --livereloadport=PORT --logserverport=PORT run watch`
+ - The site is started, by calling the site's local `solidus` bin: `./node_modules/.bin/solidus start --dev --loglevel=3 --port=PORT --livereloadport=PORT --logserverport=PORT`
+
 ### Stopping a site
 
 ```
@@ -168,6 +187,20 @@ $ vagrant solidus-box init
 $ vagrant up
 ```
 
+### Installing a Specific Version
+
+To use a specific version of vagrant-solidus, you can do the following;
+
+```
+$ vagrant halt
+$ vagrant plugin uninstall vagrant-solidus
+$ vagrant plugin install vagrant-solidus --plugin-version 1.0.0.rc1
+$ vagrant solidus-box init
+$ vagrant up
+```
+
+Replacing `1.0.0.rc1` with [the version number you want](https://rubygems.org/gems/vagrant-solidus).
+
 ## Troubleshooting ##
 
 ### Windows: 'ssh' executable not found

data/lib/vagrant-solidus/site_helpers.rb

@@ -162,7 +162,7 @@ module VagrantPlugins
 
         conf = "start on starting #{site_service_name}
                 stop on stopping #{site_service_name}
-                #{command} npm #{site_commands_arguments} run watch-assets #{logging}"
+                #{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)
 
         conf = "start on starting #{site_service_name}
@@ -180,7 +180,7 @@ module VagrantPlugins
       end
 
       def compile_site_assets
-        guest_exec(:log_on_error, "cd #{@site_guest_path} && npm #{site_commands_arguments} run compile-assets")
+        guest_exec(:log_on_error, "cd #{@site_guest_path} && npm #{site_commands_arguments} run build")
       end
 
       def start_site_service

data/lib/vagrant-solidus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-solidus
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Joannic Laborde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md