From 74647e656b1eeb63a961b608bfa454ad4a59fe44 Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Mon, 10 Jul 2023 10:51:51 +0200 Subject: [PATCH] chore: update libs --- .attach_pid1342408 | 0 .attach_pid1349125 | 0 .envrc | 5 + .gitignore | 11 ++ application/source/.idea/.gitignore | 8 ++ application/source/.idea/misc.xml | 23 ++++ application/source/.idea/vcs.xml | 6 ++ application/source/html/sync.go | 11 ++ devenv.lock | 156 ++++++++++++++++++++++++++++ devenv.nix | 49 +++++++++ devenv.yaml | 3 + 11 files changed, 272 insertions(+) create mode 100644 .attach_pid1342408 create mode 100644 .attach_pid1349125 create mode 100644 application/source/.idea/.gitignore create mode 100644 application/source/.idea/misc.xml create mode 100644 application/source/.idea/vcs.xml create mode 100644 devenv.lock create mode 100644 devenv.nix create mode 100644 devenv.yaml diff --git a/.attach_pid1342408 b/.attach_pid1342408 new file mode 100644 index 0000000..e69de29 diff --git a/.attach_pid1349125 b/.attach_pid1349125 new file mode 100644 index 0000000..e69de29 diff --git a/.envrc b/.envrc index 3550a30..f22cef9 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,6 @@ use flake + +source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" +LD_LIBRARY_PATH= +use devenv + diff --git a/.gitignore b/.gitignore index 85e0ac1..a750869 100644 --- a/.gitignore +++ b/.gitignore @@ -515,3 +515,14 @@ tags # and uncomment the following lines # .pnp.* + +# Devenv +.devenv* +devenv.local.nix + +# direnv +.direnv + +# pre-commit +.pre-commit-config.yaml + diff --git a/application/source/.idea/.gitignore b/application/source/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/application/source/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/application/source/.idea/misc.xml b/application/source/.idea/misc.xml new file mode 100644 index 0000000..0ff8b3e --- /dev/null +++ b/application/source/.idea/misc.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ComposerSettings"> + <execution /> + </component> + <component name="ProjectRootManager"> + <output url="file://$PROJECT_DIR$/out" /> + </component> + <component name="accountSettings"> + <option name="activeProfile" value="profile:default" /> + <option name="activeRegion" value="eu-west-1" /> + <option name="recentlyUsedProfiles"> + <list> + <option value="profile:default" /> + </list> + </option> + <option name="recentlyUsedRegions"> + <list> + <option value="eu-west-1" /> + </list> + </option> + </component> +</project> \ No newline at end of file diff --git a/application/source/.idea/vcs.xml b/application/source/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/application/source/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$/../.." vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/application/source/html/sync.go b/application/source/html/sync.go index 1784580..2b36272 100644 --- a/application/source/html/sync.go +++ b/application/source/html/sync.go @@ -9,6 +9,7 @@ import ( "gopkg.in/yaml.v3" "os" "path/filepath" + "strings" ) type Specification struct { @@ -201,6 +202,16 @@ func SyncHtml(p string) error { } x := cas.MatchAll(destinationFiles[d]) if x == nil { + + builder := &strings.Builder{} + + // Render the HTML to the builder + html.Render(builder, destinationFiles[d]) + + // Print the captured HTML to the console + a := builder.String() + fmt.Println(a) + return fmt.Errorf("could not find selector %s in %s", sel, d) } diff --git a/devenv.lock b/devenv.lock new file mode 100644 index 0000000..31f42d2 --- /dev/null +++ b/devenv.lock @@ -0,0 +1,156 @@ +{ + "nodes": { + "devenv": { + "locked": { + "dir": "src/modules", + "lastModified": 1688925746, + "narHash": "sha256-Lora6gsuAdVeVeGj2nD4joxTu+jZsAwySlxY1XZVq8o=", + "owner": "cachix", + "repo": "devenv", + "rev": "b058455b37d2a1833eb71bebd3d2b2aa58ce70d7", + "type": "github" + }, + "original": { + "dir": "src/modules", + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1688925019, + "narHash": "sha256-281HjmJycKt8rZ0/vpYTtJuZrQl6mpGNlUFf8cebmeA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2b356dae6208d422236c4cdc48f3bed749f9daea", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1688596063, + "narHash": "sha256-9t7RxBiKWHygsqXtiNATTJt4lim/oSYZV3RG8OjDDng=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "c8d18ba345730019c3faf412c96a045ade171895", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/devenv.nix b/devenv.nix new file mode 100644 index 0000000..cb7074d --- /dev/null +++ b/devenv.nix @@ -0,0 +1,49 @@ +# See full reference at https://devenv.sh/reference/options/ +{ pkgs, inputs, phps, lib, config, modulesPath,... }: + +{ + + + # https://devenv.sh/packages/ + packages = [ + pkgs.git + pkgs.gcc12 + #pkgs.glibc + pkgs.go-task + pkgs.blackbox + pkgs.blackbox-terminal + pkgs.jq + pkgs.delve + pkgs.gdlv + pkgs.libffi + pkgs.zlib + pkgs.procps + pkgs.php81Extensions.xdebug + pkgs.ranger + pkgs.meld + pkgs.gnused + pkgs.coreutils-full # # https://search.nixos.org/packages?channel=23.05&show=coreutils-full&from=0&size=50&sort=relevance&type=packages&query=mkdir + pkgs.gnugrep + pkgs.gnumake + pkgs.util-linux + # pkgs.logrotate + pkgs.httpie + pkgs.netcat + pkgs.memcached + pkgs.fd + + #pkgs.process-compose + # pkgs.glibc_multi + # pkgs.curl + ]; + + ## curl geht nicht! + + # https://devenv.sh/languages/ + # languages.nix.enable = true; + languages = { + go = { enable = true; }; + }; + + +} diff --git a/devenv.yaml b/devenv.yaml new file mode 100644 index 0000000..c7cb5ce --- /dev/null +++ b/devenv.yaml @@ -0,0 +1,3 @@ +inputs: + nixpkgs: + url: github:NixOS/nixpkgs/nixpkgs-unstable -- GitLab