A lot of CI work

castarco · castarco · commit 0a68a4d39d12 · 2016-02-27T16:22:40.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 composer.lock
-private.key
+.travis/phar_private.key
+.travis/deploy_private.key
+.travis/secrets.tar
 vendor/
 jupyter-php-installer.phar
+jupyter-php-installer.phar.pubkey
 .idea
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,35 @@
+sudo: false
+
+language: php
+
+cache:
+  directories:
+    - "$HOME/.composer/cache"
+    - vendor
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: hhvm
+  allow_failures:
+    - php: hhvm
+
+before_install:
+  - openssl aes-256-cbc -K $encrypted_f21abcc37842_key -iv $encrypted_f21abcc37842_iv
+    -in secrets.tar.enc -out secrets.tar -d
+  - travis_retry composer self-update
+
+install:
+  - travis_retry composer install --optimize-autoloader --prefer-dist --no-interaction
+  - composer info -i
+
+script:
+  - here call phpunit
+
+after_script:
+  - something more
+
+after_success: 
diff --git a/.travis/deploy_public.key b/.travis/deploy_public.key
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUXU2ODDrbfdRatnMFgSzEJHvThGeNbvgo6WYKmy35ER+CctnVrC/SQ1tcXAHC+F6GKhSoJDMVazti3i9wp69bkYmGTY/OKbYltBP5wldtD4oF1mTmWzAB6EoiPac9BNddry57sHFH7N/zlQVSf9ZuMd3iXJLTTD6VJeVWuSTiIW/efby9ICVyoGEqnNBeoxDFD3L9w6tW9IPZHh5Sma2dzr3+C4TsEGFmDFYIEtK+Ar49XH03OH7hd5xALqxxSTE5c40Dt5N106ch6eKb2BhA9fVIFbS9/hhgh+ZV5n1Y53op0CDK8aadoQTzvQK/AdfSnDoX2hQWNBPAzyTJps6q2OoZdaV+gbAahsHwOgvRn4kYChUzU201DcRi4xMI2QkQ4f+NPUTgtJnvRbZUPRO7va7PLkXEEZqFv1Xs6sE1ua7fB7NUyLb9MrQznJrX7fOHE82veoDrqn2du3cEPJ/FATqL+dzynB6YjOk7J1F7qaxSAaURM3fG12dcbZYgfVKTDo+OieLEoYqtm8FGMTPM8xIQR8wm4euEDxsh6Ex4sDMHKXIRu88Hx9VPwYUzv1vIVQfbbKIc65G91zJm91cW5t0dsKY9QD2u2PzDY9EmwNfihRY+jMP2A47OSzNCaqdx/qj7SG7GUjnlvoi1/sKhGP5gNwVtuqSnVlogN0MXyQ== castarco@litipk.com
diff --git a/.travis/secrets.tar.enc b/.travis/secrets.tar.enc
diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+# Unpack secrets
+tar xvf .travis/secrets.tar -C .travis
+
+# Setup SSH agent:
+eval "$(ssh-agent -s)" #start the ssh agent
+chmod 600 .travis/phar_private.key
+ssh-add .travis/phar_private.key
+
+# Setup git defaults:
+git config --global user.email "castarco@gmail.com"
+git config --global user.name "Andreu Correa Casablanca"
+
+# Add SSH-based remote to GitHub repo:
+git remote add deploy git@github.com:Litipk/Jupyter-PHP-Installer.git
+git fetch deploy
+
+# Get Box and build
+wget https://github.com/box-project/box2/releases/download/2.7.0/box-2.7.0.phar -O ./bin/box.phar
+cp .travis/phar_public.key ./public.key
+./bin/box.phar build -vv
+
+# To allow checkout gh-pages branch
+mv jupyter-php-installer.phar jupyter-php-installer.phar.tmp
+mv jupyter-php-installer.phar.pubkey jupyter-php-installer.phar.pubkey.tmp
+
+# Checkout gh-pages and add PHAR file and version:
+git checkout -b gh-pages deploy/gh-pages
+
+mv jupyter-php-installer.phar.tmp dist/jupyter-php-installer.phar
+mv jupyter-php-installer.phar.pubkey.tmp dist/jupyter-php-installer.phar.pubkey
+
+sha1sum dist/jupyter-php-installer.phar > dist/jupyter-php-installer.phar.version
+git add dist/jupyter-php-installer.phar dist/jupyter-php-installer.phar.version dist/jupyter-php-installer.phar.pubkey
+
+# Commit and push:
+git commit -m 'Rebuilt phar'
+git push deploy gh-pages:gh-pages
diff --git a/box.json b/box.json
@@ -1,11 +1,12 @@
 {
     "alias": "jupyter-php-installer.phar",
     "chmod": "0755",
+    "algorithm": "OPENSSL",
+    "compression": "GZ",
     "directories": ["src"],
     "files": [
         "LICENSE",
-        "README.md",
-        "public.key"
+        "README.md"
     ],
     "finder": [
         {
@@ -17,5 +18,6 @@
     "git-version": "package_version",
     "main": "src/EntryPoint/main.php",
     "output": "jupyter-php-installer.phar",
-    "stub": true
+    "stub": true,
+    "key": ".travis/phar_private.key"
 }
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": "5.*,>=5.5.9",
+        "php": ">=5.5.9",
         "symfony/console": "~3.0",
         "seld/cli-prompt": "~1.0"
     },
diff --git a/public.key b/public.key
diff --git a/src/Installer/Installer.php b/src/Installer/Installer.php
@@ -68,6 +68,12 @@ protected abstract function getInstallPath();
      */
     protected abstract function installKernel();
 
+    /**
+     * @param $installPath
+     * @return mixed
+     */
+    protected abstract function executeSilentComposerCommand($installPath);
+
     /**
      * @param string $installPath
      * @param bool $beVerbose
@@ -87,15 +93,7 @@ protected function executeComposerCommand($installPath, $beVerbose = false)
             );
             echo "\n";
         } else {
-            $composerOutputLines = [];
-            $composerOutput = exec(
-                'PATH=' . getenv('PATH') . ' ' .
-                $this->composerCmd . ' --prefer-dist --no-interaction --no-progress --working-dir="' .
-                $installPath .'" create-project litipk/jupyter-php=dev-master pkgs > /dev/null 2>&1 ',
-
-                $composerOutputLines,
-                $composerStatus
-            );
+            $composerStatus = $this->executeSilentComposerCommand($installPath);
         }
 
         if ($composerStatus !== 0) {
diff --git a/src/Installer/LinuxInstaller.php b/src/Installer/LinuxInstaller.php
@@ -7,7 +7,7 @@
 use Litipk\JupyterPhpInstaller\System\UnixSystem;
 
 
-final class LinuxInstaller extends Installer
+final class LinuxInstaller extends UnixInstaller
 {
     /**
      * LinuxInstaller constructor.
diff --git a/src/Installer/MacInstaller.php b/src/Installer/MacInstaller.php
@@ -7,7 +7,7 @@
 use Litipk\JupyterPhpInstaller\System\MacSystem;
 
 
-final class MacInstaller extends Installer
+final class MacInstaller extends UnixInstaller
 {
     /**
      * LinuxInstaller constructor.
diff --git a/src/Installer/UnixInstaller.php b/src/Installer/UnixInstaller.php
@@ -0,0 +1,28 @@
+<?php
+
+
+namespace Litipk\JupyterPhpInstaller\Installer;
+
+
+abstract class UnixInstaller extends Installer
+{
+    /**
+     * @param $installPath
+     * @return mixed
+     */
+    protected function executeSilentComposerCommand($installPath)
+    {
+        $composerOutputLines = [];
+
+        $composerOutput = exec(
+            'PATH=' . getenv('PATH') . ' ' .
+            $this->composerCmd . ' --prefer-dist --no-interaction --no-progress --working-dir="' .
+            $installPath . '" create-project litipk/jupyter-php=dev-master pkgs > /dev/null 2>&1 ',
+
+            $composerOutputLines,
+            $composerStatus
+        );
+
+        return $composerStatus;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUXU2ODDrbfdRatnMFgSzEJHvThGeNbvgo6WYKmy35ER+CctnVrC/SQ1tcXAHC+F6GKhSoJDMVazti3i9wp69bkYmGTY/OKbYltBP5wldtD4oF1mTmWzAB6EoiPac9BNddry57sHFH7N/zlQVSf9ZuMd3iXJLTTD6VJeVWuSTiIW/efby9ICVyoGEqnNBeoxDFD3L9w6tW9IPZHh5Sma2dzr3+C4TsEGFmDFYIEtK+Ar49XH03OH7hd5xALqxxSTE5c40Dt5N106ch6eKb2BhA9fVIFbS9/hhgh+ZV5n1Y53op0CDK8aadoQTzvQK/AdfSnDoX2hQWNBPAzyTJps6q2OoZdaV+gbAahsHwOgvRn4kYChUzU201DcRi4xMI2QkQ4f+NPUTgtJnvRbZUPRO7va7PLkXEEZqFv1Xs6sE1ua7fB7NUyLb9MrQznJrX7fOHE82veoDrqn2du3cEPJ/FATqL+dzynB6YjOk7J1F7qaxSAaURM3fG12dcbZYgfVKTDo+OieLEoYqtm8FGMTPM8xIQR8wm4euEDxsh6Ex4sDMHKXIRu88Hx9VPwYUzv1vIVQfbbKIc65G91zJm91cW5t0dsKY9QD2u2PzDY9EmwNfihRY+jMP2A47OSzNCaqdx/qj7SG7GUjnlvoi1/sKhGP5gNwVtuqSnVlogN0MXyQ== castarco@litipk.com
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Litipk\JupyterPhpInstaller\System\UnixSystem;`
`8`	`8`
`9`	`9`
`10`		`-final class LinuxInstaller extends Installer`
	`10`	`+final class LinuxInstaller extends UnixInstaller`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* LinuxInstaller constructor.`