Merge pull request #38 from Hi-Folks/feat/fix-the-new-2

fine tuning and small fix for 2.0
Hi-Folks · Sep 13, 2024 · 7ac8546 · 7ac8546
2 parents 1445b49 + 2c94b17
commit 7ac8546
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ vendor/
 /content/
 /export/
 /ibis.php
+/stubs/export/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.0.1 - 13th September 2024
+- Check if configuration exists
+- Update stubs directory with sample images
+- Update the version for `--version`
+- update highlight js to 9.18.1 (latest version for 9 major rel)
+
+
 ## 2.0.0 - 13th September 2024
 - Upgrading to Pest3 and PHPunit 11(PHP Testing)
 - Dropping support for PHP 8.1

diff --git a/composer.lock b/composer.lock
diff --git a/ibis-next b/ibis-next
@@ -18,7 +18,7 @@ if (file_exists(__DIR__ . '/../../autoload.php')) {
 /**
  * Start the console application.
  */
-$app = new Application('Ibis Next', '1.0.12');
+$app = new Application('Ibis Next', '2.0 (stable)');
 //$app->setDefaultCommand("build");
 
 

diff --git a/src/Commands/BaseBuildCommand.php b/src/Commands/BaseBuildCommand.php
@@ -44,7 +44,17 @@ protected function preExecute(InputInterface $input, OutputInterface $output): b
         $this->disk = new Filesystem();
         $this->output = $output;
 
-        $this->config = Config::load($input->getOption('workingdir'));
+        $workingDir = $input->getOption('workingdir');
+        try {
+            $this->config = Config::load($workingDir);
+        } catch (\Exception) {
+            $this->output->writeln('<error>Error, check if the ibis.php file exist into the ' . $workingDir . ' directory.</error>');
+            $this->output->writeln('<info>Did you run `ibis-next init`?</info>');
+            return false;
+
+        }
+
+
         $this->output->writeln('<info>Loading config/assets from: ' . $this->config->workingPath . '</info>');
         $this->output->writeln('<info>Loading config file from: ' . $this->config->ibisConfigPath . '</info>');
         if ($this->config->setContentPath($input->getOption('content')) === false) {

diff --git a/src/Config.php b/src/Config.php
@@ -24,7 +24,12 @@ public function __construct(public $workingPath = "")
         }
 
         $this->ibisConfigPath = self::buildPath($this->workingPath, 'ibis.php');
-        $this->config = require $this->ibisConfigPath;
+        if (file_exists($this->ibisConfigPath)) {
+            $this->config = require $this->ibisConfigPath;
+        } else {
+            throw new \Exception("The file " . $this->ibisConfigPath . " doesn't exists.");
+        }
+
     }
 
     public static function load($directory = ""): self

diff --git a/stubs/assets/images/aside-examples.png b/stubs/assets/images/aside-examples.png
diff --git a/stubs/assets/images/ibis-next-cover.png b/stubs/assets/images/ibis-next-cover.png
diff --git a/stubs/assets/images/ibis-next-setting-page-header.png b/stubs/assets/images/ibis-next-setting-page-header.png
diff --git a/stubs/assets/theme-dark.html b/stubs/assets/theme-dark.html
@@ -1,5 +1,5 @@
 <header>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.16.2/build/styles/sunburst.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/sunburst.min.css">
   <style>
     body {
       font-family: calibri;

diff --git a/stubs/assets/theme-html.html b/stubs/assets/theme-html.html
@@ -9,7 +9,7 @@
     <!-- Milligram CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/milligram/1.4.1/milligram.css">
     <!-- Highlight CSS -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.16.2/build/styles/github-gist.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/github-gist.min.css">
 </head>
 <body>
     <main class='container'>
@@ -22,4 +22,4 @@
         {{$body}}
     </main>
 </body>
-</html>
+</html>
diff --git a/stubs/assets/theme-light.html b/stubs/assets/theme-light.html
@@ -1,5 +1,5 @@
 <header>
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.16.2/build/styles/github-gist.min.css">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/github-gist.min.css">
   <style>
     body {
       font-family: calibri;