[WIP] Pull25

.gitignore

@@ -1,8 +1,11 @@
-.idea
-.sass-cache
 /vendor/
 /cache/*
 /logs/*
 silex.log
 /config/parameters.yml
 /.vagrant
+node_modules/
+web/css/*
+web/img/*
+web/js/*
+

README.md

@@ -18,8 +18,9 @@ Ensure that [VirtualBox](https://www.virtualbox.org), [Vagrant](http://www.vagra
     ```
 
 4. (from within the machine) `composer install` to install composer dependencies
-5. (from within the machine) `compass compile` to compile styles
-6. add the following to your /etc/hosts file
+5. (from within the machine) `npm install` to grab npm dependencies
+6. (from within the machine) `./node_modules/.bin/gulp` to compile styles
+7. add the following to your /etc/hosts file
 
     ```
     10.10.10.10 app.local
@@ -40,15 +41,14 @@ All done! Now you can access the application at [http://app.local/](http://app.l
 3. Install Dependencies
 
     ```
-    gem update --system
-    gem install compass
-    gem install susy
+    composer install
+    npm install
     ```
 
-4. Compile stylesheets
+4. Compile assets
 
     ```
-    compass compile
+    ./node_modules/.bin/gulp
     ```
 
 5. Create config/parameters.yml

circle.yml

@@ -0,0 +1,34 @@
+machine:
+    php:
+        version: 7.0.4
+    services:
+        - redis
+
+dependencies:
+    cache_directories:
+        - ~/.composer/cache
+
+    override:
+        - composer install --dev --no-progress --no-interaction --prefer-dist
+        - npm install --no-progress
+        - ./node_modules/.bin/gulp
+
+    post:
+        - mkdir -p $CIRCLE_TEST_REPORTS/phpunit
+
+test:
+    pre:
+        - "echo \"meetup_api_key: $MEETUP_API_KEY\nmeetup_group: $MEETUP_GROUP\" > config/parameters.yml"
+    override:
+        - php -S localhost:8080 -t web web/index.php:
+            background: true
+        - sleep 5
+        - npm test
+
+deployment:
+    production:
+        branch: master
+        owner: AmsterdamPHP
+        commands:
+            - cp ~/.ssh/id_amsterdamphp.nl ~/.ssh/id_rsa
+            - ./vendor/bin/dep deploy

composer.json

@@ -34,5 +34,9 @@
     },
 
     "repositories": [
-    ]
+    ],
+    "require-dev": {
+        "deployer/deployer": "^4@dev",
+        "symfony/var-dumper": "^3.1"
+    }
 }