diff --git a/Vagrantfile b/Vagrantfile index 9c37eb6..bb07091 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,8 @@ VAGRANTFILE_API_VERSION = '2' Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = 'ubuntu/trusty64' - config.vm.provision :shell, path: 'provision.sh' + config.vm.provision :shell, path: 'provision_root.sh' + config.vm.provision :shell, path: 'provision.sh', privileged: false config.vm.network :forwarded_port, guest: 5000, host: 5000 if Vagrant.has_plugin?("vagrant-cachier") config.cache.scope = :box diff --git a/package.json b/package.json index d6aa6bc..208bdc2 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,12 @@ "name": "BarraBrasil", "description": "Barra oficial do governo federal brasileiro", "devDependencies": { -"coffee-script": "1.9.3", +"coffee-script": "1.10.0", "uglifyjs": "2.4.10", "express": "4.13.3", "chai": "3.2.0", "chai-jq": "0.0.8", -"mocha": "2.2.5", +"mocha": "2.3.3", "zombie": "4.1.0", "ejs": "2.3.3" }, diff --git a/provision.sh b/provision.sh index e3b7f4c..8cea035 100644 --- a/provision.sh +++ b/provision.sh @@ -2,28 +2,22 @@ set -e -x -o pipefail export DEBIAN_FRONTEND='noninteractive' -sudo add-apt-repository ppa:chris-lea/node.js -sudo apt-get update +cd /home/vagrant -apt-get install -y \ - python-dev \ - python-pip \ - nodejs \ - ruby +# Installing nvm +wget -qO- https://raw.github.com/creationix/nvm/master/install.sh | sh -pip install \ - Flask \ - config \ - assetgen +# This enables NVM without a logout/login +export NVM_DIR="/home/vagrant/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm -npm install -g \ - coffee-script \ - uglify-js \ - express \ - ejs \ - zombie \ - mocha \ - chai \ - chai-jq +# Install a node and alias +nvm install iojs +nvm alias default iojs -gem install sass +rm -Rf barra-govbr/ +GIT_SSL_NO_VERIFY=true git clone http://portal.softwarepublico.gov.br/gitlab/govbr/barra-govbr.git + +cd barra-govbr + +make venv diff --git a/provision_root.sh b/provision_root.sh new file mode 100644 index 0000000..59da1fc --- /dev/null +++ b/provision_root.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -e -x -o pipefail +export DEBIAN_FRONTEND='noninteractive' + +sudo apt-get update + +apt-get install -y \ + git \ + python-dev \ + python-pip \ + python-virtualenv \ + ruby + +gem install sass + diff --git a/recipes/outubrorosa/compile.sh b/recipes/outubrorosa/compile.sh index e5fa4a1..e2c3ea3 100644 --- a/recipes/outubrorosa/compile.sh +++ b/recipes/outubrorosa/compile.sh @@ -2,7 +2,7 @@ export PATH=$PATH:../../node_modules/.bin/ ../../venv/bin/assetgen ./barra-brasil-1.yaml ../../venv/bin/assetgen ./barra-brasil-2.yaml -#../../venv/bin/assetgen ./footer-brasil-1.yaml -#../../venv/bin/assetgen ./footer-brasil-2.yaml +../../venv/bin/assetgen ./footer-brasil-1.yaml +../../venv/bin/assetgen ./footer-brasil-2.yaml ../../venv/bin/assetgen ./barra-brasil-final.yaml -- libgit2 0.21.2