Update directory structure & allow to configure paths (tmp, log, cache)

.gitignore

@@ -1,20 +1,62 @@
+# Exclude common IDE project files
 /nbproject
-/config/custom_files
-/config/templates
-/config/topics
-/config/wm
-/config/minilogos
-/config/status
-/config/stamp
-/config/configuration.yml
-/vendor
-/plugins
-/node_modules
-composer.phar
-behat.yml
-/datas
+/.idea
+
+# Exclude javascript dependencies folder
 /www/assets
 /tmp-assets
+
+# Exclude node.js dependencies folder
+/node_modules
+
+# Exclude compiled LESS folder
 /www/skins/build
-/www/crossdomain.xml
+
+# Exclude compiled javascript test fixture folder
 /www/scripts/tests/fixtures
+
+# Exclude configuration folder exception the configuration sample file
+/config
+!/config/configuration.sample.yml
+
+# Exclude generated proxies from doctrine2
+/resources/proxies
+
+# Exclude temporaries resources (zip files, quarantine documents etc ..) folder
+/tmp
+
+# Exclude cache folder
+/cache
+
+# Exclude log folder
+/logs
+
+# Exclude plugin folder
+/plugins
+# Excluse assets plugin folder
+/www/plugins
+
+# Exclude folder for storing documents (images, videos, PDF) and their sub-definitions
+/datas
+
+# Exclude dependencies folder
+/vendor
+
+# Exclude package's binaries folder except the Phraseanet's ones
+/bin
+!/bin/console
+!/bin/developer
+!/bin/setup
+
+# Exclude composer
+composer.phar
+
+# Exclude behat configuration file
+behat.yml
+
+# Exclude vagrant configuration file
+.vagrant
+
+# Exclude crossdomain.xml file it's generated
+/www/crossdomain.xml
+

.travis.yml

@@ -61,7 +61,7 @@ script:
               bin/setup system:install [email protected] --password=test --db-user=root --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y -v;
               bin/developer ini:setup-tests-dbs -v;
             fi"
-  - php hudson/cleanupSubdefs.php
+  - php resources/hudson/cleanupSubdefs.php
   #sqlite db generation should occur once Phraseanet is up to date :
   - bin/developer phraseanet:regenerate-sqlite
   - ./node_modules/.bin/grunt test

Gruntfile.js

@@ -20,7 +20,8 @@ module.exports = function(grunt) {
             all: ['www/include/js/tests/*.html']
         },
         clean: {
-            "assets": ["<%= path.bower %>", "<%= path.asset %>"]
+            "assets": ["<%= path.asset %>"],
+            "bower": ["<%= path.bower %>"]
         },
         bower: {
             install: {
@@ -253,6 +254,32 @@ module.exports = function(grunt) {
                 "dest": "<%= path.asset %>/normalize-css/",
                 "flatten": true
             },
+            "sinon-chai": {
+                "expand": true,
+                "src": [
+                    "<%= path.bower %>/sinon-chai/lib/sinon-chai.js",
+                    "<%= path.bower %>/sinon-chai/LICENCE.txt",
+                ],
+                "dest": "<%= path.asset %>/sinon-chai/",
+                "flatten": true
+            },
+            "sinonjs": {
+                "expand": true,
+                "src": [
+                    "<%= path.bower %>/sinonjs/sinon.js"
+                ],
+                "dest": "<%= path.asset %>/sinonjs/",
+                "flatten": true
+            },
+            "squire": {
+                "expand": true,
+                "src": [
+                    "<%= path.bower %>/squire/src/Squire.js",
+                    "<%= path.bower %>/squire/LICENCE"
+                ],
+                "dest": "<%= path.asset %>/squire/",
+                "flatten": true
+            },
             "qunit": {
                 "expand": true,
                 "src": [
@@ -390,6 +417,7 @@ module.exports = function(grunt) {
         "copy:blueimp",
         "copy:bootstrap",
         "copy:bootstrap-multiselect",
+        "copy:chai",
         "copy:font-awesome",
         "copy:geonames-server-jquery-plugin",
         "copy:humane-js",
@@ -402,9 +430,16 @@ module.exports = function(grunt) {
         "copy:jquery-ui",
         "copy:jquery.treeview",
         "copy:json2",
+        "copy:js-fixtures",
         "copy:modernizr",
         "copy:normalize",
+        "copy:normalize",
+        "copy:qunit",
+        "copy:mocha",
         "copy:requirejs",
+        "copy:sinon-chai",
+        "copy:sinonjs",
+        "copy:squire",
         "copy:swfobject",
         "copy:tinymce",
         "copy:underscore",
@@ -416,7 +451,8 @@ module.exports = function(grunt) {
         "bower",
         "copy-deps",
         "bower_postinst",
-        "copy-assets"
+        "copy-assets",
+        "clean:bower"
     ]);
     grunt.registerTask('test', ["shell:generate_js_fixtures", "qunit", "mocha_phantomjs"]);
 };

Vagrantfile

@@ -1,11 +1,15 @@
 require 'yaml'
 
+unless Vagrant.has_plugin?("vagrant-hostsupdater")
+  raise 'vagrant-hostmanager is not installed! please run "vagrant plugin install vagrant-hostsupdater'
+end
+
 root = File.dirname(File.expand_path(__FILE__))
 
 Vagrant.configure("2") do |config|
-    Dir.glob(root+"/vagrant/vms/**/puphpet/config.yaml").each do|f|
-        dir = File.dirname(File.expand_path(f)+"/..")
-        base_path = dir[0..-21]
+    Dir.glob(root+"/resources/vagrant/vms/**/puphpet/config.yaml").each do|f|
+        dir = File.dirname(File.expand_path(f+"/.."))
+        base_path = dir
         configValues = YAML.load_file(f)
         data = configValues['vagrantfile-local']
 
@@ -167,7 +171,7 @@ Vagrant.configure("2") do |config|
 
             node.vm.provision "shell" do |s|
                 s.path = "#{base_path}/puphpet/shell/initial-setup.sh"
-                s.args = "/vagrant/vagrant/vms/#{data['name']}/puphpet"
+                s.args = "/vagrant/resources/vagrant/vms/#{data['name']}/puphpet"
             end
 
             node.vm.provision "shell" do |kg|

config/configuration.sample.yml

@@ -79,8 +79,12 @@ main:
             host: 127.0.0.1
             port: 6700
     storage:
-        subdefs:
-            default-dir: null
+        subdefs:null
+        cache: null
+        log : null
+        download: null
+        lazaret: null
+        caption: null
     bridge:
         youtube:
             enabled: false