hof/fmt: yaml stability, json indentation

SCUMM-Next · Mar 9, 2023 · 092c775 · 092c775
1 parent a7d892f
commit 092c775
Show file tree

Hide file tree

Showing 7 changed files with 229 additions and 165 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,13 +1,13 @@
 {
-    "name": "hof cli",
-    "image": "mcr.microsoft.com/devcontainers/universal:2",
-    "postCreateCommand": "sudo rm -rf /usr/local/hugo",
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "asdine.cue",
-                "jallen7usa.vscode-cue-fmt"
-            ]
-        }
+  "name": "hof cli",
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "postCreateCommand": "sudo rm -rf /usr/local/hugo",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "asdine.cue",
+        "jallen7usa.vscode-cue-fmt"
+      ]
     }
+  }
 }
diff --git a/.hof/shadow/cli/cmd/hof/.goreleaser.yml b/.hof/shadow/cli/cmd/hof/.goreleaser.yml
@@ -1,72 +1,72 @@
-archives:
-    - files:
-        - thisfiledoesnotexist*
-      format: binary
-      replacements:
-        amd64: x86_64
-        darwin: Darwin
-        linux: Linux
-        windows: Windows
+project_name: hof
 builds:
-    - binary: hof
-      env:
-        - CGO_ENABLED=0
-      goarch:
-        - amd64
-        - arm64
-      goos:
-        - darwin
-        - linux
-        - windows
-      ldflags:
-        - -s -w
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Version={{.Version}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Commit={{.FullCommit}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildDate={{.Date}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildOS={{.Os}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArch={{.Arch}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArm={{.Arm}}
-      main: main.go
-changelog:
-    filters:
-        exclude:
-            - '^docs:'
-            - '^test:'
-    sort: asc
+  - binary: hof
+    main: main.go
+    ldflags:
+      - -s -w
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Version={{.Version}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Commit={{.FullCommit}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildDate={{.Date}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildOS={{.Os}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArch={{.Arch}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArm={{.Arm}}
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - darwin
+      - linux
+      - windows
+    goarch:
+      - amd64
+      - arm64
+snapshot:
+  name_template: '{{ .Tag }}-SNAPSHOT-{{.ShortCommit}}'
+archives:
+  - format: binary
+    replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      amd64: x86_64
+    files:
+      - thisfiledoesnotexist*
 checksum:
-    name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'
-dockers:
-    - dockerfile: ../../ci/hof/docker/Dockerfile.debian
-      image_templates:
-        - hofstadter/{{.ProjectName}}:{{.Tag}}
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}
-        - hofstadter/{{.ProjectName}}:latest
-        - hofstadter/{{.ProjectName}}:{{.Tag}}-debian
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-debian
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}-debian
-        - hofstadter/{{.ProjectName}}:latest-debian
-      skip_push: false
-    - dockerfile: ../../ci/hof/docker/Dockerfile.alpine
-      image_templates:
-        - hofstadter/{{.ProjectName}}:{{.Tag}}-alpine
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-alpine
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}-alpine
-        - hofstadter/{{.ProjectName}}:latest-alpine
-      skip_push: false
-    - dockerfile: ../../ci/hof/docker/Dockerfile.scratch
-      image_templates:
-        - hofstadter/{{.ProjectName}}:{{.Tag}}-scratch
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-scratch
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}-scratch
-        - hofstadter/{{.ProjectName}}:latest-scratch
-      skip_push: false
-project_name: hof
+  name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
 release:
-    disable: false
-    draft: false
-    github:
-        name: hof
-        owner: hofstadter-io
-snapshot:
-    name_template: '{{ .Tag }}-SNAPSHOT-{{.ShortCommit}}'
+  disable: false
+  draft: false
+  github:
+    owner: hofstadter-io
+    name: hof
+dockers:
+  - skip_push: false
+    dockerfile: ../../ci/hof/docker/Dockerfile.debian
+    image_templates:
+      - hofstadter/{{.ProjectName}}:{{.Tag}}
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}
+      - hofstadter/{{.ProjectName}}:latest
+      - hofstadter/{{.ProjectName}}:{{.Tag}}-debian
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-debian
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}-debian
+      - hofstadter/{{.ProjectName}}:latest-debian
+  - skip_push: false
+    dockerfile: ../../ci/hof/docker/Dockerfile.alpine
+    image_templates:
+      - hofstadter/{{.ProjectName}}:{{.Tag}}-alpine
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-alpine
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}-alpine
+      - hofstadter/{{.ProjectName}}:latest-alpine
+  - skip_push: false
+    dockerfile: ../../ci/hof/docker/Dockerfile.scratch
+    image_templates:
+      - hofstadter/{{.ProjectName}}:{{.Tag}}-scratch
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-scratch
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}-scratch
+      - hofstadter/{{.ProjectName}}:latest-scratch
diff --git a/cmd/hof/.goreleaser.yml b/cmd/hof/.goreleaser.yml
@@ -1,73 +1,72 @@
-archives:
-    - files:
-        - thisfiledoesnotexist*
-      format: binary
-      replacements:
-        amd64: x86_64
-        darwin: Darwin
-        linux: Linux
-        windows: Windows
+project_name: hof
 builds:
-    - binary: hof
-      env:
-        - CGO_ENABLED=0
-      goarch:
-        - amd64
-        - arm64
-      goos:
-        - darwin
-        - linux
-        - windows
-      ldflags:
-        - -s -w
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Version={{.Version}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Commit={{.FullCommit}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildDate={{.Date}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildOS={{.Os}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArch={{.Arch}}
-        - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArm={{.Arm}}
-      main: main.go
-changelog:
-    filters:
-        exclude:
-            - '^docs:'
-            - '^test:'
-    sort: asc
+  - binary: hof
+    main: main.go
+    ldflags:
+      - -s -w
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Version={{.Version}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.Commit={{.FullCommit}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildDate={{.Date}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildOS={{.Os}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArch={{.Arch}}
+      - -X github.com/hofstadter-io/hof/cmd/hof/verinfo.BuildArm={{.Arm}}
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - darwin
+      - linux
+      - windows
+    goarch:
+      - amd64
+      - arm64
+snapshot:
+  name_template: '{{ .Tag }}-SNAPSHOT-{{.ShortCommit}}'
+archives:
+  - format: binary
+    replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      amd64: x86_64
+    files:
+      - thisfiledoesnotexist*
 checksum:
-    name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'
-dockers:
-    - dockerfile: ../../ci/hof/docker/Dockerfile.debian
-      image_templates:
-        - hofstadter/{{.ProjectName}}:{{.Tag}}
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}
-        - hofstadter/{{.ProjectName}}:latest
-        - hofstadter/{{.ProjectName}}:{{.Tag}}-debian
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-debian
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}-debian
-        - hofstadter/{{.ProjectName}}:latest-debian
-      skip_push: false
-    - dockerfile: ../../ci/hof/docker/Dockerfile.alpine
-      image_templates:
-        - hofstadter/{{.ProjectName}}:{{.Tag}}-alpine
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-alpine
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}-alpine
-        - hofstadter/{{.ProjectName}}:latest-alpine
-      skip_push: false
-    - dockerfile: ../../ci/hof/docker/Dockerfile.scratch
-      image_templates:
-        - hofstadter/{{.ProjectName}}:{{.Tag}}-scratch
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-scratch
-        - hofstadter/{{.ProjectName}}:v{{ .Major }}-scratch
-        - hofstadter/{{.ProjectName}}:latest-scratch
-      skip_push: false
-project_name: hof
+  name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt'
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
 release:
-    disable: false
-    draft: false
-    github:
-        name: hof
-        owner: hofstadter-io
-snapshot:
-    name_template: '{{ .Tag }}-SNAPSHOT-{{.ShortCommit}}'
-
+  disable: false
+  draft: false
+  github:
+    owner: hofstadter-io
+    name: hof
+dockers:
+  - skip_push: false
+    dockerfile: ../../ci/hof/docker/Dockerfile.debian
+    image_templates:
+      - hofstadter/{{.ProjectName}}:{{.Tag}}
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}
+      - hofstadter/{{.ProjectName}}:latest
+      - hofstadter/{{.ProjectName}}:{{.Tag}}-debian
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-debian
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}-debian
+      - hofstadter/{{.ProjectName}}:latest-debian
+  - skip_push: false
+    dockerfile: ../../ci/hof/docker/Dockerfile.alpine
+    image_templates:
+      - hofstadter/{{.ProjectName}}:{{.Tag}}-alpine
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-alpine
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}-alpine
+      - hofstadter/{{.ProjectName}}:latest-alpine
+  - skip_push: false
+    dockerfile: ../../ci/hof/docker/Dockerfile.scratch
+    image_templates:
+      - hofstadter/{{.ProjectName}}:{{.Tag}}-scratch
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}-scratch
+      - hofstadter/{{.ProjectName}}:v{{ .Major }}-scratch
+      - hofstadter/{{.ProjectName}}:latest-scratch
diff --git a/formatters/test/json.txt b/formatters/test/json.txt
@@ -9,8 +9,8 @@ cmp in.json golden.json
 }
 -- golden.json --
 {
-    "foo": {
-        "b": "bar",
-        "a": "A"
-    }
+  "foo": {
+    "b": "bar",
+    "a": "A"
+  }
 }
diff --git a/formatters/test/json_pkg.txt b/formatters/test/json_pkg.txt
@@ -0,0 +1,50 @@
+exec hof fmt package.json
+cmp package.json golden.json
+
+-- package.json --
+{
+  "name": "formatter",
+  "version": "0.0.1",
+  "description": "a collection of formatters as a server",
+  "main": "prettier.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "@prettier/plugin-php": "^0.19.3",
+    "@prettier/plugin-ruby": "^3.2.2",
+    "express": "^4.18.2",
+    "prettier": "^2.8.4",
+    "prettier-plugin-go-template": "^0.0.13",
+    "prettier-plugin-groovy": "^0.0.2",
+    "prettier-plugin-java": "^2.0.0",
+    "prettier-plugin-rust": "^0.1.8",
+    "prettier-plugin-sql": "^0.13.0"
+  }
+}
+
+-- golden.json --
+{
+  "name": "formatter",
+  "version": "0.0.1",
+  "description": "a collection of formatters as a server",
+  "main": "prettier.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" \u0026\u0026 exit 1"
+  },
+  "author": "",
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "@prettier/plugin-php": "^0.19.3",
+    "@prettier/plugin-ruby": "^3.2.2",
+    "express": "^4.18.2",
+    "prettier": "^2.8.4",
+    "prettier-plugin-go-template": "^0.0.13",
+    "prettier-plugin-groovy": "^0.0.2",
+    "prettier-plugin-java": "^2.0.0",
+    "prettier-plugin-rust": "^0.1.8",
+    "prettier-plugin-sql": "^0.13.0"
+  }
+}
diff --git a/formatters/test/yaml.txt b/formatters/test/yaml.txt
@@ -2,10 +2,20 @@ exec hof fmt in.yaml
 cmp in.yaml golden.yaml
 
 -- in.yaml --
-foo:
-    b: "B"
-    a: "A"
+name: hof cli
+image: mcr.microsoft.com/devcontainers/universal:2
+postCreateCommand: sudo rm -rf /usr/local/hugo
+customizations:
+  vscode:
+    extensions:
+      - asdine.cue
+      - jallen7usa.vscode-cue-fmt
 -- golden.yaml --
-foo:
-    a: A
-    b: B
+name: hof cli
+image: mcr.microsoft.com/devcontainers/universal:2
+postCreateCommand: sudo rm -rf /usr/local/hugo
+customizations:
+  vscode:
+    extensions:
+      - asdine.cue
+      - jallen7usa.vscode-cue-fmt