Merge branch 'master' of https://github.com/DoclerLabs/hexMachina

.travis.yml

@@ -5,7 +5,6 @@ language: haxe
 
 # haxe versions : http://haxe.org/website-content/downloads/versions.json
 haxe:
-  - "3.2.1"
   - "3.4.0"
   - development
 
@@ -38,34 +37,57 @@ before_install:
   - sudo apt-get install -qq libgtk2.0-0:i386
 
 install:
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexUnit.git ~/hexunit
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexCore.git ~/hexcore
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexReflection.git ~/hexreflection
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexAnnotation.git ~/hexannotation
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexInject.git ~/hexinject
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexDsl.git ~/hexdsl
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexMVC.git ~/hexmvc
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexService.git ~/hexservice
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexState.git ~/hexstate
-- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexIoC.git ~/hexioc
-- git -C ~/hexannotation log -1 --pretty=oneline
-- export DISPLAY=:99.0;
-- export AUDIODEV=null;
-- haxe flash/install.hxml
-- haxelib install dox
-- git clone --recursive https://github.com/chipshort/hexDoc-Theme.git ~/hexdoctheme
+  - haxelib newrepo
+#hexLog
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexLog.git ~/hexlog
+  - haxelib dev hexlog ~/hexlog
+#hexCore
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexCore.git ~/hexcore
+  - haxelib dev hexcore ~/hexcore
+#hexUnit
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexUnit.git ~/hexunit
+  - haxelib dev hexunit ~/hexunit
+#hexReflection
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexReflection.git ~/hexreflection
+  - haxelib dev hexreflection ~/hexreflection
+#hexAnnotation
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexAnnotation.git ~/hexannotation
+  - haxelib dev hexannotation ~/hexannotation
+#hexInject
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexInject.git ~/hexinject
+  - haxelib dev hexinject ~/hexinject
+#hexDSL
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexDSL.git ~/hexdsl
+  - haxelib dev hexdsl ~/hexdsl
+#hexMVC
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexMVC.git ~/hexmvc
+  - haxelib dev hexmvc ~/hexmvc
+#hexService
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexService.git ~/hexservice
+  - haxelib dev hexservice ~/hexservice
+#hexState
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexState.git ~/hexstate
+  - haxelib dev hexstate ~/hexstate
+#hexIoC
+  - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexIoC.git ~/hexioc
+  - haxelib dev hexioc ~/hexioc
+#---- dependencies done ----
+  - export DISPLAY=:99.0;
+  - export AUDIODEV=null;
+  - haxe flash/install.hxml
+  - git clone --recursive https://github.com/chipshort/hexDoc-Theme.git ~/hexdoctheme
 # update node for deploy scripts
-- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
+  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
 
 before_script:
   - git config --global user.email "laurent@geturl.net"
   - git config --global user.name "Travis-CI"
 
 script:
-- if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-php.hxml && php bin/index.php; fi
-- if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-neko.hxml && neko bin/MainTest.n; fi
+- haxe build-php.hxml && php bin/index.php
+- haxe build-neko.hxml && neko bin/MainTest.n
 - haxe build-js.hxml           && node bin/MainTest.js
-- if [ $TRAVIS_HAXE_VERSION != "3.2.1" ]; then haxe build-flash.hxml -D fdb && haxe flash/run.hxml bin/MainTest.swf; fi
+- haxe build-flash.hxml -D fdb && haxe flash/run.hxml bin/MainTest.swf
 
 before_deploy:
 - if [ $TRAVIS_HAXE_VERSION == "3.4.0" ]; then ./.travis/pre-deploy.sh; fi

.travis/make-documentation.sh

@@ -2,9 +2,11 @@
 cd $HOME
 
 #Generate documentation
-haxe -cp ./hexcore/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/php.xml -php bin
-haxe -cp ./hexcore/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/neko.xml -neko bin/docs.n
-haxe -cp ./hexcore/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/js.xml -js bin/docs.js
-haxe -cp ./hexcore/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/flash.xml -swf-version 11 -swf bin/docs.swf
+haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/php.xml -php bin
+haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/neko.xml -neko bin/docs.n
+haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/js.xml -js bin/docs.js
+haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/flash.xml -swf-version 11 -swf bin/docs.swf
+
+haxelib install dox
 
 haxelib run dox -i xml -o api --toplevel-package "hex" --title "HEXMACHINA - API" -theme ./hexdoctheme/theme/

.travis/make-hexMachina-bundle.sh

