Skip to content

Commit

Permalink
Merge pull request #67 from hofstadter-io/update-cue-v0.3.0-alpha3
Browse files Browse the repository at this point in the history
Update to cue v0.3.0 alpha*
  • Loading branch information
verdverm committed Oct 9, 2020
2 parents d584469 + 6cea20c commit 6c0f81a
Show file tree
Hide file tree
Showing 42 changed files with 197 additions and 603 deletions.
4 changes: 4 additions & 0 deletions .hof/shadow/Cli/cmd/hof/cmd/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ var BranchCmd = &cobra.Command{

Use: "branch",

Aliases: []string{
"b",
},

Short: "list, create, or delete branches",

Long: branchLong,
Expand Down
4 changes: 4 additions & 0 deletions .hof/shadow/Cli/cmd/hof/cmd/checkout.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ var CheckoutCmd = &cobra.Command{

Use: "checkout",

Aliases: []string{
"co",
},

Short: "switch branches or restore working tree files",

Long: checkoutLong,
Expand Down
4 changes: 4 additions & 0 deletions .hof/shadow/Cli/cmd/hof/cmd/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ var CommitCmd = &cobra.Command{

Use: "commit",

Aliases: []string{
"c",
},

Short: "record changes to the repository",

Long: commitLong,
Expand Down
4 changes: 4 additions & 0 deletions .hof/shadow/Cli/cmd/hof/cmd/include.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ var IncludeCmd = &cobra.Command{

Use: "include",

Aliases: []string{
"i",
},

Short: "include changes into the changeset",

Long: includeLong,
Expand Down
6 changes: 3 additions & 3 deletions .hof/shadow/Cli/cmd/hof/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/hofstadter-io/hof/cmd/hof/ga"
)

var hofLong = `Polyglot Code Gereration Framework`
var hofLong = `The High Code Framework`

func init() {

Expand Down Expand Up @@ -80,7 +80,7 @@ var RootCmd = &cobra.Command{

Use: "hof",

Short: "Polyglot Code Gereration Framework",
Short: "The High Code Framework",

Long: hofLong,

Expand Down Expand Up @@ -273,7 +273,7 @@ func CallTS(ts *runtime.Script, args []string) error {
return err
}

const RootCustomHelp = `hof - a polyglot tool for building software
const RootCustomHelp = `hof - the high code framework
Learn more at https://docs.hofstadter.io
Expand Down
4 changes: 4 additions & 0 deletions .hof/shadow/Cli/cmd/hof/cmd/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ var StatusCmd = &cobra.Command{

Use: "status",

Aliases: []string{
"s",
},

Short: "show workspace information and status",

Long: statusLong,
Expand Down
4 changes: 4 additions & 0 deletions cmd/hof/cmd/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var BranchCmd = &cobra.Command{

Use: "branch",

Aliases: []string{
"b",
},

Short: "list, create, or delete branches",

Long: branchLong,
Expand Down
4 changes: 4 additions & 0 deletions cmd/hof/cmd/checkout.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var CheckoutCmd = &cobra.Command{

Use: "checkout",

Aliases: []string{
"co",
},

Short: "switch branches or restore working tree files",

Long: checkoutLong,
Expand Down
4 changes: 4 additions & 0 deletions cmd/hof/cmd/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var CommitCmd = &cobra.Command{

Use: "commit",

Aliases: []string{
"c",
},

Short: "record changes to the repository",

Long: commitLong,
Expand Down
4 changes: 4 additions & 0 deletions cmd/hof/cmd/include.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var IncludeCmd = &cobra.Command{

Use: "include",

Aliases: []string{
"i",
},

Short: "include changes into the changeset",

Long: includeLong,
Expand Down
8 changes: 4 additions & 4 deletions cmd/hof/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

)

var hofLong = `Polyglot Code Gereration Framework`
var hofLong = `The High Code Framework`

func init() {

Expand Down Expand Up @@ -80,7 +80,7 @@ var RootCmd = &cobra.Command{

Use: "hof",

Short: "Polyglot Code Gereration Framework",
Short: "The High Code Framework",

Long: hofLong,

Expand Down Expand Up @@ -273,7 +273,7 @@ func CallTS(ts *runtime.Script, args []string) error {
return err
}

const RootCustomHelp = `hof - a polyglot tool for building software
const RootCustomHelp = `hof - the high code framework
Learn more at https://docs.hofstadter.io
Expand Down Expand Up @@ -404,4 +404,4 @@ please check out the others!
var RootExamples = map[string]string{
"test-example": `Thit is a test example, check out the subcommands, repo, and website for more!
`,
}
}
4 changes: 4 additions & 0 deletions cmd/hof/cmd/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ var StatusCmd = &cobra.Command{

Use: "status",

Aliases: []string{
"s",
},

Short: "show workspace information and status",

Long: statusLong,
Expand Down
1 change: 0 additions & 1 deletion cue.mods
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/hofstadter-io/hof
cue master

require (
github.com/hofstadter-io/hofmod-cli v0.5.9
github.com/hofstadter-io/hofmod-cuefig v0.0.1
)

Expand Down
10 changes: 5 additions & 5 deletions design/cli/cmds/workflow.cue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
TBD: "α"
Name: "status"
Usage: "status"
Alias: ["s"]
Aliases: ["s"]
Short: "show workspace information and status"
Long: Short
}
Expand Down Expand Up @@ -45,7 +45,7 @@ import (
TBD: "α"
Name: "include"
Usage: "include"
Alias: ["i"]
Aliases: ["i"]
Short: "include changes into the changeset"
Long: Short
}
Expand All @@ -54,7 +54,7 @@ import (
TBD: "α"
Name: "branch"
Usage: "branch"
Alias: ["b"]
Aliases: ["b"]
Short: "list, create, or delete branches"
Long: Short
}
Expand All @@ -63,7 +63,7 @@ import (
TBD: "α"
Name: "checkout"
Usage: "checkout"
Alias: ["co"]
Aliases: ["co"]
Short: "switch branches or restore working tree files"
Long: Short
}
Expand All @@ -72,7 +72,7 @@ import (
TBD: "α"
Name: "commit"
Usage: "commit"
Alias: ["c"]
Aliases: ["c"]
Short: "record changes to the repository"
Long: Short
}
Expand Down
2 changes: 1 addition & 1 deletion design/cli/help.cue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// TBD: "✓"

#RootCustomHelp: """
hof - a polyglot tool for building software
hof - the high code framework
Learn more at https://docs.hofstadter.io
Expand Down
2 changes: 1 addition & 1 deletion design/cli/main.cue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
Package: "github.com/hofstadter-io/hof/cmd/hof"

Usage: "hof"
Short: "Polyglot Code Gereration Framework"
Short: "The High Code Framework"
Long: Short
CustomHelp: #RootCustomHelp
Topics: #RootTopics
Expand Down
2 changes: 1 addition & 1 deletion design/cli/releases.cue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
)

#CliReleases: schema.#GoReleaser & {
Disabled: false
Disable: false
Draft: false
Author: "Hofstadter, Inc"
Homepage: "https://hofstadter.io"
Expand Down
14 changes: 7 additions & 7 deletions design/config/main.cue
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
package config

import (
hof "github.com/hofstadter-io/hof/schema"
// hof "github.com/hofstadter-io/hof/schema"

"github.com/hofstadter-io/hofmod-cuefig/schema"
)

// Local context
#HofContext: schema.#Config & {
#HofContext: schema._Config & {
Name: "context"
Entrypoint: ".hofctx.cue"
ConfigSchema: #ContextSchema
}

// Local config
#HofConfig: schema.#Config & {
#HofConfig: schema._Config & {
Name: "config"
Entrypoint: ".hofcfg.cue"
ConfigSchema: #WorkspaceSchema
}

// Local secret
#HofSecret: schema.#Config & {
#HofSecret: schema._Config & {
Sensative: true
Name: "secret"
Entrypoint: ".hofshh.cue"
ConfigSchema: #SecretSchema
}

// (user/app config dir) context
#HofUserContext: schema.#Config & {
#HofUserContext: schema._Config & {
Name: "hofctx"
Entrypoint: ".hofctx.cue"
Workpath: "hof"
Expand All @@ -38,7 +38,7 @@ import (
}

// (user/app config dir) config
#HofUserConfig: schema.#Config & {
#HofUserConfig: schema._Config & {
Name: "hofcfg"
Entrypoint: ".hofcfg.cue"
Workpath: "hof"
Expand All @@ -47,7 +47,7 @@ import (
}

// (user/app config dir) secret
#HofUserSecret: schema.#Config & {
#HofUserSecret: schema._Config & {
Sensative: true
Name: "hofshh"
Entrypoint: ".hofshh.cue"
Expand Down
Empty file removed docs/designs/readme.md
Empty file.
10 changes: 0 additions & 10 deletions docs/develop/readme.md

This file was deleted.

Empty file removed docs/dsl-gen/readme.md
Empty file.
10 changes: 0 additions & 10 deletions docs/install.md

This file was deleted.

0 comments on commit 6c0f81a

Please sign in to comment.