Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: update import path to v2 #224

Merged
merged 1 commit into from
Jan 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/stencil/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main

import (
"github.com/urfave/cli/v2"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// NewCreateCommand returns a new urfave/cli.Command for the
Expand Down
4 changes: 2 additions & 2 deletions cmd/stencil/create_module.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/pkg/errors"
"github.com/urfave/cli/v2"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"gopkg.in/yaml.v3"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/stencil/create_module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/jaredallard/cmdexec"
"github.com/urfave/cli/v2"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
"gotest.tools/v3/env"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/pkg/errors"
"github.com/urfave/cli/v2"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/pkg/stencil"
)

// NewDescribeCommand returns a new urfave/cli.Command for the describe
Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/describe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"

"github.com/jaredallard/vcs/resolver"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/pkg/stencil"
"gopkg.in/yaml.v3"
"gotest.tools/v3/assert"
"gotest.tools/v3/env"
Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/lockfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package main

import (
"github.com/urfave/cli/v2"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// NewLockfileCommand returns a new urfave/cli.Command for the
Expand Down
6 changes: 3 additions & 3 deletions cmd/stencil/lockfile_prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (

"github.com/pkg/errors"
"github.com/urfave/cli/v2"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
)

// NewLockfilePruneCommand returns a new urfave/cli.Command for the
Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/lockfile_prune_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path"
"testing"

"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"
"os"

"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// entrypoint is the main entrypoint for the stencil CLI. It is
Expand Down
8 changes: 4 additions & 4 deletions cmd/stencil/stencil.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (

"github.com/urfave/cli/v2"

"go.rgst.io/stencil/internal/cmd/stencil"
"go.rgst.io/stencil/internal/version"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/cmd/stencil"
"go.rgst.io/stencil/v2/internal/version"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// Set the version printer to do nothing but print the version.
Expand Down
2 changes: 1 addition & 1 deletion cmd/stencil/stencil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/stencil/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"

"github.com/urfave/cli/v2"
"go.rgst.io/stencil/internal/cmd/stencil"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/cmd/stencil"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// NewUpgradeCommand returns a new urfave/cli.Command for the upgrade
Expand Down
6 changes: 3 additions & 3 deletions cmd/stencil/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"

"github.com/jaredallard/vcs/resolver"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
"gopkg.in/yaml.v3"
"gotest.tools/v3/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module go.rgst.io/stencil
module go.rgst.io/stencil/v2

go 1.23.4

Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/stencil/stencil.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (
"slices"

"github.com/jaredallard/vcs/resolver"
"go.rgst.io/stencil/internal/codegen"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/version"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/internal/codegen"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/version"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
"golang.org/x/mod/semver"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/stencil/stencil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"

"github.com/jaredallard/vcs/resolver"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
"gotest.tools/v3/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/codegen/blocks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

"go.rgst.io/stencil/internal/modules/modulestest"
"go.rgst.io/stencil/internal/testing/testmemfs"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules/modulestest"
"go.rgst.io/stencil/v2/internal/testing/testmemfs"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/codegen/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path/filepath"
"time"

"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// _ ensures that we implement the os.FileInfo interface
Expand Down
14 changes: 7 additions & 7 deletions internal/codegen/stencil.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ import (
"github.com/go-git/go-billy/v5/util"
"github.com/jaredallard/cmdexec"
"github.com/pkg/errors"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/modules/nativeext"
"go.rgst.io/stencil/internal/version"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/extensions/apiv1"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/modules/nativeext"
"go.rgst.io/stencil/v2/internal/version"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/extensions/apiv1"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
)

// NewStencil creates a new, fully initialized Stencil renderer function
Expand Down
12 changes: 6 additions & 6 deletions internal/codegen/stencil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (

"github.com/go-git/go-billy/v5/memfs"
"github.com/jaredallard/vcs/resolver"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/modules/modulestest"
"go.rgst.io/stencil/internal/version"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/modules/modulestest"
"go.rgst.io/stencil/v2/internal/version"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
"gopkg.in/yaml.v3"
"gotest.tools/v3/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"time"

"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// Template is a file that has been processed by stencil
Expand Down
10 changes: 5 additions & 5 deletions internal/codegen/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (

_ "embed"

"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/modules/modulestest"
"go.rgst.io/stencil/internal/testing/testmemfs"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/modules/modulestest"
"go.rgst.io/stencil/v2/internal/testing/testmemfs"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/tpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"fmt"
"text/template"

"go.rgst.io/stencil/internal/modules/nativeext"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules/nativeext"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// NewFuncMap returns the standard func map for a template
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/tpl_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/go-git/go-billy/v5/osfs"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
)

// TplFile is the current file we're writing output to in a
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/tpl_file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"testing"

"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/pkg/stencil"
"go.rgst.io/stencil/v2/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/stencil"
"gotest.tools/v3/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/tpl_module.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"sync"

"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// ErrStopProcessingTemplate is an error that can be returned to
Expand Down
8 changes: 4 additions & 4 deletions internal/codegen/tpl_module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"time"

"github.com/google/go-cmp/cmp"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/modules/modulestest"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/modules/modulestest"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/tpl_stencil.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/davecgh/go-spew/spew"
"github.com/go-git/go-billy/v5"
"github.com/go-git/go-billy/v5/osfs"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
)

// TplStencil contains the global functions available to a template for
Expand Down
4 changes: 2 additions & 2 deletions internal/codegen/tpl_stencil_arg.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"context"
"fmt"

"go.rgst.io/stencil/internal/dotnotation"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/v2/internal/dotnotation"
"go.rgst.io/stencil/v2/pkg/configuration"
)

// Arg returns the value of an argument in the project's manifest
Expand Down
8 changes: 4 additions & 4 deletions internal/codegen/tpl_stencil_arg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"reflect"
"testing"

"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/modules/modulestest"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/modules/modulestest"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
)

type testTpl struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/codegen/tpl_stencil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/go-git/go-billy/v5"
"github.com/pkg/errors"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/modules/modulestest"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/pkg/slogext"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/modules/modulestest"
"go.rgst.io/stencil/v2/pkg/configuration"
"go.rgst.io/stencil/v2/pkg/slogext"
"gotest.tools/v3/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/codegen/values.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
gogit "github.com/go-git/go-git/v5"
vcsgit "github.com/jaredallard/vcs/git"
"github.com/jaredallard/vcs/resolver"
"go.rgst.io/stencil/internal/modules"
"go.rgst.io/stencil/internal/version"
"go.rgst.io/stencil/pkg/configuration"
"go.rgst.io/stencil/v2/internal/modules"
"go.rgst.io/stencil/v2/internal/version"
"go.rgst.io/stencil/v2/pkg/configuration"
)

// runtimeVals contains information about the current state
Expand Down
Loading
Loading