ci-bonfire / Sprint

myth/CIModules/database/controllers/Database.php

Indentation +224 added lines, -224 removed lines

@@ -35,207 +35,207 @@ 
 class Database extends \Myth\Controllers\CLIController
 {
 
-    protected $descriptions = [
-        'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
-        'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
-        'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
-        'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
-        'seed'          => ['seed [$name]',         'Runs the named database seeder.']
-    ];
-
-    protected $long_descriptions = [
-        'migrate'       => '',
-        'quietMigrate'  => '',
-        'refresh'       => '',
-        'newMigration'  => '',
-        'seed'          => ''
-    ];
-
-    //-------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Migration Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a command-line interface to the migration scripts.
-     * If no $to is provided, will migrate to the latest version.
-     *
-     * Example:
-     *      > php index.php database migrate
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @param bool $silent If TRUE, will NOT display any prompts for verification.
-     * @return bool|void
-     */
-    public function migrate($type=null, $to = null, $silent = false)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        // We need to append 'mod:' to properly handle modules, if
-        // the $type is not one of the recognized migration groups.
-        $this->config->load('migration');
-        $groups = config_item('migration_paths');
-        $groups = array_keys($groups);
-
-        // If it's not in the groups list, then assume it's a module.
-        if (! in_array($type, $groups))
-        {
-            if (strpos($type, 'mod:') !== 0)
-            {
-                $type = 'mod:'. $type;
-            }
-        }
-
-        unset($groups);
-
-        // Get our stats on the migrations
-        $latest = $this->migration->get_latest($type);
-        $latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
-
-        if (empty($latest)) {
-            return CLI::write("\tNo migrations found.", 'yellow');
-        }
-
-        $current = $this->migration->get_version($type);
-
-        // Already at the desired version?
-        if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
-        {
-            return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
-        }
-
-        $target = is_null($to) ? $latest : $to;
-
-        // Just to be safe, verify with the user they want to migrate
-        // to the latest version.
-        if (is_null($to)) {
-            // If we're in silent mode, don't prompt, just go to the latest...
-            if (! $silent) {
-                $go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
-
-                if ($go_ahead == 'n') {
-                    return CLI::write('Bailing...', 'yellow');
-                }
-            }
-
-            if (! $this->migration->latest($type)) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        } else {
-            if ($this->migration->version($type, $to) === false) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        }
-
-        return $silent ? true :
-            CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Performs a migration that does not prompt for any information.
-     * Suitable for use within automated scripts that can't be
-     * bothered with answering questions.
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @return bool|void
-     */
-    public function quietMigrate($type='app', $to = null)
-    {
-        return $this->migrate($type, $to, true);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Migrates the database back to 0, then back up to the latest version.
-     *
-     * @param string $type  The group or module to refresh.
-     * @return mixed
-     */
-    public function refresh($type=null)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        if ($this->migration->version($type, 0) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write(CLI::color("\tCleared the database.", 'green'));
-
-        if ($this->migration->latest($type) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write("\tRe-installed the database to the latest migration.", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new migration file ready to be used.
-     *
-     * @param $name
-     */
-    public function newMigration($name = null, $type = 'app')
-    {
-        if (empty($name)) {
-            $name = CLI::prompt('Migration name? ');
-
-            if (empty($name)) {
-                return CLI::error("\tYou must provide a migration name.", 'red');
-            }
-        }
-
-        $this->load->library('migration');
-
-        $path = $this->migration->determine_migration_path($type);
-
-        // Does the alias path exist in our config?
-        if (! $path) {
-            return CLI::error("\tThe migration path for '{$type}' does not exist.'");
-        }
-
-        // Does the path really exist?
-        if (! is_dir($path)) {
-            return CLI::error("\tThe path for '{$type}' is not a directory.");
-        }
-
-        // Is the folder writeable?
-        if (! is_writeable($path)) {
-            return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
-        }
-
-        $file = $this->migration->make_name($name);
-
-        $path = rtrim($path, '/') .'/'. $file;
-
-        $contents = <<<EOT
+	protected $descriptions = [
+		'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
+		'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
+		'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
+		'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
+		'seed'          => ['seed [$name]',         'Runs the named database seeder.']
+	];
+
+	protected $long_descriptions = [
+		'migrate'       => '',
+		'quietMigrate'  => '',
+		'refresh'       => '',
+		'newMigration'  => '',
+		'seed'          => ''
+	];
+
+	//-------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Migration Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a command-line interface to the migration scripts.
+	 * If no $to is provided, will migrate to the latest version.
+	 *
+	 * Example:
+	 *      > php index.php database migrate
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @param bool $silent If TRUE, will NOT display any prompts for verification.
+	 * @return bool|void
+	 */
+	public function migrate($type=null, $to = null, $silent = false)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		// We need to append 'mod:' to properly handle modules, if
+		// the $type is not one of the recognized migration groups.
+		$this->config->load('migration');
+		$groups = config_item('migration_paths');
+		$groups = array_keys($groups);
+
+		// If it's not in the groups list, then assume it's a module.
+		if (! in_array($type, $groups))
+		{
+			if (strpos($type, 'mod:') !== 0)
+			{
+				$type = 'mod:'. $type;
+			}
+		}
+
+		unset($groups);
+
+		// Get our stats on the migrations
+		$latest = $this->migration->get_latest($type);
+		$latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
+
+		if (empty($latest)) {
+			return CLI::write("\tNo migrations found.", 'yellow');
+		}
+
+		$current = $this->migration->get_version($type);
+
+		// Already at the desired version?
+		if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
+		{
+			return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
+		}
+
+		$target = is_null($to) ? $latest : $to;
+
+		// Just to be safe, verify with the user they want to migrate
+		// to the latest version.
+		if (is_null($to)) {
+			// If we're in silent mode, don't prompt, just go to the latest...
+			if (! $silent) {
+				$go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
+
+				if ($go_ahead == 'n') {
+					return CLI::write('Bailing...', 'yellow');
+				}
+			}
+
+			if (! $this->migration->latest($type)) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		} else {
+			if ($this->migration->version($type, $to) === false) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		}
+
+		return $silent ? true :
+			CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs a migration that does not prompt for any information.
+	 * Suitable for use within automated scripts that can't be
+	 * bothered with answering questions.
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @return bool|void
+	 */
+	public function quietMigrate($type='app', $to = null)
+	{
+		return $this->migrate($type, $to, true);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Migrates the database back to 0, then back up to the latest version.
+	 *
+	 * @param string $type  The group or module to refresh.
+	 * @return mixed
+	 */
+	public function refresh($type=null)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		if ($this->migration->version($type, 0) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write(CLI::color("\tCleared the database.", 'green'));
+
+		if ($this->migration->latest($type) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write("\tRe-installed the database to the latest migration.", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new migration file ready to be used.
+	 *
+	 * @param $name
+	 */
+	public function newMigration($name = null, $type = 'app')
+	{
+		if (empty($name)) {
+			$name = CLI::prompt('Migration name? ');
+
+			if (empty($name)) {
+				return CLI::error("\tYou must provide a migration name.", 'red');
+			}
+		}
+
+		$this->load->library('migration');
+
+		$path = $this->migration->determine_migration_path($type);
+
+		// Does the alias path exist in our config?
+		if (! $path) {
+			return CLI::error("\tThe migration path for '{$type}' does not exist.'");
+		}
+
+		// Does the path really exist?
+		if (! is_dir($path)) {
+			return CLI::error("\tThe path for '{$type}' is not a directory.");
+		}
+
+		// Is the folder writeable?
+		if (! is_writeable($path)) {
+			return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
+		}
+
+		$file = $this->migration->make_name($name);
+
+		$path = rtrim($path, '/') .'/'. $file;
+
+		$contents = <<<EOT
 <?php
 
 /**
@@ -262,36 +262,36 @@ 
 
 }
 EOT;
-        $contents = str_replace('{name}', $name, $contents);
-        $contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
-        $contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
+		$contents = str_replace('{name}', $name, $contents);
+		$contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
+		$contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
 
-        $this->load->helper('file');
+		$this->load->helper('file');
 
-        if (write_file($path, $contents)) {
-            return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
-        }
+		if (write_file($path, $contents)) {
+			return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
+		}
 
-        return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
-    }
+		return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    //--------------------------------------------------------------------
-    // Seeding Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Seeding Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Installs any database seeds stored in database/seeds. Seeds just need to
-     * extend the Seeder class and have a method named run.
-     */
-    public function seed($name = null)
-    {
-        $this->load->library('seeder');
+	/**
+	 * Installs any database seeds stored in database/seeds. Seeds just need to
+	 * extend the Seeder class and have a method named run.
+	 */
+	public function seed($name = null)
+	{
+		$this->load->library('seeder');
 
-        $this->seeder->call($name);
-    }
+		$this->seeder->call($name);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/database/libraries/Seeder.php

Indentation +63 added lines, -63 removed lines

@@ -39,92 +39,92 @@
  */
 class Seeder {
 
-    public $error_string    = '';
+	public $error_string    = '';
 
-    protected $ci;
+	protected $ci;
 
-    protected $is_cli = false;
+	protected $is_cli = false;
 
-    protected $db;
-    protected $dbforge;
+	protected $db;
+	protected $dbforge;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct ()
-    {
-        $this->ci =& get_instance();
+	public function __construct ()
+	{
+		$this->ci =& get_instance();
 
-        $this->is_cli = $this->ci->input->is_cli_request();
+		$this->is_cli = $this->ci->input->is_cli_request();
 
-        if ($this->is_cli)
-        {
-            $cli = new CLI();
-            $cli::_init();
-        }
+		if ($this->is_cli)
+		{
+			$cli = new CLI();
+			$cli::_init();
+		}
 
-        $this->ci->load->dbforge();
+		$this->ci->load->dbforge();
 
-        // Setup some convenience vars.
-        $this->db       =& $this->ci->db;
-        $this->dbforge  =& $this->ci->dbforge;
-    }
+		// Setup some convenience vars.
+		$this->db       =& $this->ci->db;
+		$this->dbforge  =& $this->ci->dbforge;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Run the database seeds. It's where the magic happens.
-     * This method MUST be overridden by child classes.
-     */
-    public function run ()
-    {
+	/**
+	 * Run the database seeds. It's where the magic happens.
+	 * This method MUST be overridden by child classes.
+	 */
+	public function run ()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Loads the class file and calls the run() method
-     * on the class.
-     *
-     * @param $class
-     */
-    public function call ($class)
-    {
-        if (empty($class))
-        {
-            // Ask the user...
-            $class = trim( CLI::prompt("Seeder name") );
+	/**
+	 * Loads the class file and calls the run() method
+	 * on the class.
+	 *
+	 * @param $class
+	 */
+	public function call ($class)
+	{
+		if (empty($class))
+		{
+			// Ask the user...
+			$class = trim( CLI::prompt("Seeder name") );
 
-            if (empty($class)) {
-                return CLI::error("\tNo Seeder was specified.");
-            }
-        }
+			if (empty($class)) {
+				return CLI::error("\tNo Seeder was specified.");
+			}
+		}
 
-        $path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
+		$path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
 
-        if ( ! is_file($path))
-        {
-            return CLI::error("\tUnable to find seed class: ". $class);
-        }
+		if ( ! is_file($path))
+		{
+			return CLI::error("\tUnable to find seed class: ". $class);
+		}
 
-        try {
-            require $path;
+		try {
+			require $path;
 
-            $seeder = new $class();
+			$seeder = new $class();
 
-            $seeder->run();
+			$seeder->run();
 
-            unset($seeder);
-        }
-        catch (\Exception $e)
-        {
-            show_error($e->getMessage(), $e->getCode());
-        }
+			unset($seeder);
+		}
+		catch (\Exception $e)
+		{
+			show_error($e->getMessage(), $e->getCode());
+		}
 
-        return Cli::write("\tSeeded: $class", 'green');
-    }
+		return Cli::write("\tSeeded: $class", 'green');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/docs/config/docs.php

Indentation +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 | if realpath cannot find/read the folder.
 */
 $config['docs.folders'] = [
-    'application'   => APPPATH .'docs',
-    'developer'     => APPPATH .'../myth/_docs_src'
+	'application'   => APPPATH .'docs',
+	'developer'     => APPPATH .'../myth/_docs_src'
 ];
 
 /*

myth/CIModules/forge/controllers/Forge.php

Indentation +168 added lines, -168 removed lines

@@ -34,133 +34,133 @@ 
 
 class Forge extends \Myth\Controllers\CLIController {
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
-    }
+		$this->load->config('forge');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    public function _remap($method, $params)
-    {
-        if (method_exists($this, $method))
-        {
-            call_user_func_array( [$this, $method], $params);
-        }
-        else
-        {
-	        $params = array_merge([CLI::cli_string()], $params);
+	public function _remap($method, $params)
+	{
+		if (method_exists($this, $method))
+		{
+			call_user_func_array( [$this, $method], $params);
+		}
+		else
+		{
+			$params = array_merge([CLI::cli_string()], $params);
 
-            call_user_func_array( [$this, 'run'], $params);
-        }
-    }
+			call_user_func_array( [$this, 'run'], $params);
+		}
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Overrides to implement dynamic description building based on
-     * scanning the collections and grabbing the information from
-     * 'forge.php' files.
-     */
-    public function index()
-    {
-        $collections = config_item('forge.collections');
-
-        if (! is_array($collections) || ! count($collections) )
-        {
-            return CLI::error('No generator collections found.');
-        }
-
-        // We loop through each collection scanning
-        // for any generator folders that have a
-        // 'forge.php' file. For each one found
-        // we build out another section in our help commands
-        foreach ($collections as $alias => $path)
-        {
-            $path = rtrim($path, '/ ') .'/';
-            $folders = scandir($path);
-
-            $_descriptions = [];
-
-            foreach ($folders as $dir)
-            {
-                if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
-                {
-                    continue;
-                }
-
-                include $path . $dir .'/forge.php';
-
-                // Don't have valid arrays to work with? Move along...
-                if (! isset($descriptions))
-                {
-                    log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
-                    continue;
-                }
-
-                $_descriptions = array_merge($descriptions, $_descriptions);
-            }
-
-	        ksort($_descriptions);
-
-            CLI::new_line();
-            CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
-            $this->sayDescriptions($_descriptions);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * The primary method that calls the correct generator and
-     * makes it run.
-     */
-    public function run($command)
-    {
-	    $quiet = false;
-
-	    $segments = explode(" ", $command);
-
-	    // Get rid of the 'forge' command
-	    if ($segments[0] == 'forge') {
-		    array_shift( $segments );
-	    }
-
-	    $command = trim(str_ireplace("forge", '', array_shift($segments)));
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overrides to implement dynamic description building based on
+	 * scanning the collections and grabbing the information from
+	 * 'forge.php' files.
+	 */
+	public function index()
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			$_descriptions = [];
+
+			foreach ($folders as $dir)
+			{
+				if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
+				{
+					continue;
+				}
+
+				include $path . $dir .'/forge.php';
+
+				// Don't have valid arrays to work with? Move along...
+				if (! isset($descriptions))
+				{
+					log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
+					continue;
+				}
+
+				$_descriptions = array_merge($descriptions, $_descriptions);
+			}
+
+			ksort($_descriptions);
+
+			CLI::new_line();
+			CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
+			$this->sayDescriptions($_descriptions);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The primary method that calls the correct generator and
+	 * makes it run.
+	 */
+	public function run($command)
+	{
+		$quiet = false;
+
+		$segments = explode(" ", $command);
+
+		// Get rid of the 'forge' command
+		if ($segments[0] == 'forge') {
+			array_shift( $segments );
+		}
+
+		$command = trim(str_ireplace("forge", '', array_shift($segments)));
 
 		$dir = $this->locateGenerator($command);
 
 		$class_name = ucfirst($command) .'Generator';
 
-	    if (! file_exists($dir . $class_name .'.php'))
-	    {
-		    return CLI::error("Generator file not found for: {$class_name}");
-	    }
+		if (! file_exists($dir . $class_name .'.php'))
+		{
+			return CLI::error("Generator file not found for: {$class_name}");
+		}
 
 		require_once $dir . $class_name .'.php';
 
-	    if (! class_exists($class_name, false))
-	    {
-		    return CLI::error("No class `{$class_name}` found in generator file.");
-	    }
+		if (! class_exists($class_name, false))
+		{
+			return CLI::error("No class `{$class_name}` found in generator file.");
+		}
 
-	    // Should we run the process quietly?
-	    if ( (CLI::option('q') || CLI::option('quiet')))
-	    {
-		    $quiet = true;
-	    }
+		// Should we run the process quietly?
+		if ( (CLI::option('q') || CLI::option('quiet')))
+		{
+			$quiet = true;
+		}
 
-	    CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
+		CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
 
 		$class = new $class_name();
 
-	    $class->run( $segments, $quiet );
-    }
+		$class->run( $segments, $quiet );
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Displays the readme file for a generator if it exists.
@@ -205,67 +205,67 @@ 
 	//--------------------------------------------------------------------
 
 
-    /**
-     * Overrides CLIController's version to support searching our
-     * collections for the help description.
-     *
-     * @param null $method
-     */
-    public function longDescribeMethod($method=null)
-    {
-	    $collections = config_item('forge.collections');
-
-	    if (! is_array($collections) || ! count($collections) )
-	    {
-		    return CLI::error('No generator collections found.');
-	    }
-
-	    // We loop through each collection scanning
-	    // for any generator folders that have a
-	    // 'forge.php' file. For each one found
-	    // we build out another section in our help commands
-	    foreach ($collections as $alias => $path)
-	    {
-
-		    $path = rtrim($path, '/ ') .'/';
-		    $folders = scandir($path);
-
-		    if (! $i = array_search(ucfirst($method), $folders))
-		    {
-			    continue;
-		    }
-
-		    $dir = $path . $folders[$i] .'/';
-
-		    if (! is_file($dir .'/forge.php'))
-		    {
-			    CLI::error("The {$method} command does not have any cli help available.");
-		    }
-
-		    include $dir .'/forge.php';
-
-		    // Don't have valid arrays to work with? Move along...
-		    if (! isset($long_description))
-		    {
-			    log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
-			    continue;
-		    }
-
-		    if (empty($long_description))
-		    {
-			    return CLI::error("The {$method} command does not have an cli help available.");
-		    }
-
-		    CLI::new_line();
-		    CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
-		    return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
-	    }
-
-	    // Still here?
-	    CLI::error("No help found for command: {$method}");
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Overrides CLIController's version to support searching our
+	 * collections for the help description.
+	 *
+	 * @param null $method
+	 */
+	public function longDescribeMethod($method=null)
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			if (! $i = array_search(ucfirst($method), $folders))
+			{
+				continue;
+			}
+
+			$dir = $path . $folders[$i] .'/';
+
+			if (! is_file($dir .'/forge.php'))
+			{
+				CLI::error("The {$method} command does not have any cli help available.");
+			}
+
+			include $dir .'/forge.php';
+
+			// Don't have valid arrays to work with? Move along...
+			if (! isset($long_description))
+			{
+				log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
+				continue;
+			}
+
+			if (empty($long_description))
+			{
+				return CLI::error("The {$method} command does not have an cli help available.");
+			}
+
+			CLI::new_line();
+			CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
+			return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
+		}
+
+		// Still here?
+		CLI::error("No help found for command: {$method}");
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Scans through the collections for the folder for this generator.

myth/CLI.php

Indentation +511 added lines, -511 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * Part of the Fuel framework.
- *
- * @package    Fuel
- * @version    1.7
- * @author     Fuel Development Team
- * @license    MIT License
- * @copyright  2010 - 2013 Fuel Development Team
- * @link       http://fuelphp.com
- */
+	 * Part of the Fuel framework.
+	 *
+	 * @package    Fuel
+	 * @version    1.7
+	 * @author     Fuel Development Team
+	 * @license    MIT License
+	 * @copyright  2010 - 2013 Fuel Development Team
+	 * @link       http://fuelphp.com
+	 */
 
 /**
  * Modified to work with CodeIgniter by Lonnie Ezell.
@@ -30,506 +30,506 @@ 
  */
 class CLI {
 
-    public static $readline_support = false;
+	public static $readline_support = false;
 
-    public static $wait_msg = 'Press any key to continue...';
+	public static $wait_msg = 'Press any key to continue...';
 
-    public static $segments = [];
+	public static $segments = [];
 
 	protected static $options = [];
 
 	protected static $initialized = false;
 
-    // Used by progress bar
-    protected static $inProgress = false;
-
-    protected static $foreground_colors = array(
-        'black'			=> '0;30',
-        'dark_gray'		=> '1;30',
-        'blue'			=> '0;34',
-        'dark_blue'		=> '1;34',
-        'light_blue'	=> '1;34',
-        'green'			=> '0;32',
-        'light_green'	=> '1;32',
-        'cyan'			=> '0;36',
-        'light_cyan'	=> '1;36',
-        'red'			=> '0;31',
-        'light_red'		=> '1;31',
-        'purple'		=> '0;35',
-        'light_purple'	=> '1;35',
-        'light_yellow'	=> '0;33',
-        'yellow'		=> '1;33',
-        'light_gray'	=> '0;37',
-        'white'			=> '1;37',
-    );
-
-    protected static $background_colors = array(
-        'black'			=> '40',
-        'red'			=> '41',
-        'green'			=> '42',
-        'yellow'		=> '43',
-        'blue'			=> '44',
-        'magenta'		=> '45',
-        'cyan'			=> '46',
-        'light_gray'	=> '47',
-    );
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Static constructor.	Parses all the CLI params.
-     */
-    public static function _init()
-    {
-	    if (static::$initialized === true)
-	    {
-		    return;
-	    }
-
-        if ( ! (PHP_SAPI === 'cli' || defined('STDIN')) )
-        {
-            throw new \Exception('Cli class cannot be used outside of the command line.');
-        }
-
-	    self::parseCommand();
-
-        // Readline is an extension for PHP that makes interactive with PHP much more bash-like
-        // http://www.php.net/manual/en/readline.installation.php
-        static::$readline_support = extension_loaded('readline');
-
-	    static::$initialized = true;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Grabs an individual
-     *
-     * @param $index
-     * @return null
-     */
-    public static function segment($index)
-    {
-        if (! isset(static::$segments[$index - 1]))
-        {
-            return null;
-        }
-
-        return static::$segments[$index - 1];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the command string portion of the arguments. Used
-     * by the 'sprint' CLI script to grab the portion of the arguments
-     * that is used to call the CodeIgniter application.
-     *
-     * @return string
-     */
-    public static function cli_string()
-    {
-        return implode(' ', static::$segments);
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Get input from the shell, using readline or the standard STDIN
-     *
-     * Named options must be in the following formats:
-     * php index.php user -v --v -name=John --name=John
-     *
-     * @param	string|int	$name	the name of the option (int if unnamed)
-     * @return	string
-     */
-    public static function input($prefix = '')
-    {
-        if (static::$readline_support)
-        {
-            return readline($prefix);
-        }
-
-        echo $prefix;
-        return fgets(STDIN);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Asks the user for input.  This can have either 1 or 2 arguments.
-     *
-     * Usage:
-     *
-     * // Waits for any key press
-     * CLI::prompt();
-     *
-     * // Takes any input
-     * $color = CLI::prompt('What is your favorite color?');
-     *
-     * // Takes any input, but offers default
-     * $color = CLI::prompt('What is your favourite color?', 'white');
-     *
-     * // Will only accept the options in the array
-     * $ready = CLI::prompt('Are you ready?', array('y','n'));
-     *
-     * @return	string	the user input
-     */
-    public static function prompt()
-    {
-        $args = func_get_args();
-
-        $options = array();
-        $output = '';
-        $default = null;
-
-        // How many we got
-        $arg_count = count($args);
-
-        // Is the last argument a boolean? True means required
-        $required = end($args) === true;
-
-        // Reduce the argument count if required was passed, we don't care about that anymore
-        $required === true and --$arg_count;
-
-        // This method can take a few crazy combinations of arguments, so lets work it out
-        switch ($arg_count)
-        {
-            case 2:
-
-                // E.g: $ready = CLI::prompt('Are you ready?', array('y','n'));
-                if (is_array($args[1]))
-                {
-                    list($output, $options)=$args;
-                }
-
-                // E.g: $color = CLI::prompt('What is your favourite color?', 'white');
-                elseif (is_string($args[1]))
-                {
-                    list($output, $default)=$args;
-                }
-
-                break;
-
-            case 1:
-
-                // No question (probably been asked already) so just show options
-                // E.g: $ready = CLI::prompt(array('y','n'));
-                if (is_array($args[0]))
-                {
-                    $options = $args[0];
-                }
-
-                // Question without options
-                // E.g: $ready = CLI::prompt('What did you do today?');
-                elseif (is_string($args[0]))
-                {
-                    $output = $args[0];
-                }
-
-                break;
-        }
-
-        // If a question has been asked with the read
-        if ($output !== '')
-        {
-            $extra_output = '';
-
-            if ($default !== null)
-            {
-                $extra_output = ' [ Default: "'.$default.'" ]';
-            }
-
-            elseif ($options !== array())
-            {
-                $extra_output = ' [ '.implode(', ', $options).' ]';
-            }
-
-            fwrite(STDOUT, $output.$extra_output.': ');
-        }
-
-        // Read the input from keyboard.
-        $input = trim(static::input()) ?: $default;
-
-        // No input provided and we require one (default will stop this being called)
-        if (empty($input) and $required === true)
-        {
-            static::write('This is required.');
-            static::new_line();
-
-            $input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
-        }
-
-        // If options are provided and the choice is not in the array, tell them to try again
-        if ( ! empty($options) and ! in_array($input, $options))
-        {
-            static::write('This is not a valid option. Please try again.');
-            static::new_line();
-
-            $input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
-        }
-
-        return $input;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Outputs a string to the cli.	 If you send an array it will implode them
-     * with a line break.
-     *
-     * @param	string|array	$text	the text to output, or array of lines
-     */
-    public static function write($text = '', $foreground = null, $background = null)
-    {
-        if (is_array($text))
-        {
-            $text = implode(PHP_EOL, $text);
-        }
-
-        if ($foreground or $background)
-        {
-            $text = static::color($text, $foreground, $background);
-        }
-
-        fwrite(STDOUT, $text.PHP_EOL);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Outputs an error to the CLI using STDERR instead of STDOUT
-     *
-     * @param	string|array	$text	the text to output, or array of errors
-     */
-    public static function error($text = '', $foreground = 'light_red', $background = null)
-    {
-        if (is_array($text))
-        {
-            $text = implode(PHP_EOL, $text);
-        }
-
-        if ($foreground OR $background)
-        {
-            $text = static::color($text, $foreground, $background);
-        }
-
-        fwrite(STDERR, $text.PHP_EOL);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Beeps a certain number of times.
-     *
-     * @param	int $num	the number of times to beep
-     */
-    public static function beep($num = 1)
-    {
-        echo str_repeat("\x07", $num);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Waits a certain number of seconds, optionally showing a wait message and
-     * waiting for a key press.
-     *
-     * @param	int		$seconds	number of seconds
-     * @param	bool	$countdown	show a countdown or not
-     */
-    public static function wait($seconds = 0, $countdown = false)
-    {
-        if ($countdown === true)
-        {
-            $time = $seconds;
-
-            while ($time > 0)
-            {
-                fwrite(STDOUT, $time.'... ');
-                sleep(1);
-                $time--;
-            }
-            static::write();
-        }
-
-        else
-        {
-            if ($seconds > 0)
-            {
-                sleep($seconds);
-            }
-            else
-            {
-                static::write(static::$wait_msg);
-                static::input();
-            }
-        }
-    }
-
-
-    //--------------------------------------------------------------------
-
-    /**
-     * if operating system === windows
-     */
-    public static function is_windows()
-    {
-        return 'win' === strtolower(substr(php_uname("s"), 0, 3));
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Enter a number of empty lines
-     *
-     * @param	integer	Number of lines to output
-     * @return	void
-     */
-    public static function new_line($num = 1)
-    {
-        // Do it once or more, write with empty string gives us a new line
-        for($i = 0; $i < $num; $i++)
-        {
-            static::write();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Clears the screen of output
-     *
-     * @return	void
-     */
-    public static function clear_screen()
-    {
-        static::is_windows()
-
-            // Windows is a bit crap at this, but their terminal is tiny so shove this in
-            ? static::new_line(40)
-
-            // Anything with a flair of Unix will handle these magic characters
-            : fwrite(STDOUT, chr(27)."[H".chr(27)."[2J");
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the given text with the correct color codes for a foreground and
-     * optionally a background color.
-     *
-     * @param	string	$text		the text to color
-     * @param	string	$foreground the foreground color
-     * @param	string	$background the background color
-     * @param	string	$format		other formatting to apply. Currently only 'underline' is understood
-     * @return	string	the color coded string
-     */
-    public static function color($text, $foreground, $background = null, $format=null)
-    {
-        if (static::is_windows() and ! isset($_SERVER['ANSICON']))
-        {
-            return $text;
-        }
-
-        if ( ! array_key_exists($foreground, static::$foreground_colors))
-        {
-            throw new \RuntimeException('Invalid CLI foreground color: '.$foreground);
-        }
-
-        if ( $background !== null and ! array_key_exists($background, static::$background_colors))
-        {
-            throw new \RuntimeException('Invalid CLI background color: '.$background);
-        }
-
-        $string = "\033[".static::$foreground_colors[$foreground]."m";
-
-        if ($background !== null)
-        {
-            $string .= "\033[".static::$background_colors[$background]."m";
-        }
-
-        if ($format === 'underline')
-        {
-            $string .= "\033[4m";
-        }
-
-        $string .= $text."\033[0m";
-
-        return $string;
-    }
-
-    //--------------------------------------------------------------------
-
-    public static function getWidth($default=80)
-    {
-        if (static::is_windows())
-        {
-            return $default;
-        }
-
-        return (int)shell_exec('tput cols');
-    }
+	// Used by progress bar
+	protected static $inProgress = false;
+
+	protected static $foreground_colors = array(
+		'black'			=> '0;30',
+		'dark_gray'		=> '1;30',
+		'blue'			=> '0;34',
+		'dark_blue'		=> '1;34',
+		'light_blue'	=> '1;34',
+		'green'			=> '0;32',
+		'light_green'	=> '1;32',
+		'cyan'			=> '0;36',
+		'light_cyan'	=> '1;36',
+		'red'			=> '0;31',
+		'light_red'		=> '1;31',
+		'purple'		=> '0;35',
+		'light_purple'	=> '1;35',
+		'light_yellow'	=> '0;33',
+		'yellow'		=> '1;33',
+		'light_gray'	=> '0;37',
+		'white'			=> '1;37',
+	);
+
+	protected static $background_colors = array(
+		'black'			=> '40',
+		'red'			=> '41',
+		'green'			=> '42',
+		'yellow'		=> '43',
+		'blue'			=> '44',
+		'magenta'		=> '45',
+		'cyan'			=> '46',
+		'light_gray'	=> '47',
+	);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Static constructor.	Parses all the CLI params.
+	 */
+	public static function _init()
+	{
+		if (static::$initialized === true)
+		{
+			return;
+		}
+
+		if ( ! (PHP_SAPI === 'cli' || defined('STDIN')) )
+		{
+			throw new \Exception('Cli class cannot be used outside of the command line.');
+		}
+
+		self::parseCommand();
+
+		// Readline is an extension for PHP that makes interactive with PHP much more bash-like
+		// http://www.php.net/manual/en/readline.installation.php
+		static::$readline_support = extension_loaded('readline');
+
+		static::$initialized = true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Grabs an individual
+	 *
+	 * @param $index
+	 * @return null
+	 */
+	public static function segment($index)
+	{
+		if (! isset(static::$segments[$index - 1]))
+		{
+			return null;
+		}
+
+		return static::$segments[$index - 1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the command string portion of the arguments. Used
+	 * by the 'sprint' CLI script to grab the portion of the arguments
+	 * that is used to call the CodeIgniter application.
+	 *
+	 * @return string
+	 */
+	public static function cli_string()
+	{
+		return implode(' ', static::$segments);
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Get input from the shell, using readline or the standard STDIN
+	 *
+	 * Named options must be in the following formats:
+	 * php index.php user -v --v -name=John --name=John
+	 *
+	 * @param	string|int	$name	the name of the option (int if unnamed)
+	 * @return	string
+	 */
+	public static function input($prefix = '')
+	{
+		if (static::$readline_support)
+		{
+			return readline($prefix);
+		}
+
+		echo $prefix;
+		return fgets(STDIN);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asks the user for input.  This can have either 1 or 2 arguments.
+	 *
+	 * Usage:
+	 *
+	 * // Waits for any key press
+	 * CLI::prompt();
+	 *
+	 * // Takes any input
+	 * $color = CLI::prompt('What is your favorite color?');
+	 *
+	 * // Takes any input, but offers default
+	 * $color = CLI::prompt('What is your favourite color?', 'white');
+	 *
+	 * // Will only accept the options in the array
+	 * $ready = CLI::prompt('Are you ready?', array('y','n'));
+	 *
+	 * @return	string	the user input
+	 */
+	public static function prompt()
+	{
+		$args = func_get_args();
+
+		$options = array();
+		$output = '';
+		$default = null;
+
+		// How many we got
+		$arg_count = count($args);
+
+		// Is the last argument a boolean? True means required
+		$required = end($args) === true;
+
+		// Reduce the argument count if required was passed, we don't care about that anymore
+		$required === true and --$arg_count;
+
+		// This method can take a few crazy combinations of arguments, so lets work it out
+		switch ($arg_count)
+		{
+			case 2:
+
+				// E.g: $ready = CLI::prompt('Are you ready?', array('y','n'));
+				if (is_array($args[1]))
+				{
+					list($output, $options)=$args;
+				}
+
+				// E.g: $color = CLI::prompt('What is your favourite color?', 'white');
+				elseif (is_string($args[1]))
+				{
+					list($output, $default)=$args;
+				}
+
+				break;
+
+			case 1:
+
+				// No question (probably been asked already) so just show options
+				// E.g: $ready = CLI::prompt(array('y','n'));
+				if (is_array($args[0]))
+				{
+					$options = $args[0];
+				}
+
+				// Question without options
+				// E.g: $ready = CLI::prompt('What did you do today?');
+				elseif (is_string($args[0]))
+				{
+					$output = $args[0];
+				}
+
+				break;
+		}
+
+		// If a question has been asked with the read
+		if ($output !== '')
+		{
+			$extra_output = '';
+
+			if ($default !== null)
+			{
+				$extra_output = ' [ Default: "'.$default.'" ]';
+			}
+
+			elseif ($options !== array())
+			{
+				$extra_output = ' [ '.implode(', ', $options).' ]';
+			}
+
+			fwrite(STDOUT, $output.$extra_output.': ');
+		}
+
+		// Read the input from keyboard.
+		$input = trim(static::input()) ?: $default;
+
+		// No input provided and we require one (default will stop this being called)
+		if (empty($input) and $required === true)
+		{
+			static::write('This is required.');
+			static::new_line();
+
+			$input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
+		}
+
+		// If options are provided and the choice is not in the array, tell them to try again
+		if ( ! empty($options) and ! in_array($input, $options))
+		{
+			static::write('This is not a valid option. Please try again.');
+			static::new_line();
+
+			$input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
+		}
+
+		return $input;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs a string to the cli.	 If you send an array it will implode them
+	 * with a line break.
+	 *
+	 * @param	string|array	$text	the text to output, or array of lines
+	 */
+	public static function write($text = '', $foreground = null, $background = null)
+	{
+		if (is_array($text))
+		{
+			$text = implode(PHP_EOL, $text);
+		}
+
+		if ($foreground or $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		fwrite(STDOUT, $text.PHP_EOL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs an error to the CLI using STDERR instead of STDOUT
+	 *
+	 * @param	string|array	$text	the text to output, or array of errors
+	 */
+	public static function error($text = '', $foreground = 'light_red', $background = null)
+	{
+		if (is_array($text))
+		{
+			$text = implode(PHP_EOL, $text);
+		}
+
+		if ($foreground OR $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		fwrite(STDERR, $text.PHP_EOL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Beeps a certain number of times.
+	 *
+	 * @param	int $num	the number of times to beep
+	 */
+	public static function beep($num = 1)
+	{
+		echo str_repeat("\x07", $num);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Waits a certain number of seconds, optionally showing a wait message and
+	 * waiting for a key press.
+	 *
+	 * @param	int		$seconds	number of seconds
+	 * @param	bool	$countdown	show a countdown or not
+	 */
+	public static function wait($seconds = 0, $countdown = false)
+	{
+		if ($countdown === true)
+		{
+			$time = $seconds;
+
+			while ($time > 0)
+			{
+				fwrite(STDOUT, $time.'... ');
+				sleep(1);
+				$time--;
+			}
+			static::write();
+		}
+
+		else
+		{
+			if ($seconds > 0)
+			{
+				sleep($seconds);
+			}
+			else
+			{
+				static::write(static::$wait_msg);
+				static::input();
+			}
+		}
+	}
+
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * if operating system === windows
+	 */
+	public static function is_windows()
+	{
+		return 'win' === strtolower(substr(php_uname("s"), 0, 3));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enter a number of empty lines
+	 *
+	 * @param	integer	Number of lines to output
+	 * @return	void
+	 */
+	public static function new_line($num = 1)
+	{
+		// Do it once or more, write with empty string gives us a new line
+		for($i = 0; $i < $num; $i++)
+		{
+			static::write();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears the screen of output
+	 *
+	 * @return	void
+	 */
+	public static function clear_screen()
+	{
+		static::is_windows()
+
+			// Windows is a bit crap at this, but their terminal is tiny so shove this in
+			? static::new_line(40)
+
+			// Anything with a flair of Unix will handle these magic characters
+			: fwrite(STDOUT, chr(27)."[H".chr(27)."[2J");
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the given text with the correct color codes for a foreground and
+	 * optionally a background color.
+	 *
+	 * @param	string	$text		the text to color
+	 * @param	string	$foreground the foreground color
+	 * @param	string	$background the background color
+	 * @param	string	$format		other formatting to apply. Currently only 'underline' is understood
+	 * @return	string	the color coded string
+	 */
+	public static function color($text, $foreground, $background = null, $format=null)
+	{
+		if (static::is_windows() and ! isset($_SERVER['ANSICON']))
+		{
+			return $text;
+		}
+
+		if ( ! array_key_exists($foreground, static::$foreground_colors))
+		{
+			throw new \RuntimeException('Invalid CLI foreground color: '.$foreground);
+		}
+
+		if ( $background !== null and ! array_key_exists($background, static::$background_colors))
+		{
+			throw new \RuntimeException('Invalid CLI background color: '.$background);
+		}
+
+		$string = "\033[".static::$foreground_colors[$foreground]."m";
+
+		if ($background !== null)
+		{
+			$string .= "\033[".static::$background_colors[$background]."m";
+		}
+
+		if ($format === 'underline')
+		{
+			$string .= "\033[4m";
+		}
+
+		$string .= $text."\033[0m";
+
+		return $string;
+	}
+
+	//--------------------------------------------------------------------
+
+	public static function getWidth($default=80)
+	{
+		if (static::is_windows())
+		{
+			return $default;
+		}
+
+		return (int)shell_exec('tput cols');
+	}
     
-    //--------------------------------------------------------------------
-
-    public static function getHeight($default=32)
-    {
-        if (static::is_windows())
-        {
-            return $default;
-        }
-
-        return (int)shell_exec('tput lines');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Displays a progress bar on the CLI. You must call it repeatedly
-     * to update it. Set $thisStep = false to erase the progress bar.
-     *
-     * @param int $thisStep
-     * @param int $totalSteps
-     */
-    public static function showProgress($thisStep=1, $totalSteps=10)
-    {
-        // The first time through, save
-        // our position so the script knows where to go
-        // back to when writing the bar, and
-        // at the end of the script.
-        if (! static::$inProgress) {
-            fwrite(STDOUT, "\0337");
-            static::$inProgress = true;
-        }
-
-        // Restore position
-        fwrite(STDERR, "\0338");
-
-        if ($thisStep !== false) {
-            // Don't allow div by zero or negative numbers....
-            $thisStep = abs($thisStep);
-            $totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
-
-            $percent = intval( ($thisStep / $totalSteps) * 100 );
-            $step = (int)round($percent / 10);
-
-            // Write the progress bar
-            fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
-            // Textual representation...
-            fwrite(STDOUT, " {$percent}% Complete" . PHP_EOL);
-            // Move up, undo the PHP_EOL
-            fwrite(STDOUT, "\033[1A");
-        }
-        else
-        {
-            fwrite(STDERR, "\007");
-        }
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	public static function getHeight($default=32)
+	{
+		if (static::is_windows())
+		{
+			return $default;
+		}
+
+		return (int)shell_exec('tput lines');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays a progress bar on the CLI. You must call it repeatedly
+	 * to update it. Set $thisStep = false to erase the progress bar.
+	 *
+	 * @param int $thisStep
+	 * @param int $totalSteps
+	 */
+	public static function showProgress($thisStep=1, $totalSteps=10)
+	{
+		// The first time through, save
+		// our position so the script knows where to go
+		// back to when writing the bar, and
+		// at the end of the script.
+		if (! static::$inProgress) {
+			fwrite(STDOUT, "\0337");
+			static::$inProgress = true;
+		}
+
+		// Restore position
+		fwrite(STDERR, "\0338");
+
+		if ($thisStep !== false) {
+			// Don't allow div by zero or negative numbers....
+			$thisStep = abs($thisStep);
+			$totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
+
+			$percent = intval( ($thisStep / $totalSteps) * 100 );
+			$step = (int)round($percent / 10);
+
+			// Write the progress bar
+			fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
+			// Textual representation...
+			fwrite(STDOUT, " {$percent}% Complete" . PHP_EOL);
+			// Move up, undo the PHP_EOL
+			fwrite(STDOUT, "\033[1A");
+		}
+		else
+		{
+			fwrite(STDERR, "\007");
+		}
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Checks to see if an option was passed to us on the CLI and returns
@@ -541,11 +541,11 @@ 
 	 */
 	public static function option($name)
 	{
-	    if (array_key_exists($name, self::$options))
-	    {
-		    $val = self::$options[$name] === null ? true : self::$options[$name];
-		    return $val;
-	    }
+		if (array_key_exists($name, self::$options))
+		{
+			$val = self::$options[$name] === null ? true : self::$options[$name];
+			return $val;
+		}
 
 		return null;
 	}
@@ -559,7 +559,7 @@ 
 	 */
 	public static function getOptions()
 	{
-	    return self::$options;
+		return self::$options;
 	}
 
 	//--------------------------------------------------------------------
@@ -615,10 +615,10 @@ 
 			return '';
 		}
 
-        if ($max == 0)
-        {
-            $max = CLI::getWidth();
-        }
+		if ($max == 0)
+		{
+			$max = CLI::getWidth();
+		}
 
 		if (CLI::getWidth() < $max)
 		{

myth/Controllers/BaseController.php

Indentation +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
 	{
 		parent::__construct();
 
-        $this->load->library('session');
+		$this->load->library('session');
 
 		$this->setupCache();
 
@@ -236,8 +236,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'text/plain' )
-		             ->set_output( $text );
+					 ->set_content_type( 'text/plain' )
+					 ->set_output( $text );
 	}
 
 	//--------------------------------------------------------------------
@@ -267,8 +267,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/json' )
-		             ->set_output( json_encode( $json ) );
+					 ->set_content_type( 'application/json' )
+					 ->set_output( json_encode( $json ) );
 	}
 
 	//--------------------------------------------------------------------
@@ -292,8 +292,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/x-javascript' )
-		             ->set_output( $js );
+					 ->set_content_type( 'application/x-javascript' )
+					 ->set_output( $js );
 	}
 
 	//--------------------------------------------------------------------

myth/Controllers/CLIController.php

Indentation +138 added lines, -138 removed lines

@@ -41,144 +41,144 @@
  */
 class CLIController extends \CI_Controller {
 
-    /**
-     * Holds short descriptions for the public functions in this class.
-     * Each 'key' in the array should match the function name.
-     *
-     * @var array
-     */
-    protected $descriptions = [];
-
-    /**
-     * Holds long descriptions for the public functions in this class.
-     * Each 'key' in the array should match the function name.
-     * @var array
-     */
-    protected $long_descriptions = [];
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Ensures that we are running on the CLI, and collects basic settings
-     * like collecting our command line arguments into a pretty array.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Restrict usage to the command line.
-        if (! is_cli() )
-        {
-            show_error( lang('cli_required') );
-        }
-
-        // Make sure the CLI library is loaded and ready.
+	/**
+	 * Holds short descriptions for the public functions in this class.
+	 * Each 'key' in the array should match the function name.
+	 *
+	 * @var array
+	 */
+	protected $descriptions = [];
+
+	/**
+	 * Holds long descriptions for the public functions in this class.
+	 * Each 'key' in the array should match the function name.
+	 * @var array
+	 */
+	protected $long_descriptions = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures that we are running on the CLI, and collects basic settings
+	 * like collecting our command line arguments into a pretty array.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Restrict usage to the command line.
+		if (! is_cli() )
+		{
+			show_error( lang('cli_required') );
+		}
+
+		// Make sure the CLI library is loaded and ready.
 //        CLI::_init();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A default index method that all CLI Controllers can share. Will
-     * list all of the methods and their short descriptions, if available.
-     */
-    public function index()
-    {
-        CLI::new_line();
-        CLI::write( lang('cli.available_commands') );
-
-        $this->sayDescriptions($this->descriptions);
-
-        CLI::new_line();
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Grabs the short description of a command, if it exists.
-     *
-     * @param null $method
-     */
-    public function describeMethod($method=null)
-    {
-        if (empty($this->descriptions[$method]))
-        {
-            return CLI::error( lang('cli.bad_description') );
-        }
-
-        CLI::write("\t{$this->descriptions[$method]}", 'yellow');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function longDescribeMethod($method=null)
-    {
-        if (empty($this->long_descriptions[$method]))
-        {
-            return CLI::error( lang('cli.no_help') );
-        }
-
-        CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    protected function sayDescriptions($descriptions)
-    {
-        $names      = array_keys($descriptions);
-        $syntaxes   = array_column($descriptions, 0);
-        $descs      = array_column($descriptions, 1);
-
-        // Pad each item to the same length
-        $names      = $this->padArray($names);
-        $syntaxes   = $this->padArray($syntaxes);
-
-        for ($i=0; $i < count($names); $i++)
-        {
-            $out = CLI::color($names[$i], 'yellow');
-
-            // The rest of the items stay default color.
-            if (isset($syntaxes[$i]))
-            {
-                $out .= $syntaxes[$i];
-            }
-
-            if (isset($descs[$i]))
-            {
-                $out .= CLI::wrap($descs[$i], 125, strlen($names[$i]) + strlen($syntaxes[$i]));
-            }
-
-            CLI::write($out);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a new array where all of the string elements have
-     * been padding with trailling spaces to be the same length.
-     *
-     * @param array $array
-     * @param int $extra // How many extra spaces to add at the end
-     * @return array
-     */
-    protected function padArray($array, $extra=2)
-    {
-        $max = max(array_map('strlen', $array)) + $extra;
-
-        foreach ($array as &$item)
-        {
-            $item = str_pad($item, $max);
-        }
-
-        return $array;
-    }
-
-    //--------------------------------------------------------------------
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A default index method that all CLI Controllers can share. Will
+	 * list all of the methods and their short descriptions, if available.
+	 */
+	public function index()
+	{
+		CLI::new_line();
+		CLI::write( lang('cli.available_commands') );
+
+		$this->sayDescriptions($this->descriptions);
+
+		CLI::new_line();
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Grabs the short description of a command, if it exists.
+	 *
+	 * @param null $method
+	 */
+	public function describeMethod($method=null)
+	{
+		if (empty($this->descriptions[$method]))
+		{
+			return CLI::error( lang('cli.bad_description') );
+		}
+
+		CLI::write("\t{$this->descriptions[$method]}", 'yellow');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function longDescribeMethod($method=null)
+	{
+		if (empty($this->long_descriptions[$method]))
+		{
+			return CLI::error( lang('cli.no_help') );
+		}
+
+		CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	protected function sayDescriptions($descriptions)
+	{
+		$names      = array_keys($descriptions);
+		$syntaxes   = array_column($descriptions, 0);
+		$descs      = array_column($descriptions, 1);
+
+		// Pad each item to the same length
+		$names      = $this->padArray($names);
+		$syntaxes   = $this->padArray($syntaxes);
+
+		for ($i=0; $i < count($names); $i++)
+		{
+			$out = CLI::color($names[$i], 'yellow');
+
+			// The rest of the items stay default color.
+			if (isset($syntaxes[$i]))
+			{
+				$out .= $syntaxes[$i];
+			}
+
+			if (isset($descs[$i]))
+			{
+				$out .= CLI::wrap($descs[$i], 125, strlen($names[$i]) + strlen($syntaxes[$i]));
+			}
+
+			CLI::write($out);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new array where all of the string elements have
+	 * been padding with trailling spaces to be the same length.
+	 *
+	 * @param array $array
+	 * @param int $extra // How many extra spaces to add at the end
+	 * @return array
+	 */
+	protected function padArray($array, $extra=2)
+	{
+		$max = max(array_map('strlen', $array)) + $extra;
+
+		foreach ($array as &$item)
+		{
+			$item = str_pad($item, $max);
+		}
+
+		return $array;
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Controllers/ThemedController.php

Indentation +353 added lines, -353 removed lines

@@ -41,358 +41,358 @@
  */
 class ThemedController extends BaseController
 {
-    /**
-     * Stores data variables to be sent to the view.
-     * @var array
-     */
-    protected $vars = array();
-
-    /**
-     * Stores current status message.
-     * @var
-     */
-    protected $message;
-
-    /**
-     * The UIKit to make available to the template views.
-     * @var string
-     */
-    protected $uikit = '';
-
-    /**
-     * An instance of an active Themer to use.
-     * @var null
-     */
-    protected $themer = null;
-
-    /**
-     * Allows per-controller override of theme.
-     * @var null
-     */
-    protected $theme = null;
-
-    /**
-     * Per-controller override of the current layout file.
-     * @var null
-     */
-    protected $layout = null;
-
-    /**
-     * Stores an array of javascript files.
-     * @var array
-     */
-    protected $external_scripts = array();
-
-    /**
-     * Stores an array of CSS stylesheets.
-     * @var array
-     */
-    protected $stylesheets = array();
-
-    /**
-     * A MenuCollection instance
-     * @var
-     */
-    protected $meta;
-
-    /**
-     * Whether set() should escape the output...
-     * @var bool
-     */
-    protected $auto_escape = null;
-
-    /**
-     * An instance of ZendFrameworks Escaper
-     * @var null
-     */
-    protected $escaper = null;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Constructor takes care of getting the template engine up and running
-     * and bound to our DI object, as well as any other preliminary needs,
-     * like detecting the variant to use, etc.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Setup our Template Engine
-        $themer = config_item('active_themer');
-
-        if (empty($themer)) {
-            throw new \RuntimeException( lang('no_themer') );
-        }
-
-        $this->themer = new $themer( get_instance() );
-
-        // Register our paths with the themer
-        $paths = config_item('theme.paths');
-
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-
-        // Set our default theme.
-        $this->themer->setDefaultTheme( config_item('theme.default_theme') );
-
-        // Register our variants with the engine.
-        $variants = config_item('theme.variants');
-
-        foreach ($variants as $key => $value) {
-            $this->themer->addVariant($key, $value);
-        }
-
-        $this->detectVariant();
-
-        // Ensure that our UIKit is loaded up if we're using one.
-        $uikit = config_item('theme.uikit');
-
-        if ($uikit)
-        {
-            $this->uikit = new $uikit();
-        }
-
-        // Load up our meta collection
-        $this->meta = new MetaCollection( get_instance() );
-
-        // Should we autoescape vars?
-        if (is_null($this->auto_escape))
-        {
-            $this->auto_escape = config_item( 'theme.auto_escape' );
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a common interface with the other rendering methods to
-     * set the output of the method. Uses the current instance of $this->template.
-     * Ensures that any data we've stored through $this->setVar() are present
-     * and includes the status messages into the data.
-     *
-     * @param array $data
-     * @param int   $cache_time
-     */
-    public function render($data = array(), $cache_time=0)
-    {
-	    if ($cache_time > 0)
-	    {
-		    $this->output->cache( (int)$cache_time );
-	    }
-
-        // Determine the correct theme to use
-        $theme = ! empty($this->theme) ? $this->theme : config_item('theme.default_theme');
-        $this->themer->setTheme($theme);
-
-        // Determine the correct layout to use
-        $layout = !empty($this->layout) ? $this->layout : null;
-        $this->themer->setLayout($layout);
-
-        // Merge any saved vars into the data
-        // But first, escape the data if needed
-        if ($this->auto_escape)
-        {
-            $data = esc($data, 'html');
-        }
-        $data = array_merge($data, $this->vars);
-
-        // Make sure the MetaCollection is available in the view.
-        $data['html_meta'] = $this->meta;
-
-        // Include our UIKit so views can use it
-        if (! empty($this->uikit)) {
-            $data['uikit'] = $this->uikit;
-        }
-
-        // Build our notices from the theme's view file.
-        $data['notice'] = $this->themer->display($this->themer->theme() . ':notice', ["notice" => $this->message()]);
-
-        // Make sure any scripts/stylesheets are available to the view
-        $data['external_scripts'] = $this->external_scripts;
-        $data['stylesheets'] = $this->stylesheets;
-
-        $this->themer->set($data);
-
-        $this->output->set_content_type('html')
-                     ->set_output($this->themer->render());
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a data variable to be sent to the view during the render() method.
-     * Will auto-escape data on the way in, unless specifically told not to.
-     *
-     * Uses ZendFramework's Escaper to handle the data escaping,
-     * based on context. Valid contexts are:
-     *      - html
-     *      - htmlAttr
-     *      - js
-     *      - css
-     *      - url
-     *
-     * @param string $name
-     * @param mixed $value
-     * @param string $context
-     * @param bool $do_escape
-     */
-    public function setVar($name, $value = null, $context='html', $do_escape=null)
-    {
-        $escape = $do_escape == true ? true : $this->auto_escape;
-
-        if (is_null($this->escaper))
-        {
-            $this->escaper = new Escaper(config_item('charset'));
-        }
-
-        if (is_array($name))
-        {
-            foreach ($name as $k => $v)
-            {
-                $this->vars[$k] = $escape ? esc($v, $context, $this->escaper) : $v;
-            }
-        }
-        else
-        {
-            $this->vars[$name] = $escape ? esc($value, $context, $this->escaper) : $value;
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Status Messages
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets a status message (for displaying small success/error messages).
-     * This is used in place of the session->flashdata functions since you
-     * don't always want to have to refresh the page to show the message.
-     *
-     * @param string $message The message to save.
-     * @param string $type The string to be included as the CSS class of the containing div.
-     */
-    public function setMessage($message = '', $type = 'info')
-    {
-        if (! empty($message)) {
-            if (isset($this->session)) {
-                $this->session->set_flashdata('message', $type . '::' . $message);
-            }
-
-            $this->message = array(
-                'type' => $type,
-                'message' => $message
-            );
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves the status message to display (if any).
-     *
-     * @param  string $message [description]
-     * @param  string $type [description]
-     * @return array
-     */
-    public function message($message = '', $type = 'info')
-    {
-        $return = array(
-            'message' => $message,
-            'type' => $type
-        );
-
-        // Does session data exist?
-        if (empty($message) && class_exists('CI_Session')) {
-            $message = $this->session->flashdata('message');
-
-            if (! empty($message)) {
-                // Split out our message parts
-                $temp_message = explode('::', $message);
-                $return['type'] = $temp_message[0];
-                $return['message'] = $temp_message[1];
-
-                unset($temp_message);
-            }
-        }
-
-        // If message is empty, we need to check our own storage.
-        if (empty($message)) {
-            if (empty($this->message['message'])) {
-                return '';
-            }
-
-            $return = $this->message;
-        }
-
-        // Clear our session data so we don't get extra messages on rare occasions.
-        if (class_exists('CI_Session')) {
-            $this->session->set_flashdata('message', '');
-        }
-
-        return $return;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Detects whether the item is being displayed on a desktop, phone,
-     * or tablet device.
-     */
-    protected function detectVariant()
-    {
-        // Variant Detection and setup
-        if (config_item('autodetect_variant') === true) {
-            $detect = new \Mobile_Detect();
-
-            if ($detect->isMobile()) {
-                $this->template->setVariant('phone');
-            } else if ($detect->isTablet()) {
-                $this->template->setVariant('tablet');
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // 'Asset' functions
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an external javascript file to the 'external_scripts' array.
-     *
-     * @param [type] $filename [description]
-     */
-    public function addScript($filename)
-    {
-        if (strpos($filename, 'http') === FALSE) {
-            $filename = base_url() . 'assets/js/' . $filename;
-        }
-
-        $this->external_scripts[] = $filename;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an external stylesheet file to the 'stylesheets' array.
-     */
-    public function addStyle($filename)
-    {
-        if (strpos($filename, 'http') === FALSE) {
-            $filename = base_url() . 'assets/css/' . $filename;
-        }
-
-        $this->stylesheets[] = $filename;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Stores data variables to be sent to the view.
+	 * @var array
+	 */
+	protected $vars = array();
+
+	/**
+	 * Stores current status message.
+	 * @var
+	 */
+	protected $message;
+
+	/**
+	 * The UIKit to make available to the template views.
+	 * @var string
+	 */
+	protected $uikit = '';
+
+	/**
+	 * An instance of an active Themer to use.
+	 * @var null
+	 */
+	protected $themer = null;
+
+	/**
+	 * Allows per-controller override of theme.
+	 * @var null
+	 */
+	protected $theme = null;
+
+	/**
+	 * Per-controller override of the current layout file.
+	 * @var null
+	 */
+	protected $layout = null;
+
+	/**
+	 * Stores an array of javascript files.
+	 * @var array
+	 */
+	protected $external_scripts = array();
+
+	/**
+	 * Stores an array of CSS stylesheets.
+	 * @var array
+	 */
+	protected $stylesheets = array();
+
+	/**
+	 * A MenuCollection instance
+	 * @var
+	 */
+	protected $meta;
+
+	/**
+	 * Whether set() should escape the output...
+	 * @var bool
+	 */
+	protected $auto_escape = null;
+
+	/**
+	 * An instance of ZendFrameworks Escaper
+	 * @var null
+	 */
+	protected $escaper = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor takes care of getting the template engine up and running
+	 * and bound to our DI object, as well as any other preliminary needs,
+	 * like detecting the variant to use, etc.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Setup our Template Engine
+		$themer = config_item('active_themer');
+
+		if (empty($themer)) {
+			throw new \RuntimeException( lang('no_themer') );
+		}
+
+		$this->themer = new $themer( get_instance() );
+
+		// Register our paths with the themer
+		$paths = config_item('theme.paths');
+
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+
+		// Set our default theme.
+		$this->themer->setDefaultTheme( config_item('theme.default_theme') );
+
+		// Register our variants with the engine.
+		$variants = config_item('theme.variants');
+
+		foreach ($variants as $key => $value) {
+			$this->themer->addVariant($key, $value);
+		}
+
+		$this->detectVariant();
+
+		// Ensure that our UIKit is loaded up if we're using one.
+		$uikit = config_item('theme.uikit');
+
+		if ($uikit)
+		{
+			$this->uikit = new $uikit();
+		}
+
+		// Load up our meta collection
+		$this->meta = new MetaCollection( get_instance() );
+
+		// Should we autoescape vars?
+		if (is_null($this->auto_escape))
+		{
+			$this->auto_escape = config_item( 'theme.auto_escape' );
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a common interface with the other rendering methods to
+	 * set the output of the method. Uses the current instance of $this->template.
+	 * Ensures that any data we've stored through $this->setVar() are present
+	 * and includes the status messages into the data.
+	 *
+	 * @param array $data
+	 * @param int   $cache_time
+	 */
+	public function render($data = array(), $cache_time=0)
+	{
+		if ($cache_time > 0)
+		{
+			$this->output->cache( (int)$cache_time );
+		}
+
+		// Determine the correct theme to use
+		$theme = ! empty($this->theme) ? $this->theme : config_item('theme.default_theme');
+		$this->themer->setTheme($theme);
+
+		// Determine the correct layout to use
+		$layout = !empty($this->layout) ? $this->layout : null;
+		$this->themer->setLayout($layout);
+
+		// Merge any saved vars into the data
+		// But first, escape the data if needed
+		if ($this->auto_escape)
+		{
+			$data = esc($data, 'html');
+		}
+		$data = array_merge($data, $this->vars);
+
+		// Make sure the MetaCollection is available in the view.
+		$data['html_meta'] = $this->meta;
+
+		// Include our UIKit so views can use it
+		if (! empty($this->uikit)) {
+			$data['uikit'] = $this->uikit;
+		}
+
+		// Build our notices from the theme's view file.
+		$data['notice'] = $this->themer->display($this->themer->theme() . ':notice', ["notice" => $this->message()]);
+
+		// Make sure any scripts/stylesheets are available to the view
+		$data['external_scripts'] = $this->external_scripts;
+		$data['stylesheets'] = $this->stylesheets;
+
+		$this->themer->set($data);
+
+		$this->output->set_content_type('html')
+					 ->set_output($this->themer->render());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a data variable to be sent to the view during the render() method.
+	 * Will auto-escape data on the way in, unless specifically told not to.
+	 *
+	 * Uses ZendFramework's Escaper to handle the data escaping,
+	 * based on context. Valid contexts are:
+	 *      - html
+	 *      - htmlAttr
+	 *      - js
+	 *      - css
+	 *      - url
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 * @param string $context
+	 * @param bool $do_escape
+	 */
+	public function setVar($name, $value = null, $context='html', $do_escape=null)
+	{
+		$escape = $do_escape == true ? true : $this->auto_escape;
+
+		if (is_null($this->escaper))
+		{
+			$this->escaper = new Escaper(config_item('charset'));
+		}
+
+		if (is_array($name))
+		{
+			foreach ($name as $k => $v)
+			{
+				$this->vars[$k] = $escape ? esc($v, $context, $this->escaper) : $v;
+			}
+		}
+		else
+		{
+			$this->vars[$name] = $escape ? esc($value, $context, $this->escaper) : $value;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Status Messages
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets a status message (for displaying small success/error messages).
+	 * This is used in place of the session->flashdata functions since you
+	 * don't always want to have to refresh the page to show the message.
+	 *
+	 * @param string $message The message to save.
+	 * @param string $type The string to be included as the CSS class of the containing div.
+	 */
+	public function setMessage($message = '', $type = 'info')
+	{
+		if (! empty($message)) {
+			if (isset($this->session)) {
+				$this->session->set_flashdata('message', $type . '::' . $message);
+			}
+
+			$this->message = array(
+				'type' => $type,
+				'message' => $message
+			);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves the status message to display (if any).
+	 *
+	 * @param  string $message [description]
+	 * @param  string $type [description]
+	 * @return array
+	 */
+	public function message($message = '', $type = 'info')
+	{
+		$return = array(
+			'message' => $message,
+			'type' => $type
+		);
+
+		// Does session data exist?
+		if (empty($message) && class_exists('CI_Session')) {
+			$message = $this->session->flashdata('message');
+
+			if (! empty($message)) {
+				// Split out our message parts
+				$temp_message = explode('::', $message);
+				$return['type'] = $temp_message[0];
+				$return['message'] = $temp_message[1];
+
+				unset($temp_message);
+			}
+		}
+
+		// If message is empty, we need to check our own storage.
+		if (empty($message)) {
+			if (empty($this->message['message'])) {
+				return '';
+			}
+
+			$return = $this->message;
+		}
+
+		// Clear our session data so we don't get extra messages on rare occasions.
+		if (class_exists('CI_Session')) {
+			$this->session->set_flashdata('message', '');
+		}
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Detects whether the item is being displayed on a desktop, phone,
+	 * or tablet device.
+	 */
+	protected function detectVariant()
+	{
+		// Variant Detection and setup
+		if (config_item('autodetect_variant') === true) {
+			$detect = new \Mobile_Detect();
+
+			if ($detect->isMobile()) {
+				$this->template->setVariant('phone');
+			} else if ($detect->isTablet()) {
+				$this->template->setVariant('tablet');
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// 'Asset' functions
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an external javascript file to the 'external_scripts' array.
+	 *
+	 * @param [type] $filename [description]
+	 */
+	public function addScript($filename)
+	{
+		if (strpos($filename, 'http') === FALSE) {
+			$filename = base_url() . 'assets/js/' . $filename;
+		}
+
+		$this->external_scripts[] = $filename;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an external stylesheet file to the 'stylesheets' array.
+	 */
+	public function addStyle($filename)
+	{
+		if (strpos($filename, 'http') === FALSE) {
+			$filename = base_url() . 'assets/css/' . $filename;
+		}
+
+		$this->stylesheets[] = $filename;
+	}
+
+	//--------------------------------------------------------------------
 }
 

myth/Cron/CronManager.php

Indentation +252 added lines, -252 removed lines

@@ -34,257 +34,257 @@
 
 class CronManager {
 
-    protected static $tasks = [];
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Schedules a new task in the system.
-     *
-     * @param $alias
-     * @param $time_string
-     * @param callable|string $task
-     */
-    public static function schedule($alias, $time_string, $task)
-    {
-        // Valid Alias?
-        if (! is_string($alias) || empty($alias))
-        {
-            throw new \RuntimeException( lang('cron.bad_alias') );
-        }
-
-        // Valid TimeString?
-        if (! is_string($time_string) || empty($time_string))
-        {
-            throw new \RuntimeException( lang('cron.bad_timestring') );
-        }
-
-        // Valid Task?
-        if (! is_callable($task) && ! is_string($task))
-        {
-            throw new \RuntimeException( lang('cron.bad_task') . $alias);
-        }
-
-        static::$tasks[$alias] = new CronTask($time_string, $task);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single task from the system.
-     *
-     * @param $alias
-     */
-    public static function remove($alias)
-    {
-        if (empty(static::$tasks[$alias]))
-        {
-            return null;
-        }
-
-        unset(static::$tasks[$alias]);
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Provides an array of all tasks in the system. The format will be
-     * like:
-     *      [
-     *          'alias' => [
-     *              'next_run'  => '123456789',
-     *              'prev_run'  => '123456789',
-     *              'task'  => mixed
-     *          ],
-     *          ...
-     *      ]
-     */
-    public static function listAll($current_time='now')
-    {
-        if (! count(static::$tasks))
-        {
-            return null;
-        }
-
-        $output = array();
-
-        foreach (static::$tasks as $alias => $task)
-        {
-            $output[$alias] = [
-                'next_run'  => $task->nextRunDate($current_time),
-                'prev_run'  => $task->previousRunDate($current_time),
-                'task'      => $task->task()
-            ];
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the task object assigned to an alias.
-     *
-     * @param $alias
-     * @return null|CronTask object
-     */
-    public static function task($alias)
-    {
-        if (empty(static::$tasks[$alias]) )
-        {
-            return null;
-        }
-
-        return static::$tasks[$alias];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns all tasks currently in the system.
-     *
-     * @return array
-     */
-    public static function tasks()
-    {
-        return count(static::$tasks) ? static::$tasks : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs all tasks scheduled to run right now.
-     *
-     * Can be limited to a single task by passing it's alias in the first param.
-     *
-     * Returns the output of all task runs as a single string. Perfect for
-     * emailing to users on completion
-     *
-     * @param null $alias
-     * @param bool $force_run
-     * @param string $current_time
-     * @return string
-     */
-    public static function run($alias=null, $force_run=false, $current_time='now')
-    {
-        $tasks = static::$tasks;
-
-        if (! empty($alias) && isset($tasks[$alias]))
-        {
-            $tasks = [$alias => $tasks[$alias] ];
-        }
-
-        $output = '';
-
-        $count = 0; // How many tasks have ran?
-
-        foreach ($tasks as $alias => $task)
-        {
-            if ($task->isDue($current_time) || $force_run === true)
-            {
-                $output .= sprintf( lang('cron.running_task'), $alias);
-
-                try {
-                    $result = self::runTask($alias);
-
-                    if (is_bool($result))
-                    {
-                        $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
-                    }
-                    else if (is_string($result))
-                    {
-                        $output .= sprintf( lang('cron.done_with_msg'), $result);
-                    }
-                }
-                catch (\Exception $e)
-                {
-                    $output .= "[Exception] ". $e->getMessage() ."\n";
-                }
-
-                $count++;
-            }
-            else
-            {
-                $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
-            }
-        }
-
-        if (! $count)
-        {
-            $output .= lang('cron.nothing_scheduled');
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Clears all tasks from the system
-     */
-    public static function reset()
-    {
-        static::$tasks = [];
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a single Task.
-     *
-     * NOTE: Tasks MUST return a true/false value only.
-     *
-     * @param $alias
-     * @return bool
-     */
-    protected static function runTask($alias)
-    {
-        $task = static::$tasks[$alias]->task();
-
-        $success = false;
-
-        // If it's a standard callable item,
-        // then run it.
-        if (is_callable($task))
-        {
-            $success = call_user_func($task);
-        }
-
-        // Otherwise, if it's a string it should be
-        // a library:method string so try to run it.
-        else if (is_string($task) && ! empty($task) && strpos($task, ':') !== false)
-        {
-            list($class, $method) = explode(':', $task);
-
-            // Let PHP try to autoload it through any available autoloaders
-            // (including Composer and user's custom autoloaders). If we
-            // don't find it, then assume it's a CI library that we can reach.
-            if (class_exists($class)) {
-                $class = new $class();
-            } else {
-                get_instance()->load->library($class);
-                $class =& get_instance()->$class;
-            }
-
-            if (! method_exists($class, $method)) {
-                log_message('error', "[CRON] Method not found: {$class}::{$method}");
-                return $success;
-            }
-
-            // Call the class with our parameters
-            $success = $class->{$method}();
-        }
-
-        return $success;
-    }
-
-    //--------------------------------------------------------------------
+	protected static $tasks = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Schedules a new task in the system.
+	 *
+	 * @param $alias
+	 * @param $time_string
+	 * @param callable|string $task
+	 */
+	public static function schedule($alias, $time_string, $task)
+	{
+		// Valid Alias?
+		if (! is_string($alias) || empty($alias))
+		{
+			throw new \RuntimeException( lang('cron.bad_alias') );
+		}
+
+		// Valid TimeString?
+		if (! is_string($time_string) || empty($time_string))
+		{
+			throw new \RuntimeException( lang('cron.bad_timestring') );
+		}
+
+		// Valid Task?
+		if (! is_callable($task) && ! is_string($task))
+		{
+			throw new \RuntimeException( lang('cron.bad_task') . $alias);
+		}
+
+		static::$tasks[$alias] = new CronTask($time_string, $task);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single task from the system.
+	 *
+	 * @param $alias
+	 */
+	public static function remove($alias)
+	{
+		if (empty(static::$tasks[$alias]))
+		{
+			return null;
+		}
+
+		unset(static::$tasks[$alias]);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Provides an array of all tasks in the system. The format will be
+	 * like:
+	 *      [
+	 *          'alias' => [
+	 *              'next_run'  => '123456789',
+	 *              'prev_run'  => '123456789',
+	 *              'task'  => mixed
+	 *          ],
+	 *          ...
+	 *      ]
+	 */
+	public static function listAll($current_time='now')
+	{
+		if (! count(static::$tasks))
+		{
+			return null;
+		}
+
+		$output = array();
+
+		foreach (static::$tasks as $alias => $task)
+		{
+			$output[$alias] = [
+				'next_run'  => $task->nextRunDate($current_time),
+				'prev_run'  => $task->previousRunDate($current_time),
+				'task'      => $task->task()
+			];
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the task object assigned to an alias.
+	 *
+	 * @param $alias
+	 * @return null|CronTask object
+	 */
+	public static function task($alias)
+	{
+		if (empty(static::$tasks[$alias]) )
+		{
+			return null;
+		}
+
+		return static::$tasks[$alias];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns all tasks currently in the system.
+	 *
+	 * @return array
+	 */
+	public static function tasks()
+	{
+		return count(static::$tasks) ? static::$tasks : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs all tasks scheduled to run right now.
+	 *
+	 * Can be limited to a single task by passing it's alias in the first param.
+	 *
+	 * Returns the output of all task runs as a single string. Perfect for
+	 * emailing to users on completion
+	 *
+	 * @param null $alias
+	 * @param bool $force_run
+	 * @param string $current_time
+	 * @return string
+	 */
+	public static function run($alias=null, $force_run=false, $current_time='now')
+	{
+		$tasks = static::$tasks;
+
+		if (! empty($alias) && isset($tasks[$alias]))
+		{
+			$tasks = [$alias => $tasks[$alias] ];
+		}
+
+		$output = '';
+
+		$count = 0; // How many tasks have ran?
+
+		foreach ($tasks as $alias => $task)
+		{
+			if ($task->isDue($current_time) || $force_run === true)
+			{
+				$output .= sprintf( lang('cron.running_task'), $alias);
+
+				try {
+					$result = self::runTask($alias);
+
+					if (is_bool($result))
+					{
+						$output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
+					}
+					else if (is_string($result))
+					{
+						$output .= sprintf( lang('cron.done_with_msg'), $result);
+					}
+				}
+				catch (\Exception $e)
+				{
+					$output .= "[Exception] ". $e->getMessage() ."\n";
+				}
+
+				$count++;
+			}
+			else
+			{
+				$output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
+			}
+		}
+
+		if (! $count)
+		{
+			$output .= lang('cron.nothing_scheduled');
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears all tasks from the system
+	 */
+	public static function reset()
+	{
+		static::$tasks = [];
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a single Task.
+	 *
+	 * NOTE: Tasks MUST return a true/false value only.
+	 *
+	 * @param $alias
+	 * @return bool
+	 */
+	protected static function runTask($alias)
+	{
+		$task = static::$tasks[$alias]->task();
+
+		$success = false;
+
+		// If it's a standard callable item,
+		// then run it.
+		if (is_callable($task))
+		{
+			$success = call_user_func($task);
+		}
+
+		// Otherwise, if it's a string it should be
+		// a library:method string so try to run it.
+		else if (is_string($task) && ! empty($task) && strpos($task, ':') !== false)
+		{
+			list($class, $method) = explode(':', $task);
+
+			// Let PHP try to autoload it through any available autoloaders
+			// (including Composer and user's custom autoloaders). If we
+			// don't find it, then assume it's a CI library that we can reach.
+			if (class_exists($class)) {
+				$class = new $class();
+			} else {
+				get_instance()->load->library($class);
+				$class =& get_instance()->$class;
+			}
+
+			if (! method_exists($class, $method)) {
+				log_message('error', "[CRON] Method not found: {$class}::{$method}");
+				return $success;
+			}
+
+			// Call the class with our parameters
+			$success = $class->{$method}();
+		}
+
+		return $success;
+	}
+
+	//--------------------------------------------------------------------
 
 }