Merge Request for v1.x.x

build/clarity.sh

@@ -1,10 +1,13 @@
 git subsplit init git@github.com:phalconslayer/framework.git
-git subsplit publish --heads="master dev" src/Clarity/Lang:git@github.com:ps-clarity/lang.git
-git subsplit publish --heads="master dev" src/Clarity/Mail:git@github.com:ps-clarity/mail.git
 git subsplit publish --heads="master dev" src/Clarity/Console:git@github.com:ps-clarity/console.git
-git subsplit publish --heads="master dev" src/Clarity:git@github.com:ps-clarity/kernel.git
-git subsplit publish --heads="master dev" src/Clarity/View:git@github.com:ps-clarity/view.git
-git subsplit publish --heads="master dev" src/Clarity/Support:git@github.com:ps-clarity/support.git
 git subsplit publish --heads="master dev" src/Clarity/Contracts:git@github.com:ps-clarity/contracts.git
 git subsplit publish --heads="master dev" src/Clarity/Exceptions:git@github.com:ps-clarity/exceptions.git
+#git subsplit publish --heads="master dev" src/Clarity/Facades:git@github.com:ps-clarity/facades.git
+#git subsplit publish --heads="master dev" src/Clarity/Kernel:git@github.com:ps-clarity/kernel.git
+git subsplit publish --heads="master dev" src/Clarity/Lang:git@github.com:ps-clarity/lang.git
+git subsplit publish --heads="master dev" src/Clarity/Mail:git@github.com:ps-clarity/mail.git
+#git subsplit publish --heads="master dev" src/Clarity/Providers:git@github.com:ps-clarity/providers.git
+git subsplit publish --heads="master dev" src/Clarity/Support:git@github.com:ps-clarity/support.git
+git subsplit publish --heads="master dev" src/Clarity/View:git@github.com:ps-clarity/view.git
+
 rm -rf .subsplit/

composer.json

@@ -25,6 +25,7 @@
         "classpreloader/classpreloader": "^2.0",
         "classpreloader/console": "^1.0",
         "fzaninotto/faker": "~1.4",
+        "guzzlehttp/guzzle": "6.1.*",
         "illuminate/support": "5.2.*",
         "illuminate/view": "5.2.*",
         "paragonie/random_compat": "1.1.*",

src/Clarity/Console/DB/SeedFactory.php

@@ -12,10 +12,9 @@ class SeedFactory extends SlayerCommand
 
     public function slash()
     {
+        $factory = new Factory($this);
         $files = folder_files(config()->path->database . 'factories');
 
-        $factory = new Factory;
-
         if ( !empty($files) ) {
 
             foreach ( $files as $file ) {
@@ -27,5 +26,7 @@ public function slash()
                 $this->info('Done.' . "\n");
             }
         }
+
+        return $this;
     }
 }

src/Clarity/Console/Server/EnvCommand.php

@@ -0,0 +1,21 @@
+<?php
+namespace Clarity\Console\Server;
+
+use Clarity\Console\CLI;
+use Clarity\Console\SlayerCommand;
+
+class EnvCommand extends SlayerCommand
+{
+    protected $name = 'env';
+    protected $description = 'Get current environment';
+
+    public function slash()
+    {
+        $timeout = $this->getInput()->getOption('timeout');
+
+        $this->info(
+            "\n".'Your current environment ['.config()->environment.']'."\n"
+            // .' | Timeout: '.$timeout
+        );
+    }
+}

src/Clarity/Console/SlayerCommand.php

@@ -1,19 +1,25 @@
 <?php
 namespace Clarity\Console;
 
+use Phalcon\Config;
 use Clarity\Services\ServiceMagicMethods;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Exception\InvalidOptionException;
 
 abstract class SlayerCommand extends Command
 {
     use ServiceMagicMethods;
 
     protected $input;
     protected $output;
+    protected $environment_option = true;
+    protected $timeout_option = true;
 
     abstract public function slash();
 
@@ -22,17 +28,68 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->input = $input;
         $this->output = $output;
 
+        $this->loadEnv();
+
+        $this->loadTimeout();
+
         $this->slash();
     }
 