@@ -5,6 +5,10 @@ mkdir hexmachina-bundle hexmachina-bundle/src hexmachina-bundle/test
 rsync -a ./hexcore/src ./hexmachina-bundle 
 rsync -a ./hexcore/test ./hexmachina-bundle 
 cp ./hexcore/README.md ./hexmachina-bundle/README-hexcore.md
+# hexLog
+rsync -a ./hexlog/src ./hexmachina-bundle 
+rsync -a ./hexlog/test ./hexmachina-bundle 
+cp ./hexlog/README.md ./hexmachina-bundle/README-hexlog.md
 # hexReflection
 rsync -a ./hexreflection/src ./hexmachina-bundle 
 rsync -a ./hexreflection/test ./hexmachina-bundle 

build-each.hxml

@@ -1,24 +1,30 @@
 -main MainMachinaTest
+
+#all libraries
+-lib hexlog
+-lib hexcore
+-lib hexunit
+-lib hexreflection
+-lib hexannotation
+-lib hexinject
+-lib hexdsl
+-lib hexservice
+-lib hexmvc
+-lib hexstate
+-lib hexioc
+
+#all test sources to run the whole test suite
 -cp test
--cp /home/travis/hexunit/src
 -cp /home/travis/hexunit/test
--cp /home/travis/hexcore/src
+-cp /home/travis/hexlog/test
 -cp /home/travis/hexcore/test
--cp /home/travis/hexreflection/src
 -cp /home/travis/hexreflection/test
--cp /home/travis/hexannotation/src
 -cp /home/travis/hexannotation/test
--cp /home/travis/hexinject/src
 -cp /home/travis/hexinject/test
--cp /home/travis/hexdsl/src
 -cp /home/travis/hexdsl/test
--cp /home/travis/hexservice/src
 -cp /home/travis/hexservice/test
--cp /home/travis/hexmvc/src
 -cp /home/travis/hexmvc/test
--cp /home/travis/hexstate/src
 -cp /home/travis/hexstate/test
--cp /home/travis/hexioc/src
 -cp /home/travis/hexioc/test
 
 -D debug

haxelib.json

@@ -5,19 +5,11 @@
   "description": "A powerful multi-modular MVC+S system written in Haxe",
   "contributors": ["doclerlabs"],
   "releasenote": "${releasenote}",
-  "version": "${version}",
+  "version": "git",
   "url": "https://github.com/DoclerLabs/hexMachina",
   "dependencies": 
   {
-	"hexcore": "git:https://github.com/DoclerLabs/hexCore.git",
-	"hexunit": "git:https://github.com/DoclerLabs/hexUnit.git",
-	"hexreflection": "git:https://github.com/DoclerLabs/hexReflection.git",
-	"hexannotation": "git:https://github.com/DoclerLabs/hexAnnotation.git",
-	"hexinject": "git:https://github.com/DoclerLabs/hexInject.git",
-	"hexdsl": "git:https://github.com/DoclerLabs/hexDsl.git",
-	"hexservice": "git:https://github.com/DoclerLabs/hexService.git",
-	"hexstate": "git:https://github.com/DoclerLabs/hexState.git",
-	"hexmvc": "git:https://github.com/DoclerLabs/hexMVC.git",
-	"hexioc": "git:https://github.com/DoclerLabs/hexIoC.git"
+	"hexioc": "git:https://github.com/DoclerLabs/hexIoC.git",
+	"hexunit": "git:https://github.com/DoclerLabs/hexUnit.git"
   }
 }

test/MachinaSuite.hx

@@ -5,6 +5,7 @@ import hex.HexCoreSuite;
 import hex.HexDslSuite;
 import hex.HexInjectSuite;
 import hex.HexIoCSuite;
+import hex.HexLogSuite;
 import hex.HexMVCSuite;
 import hex.HexReflectionSuite;
 import hex.HexServiceSuite;
@@ -18,5 +19,17 @@ import hex.HexStateSuite;
 class MachinaSuite
 {
 	@Suite( "Machina suite" )
-    public var list : Array<Class<Dynamic>> = [ HexUnitSuite, HexCoreSuite, HexReflectionSuite, HexAnnotationSuite, HexInjectSuite, HexDslSuite, HexServiceSuite, HexMVCSuite, HexStateSuite, HexIoCSuite ];
+	public var list : Array<Class<Dynamic>> = [
+		HexUnitSuite,
+		HexCoreSuite,
+		HexReflectionSuite,
+		HexAnnotationSuite,
+		HexInjectSuite,
+		HexDslSuite,
+		HexServiceSuite,
+		HexMVCSuite,
+		HexStateSuite,
+		HexIoCSuite,
+		HexLogSuite
+	];
 }