Skip to content

Commit

Permalink
Release 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dermatz committed May 4, 2023
1 parent 689676a commit 9942bc8
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 18 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
All notable changes to this project will be documented in this file.
---
### Upcoming Changes for 1.2.0
- change Wording in README.md and CHANGELOG.md

---
## Latesest Release
### 1.1.1
- **Important Change** Switch command from `ddev woodoo ...` to `ddev frontend ...`
- update README.md Feature List and Update instructions
- change Wording in README.md and CHANGELOG.md
- change Wording in `selfcheck`
- improve Errorhandling in theme path validation (during `ddev woodoo themes`)
- improve Errorhandling in theme path validation (during `ddev frontend themes`)

### 1.1.0

Expand Down
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ddev Woodoo-Buildtools for Magento
# ddev Woodoo Frontend Buildtools for Magento
[![tests](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml/badge.svg)](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2024.svg)

---
Expand All @@ -13,7 +13,7 @@ _>> Build all your Magento themes at once, with Magic, build with Woodoo!_
|<img src="https://img.shields.io/badge/Magento_2.x-Supported-43A047">| released |
|<img src="https://img.shields.io/badge/Magento_2_Hyvä_1.2x-Supported-43A047">| released |
|<img src="https://img.shields.io/badge/Magento_2_Hyvä_Fallback-Supported-43A047">| released |
|<img src="https://img.shields.io/badge/Magento_1 (_MageOne_)-planned-BDBDBD">| planned 2023 |
|<img src="https://img.shields.io/badge/Magento_1 (_MageOne_)-planned-FFCA28">| not started yet |

| Features | Status |
|-|-|
Expand All @@ -24,24 +24,30 @@ _>> Build all your Magento themes at once, with Magic, build with Woodoo!_
|<img src="https://img.shields.io/badge/Hyvä_Fallback_Themes-Supported-43A047">| released |
|<img src="https://img.shields.io/badge/DDEV Project_Selfcheck-Supported-43A047">| released |
|<img src="https://img.shields.io/badge/DDEV Get_Installer-Supported-43A047">| released |
|<img src="https://img.shields.io/badge/Magento_2_Code_Quality_Tools-planned-FFCA28">| not started yet |

---
## Install
**1 . Get the latest Version (Main-Branch) of Woodoo with following command in your ddev project root**
#### Latest stable version (recommended)
**1 . Get the latest Version with following command in your ddev project root**
##### Latest stable version (recommended)
```shell
ddev get https://github.com/dermatz/ddev-woodoo-buildtools-magento/archive/refs/tags/1.1.1.tar.gz
```
#### Latest developer-version
##### Latest Developer-version (Main-Branch) - can be instable!
```shell
ddev get https://github.com/dermatz/ddev-woodoo-buildtools-magento/archive/refs/heads/main.tar.gz
```
---
**2. Start Woodoo Init to update your ./ddev/config.yaml**

```shell
ddev woodoo init
ddev frontend init
```

- Add all themes you want to build or watch

----

**3. Edit .ddev/config.yaml**
Open and edit `.ddev/config.yaml` and specify pathes to the themes based on your project structure. (E.g. `src/vendor/...` or `app/design/frontend/Vendor/...`)

Expand All @@ -51,7 +57,7 @@ If a newer Release is available you can install the specific version in the same

## Usage
```shell
Usage: ddev woodoo [command] [option, theme]
Usage: ddev frontend [command] [option, theme]

Command:
init Setup Woodoo, get all themes from dataabase and write to .ddev/config.yaml
Expand Down
9 changes: 4 additions & 5 deletions commands/web/woodoo → commands/web/frontend
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#!/bin/bash
#ddev-generated - Do not modify this file; your modifications will be overwritten.

## Description: Run woodoo inside the web container in the root of the project (Use --cwd for another directory)
## Usage: woodoo [flags] [args]
## Example: "ddev woodoo install"
## Description: Run the frontend command inside the web container in the root of the project (Use --cwd for another directory)
## Usage: frontend [flags] [args]
## Example: "ddev frontend init"
## ExecRaw: true
## HostWorkingDir: true


source ".ddev/commands/web/woodoo_components/variables"

echo -e "🛠️ ${bldblu}DDEV Woodoo-Buildtools $WOODOO_VERSION for Magento${txtrst}"
echo -e "🛠️ ${bldblu}DDEV Woodoo Frontend Buildtools $WOODOO_VERSION for Magento${txtrst}"

source ".ddev/commands/web/woodoo_components/checks"
source ".ddev/commands/web/woodoo_components/themes"
Expand Down
4 changes: 2 additions & 2 deletions commands/web/woodoo_components/help
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
if [[ "$1" == "help" || "$1" == "-help" || "$1" == "--help" || "$1" == "--h" || "$1" == "--hilfe" || "$1" == "--rtfm" || "$1" == "--manual" || "$1" == "--doc" ]]; then
readThemesInConfig

echo -e "${txtgrn}\nUsage: ${txtrst}ddev woodoo [${txtcyn}command${txtrst}] [${txtylw}option${txtrst} or ${txtpur}theme${txtrst}]\n"
echo -e "${txtgrn}\nUsage: ${txtrst}ddev frontend [${txtcyn}command${txtrst}] [${txtylw}option${txtrst} or ${txtpur}theme${txtrst}]\n"

echo -e "${txtcyn}Command:${txtrst}"
echo -e " ${txtcyn}help${txtrst} Displays this help page"
echo -e " ${txtcyn}check, selftest${txtrst} Woodoo Self Test"
echo -e " ${txtcyn}check, selftest${txtrst} Frontend Self-Test"
echo -e " ${txtcyn}themes${txtrst} List all available themes that are configured in ${txtcyn}.ddev/config.yaml${txtrst}"
echo -e " ${txtcyn}build${txtrst} Builds all themes that are configured in ${txtcyn}.ddev/config.yaml${txtrst}"
echo -e " ${txtcyn}build ${txtpur}theme${txtrst} Build a specific theme${txtrst}"
Expand Down
2 changes: 1 addition & 1 deletion commands/web/woodoo_components/variables
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#ddev-generated - Do not modify this file; your modifications will be overwritten.
WOODOO_VERSION="1.1.0"
WOODOO_VERSION="1.1.1"
LATEST_WOODOO_VERSION=$(curl -s https://api.github.com/repos/dermatz/ddev-woodoo-buildtools-magento/releases/latest | grep tag_name | cut -d '"' -f 4)

PROJECT_CONFIG_FILE=".ddev/config.yaml"
Expand Down
2 changes: 1 addition & 1 deletion install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pre_install_actions:

project_files:
- commands/web/woodoo_components/
- commands/web/woodoo
- commands/web/frontend

post_install_actions:

0 comments on commit 9942bc8

Please sign in to comment.