+    protected function loadEnv()
+    {
+        $env = $this->getInput()->getOption('env');
+
+        config()->merge(new Config(['environment' => $env]));
+
+        $folder = '';
+
+        if ( $env !== 'production') {
+            $folder = $env;
+        }
+
+        $folder_path = url_trimmer(config()->path->config.'/'.$folder);
+
+        if ( file_exists($folder_path) === false ) {
+            throw new InvalidOptionException("Environment [$env] not found.");
+        }
+
+        config()->merge(
+            new Config(
+                iterate_require(folder_files($folder_path))
+            )
+        );
+
+        return $this;
+    }
+
+    protected function loadTimeout()
+    {
+        $timeout = $this->getInput()->getOption('timeout');
+
+        if ( $timeout !== 30 ) {
+            set_time_limit($timeout);
+        }
+
+        return $this;
+    }
+
+    protected function getInput()
+    {
+        return $this->input;
+    }
+
+    protected function getOutput()
+    {
+        return $this->output;
+    }
+
     protected function configure()
     {
         $this
             ->setName($this->name)
             ->setDescription($this->description);
 
-
-        if ( count($this->arguments()) ) {
+        if ( !empty($this->arguments()) ) {
 
             foreach ( $this->arguments() as $arg ) {
 
@@ -45,9 +102,30 @@ protected function configure()
             }
         }
 
-        if ( count($this->options()) ) {
+        if ( $this->environment_option ) {
+            $this->addOption(
+                'env',
+                'e',
+                InputOption::VALUE_OPTIONAL,
+                'The environment to be used',
+                'production'
+            );
+        }
+
+        if ( $this->timeout_option ) {
+            $this->addOption(
+                'timeout',
+                't',
+                InputOption::VALUE_OPTIONAL,
+                'Set timeout to bypass default execution time',
+                30
+            );
+        }
+
 
-            foreach ($this->options() as $opt) {
+        if ( !empty($this->options()) ) {
+
+            foreach ( $this->options() as $opt ) {
 
                 $this->addOption(
                     isset($opt[0]) ? $opt[0] : null,
@@ -91,6 +169,37 @@ public function error($string)
         $this->output->writeln("<error>$string</error>");
     }
 
+    public function exception($e)
+    {
+        $message = sprintf(
+            '%s: %s (uncaught exception) at %s line %s',
+            get_class($e),
+            $e->getMessage(),
+            $e->getFile(),
+            $e->getLine()
+        );
+
+        $this->error("\n".$message."\n");
+    }
+
+    public function ask($message, $default)
+    {
+        $helper = $this->getHelper('question');
+
+        $question = new Question($message, $default);
+
+        return $helper->ask($this->input, $this->output, $question);
+    }
+
+    public function confirm($message)
+    {
+        $helper = $this->getHelper('question');
+
+        $question = new ConfirmationQuestion($message, false);
+
+        return $helper->ask($this->input, $this->output, $question);
+    }
+
     public function callDumpAutoload()
     {
         CLI::bash([

src/Clarity/Console/Vendor/PublishCommand.php

@@ -8,32 +8,46 @@
 
 class PublishCommand extends SlayerCommand
 {
-    protected $name        = 'vendor:publish';
-
+    protected $name = 'vendor:publish';
     protected $description = 'Publish a vendor package';
 
     public function slash()
     {
+        $tag_name = $this->input->getOption('tag');
         $alias = $this->input->getArgument('alias');
-        $tag = $this->input->getOption('tag');
 
         foreach (config()->app->services as $service) {
+
             $obj = new $service;
-            if ($alias != $obj->getAlias()) {
+
+            if ( $alias != $obj->getAlias() ) {
                 continue;
             }
 
             $obj->boot();
 
             try {
-                $tags = $obj->getToBePublished($tag);
+                $tags = $obj->getToBePublished($tag_name);
+
+                foreach ($tags as $tag_name => $tag) {
 
-                foreach ($tags as $tag) {
                     foreach ($tag as $source => $dest) {
+
+                        $are_you_sure = 'Are you sure you want to '.
+                                        'publish "'.$tag_name.'"? [y/n]: ';
+
+                        if ( ! $this->confirm($are_you_sure) ) {
+                            continue;
+                        }
+
                         cp($source, $dest);
+
+                        $this->info("Publishing tag \"$tag_name\" from [$source] to [$dest]");
                     }
                 }
+
             } catch (Exception $e) {
+
                 $this->error($e->getMessage());
             }
         }

src/Clarity/Kernel.php → src/Clarity/Kernel/Kernel.php

@@ -1,5 +1,5 @@
 <?php
-namespace Clarity;
+namespace Clarity\Kernel;
 
 use Clarity\Providers\Log;
 use Clarity\Services\Service\ServiceContainer;
@@ -9,7 +9,7 @@ class Kernel
     use KernelTrait;
 
     private $di;
-    private $app;
+    private $env;
     private $path;
     private $modules;
 
@@ -22,10 +22,6 @@ public function initialize()
         $this->loadTimeZone();
 
         $this->loadServices();
-
-        $this->di->set('app', function() {
-            return $this->app;
-        });
     }
 
     /**
@@ -52,14 +48,31 @@ public function setModules($modules)
         return $this;
     }
 
+    /**
+     * Set the environment
+     *
+     * @param string $env
+     */
+    public function setEnvironment($env)
+    {
+        $this->env = $env;
+
+        return $this;
+    }
+
+    public function getEnvironment()
+    {
+        return $this->env;
+    }
+
     /**
      * Register modules
      *
      * @return mixed
      */
     public function modules()
     {
-        $this->app->registerModules($this->modules);
+        di()->get('application')->registerModules($this->modules);
 
         return $this;
     }
@@ -69,7 +82,7 @@ public function modules()
      */
     public function render()
     {
-        echo $this->app->handle()->getContent();
+        echo di()->get('application')->handle()->getContent();
     }
 
     /**
@@ -80,7 +93,7 @@ public function render()
      */
     public function run($module_name)
     {
-        $this->app->setDefaultModule($module_name);
+        di()->get('application')->setDefaultModule($module_name);
 
         $path = url_trimmer(config()->path->app.'/'.$module_name.'/routes.php');