Skip to content

Commit

Permalink
Fix package name to allow using go install...
Browse files Browse the repository at this point in the history
  • Loading branch information
silphid committed Apr 18, 2022
1 parent aaaf788 commit 8173754
Show file tree
Hide file tree
Showing 33 changed files with 98 additions and 98 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Samasource/jen
module github.com/silphid/jen

go 1.16

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

"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/cmd/internal"
"github.com/Samasource/jen/src/internal/exec"
"github.com/silphid/jen/src/cmd/internal"
"github.com/silphid/jen/src/internal/exec"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions src/cmd/exec/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"strings"

"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/cmd/internal"
"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/shell"
"github.com/silphid/jen/src/cmd/internal"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/shell"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/export/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"sort"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/internal"
"github.com/spf13/cobra"
)

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

"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/helpers"
"github.com/Samasource/jen/src/internal/home"
"github.com/Samasource/jen/src/internal/logging"
"github.com/Samasource/jen/src/internal/project"
"github.com/Samasource/jen/src/internal/spec"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/helpers"
"github.com/silphid/jen/src/internal/home"
"github.com/silphid/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/project"
"github.com/silphid/jen/src/internal/spec"
)

// Options represents all command line configurations
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/list/actions/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actions
import (
"fmt"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/internal"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions src/cmd/list/list.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package list

import (
"github.com/Samasource/jen/src/cmd/internal"
"github.com/Samasource/jen/src/cmd/list/actions"
"github.com/Samasource/jen/src/cmd/list/scripts"
"github.com/Samasource/jen/src/cmd/list/templates"
"github.com/Samasource/jen/src/cmd/list/vars"
"github.com/silphid/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/list/actions"
"github.com/silphid/jen/src/cmd/list/scripts"
"github.com/silphid/jen/src/cmd/list/templates"
"github.com/silphid/jen/src/cmd/list/vars"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/list/scripts/scripts.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package scripts
import (
"fmt"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/internal"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions src/cmd/list/templates/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"path/filepath"
"strings"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/Samasource/jen/src/internal/home"
"github.com/Samasource/jen/src/internal/spec"
"github.com/silphid/jen/src/cmd/internal"
"github.com/silphid/jen/src/internal/home"
"github.com/silphid/jen/src/internal/spec"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/list/vars/vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"sort"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/internal"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions src/cmd/pull/pull.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package pull

import (
"github.com/Samasource/jen/src/internal/home"
"github.com/Samasource/jen/src/internal/shell"
"github.com/silphid/jen/src/internal/home"
"github.com/silphid/jen/src/internal/shell"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/require/require.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/internal"
"github.com/spf13/cobra"
)

Expand Down
18 changes: 9 additions & 9 deletions src/cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package cmd

import (
"github.com/Samasource/jen/src/cmd/do"
"github.com/Samasource/jen/src/cmd/exec"
"github.com/Samasource/jen/src/cmd/export"
"github.com/Samasource/jen/src/cmd/internal"
"github.com/Samasource/jen/src/cmd/pull"
"github.com/Samasource/jen/src/cmd/require"
"github.com/Samasource/jen/src/cmd/shell"
"github.com/Samasource/jen/src/cmd/versioning"
"github.com/Samasource/jen/src/internal/logging"
"github.com/silphid/jen/src/cmd/do"
"github.com/silphid/jen/src/cmd/exec"
"github.com/silphid/jen/src/cmd/export"
"github.com/silphid/jen/src/cmd/internal"
"github.com/silphid/jen/src/cmd/pull"
"github.com/silphid/jen/src/cmd/require"
"github.com/silphid/jen/src/cmd/shell"
"github.com/silphid/jen/src/cmd/versioning"
"github.com/silphid/jen/src/internal/logging"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions src/cmd/shell/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"strings"

"github.com/Samasource/jen/src/cmd/internal"
"github.com/Samasource/jen/src/internal/shell"
"github.com/silphid/jen/src/cmd/internal"
"github.com/silphid/jen/src/internal/shell"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion src/internal/evaluation/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"path/filepath"

"github.com/Samasource/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/logging"
)

// Render copies all files from inputDir into outputDir, rendering as templates those for which rendering is enabled
Expand Down
2 changes: 1 addition & 1 deletion src/internal/helpers/variables/variables.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package variables

import "github.com/Samasource/jen/src/internal/helpers/conversion"
import "github.com/silphid/jen/src/internal/helpers/conversion"

// TryGetString tries to fetch given variable from map and return it as a string,
// also returning whether the variable was successfully found and converted.
Expand Down
8 changes: 4 additions & 4 deletions src/internal/home/home.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"os"
"path/filepath"

"github.com/Samasource/jen/src/internal/constant"
"github.com/Samasource/jen/src/internal/helpers"
"github.com/Samasource/jen/src/internal/logging"
"github.com/Samasource/jen/src/internal/shell"
"github.com/mitchellh/go-homedir"
"github.com/silphid/jen/src/internal/constant"
"github.com/silphid/jen/src/internal/helpers"
"github.com/silphid/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/shell"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions src/internal/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"strings"

survey "github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/internal/constant"
"github.com/Samasource/jen/src/internal/helpers"
"github.com/Samasource/jen/src/internal/home"
"github.com/Samasource/jen/src/internal/spec"
"github.com/silphid/jen/src/internal/constant"
"github.com/silphid/jen/src/internal/helpers"
"github.com/silphid/jen/src/internal/home"
"github.com/silphid/jen/src/internal/spec"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion src/internal/shell/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/exec"
"strings"

"github.com/Samasource/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/logging"
)

// Execute executes one or multiple shell commands, given specific env vars (defaults to process' env vars if nil)
Expand Down
4 changes: 2 additions & 2 deletions src/internal/spec/action.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package spec

import (
"github.com/Samasource/jen/src/internal/exec"
logging "github.com/Samasource/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/exec"
logging "github.com/silphid/jen/src/internal/logging"
)

// Action represents a named executable that can be invoked from the
Expand Down
22 changes: 11 additions & 11 deletions src/internal/spec/spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import (
"fmt"
"path/filepath"

"github.com/Samasource/jen/src/internal/constant"
"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/steps"
"github.com/Samasource/jen/src/internal/steps/choice"
"github.com/Samasource/jen/src/internal/steps/do"
execstep "github.com/Samasource/jen/src/internal/steps/exec"
"github.com/Samasource/jen/src/internal/steps/input"
"github.com/Samasource/jen/src/internal/steps/option"
"github.com/Samasource/jen/src/internal/steps/options"
"github.com/Samasource/jen/src/internal/steps/render"
"github.com/Samasource/jen/src/internal/steps/set"
"github.com/kylelemons/go-gypsy/yaml"
"github.com/silphid/jen/src/internal/constant"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/steps"
"github.com/silphid/jen/src/internal/steps/choice"
"github.com/silphid/jen/src/internal/steps/do"
execstep "github.com/silphid/jen/src/internal/steps/exec"
"github.com/silphid/jen/src/internal/steps/input"
"github.com/silphid/jen/src/internal/steps/option"
"github.com/silphid/jen/src/internal/steps/options"
"github.com/silphid/jen/src/internal/steps/render"
"github.com/silphid/jen/src/internal/steps/set"
)

// Spec represents a template specification file found in the root of the template's dir
Expand Down
20 changes: 10 additions & 10 deletions src/internal/spec/spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import (
"strings"
"testing"

"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/steps"
"github.com/Samasource/jen/src/internal/steps/choice"
"github.com/Samasource/jen/src/internal/steps/do"
execstep "github.com/Samasource/jen/src/internal/steps/exec"
"github.com/Samasource/jen/src/internal/steps/input"
"github.com/Samasource/jen/src/internal/steps/option"
"github.com/Samasource/jen/src/internal/steps/options"
"github.com/Samasource/jen/src/internal/steps/render"
"github.com/Samasource/jen/src/internal/steps/set"
"github.com/go-test/deep"
"github.com/kylelemons/go-gypsy/yaml"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/steps"
"github.com/silphid/jen/src/internal/steps/choice"
"github.com/silphid/jen/src/internal/steps/do"
execstep "github.com/silphid/jen/src/internal/steps/exec"
"github.com/silphid/jen/src/internal/steps/input"
"github.com/silphid/jen/src/internal/steps/option"
"github.com/silphid/jen/src/internal/steps/options"
"github.com/silphid/jen/src/internal/steps/render"
"github.com/silphid/jen/src/internal/steps/set"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions src/internal/steps/choice/choice.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package choice

import (
"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/internal/evaluation"
"github.com/Samasource/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/evaluation"
"github.com/silphid/jen/src/internal/exec"
)

// Item represent one of the multiple choices prompted to user
Expand Down
6 changes: 3 additions & 3 deletions src/internal/steps/confirm.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package steps

import (
"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/internal/evaluation"
"github.com/Samasource/jen/src/internal/exec"
logging "github.com/Samasource/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/evaluation"
"github.com/silphid/jen/src/internal/exec"
logging "github.com/silphid/jen/src/internal/logging"
)

// Confirm represents a conditional step that executes its child executable only if
Expand Down
2 changes: 1 addition & 1 deletion src/internal/steps/do/do.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package do
import (
"fmt"

"github.com/Samasource/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/exec"
)

// Do represents a reference to another action within same spec file to which
Expand Down
4 changes: 2 additions & 2 deletions src/internal/steps/exec/exec.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package exec

import (
"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/shell"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/shell"
)

// Exec represent a set of shell commands
Expand Down
6 changes: 3 additions & 3 deletions src/internal/steps/if.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package steps
import (
"fmt"

"github.com/Samasource/jen/src/internal/evaluation"
"github.com/Samasource/jen/src/internal/exec"
logging "github.com/Samasource/jen/src/internal/logging"
"github.com/silphid/jen/src/internal/evaluation"
"github.com/silphid/jen/src/internal/exec"
logging "github.com/silphid/jen/src/internal/logging"
)

// If represents a conditional step that executes its child executable only if
Expand Down
6 changes: 3 additions & 3 deletions src/internal/steps/input/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package input

import (
"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/internal/evaluation"
"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/helpers/variables"
"github.com/silphid/jen/src/internal/evaluation"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/helpers/variables"
)

// Prompt represents a single text input user prompt
Expand Down
6 changes: 3 additions & 3 deletions src/internal/steps/option/option.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package option

import (
"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/internal/evaluation"
"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/helpers/variables"
"github.com/silphid/jen/src/internal/evaluation"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/helpers/variables"
)

// Prompt represents a boolean user prompt
Expand Down
6 changes: 3 additions & 3 deletions src/internal/steps/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package options

import (
"github.com/AlecAivazis/survey/v2"
"github.com/Samasource/jen/src/internal/evaluation"
"github.com/Samasource/jen/src/internal/exec"
"github.com/Samasource/jen/src/internal/helpers/variables"
"github.com/silphid/jen/src/internal/evaluation"
"github.com/silphid/jen/src/internal/exec"
"github.com/silphid/jen/src/internal/helpers/variables"
)

// Item represent one of the multiple boolean values prompted to user
Expand Down
Loading

0 comments on commit 8173754

Please sign in to comment.