Added the option use just as a builder #398

.github/workflows/docs.yml

@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}

.github/workflows/generate-linter-advanced.yml

@@ -8,9 +8,11 @@ jobs:
   framework_matrix:
     strategy:
       matrix:
-        framework: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
+        framework:
+          [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
         driver: [postgres]
         git: [commit]
+        builder: [just, make]
         advanced: [htmx, githubaction, websocket, tailwind, docker, react]
 
     runs-on: ubuntu-latest
@@ -20,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.x'
+          go-version: "1.23.x"
 
       - name: Install golangci-lint
         run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
@@ -35,16 +37,16 @@ jobs:
         run: echo "PROJECT_DIRECTORY=${{ matrix.framework }}" | sed 's/\//-/g' >> $GITHUB_ENV
 
       - name: build templates
-        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -f ${{ matrix.framework}} -d ${{ matrix.driver }} -g ${{ matrix.git}} --advanced --feature ${{ matrix.advanced }}"
+        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -f ${{ matrix.framework}} -d ${{ matrix.driver }} -g ${{ matrix.git}} -br ${{ matrix.builder}} --advanced --feature ${{ matrix.advanced }}"
 
       - if: ${{ matrix.advanced == 'htmx' || matrix.advanced == 'tailwind' }}
         name: Install Templ & gen templates
-        run: | 
+        run: |
           go install github.com/a-h/templ/cmd/templ@latest
           /home/runner/go/bin/templ generate -path ${{ env.PROJECT_DIRECTORY }}
 
       - name: golangci-lint
-        run: | 
+        run: |
           cd ${{ env.PROJECT_DIRECTORY }}
           golangci-lint run
 

.github/workflows/generate-linter-core.yml

@@ -8,9 +8,11 @@ jobs:
   framework_matrix:
     strategy:
       matrix:
-        framework: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
+        framework:
+          [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
         driver: [mysql, postgres, sqlite, mongo, redis, scylla, none]
         git: [commit, stage, skip]
+        builder: [just]
 
     runs-on: ubuntu-latest
     steps:
@@ -19,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.x'
+          go-version: "1.23.x"
 
       - name: Install golangci-lint
         run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
@@ -34,10 +36,10 @@ jobs:
         run: echo "PROJECT_DIRECTORY=${{ matrix.framework }}" | sed 's/\//-/g' >> $GITHUB_ENV
 
       - name: build templates
-        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -f ${{ matrix.framework}} -d ${{ matrix.driver }} -g ${{ matrix.git}}"
+        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -f ${{ matrix.framework}} -d ${{ matrix.driver }} -g ${{ matrix.git}} -br ${{ matrix.builder}}"
 
       - name: golangci-lint
-        run: | 
+        run: |
           cd ${{ env.PROJECT_DIRECTORY }}
           golangci-lint run
 

.github/workflows/testcontainers.yml

@@ -8,23 +8,22 @@ jobs:
   itests_matrix:
     strategy:
       matrix:
-        driver:
-          [mysql, postgres, mongo, redis, scylla]
+        driver: [mysql, postgres, mongo, redis, scylla]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.x'
+          go-version: "1.23.x"
 
       - name: Commit report
         run: |
           git config --global user.name 'testname'
           git config --global user.email 'testemail@users.noreply.github.com'
 
       - name: build ${{ matrix.driver }} template
-        run: script -q /dev/null -c "go run main.go create -n ${{ matrix.driver }} -g commit -f fiber -d ${{matrix.driver}}"
+        run: script -q /dev/null -c "go run main.go create -n ${{ matrix.driver }} -g commit -b just -f fiber -d ${{matrix.driver}}"
 
       - name: run ${{ matrix.driver }} integration tests
         working-directory: ${{ matrix.driver }}

README.md

@@ -85,6 +85,18 @@ See `go-blueprint create -h` for all the options and shorthands.
 - [Gorilla/mux](https://github.com/gorilla/mux)
 - [Echo](https://github.com/labstack/echo)
 
+<a id="builders-supported"></a>
+
+<h2>
+  <picture>
+    <img src="./public/build.gif?raw=true" width="60px" style="margin-right: 1px;">
+  </picture>
+  Builders Supported
+</h2>
+
+- [GNU Make](https://www.gnu.org/software/make/)
+- [Just](https://github.com/casey/just)
+
 <a id="database-support"></a>
 
 <h2>
@@ -152,7 +164,7 @@ Blueprint UI is a web application that allows you to create commands for the CLI
 Here's an example of setting up a project with a specific database driver:
 
 ```bash
-go-blueprint create --name my-project --framework gin --driver postgres --git commit
+go-blueprint create --name my-project --framework gin --driver postgres --git commit --builder just
 ```
 
 <p align="center">
@@ -206,7 +218,7 @@ go-blueprint create --advanced --feature react
 Or all features at once:
 
 ```bash
-go-blueprint create --name my-project --framework chi --driver mysql --advanced --feature htmx --feature githubaction --feature websocket --feature tailwind --feature docker --git commit --feature react
+go-blueprint create --name my-project --framework chi --driver mysql --advanced --feature htmx --feature githubaction --feature websocket --feature tailwind --feature docker --git commit --builder just --feature react
 ```
 
 <p align="center">

cmd/create.go

@@ -44,6 +44,7 @@ func init() {
 	var flagDBDriver flags.Database
 	var advancedFeatures flags.AdvancedFeatures
 	var flagGit flags.Git
+	var flagBuilder flags.Builder
 	rootCmd.AddCommand(createCmd)
 
 	createCmd.Flags().StringP("name", "n", "", "Name of project to create")
@@ -52,6 +53,13 @@ func init() {
 	createCmd.Flags().BoolP("advanced", "a", false, "Get prompts for advanced features")
 	createCmd.Flags().Var(&advancedFeatures, "feature", fmt.Sprintf("Advanced feature to use. Allowed values: %s", strings.Join(flags.AllowedAdvancedFeatures, ", ")))
 	createCmd.Flags().VarP(&flagGit, "git", "g", fmt.Sprintf("Git to use. Allowed values: %s", strings.Join(flags.AllowedGitsOptions, ", ")))
+	createCmd.Flags().VarP(&flagBuilder, "builder", "br", fmt.Sprintf("Builder to use. Allowed values: %s", strings.Join(flags.AllowedBuilders, ", ")))
+
+	utils.RegisterStaticCompletions(createCmd, "framework", flags.AllowedProjectTypes)
+	utils.RegisterStaticCompletions(createCmd, "driver", flags.AllowedDBDrivers)
+	utils.RegisterStaticCompletions(createCmd, "feature", flags.AllowedAdvancedFeatures)
+	utils.RegisterStaticCompletions(createCmd, "git", flags.AllowedGitsOptions)
+	utils.RegisterStaticCompletions(createCmd, "builder", flags.AllowedBuilders)
 }
 
 type Options struct {
@@ -61,6 +69,7 @@ type Options struct {
 	Advanced    *multiSelect.Selection
 	Workflow    *multiInput.Selection
 	Git         *multiInput.Selection
+	Builder     *multiInput.Selection
 }
 
 // createCmd defines the "create" command for the CLI
@@ -92,6 +101,7 @@ var createCmd = &cobra.Command{
 		flagFramework := flags.Framework(cmd.Flag("framework").Value.String())
 		flagDBDriver := flags.Database(cmd.Flag("driver").Value.String())
 		flagGit := flags.Git(cmd.Flag("git").Value.String())
+		flagBuilder := flags.Builder(cmd.Flag("builder").Value.String())
 
 		options := Options{
 			ProjectName: &textinput.Output{},
@@ -101,6 +111,7 @@ var createCmd = &cobra.Command{
 				Choices: make(map[string]bool),
 			},
 			Git: &multiInput.Selection{},
+			Builder: &multiInput.Selection{},
 		}
 
 		project := &program.Project{
@@ -109,8 +120,10 @@ var createCmd = &cobra.Command{
 			DBDriver:        flagDBDriver,
 			FrameworkMap:    make(map[flags.Framework]program.Framework),
 			DBDriverMap:     make(map[flags.Database]program.Driver),
+			BuilderMap:     make(map[flags.Builder]program.Builder),
 			AdvancedOptions: make(map[string]bool),
 			GitOptions:      flagGit,
+			Builder:	 flagBuilder,
 		}
 
 		steps := steps.InitSteps(flagFramework, flagDBDriver)
@@ -238,6 +251,21 @@ var createCmd = &cobra.Command{
 			}
 		}
 
+		if project.Builder == "" {
+			isInteractive = true
+			step := steps.Steps["builder"]
+			tprogram = tea.NewProgram(multiInput.InitialModelMulti(step.Options, options.Builder, step.Headers, project))
+			if _, err := tprogram.Run(); err != nil {
+				cobra.CheckErr(textinput.CreateErrorInputModel(err).Err())
+			}
+			project.ExitCLI(tprogram)
+
+			project.Builder = flags.Builder(strings.ToLower(options.Builder.Choice))
+			err := cmd.Flag("builder").Value.Set(project.Builder.String())
+			if err != nil {
+				log.Fatal("failed to set the builder flag value: ", err)
+			}
+		}
 		currentWorkingDir, err := os.Getwd()
 		if err != nil {
 			log.Printf("could not get current working directory: %v", err)
@@ -273,7 +301,7 @@ var createCmd = &cobra.Command{
 			if releaseErr := spinner.ReleaseTerminal(); releaseErr != nil {
 				log.Printf("Problem releasing terminal: %v", releaseErr)
 			}
-			log.Printf("Problem creating files for project. %v", err)
+			log.Printf("Problem creating files for project.")
 			cobra.CheckErr(textinput.CreateErrorInputModel(err).Err())
 		}
 

cmd/flags/builder.go

@@ -0,0 +1,37 @@
+
+package flags
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Builder string
+
+const (
+	Make Builder = "make"
+	Just Builder = "just"
+)
+
+var AllowedBuilders = []string{string(Make), string(Just)}
+
+func (f Builder) String() string {
+	return string(f)
+}
+
+func (f *Builder) Type() string {
+	return "Database"
+}
+
+func (f *Builder) Set(value string) error {
+	// Contains isn't available in 1.20 yet
+	// if AllowedDBDrivers.Contains(value) {
+	for _, builder := range AllowedBuilders {
+		if builder == value {
+			*f = Builder(value)
+			return nil
+		}
+	}
+
+	return fmt.Errorf("Builder to use. Allowed values: %s", strings.Join(AllowedBuilders, ", "))
+}