Skip to content

Commit

Permalink
Update command names for consistency (#175)
Browse files Browse the repository at this point in the history
Updated the command names used in command line execution from
`validate:csv`, `create:schema`, and `validate:schema` to
`validate-csv`, `create-schema`, and `validate-schema` respectively.
These changes have been made across all code files, ensuring a more
consistent command naming convention throughout the application. A
legacy name is retained for backwards compatibility.
  • Loading branch information
SmetDenis committed Apr 18, 2024
1 parent 9735b89 commit d192792
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
BLUEPRINT: time ./csv-blueprint
BLUEPRINT_PHAR: time ./build/csv-blueprint.phar
BLUEPRINT_DOCKER: time docker run --rm --workdir=/parent-host -v .:/parent-host jbzoo/csv-blueprint:local
CMD_VALIDATE: validate:csv --ansi -vvv
CMD_VALIDATE: validate-csv --ansi -vvv
VALID_TEST: --csv=./tests/fixtures/batch/*.csv --schema=./tests/schemas/demo_valid.yml
INVALID_TEST: --csv=./tests/fixtures/batch/*.csv --schema=./tests/schemas/demo_*.yml --schema=./tests/schemas/invalid_schema.yml

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COPY ./docker/php.ini /usr/local/etc/php/conf.d/docker-z99-php.ini
# Warmup caches
RUN php ./docker/random-csv.php \
&& JBZOO_BUILD_PRELOADER=1 \
./csv-blueprint validate:csv \
./csv-blueprint validate-csv \
--schema=/app/schema-examples/full.yml \
--csv=/app/docker/random_data.csv \
--apply-all=yes \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ifneq (, $(wildcard ./vendor/jbzoo/codestyle/src/init.Makefile))
endif

DOCKER_IMAGE ?= jbzoo/csv-blueprint:local
CMD_VALIDATE := validate:csv --ansi
CMD_VALIDATE := validate-csv --ansi
BLUEPRINT := COLUMNS=300 time $(PHP_BIN) ./csv-blueprint $(CMD_VALIDATE)
BLUEPRINT_PHAR := COLUMNS=300 time $(PHP_BIN) ./build/csv-blueprint.phar $(CMD_VALIDATE)
BLUEPRINT_DOCKER := time docker run --rm --workdir=/parent-host -v .:/parent-host $(DOCKER_IMAGE) $(CMD_VALIDATE)
Expand Down
27 changes: 14 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ docker run --rm \
--workdir=/parent-host \
-v $(pwd):/parent-host \
jbzoo/csv-blueprint:latest \
validate:csv \ # See available commands and options below.
validate-csv \ # See available commands and options below.
--csv=./tests/fixtures/demo.csv \ # Your CSV(s).
--schema=./tests/schemas/demo_invalid.yml \ # Your schema(s).
--ansi
Expand Down Expand Up @@ -194,22 +194,22 @@ Ensure you have PHP installed on your machine.
# Just download the latest version
wget https://github.com/jbzoo/csv-blueprint/releases/latest/download/csv-blueprint.phar
chmod +x ./csv-blueprint.phar
./csv-blueprint.phar validate:csv \
./csv-blueprint.phar validate-csv \
--csv=./tests/fixtures/demo.csv \
--schema=./tests/schemas/demo_invalid.yml

# OR create project via Composer (--no-dev is optional)
composer create-project --no-dev jbzoo/csv-blueprint
cd ./csv-blueprint
./csv-blueprint validate:csv \
./csv-blueprint validate-csv \
--csv=./tests/fixtures/demo.csv \
--schema=./tests/schemas/demo_invalid.yml

# OR build from source
git clone git@github.com:jbzoo/csv-blueprint.git csv-blueprint
cd csv-blueprint
make build
./csv-blueprint validate:csv \
./csv-blueprint validate-csv \
--csv=./tests/fixtures/demo.csv \
--schema=./tests/schemas/demo_invalid.yml
```
Expand Down Expand Up @@ -1408,18 +1408,19 @@ For detailed information on each command and option, refer to
the [JBZoo/Cli documentation](https://github.com/JBZoo/Cli). This resource provides insights into the functionality and
application of the CLI commands, helping users make the most out of the tool's capabilities.

`./csv-blueprint validate:csv --help`
`./csv-blueprint validate-csv --help`

<details>
<summary>CLICK to see validate:csv help messege</summary>
<summary>CLICK to see validate-csv help messege</summary>

<!-- auto-update:validate-csv-help -->
```
Description:
Validate CSV file(s) by schema(s).
Usage:
validate:csv [options]
validate-csv [options]
validate:csv
Options:
-c, --csv=CSV Specify the path(s) to the CSV files you want to validate.
Expand Down Expand Up @@ -1482,18 +1483,18 @@ Options:
</details>


`./csv-blueprint validate:schema --help`
`./csv-blueprint validate-schema --help`

<details>
<summary>CLICK to see validate:schema help messege</summary>
<summary>CLICK to see validate-schema help messege</summary>

<!-- auto-update:validate-schema-help -->
```
Description:
Validate syntax in schema file(s).
Usage:
validate:schema [options]
validate-schema [options]
Options:
-s, --schema=SCHEMA Specify the path(s) to the schema file(s), supporting YAML, JSON, or PHP formats.
Expand Down Expand Up @@ -1585,19 +1586,19 @@ Options:
</details>


`./csv-blueprint create:schema --help`
`./csv-blueprint create-schema --help`
It's beta. Work in progress.

<details>
<summary>CLICK to see create:schema help messege</summary>
<summary>CLICK to see create-schema help messege</summary>

<!-- auto-update:create-schema-help -->
```
Description:
Analyze CSV files and suggest a schema based on the data found.
Usage:
create:schema [options]
create-schema [options]
Options:
-c, --csv=CSV Specify the path(s) to the CSV files you want to analyze.
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/CreateSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class CreateSchema extends AbstractValidate
protected function configure(): void
{
$this
->setName('create:schema')
->setName('create-schema')
->setDescription('Analyze CSV files and suggest a schema based on the data found.')
->addOption(
'csv',
Expand Down
3 changes: 2 additions & 1 deletion src/Commands/ValidateCsv.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ final class ValidateCsv extends AbstractValidate
protected function configure(): void
{
$this
->setName('validate:csv')
->setName('validate-csv')
->setAliases(['validate:csv']) // Legacy name for backward compatibility only
->setDescription('Validate CSV file(s) by schema(s).')
->addOption(
'csv',
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/ValidateSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class ValidateSchema extends AbstractValidate
protected function configure(): void
{
$this
->setName('validate:schema')
->setName('validate-schema')
->setDescription('Validate syntax in schema file(s).')
->addOption(
'schema',
Expand Down
8 changes: 4 additions & 4 deletions tests/Commands/CreateSchemaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final class CreateSchemaTest extends TestCase
{
public function testWithoutHeader(): void
{
[$actual, $exitCode] = Tools::virtualExecution('create:schema', [
[$actual, $exitCode] = Tools::virtualExecution('create-schema', [
'csv' => './tests/fixtures/demo.csv',
]);

Expand Down Expand Up @@ -100,7 +100,7 @@ public function testWithoutHeader(): void

\file_put_contents(PROJECT_ROOT . '/build/demo.schema.yml', $actual);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => './tests/fixtures/demo.csv',
'schema' => PROJECT_ROOT . '/build/demo.schema.yml',
]);
Expand All @@ -109,7 +109,7 @@ public function testWithoutHeader(): void

public function testWithHeader(): void
{
[$actual, $exitCode] = Tools::virtualExecution('create:schema', [
[$actual, $exitCode] = Tools::virtualExecution('create-schema', [
'csv' => './tests/fixtures/demo.csv',
'header' => 'true',
]);
Expand Down Expand Up @@ -184,7 +184,7 @@ public function testWithHeader(): void

\file_put_contents(PROJECT_ROOT . '/build/demo.schema.yml', $actual);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => './tests/fixtures/demo.csv',
'schema' => PROJECT_ROOT . '/build/demo.schema.yml',
]);
Expand Down
12 changes: 6 additions & 6 deletions tests/Commands/ValidateCsvApplyAllTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testNoPatternApplyAllAutoNegativeMany(): void
],
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -71,7 +71,7 @@ public function testNoPatternApplyAllAutoNegativeGlob(): void
'schema' => './tests/schemas/demo_invalid_*.yml',
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -107,7 +107,7 @@ public function testNoPatternApplyAllAutoPositive(): void
'schema' => './tests/schemas/demo_invalid_no_pattern.yml',
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -150,7 +150,7 @@ public function testNoPatternApplyAllYes(): void
'apply-all' => 'yes',
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -197,7 +197,7 @@ public function testNoPatternApplyAllYesGlob(): void
'apply-all' => 'yes',
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -240,7 +240,7 @@ public function testNoPatternApplyAllNo(): void
'apply-all' => 'no',
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down
16 changes: 8 additions & 8 deletions tests/Commands/ValidateCsvBasicTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class ValidateCsvBasicTest extends TestCase
{
public function testValidateOneCsvPositive(): void
{
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => Tools::DEMO_CSV,
'schema' => Tools::DEMO_YML_VALID,
]);
Expand Down Expand Up @@ -60,7 +60,7 @@ public function testValidateOneCsvPositive(): void

public function testValidateOneCsvNegative(): void
{
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => Tools::DEMO_INVALID_CSV,
'schema' => Tools::DEMO_YML_VALID,
]);
Expand Down Expand Up @@ -98,7 +98,7 @@ public function testValidateOneCsvNegative(): void

public function testValidateOneCsvWithInvalidSchemaNegative(): void
{
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => Tools::DEMO_CSV,
'schema' => Tools::DEMO_YML_INVALID,
]);
Expand Down Expand Up @@ -158,7 +158,7 @@ public function testInvalidSchemaNotMatched(): void
'schema' => Tools::SCHEMA_INVALID,
];
$optionsAsString = new StringInput(Cli::build('', $options));
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $options);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $options);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -206,7 +206,7 @@ public function testInvalidSchemaAndNotFoundCSV(): void
'schema' => Tools::SCHEMA_INVALID,
];
$optionsAsString = new StringInput(Cli::build('', $options));
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $options);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $options);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -247,7 +247,7 @@ public function testInvalidSchemaAndNotFoundCSV(): void

public function testValidateOneCsvNoHeaderNegative(): void
{
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => Tools::DEMO_CSV,
'schema' => './tests/schemas/simple_no_header.yml',
'apply-all' => 'yes',
Expand Down Expand Up @@ -288,7 +288,7 @@ public function testValidateOneCsvNoHeaderNegative(): void

public function testNothingFound(): void
{
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', [
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', [
'csv' => './tests/fixtures/no-found-file.csv',
'schema' => 'invalid_schema_path.yml',
]);
Expand Down Expand Up @@ -325,7 +325,7 @@ public function testNoSchemaWasAppliedToCsv(): void
'./tests/schemas/demo_valid.yml',
],
]);
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down
8 changes: 4 additions & 4 deletions tests/Commands/ValidateCsvBatchCsvTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function testValidateManyCsvPositive(): void
'schema' => Tools::DEMO_YML_VALID,
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -75,7 +75,7 @@ public function testValidateManyCsvNegative(): void
'report' => 'text',
];
$optionsAsString = new StringInput(Cli::build('', $options));
[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $options);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $options);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down Expand Up @@ -125,13 +125,13 @@ public function testValidateManyCsvNegative(): void

public function testMultipleCsvOptions(): void
{
[$expected, $expectedCode] = Tools::virtualExecution('validate:csv', [
[$expected, $expectedCode] = Tools::virtualExecution('validate-csv', [
'csv' => './tests/fixtures/batch/*.csv',
'schema' => Tools::DEMO_YML_INVALID,
]);

$actual = Tools::realExecution(
'validate:csv ' . \implode(' ', [
'validate-csv ' . \implode(' ', [
'--csv="./tests/fixtures/batch/sub/demo-3.csv"',
'--csv="./tests/fixtures/batch/demo-1.csv"',
'--csv="./tests/fixtures/batch/demo-2.csv"',
Expand Down
2 changes: 1 addition & 1 deletion tests/Commands/ValidateCsvBatchSchemaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function testMultiSchemaDiscovery(): void
],
]);

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $optionsAsString);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $optionsAsString);

$expected = <<<'TXT'
CSV Blueprint: Unknown version (PhpUnit)
Expand Down
2 changes: 1 addition & 1 deletion tests/Commands/ValidateCsvQuickTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private function getQuickOutput(?array $quickOption = null): string
$options = \array_merge($options, $quickOption);
}

[$actual, $exitCode] = Tools::virtualExecution('validate:csv', $options);
[$actual, $exitCode] = Tools::virtualExecution('validate-csv', $options);

isSame(1, $exitCode, $actual);

Expand Down
2 changes: 1 addition & 1 deletion tests/Commands/ValidateCsvReportsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ private static function getReport(?string $reportType = null): string
$options['report'] = $reportType;
}

[$output, $exitCode] = Tools::virtualExecution('validate:csv', $options);
[$output, $exitCode] = Tools::virtualExecution('validate-csv', $options);
isSame(1, $exitCode, $output);

$output = \str_replace([
Expand Down

0 comments on commit d192792

Please sign in to comment.