Merge branch 'release/1.5.4'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.5.4
+## 10/26/2021
+
+1. [](#improved)
+   * Moved offline check to CLI flag [#70](https://github.com/getgrav/grav-plugin-devtools/issues/70)
+   * Updated footer copyrights for Pure Blank
+
 # v1.5.3
 ## 06/16/2021
 

README.md

@@ -69,6 +69,11 @@ There are **three template creation options**
 2. `inheritance` - This creates a very basic template with minimal files that inherits a base theme.  To find out more about theme inheritance, [check out the subject in more details on the Grav Learn site](https://learn.getgrav.org/themes/customization#theme-inheritance).
 3. `copy` - This allows you to create a new theme based on an existing theme.  This is the simplest way to get started with a new theme by using another theme as the basis.
 
+## Skipping Online Project Name Collision Checking
 
+By default, devtools will check your project's name with the existing gpm ecosystem to ensure no collisions.  In order to skip this check, add an `--offline` or `-o` to your command:
 
+    `bin/plugin devtools new-theme --offline`
+or
 
+    `bin/plugin devtools new-theme -o`

blueprints.yaml

@@ -1,7 +1,7 @@
 name: DevTools
 slug: devtools
 type: plugin
-version: 1.5.3
+version: 1.5.4
 description: Plugin and Theme scaffolding utilities
 icon: cogs
 author:

classes/DevToolsCommand.php

@@ -293,24 +293,21 @@ protected function validateOptions(): void
      */
     protected function validate(string $type, $value)
     {
-        $grav = Grav::instance();
-        $config = $grav['config'];
         switch ($type) {
             case 'name':
                 // Check If name
                 if ($value === null || trim($value) === '') {
                     throw new \RuntimeException('Name cannot be empty');
                 }
 
-                // Check for name collision with online gpm.
-                $collision_check = $config->get('plugins.devtools.collision_check');
-                if ( $collision_check == true) {
+                if (!$this->options['offline']) {
+                    // Check for name collision with online gpm.
                     if (false !== $this->gpm->findPackage($value)) {
                         throw new \RuntimeException('Package name exists in GPM');
                     }
                 } else {
-                    $this->output->writeln('<red>Warning</red>: Devtools is configured for "<cyan>collision_check</cyan>: <red>false</red>".');
-                    $this->output->writeln('Please be aware that your project\'s plugin or theme name may conflict with an existing plugin or theme.');
+                    $this->output->writeln('');
+                    $this->output->writeln('  <red>Warning</red>: Please note that by skipping the online check, your project\'s plugin or theme name may conflict with an existing plugin or theme.');
                 }
 
                 // Check if it's reserved

cli/NewPluginCommand.php

@@ -51,6 +51,12 @@ protected function configure(): void
                 InputOption::VALUE_OPTIONAL,
                 'The developer\'s email'
             )
+            ->addOption(
+                'offline',
+                'o',
+                InputOption::VALUE_NONE,
+                'Skip online name collision check'
+            )
             ->setDescription('Creates a new Grav plugin with the basic required files')
             ->setHelp('The <info>new-plugin</info> command creates a new Grav instance and performs the creation of a plugin.');
     }
@@ -76,7 +82,8 @@ protected function serve(): int
                 'name' => $input->getOption('dev'),
                 'email' => $input->getOption('email'),
                 'githubid' => $input->getOption('github')
-            ]
+            ],
+            'offline' => $input->getOption('offline'),
         ];
 
         $this->validateOptions();

cli/NewThemeCommand.php

@@ -52,6 +52,12 @@ protected function configure(): void
                 InputOption::VALUE_OPTIONAL,
                 'The developer\'s email'
             )
+            ->addOption(
+                'offline',
+                'o',
+                InputOption::VALUE_NONE,
+                'Skip online name collision check'
+            )
             ->setDescription('Creates a new Grav theme with the basic required files')
             ->setHelp('The <info>new-theme</info> command creates a new Grav instance and performs the creation of a theme.');
     }
@@ -77,7 +83,8 @@ protected function serve(): int
                 'name' => $input->getOption('dev'),
                 'email' => $input->getOption('email'),
                 'githubid' => $input->getOption('github'),
-            ]
+            ],
+            'offline' => $input->getOption('offline'),
         ];
 
         $this->validateOptions();

components/theme/pure-blank/templates/partials/base.html.twig

@@ -57,7 +57,7 @@
 {% block footer %}
     <div class="footer text-center">
         <div class="wrapper padding">
-            <p><a href="https://getgrav.org">Grav</a> was <i class="fa fa-code"></i> with <i class="fa fa-heart"></i> by <a href="https://rockettheme.com">RocketTheme</a>.</p>
+            <p><a href="https://getgrav.org">Grav</a> was <i class="fa fa-code"></i> with <i class="fa fa-heart"></i> by <a href="https://trilby.media">Trilby Media, LLC</a>.</p>
         </div>
     </div>
 {% endblock %}