Merge branch 'master' of github.com:dalailomo/ace

dalailomo · Dec 3, 2017 · 1c173c5 · 1c173c5
2 parents 1343199 + df3cdcb
commit 1c173c5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/Helper/Env.php b/src/Helper/Env.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace DalaiLomo\ACE\Helper;
+
+class Env
+{
+    public static function getPager()
+    {
+        $envPager = trim(shell_exec('echo $PAGER'));
+
+        return false === empty($envPager) ? $envPager : 'less';
+    }
+
+    public static function getEditor()
+    {
+        $envEditor = trim(shell_exec('echo $EDITOR'));
+
+        return false === empty($envEditor) ? $envEditor : 'nano';
+    }
+}
diff --git a/src/Setup/Section/EditConfigurationFileSection.php b/src/Setup/Section/EditConfigurationFileSection.php
@@ -2,6 +2,7 @@
 
 namespace DalaiLomo\ACE\Setup\Section;
 
+use DalaiLomo\ACE\Helper\Env;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
 
@@ -14,7 +15,7 @@ public function getSectionName()
 
     public function doAction()
     {
-        $process = new Process('vim ' . $this->config->getConfigFilePath());
+        $process = new Process(Env::getEditor() . ' ' . $this->config->getConfigFilePath());
 
         try {
             $process->setTty(true);

diff --git a/src/Setup/Section/ListCommandGroupsSection.php b/src/Setup/Section/ListCommandGroupsSection.php
@@ -4,6 +4,7 @@
 
 use DalaiLomo\ACE\Helper\CommandOutputHelper;
 use RomaricDrigon\MetaYaml\Exception\NodeValidatorException;
+use DalaiLomo\ACE\Helper\Env;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
 
@@ -31,7 +32,7 @@ public function doAction()
         }
 
         file_put_contents(self::TMP_FILE, $this->config->getSummary());
-        $process = new Process('less ' . self::TMP_FILE);
+        $process = new Process(Env::getPager() . ' ' . self::TMP_FILE);
 
         try {
             $process->setTty(true);

diff --git a/src/Setup/Section/LogViewerSection/LogFileSection.php b/src/Setup/Section/LogViewerSection/LogFileSection.php
@@ -3,6 +3,7 @@
 namespace DalaiLomo\ACE\Setup\Section\LogViewerSection;
 
 use DalaiLomo\ACE\Helper\CommandOutputHelper;
+use DalaiLomo\ACE\Helper\Env;
 use DalaiLomo\ACE\Log\LogDecorator;
 use DalaiLomo\ACE\Setup\Section\AbstractSection;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -31,7 +32,7 @@ public function getSectionName()
     public function doAction()
     {
         file_put_contents(self::TMP_FILE, $this->logDecorator->getStreamsOutput());
-        $process = new Process('less ' . self::TMP_FILE);
+        $process = new Process(Env::getPager() . ' ' . self::TMP_FILE);
 
         try {
             $process->setTty(true);