Remove old tooling

Makefile

@@ -1,45 +0,0 @@
-APP_ENV := dev
-APP_OUTPUT_DIR := output_dev
-APP_URL := homepage.site
-APP_NPM_BUILD_CMD := build
-
-ifeq ($(TARGET), prod)
-	APP_ENV := prod
-	APP_OUTPUT_DIR := output_prod
-	APP_URL := https://vakhrushev.me
-	APP_NPM_BUILD_CMD := build-prod
-endif
-
-# Building
-
-clean:
-	rm -rf ./${APP_OUTPUT_DIR}/*
-
-build-assets:
-	./tools/npm run "${APP_NPM_BUILD_CMD}"
-
-build-site:
-	./tools/sculpin generate \
-		--env="${APP_ENV}" \
-		--url="${APP_URL}" \
-		--no-interaction \
-		-vv
-
-build: clean build-assets build-site
-
-build-prod:
-	$(MAKE) build TARGET=prod
-
-watch: clean build-assets
-	./tools/sculpin generate \
-		--env="${APP_ENV}" \
-		--watch \
-		--server \
-		--port=8000 \
-		--no-interaction
-
-# Deploy
-
-deploy: build-prod
-	invoke deploy
-

Taskfile.yml

@@ -36,14 +36,18 @@ tasks:
     cmds:
       - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" composer {{.CLI_ARGS}}
 
-  shell-node:
-    cmds:
-      - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" bash
-
   npm:
     cmds:
       - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" npm {{.CLI_ARGS}}
 
+  sculpin:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" ./vendor/bin/sculpin {{.CLI_ARGS}}
+
+  shell-node:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" bash
+
   install-dependencies:
     cmds:
       - task: composer
@@ -70,3 +74,35 @@ tasks:
   format-php:
     cmds:
       - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" php-cs-fixer fix
+
+  build-dev:
+    vars:
+      APP_OUTPUT_DIR: output_dev
+      NPM_SCRIPT: build
+      APP_ENV: dev
+      APP_URL: homepage.site      
+    cmds:
+      - rm -rf ./{{.APP_OUTPUT_DIR}}/*
+      - task: npm
+        vars: { CLI_ARGS: 'run {{.NPM_SCRIPT}}' }
+      - task: sculpin
+        vars: { CLI_ARGS: 'generate --env="{{.APP_ENV}}" --url="{{.APP_URL}}" --no-interaction -vv' }
+
+  build-prod:
+    vars:
+      APP_OUTPUT_DIR: output_prod
+      NPM_SCRIPT: build-prod
+      APP_ENV: prod
+      APP_URL: https://vakhrushev.me      
+    cmds:
+      - rm -rf ./{{.APP_OUTPUT_DIR}}/*
+      - task: npm
+        vars: { CLI_ARGS: 'run {{.NPM_SCRIPT}}' }
+      - task: sculpin
+        vars: { CLI_ARGS: 'generate --env="{{.APP_ENV}}" --url="{{.APP_URL}}" --no-interaction -vv' }
+
+  make-post:
+    vars:
+      POST_DATE:
+        sh: date +'%Y-%m-%d'
+    cmd: touch "source/_articles/{{.POST_DATE}}-new-post.md"

tools/dep

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source .env
-
-docker run \
-    --rm \
-	  --interactive \
-	  --tty \
-    --user "$UID:$(id -g)" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume "$HOME:$HOME" \
-	  --volume "$PWD:/srv/app" \
-	  "${PHP_IMAGE}" \
-	  dep "$@"

tools/mkpost

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-touch "source/_articles/$(date +'%Y-%m-%d')-$1.md"

tools/php-cs-fixer

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-source .env
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --user "$UID:$(id -g)" \
-    --volume "$PWD:/srv/app" \
-    "${PHP_IMAGE}" \
-    php-cs-fixer "$@"

tools/sculpin

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source .env
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --init \
-    --user "$UID:$(id -g)" \
-	  --volume="$PWD:/srv/app" \
-	  --expose=8000 \
-	  --publish=8000:8000 \
-	  "${PHP_IMAGE}" \
-	  ./vendor/bin/sculpin "$@"