Merge pull request #134 from do3meli/refactor-composer

Refactor composer

.gitignore

@@ -1,22 +1,16 @@
 # files that get generated by piLogger
 etc/devices.scanned
-etc/piLogger.conf
-etc/aliases.conf
 etc/*.conf
-bin/.*.swp
 html/cache
 html/graphs
 html/xml
-html/index.html
-include/composer.phar
-include/composer.lock
-include/vendor
 
-# ignore AbioWire files
-AbioWire
-*.swp
+# composer files
+composer.lock
+vendor
 
-# ignore some OSX files when not working directly from my raspberry pi
+# ignore temporary, hidden system files
+*.swp
 .DS_Store
 .AppleDouble
 .LSOverride

bin/functions-upgrade

@@ -270,9 +270,9 @@ function piLogger_doUpgrade_20150628-001_to_20150823-001(){
 
   # now we can get composer and use php5-cli for it
   echo "    - Installing composer"
-  cd $baseDir/include
-  curl -s https://getcomposer.org/installer | php
-  ./composer.phar install
+  cd $baseDir
+  curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
+  composer install
 
   # we will restart lighttpd just to be sure it picked up the correct config file
   sudo dpkg -s lighttpd >/dev/null 2>&1  && { sudo /etc/init.d/lighttpd restart ; }
@@ -375,3 +375,21 @@ function piLogger_doUpgrade_20150920-002_to_20151020-001(){
       return $?;
    fi 
 }
+
+#========================================
+# from 20151020-001 to 20151014-001
+#========================================
+function piLogger_doUpgrade_20151020-001_to_20151014-001(){
+
+  echo "    - moving composer files from previous installations if necessary"
+  [ -d $baseDir/include/vendor ] && mv $baseDir/include/vendor $baseDir/vendor
+  [ -f $baseDir/include/composer.lock ] && mv $baseDir/include/composer.lock $baseDir/composer.lock
+
+  echo "    - check if composer files are at the correct place now"
+  if [ -d $baseDir/vendor ] && [ -f $baseDir/composer.lock ]; then
+     return 0;
+  else
+     return -1;
+  fi
+
+}

bin/upgrade.sh

@@ -103,7 +103,8 @@ versions="20150422-001
 20150918-001
 20150920-001
 20150920-002
-20151020-001"
+20151020-001
+20151014-001"
 
 fromVersion=""
 for toVersion in $versions

currentVersion

@@ -1 +1 @@
-20151002-001
+20151014-001

html/api/rest.php

@@ -1,13 +1,4 @@
 <?php
-	#--- go to xyz/includes (which has composer.phar and composer.json)
-	#--- run ./composer.phar install
-	#
-	#--- the .htaccess file in the ./api directory can look like this:
-	#
-	#--- maglub@ubuntu-14:~/dev/web/public_html/api$ cat .htaccess 
-	#--- RewriteEngine on
-	#--- RewriteCond %{REQUEST_FILENAME} !-f
-	#--- RewriteRule ^ /api/rest.php [QSA,L]
 
 	//set up environment for cli
 	if (!(isset($_SERVER['DOCUMENT_ROOT']) && $_SERVER['DOCUMENT_ROOT'] !== "")) {
@@ -24,8 +15,7 @@
 	if(isset($ENV['debug'])) { print "apa\n"; };
 
 	require_once($_SERVER['DOCUMENT_ROOT']."/stub.php");
-	require_once($root."/vendor/autoload.php");
-
+	require_once($root."/../vendor/autoload.php");
 	require_once($root . "myfunctions.inc");
 
 	#--- instantiate Slim and SlimJson

html/index.php

@@ -2,6 +2,7 @@
 
 	require_once("./stub.php");
         require_once($root . "myfunctions.inc");
+        require_once($root."/../vendor/autoload.php");
 
         //set up environment for cli
         if (!(isset($_SERVER['DOCUMENT_ROOT']) && $_SERVER['DOCUMENT_ROOT'] !== "")) {
@@ -10,16 +11,13 @@
                 $_SERVER['DOCUMENT_ROOT'] = __DIR__ . "/..";
                 $argv = $GLOBALS['argv'];
                 array_shift($GLOBALS['argv']);
-                #$pathInfo = implode('/', $argv);
                 $pathInfo = $argv[0];
         }
 
-        require_once($root."/vendor/autoload.php");
-
         #--- instantiate Slim and SlimJson
         $app = new \Slim\Slim(array(
              'templates.path' => 'templates')
-          );
+        );
 
         //if run from the command-line
         if ($_SERVER['HTTP_HOST'] === "cron"){

setup.sh

@@ -239,9 +239,9 @@ $this_dir/bin/upgrade.sh --doIt
 #================================
 # Run composer
 #================================
-cd $this_dir/include
-curl -s https://getcomposer.org/installer | php
-./composer.phar install
+curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
+cd $this_dir
+composer install
 cd -
 
 #================================