Merge pull request #13 from lbausch/development

Version 2.0.1 (maintenance release)

Author: lbausch

.gitignore

@@ -1,8 +1,8 @@
 /vendor
 /node_modules
 /public/storage
-Homestead.yaml
-Homestead.json
+ci/Homestead.yaml
+ci/Homestead.json
 .env
 
 ## Development

Vagrantfile

@@ -4,10 +4,10 @@ require 'yaml'
 VAGRANTFILE_API_VERSION ||= "2"
 confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__))
 
-homesteadYamlPath = "Homestead.yaml"
-homesteadJsonPath = "Homestead.json"
-afterScriptPath = "after.sh"
-aliasesPath = "aliases"
+homesteadYamlPath = "ci/Homestead.yaml"
+homesteadJsonPath = "ci/Homestead.json"
+afterScriptPath = "ci/after.sh"
+aliasesPath = "ci/aliases"
 
 require File.expand_path(confDir + '/scripts/homestead.rb')
 

ci/Homestead.yaml.example

@@ -0,0 +1,37 @@
+---
+ip: "192.168.10.10"
+memory: 2048
+cpus: 2
+hostname: sqlgreygui
+name: sqlgreygui
+provider: virtualbox
+
+authorize: ~/.ssh/id_rsa.pub
+
+keys:
+    - ~/.ssh/id_rsa
+
+folders:
+    - map: "/path/to/repository"
+      to: "/home/vagrant/Code"
+
+sites:
+    - map: sqlgreygui.app
+      to: "/home/vagrant/Code/public"
+      schedules: true
+
+databases:
+    - homestead
+
+# blackfire:
+#     - id: foo
+#       token: bar
+#       client-id: foo
+#       client-token: bar
+
+# ports:
+#     - send: 50000
+#       to: 5000
+#     - send: 7777
+#       to: 777
+#       protocol: udp

ci/setup_environment.sh

@@ -5,7 +5,7 @@ if [ "$CI" = true ]; then
 fi
 
 if [ "$CI" = true ]; then
-    composer install --quiet --no-interaction --prefer-dist
+    composer install --no-ansi --no-interaction --no-progress
 fi
 
 cp -nv .env.example .env

composer.json

@@ -14,7 +14,7 @@
         "stolz/assets": "^0.1.4",
         "laravelcollective/html": "5.2.*",
         "spatie/laravel-tail": "^1.1.1",
-        "components/jquery": "^2.2.0",
+        "components/jquery": "^3.0",
         "twbs/bootstrap": "^3.3.5",
         "eonasdan/bootstrap-datetimepicker": "^4.17",
         "fortawesome/font-awesome": "^4.4",