refactor: srcディレクトリを掘ってそこにGoのソースコードを置くように

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/xztaityozx/sel/cmd"
+	"github.com/xztaityozx/sel/src/cmd"
 )
 
 func main() {

src/cmd/completion.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"log"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var completionCmd = &cobra.Command{
+	Use:                   "completion [bash|zsh|fish|powershell]",
+	Short:                 "Generate completion script",
+	DisableFlagsInUseLine: true,
+	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
+	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
+	Run: func(cmd *cobra.Command, args []string) {
+		switch args[0] {
+		case "bash":
+			err := cmd.Root().GenBashCompletion(os.Stdout)
+			if err != nil {
+				log.Fatalln(err)
+			}
+		case "zsh":
+			err := cmd.Root().GenZshCompletion(os.Stdout)
+			if err != nil {
+				log.Fatalln(err)
+			}
+		case "fish":
+			err := cmd.Root().GenFishCompletion(os.Stdout, true)
+			if err != nil {
+				log.Fatalln(err)
+			}
+		case "powershell":
+			err := cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
+			if err != nil {
+				log.Fatalln(err)
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(completionCmd)
+	completionCmd.SetUsageTemplate(completionCmd.Use)
+}

cmd/root.go → src/cmd/root.go

@@ -8,13 +8,13 @@ import (
 	"os"
 	"strings"
 
-	"github.com/xztaityozx/sel/iterator"
+	"github.com/xztaityozx/sel/src/iterator"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/xztaityozx/sel/column"
-	"github.com/xztaityozx/sel/option"
-	"github.com/xztaityozx/sel/parser"
+	"github.com/xztaityozx/sel/src/column"
+	"github.com/xztaityozx/sel/src/option"
+	"github.com/xztaityozx/sel/src/parser"
 )
 
 var Version string = "undefined"

column/index.go → src/column/index.go

@@ -3,7 +3,7 @@ package column
 import (
 	"strconv"
 
-	"github.com/xztaityozx/sel/iterator"
+	"github.com/xztaityozx/sel/src/iterator"
 )
 
 // IndexSelector は単一のindexを指定してカラムを選択するやつ

column/index_test.go → src/column/index_test.go

@@ -3,7 +3,7 @@ package column
 import (
 	"bytes"
 	"github.com/stretchr/testify/assert"
-	"github.com/xztaityozx/sel/iterator"
+	"github.com/xztaityozx/sel/src/iterator"
 	"github.com/xztaityozx/sel/test_util"
 	"math/rand"
 	"reflect"
@@ -43,15 +43,15 @@ func TestNewIndexSelectorFromString(t *testing.T) {
 }
 
 func TestNewIndexSelector(t *testing.T) {
-	rand.Seed(time.Now().UnixNano())
+	rand.New(rand.NewSource(time.Now().UnixNano()))
 	expect := rand.Int()
 	actual := NewIndexSelector(expect)
 	assert.Equal(t, expect, actual.index)
 }
 
 func TestIndexSelector_Select(t *testing.T) {
 
-	rand.Seed(time.Now().UnixNano())
+	rand.New(rand.NewSource(time.Now().UnixNano()))
 	for i := 0; i < 10; i++ {
 		var cols []string
 		for k := 0; k < 10; k++ {

column/range.go → src/column/range.go

@@ -2,7 +2,7 @@ package column
 
 import (
 	"fmt"
-	"github.com/xztaityozx/sel/iterator"
+	"github.com/xztaityozx/sel/src/iterator"
 )
 
 // RangeSelector はカラムの範囲選択するやつ
@@ -19,25 +19,25 @@ func NewRangeSelector(start, step, stop int, isInfStop bool) RangeSelector {
 
 func (r RangeSelector) Select(w *Writer, iter iterator.IEnumerable) error {
 	strings := iter.ToArray()
-	max := len(strings)
+	m := len(strings)
 
 	start := r.start
 	if start < 0 {
-		start = max + start + 1
+		start = m + start + 1
 	}
 
 	stop := r.stop
-	if r.isInfStop || stop >= max {
-		stop = max
+	if r.isInfStop || stop >= m {
+		stop = m
 	}
 	if stop < 0 {
-		stop = max + stop + 1
+		stop = m + stop + 1
 	}
 
 	step := r.step
 
 	if start == stop {
-		if start > max {
+		if start > m {
 			return fmt.Errorf("index out of range")
 		}
 

column/range_test.go → src/column/range_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestNewRangeSelector(t *testing.T) {
-	rand.Seed(time.Now().UnixNano())
+	rand.New(rand.NewSource(time.Now().UnixNano()))
 	start := rand.Int()
 	step := rand.Int()
 	stop := rand.Int()
@@ -63,7 +63,7 @@ func TestRangeSelector_Select(t *testing.T) {
 			err := rs.Select(writer, &testEnumerable{a: cols})
 			assert.Nil(t, writer.Flush())
 			assert.Nil(t, err)
-			assert.Equal(t, strings.Join(expect, " "), w.String() , "start: %d, step: %d, stop: %d", v.start, v.step, v.stop)
+			assert.Equal(t, strings.Join(expect, " "), w.String(), "start: %d, step: %d, stop: %d", v.start, v.step, v.stop)
 			w.Reset()
 		}
 	})

column/selector.go → src/column/selector.go

@@ -1,6 +1,6 @@
 package column
 
-import "github.com/xztaityozx/sel/iterator"
+import "github.com/xztaityozx/sel/src/iterator"
 
 type Selector interface {
 	Select(w *Writer, iterator iterator.IEnumerable) error

column/switch.go → src/column/switch.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/xztaityozx/sel/iterator"
+	"github.com/xztaityozx/sel/src/iterator"
 )
 
 type address struct {
@@ -50,17 +50,17 @@ func between(a, max, min int) int {
 func (s SwitchSelector) Select(w *Writer, iter iterator.IEnumerable) error {
 	// isAroundContextなときは、配列の最大長が必要になるので、最初に全部分割してしまう
 	strings := iter.ToArray()
-	max := len(strings)
-	min := 0
+	maximum := len(strings)
+	minimum := 0
 	var rt []string
 	if s.end.isAroundContext {
 		for i, v := range strings {
 			if s.begin.match(v, i) {
 				// マッチした位置から前後どちらかにs.end.num個
 				if s.end.num < 0 {
-					rt = append(rt, strings[between(i+s.end.num, max, min):between(i+1, max, min)]...)
+					rt = append(rt, strings[between(i+s.end.num, maximum, minimum):between(i+1, maximum, minimum)]...)
 				} else {
-					rt = append(rt, strings[between(i, max, min):between(i+s.end.num+1, max, min)]...)
+					rt = append(rt, strings[between(i, maximum, minimum):between(i+s.end.num+1, maximum, minimum)]...)
 				}
 			}
 		}

column/switch_test.go → src/column/switch_test.go

@@ -3,7 +3,7 @@ package column
 import (
 	"bytes"
 	"github.com/stretchr/testify/assert"
-	"github.com/xztaityozx/sel/iterator"
+	"github.com/xztaityozx/sel/src/iterator"
 	"github.com/xztaityozx/sel/test_util"
 	"regexp"
 	"strings"
@@ -43,11 +43,11 @@ type testEnumerable struct {
 	a []string
 }
 
-func (t *testEnumerable) ResetFromArray(a []string) {
-  panic("implement me")
+func (t *testEnumerable) ResetFromArray(_ []string) {
+	panic("implement me")
 }
 
-func (t *testEnumerable) ElementAt(idx int) (string, error) {
+func (t *testEnumerable) ElementAt(_ int) (string, error) {
 	panic("implement me")
 }
 
@@ -59,7 +59,7 @@ func (t *testEnumerable) Last() (item string, ok bool) {
 	panic("implement me")
 }
 
-func (t *testEnumerable) Reset(s string) {
+func (t *testEnumerable) Reset(_ string) {
 	panic("implement me")
 }
 

iterator/iterator.go → src/iterator/iterator.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/xztaityozx/sel/option"
+	"github.com/xztaityozx/sel/src/option"
 )
 
 type IEnumerable interface {
@@ -222,7 +222,7 @@ func (i *Iterator) ToArray() []string {
 	return a
 }
 
-func (i *Iterator) ResetFromArray(a []string) {
+func (i *Iterator) ResetFromArray(_ []string) {
 	panic("not impl")
 }
 
@@ -396,7 +396,7 @@ func (r *RegexpIterator) Reset(s string) {
 	r.a = nil
 }
 
-func (r *RegexpIterator) ResetFromArray(a []string) {
+func (r *RegexpIterator) ResetFromArray(_ []string) {
 	panic("not impl")
 }
 

iterator/iterator_test.go → src/iterator/iterator_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/xztaityozx/sel/option"
+	"github.com/xztaityozx/sel/src/option"
 )
 
 func TestNewIterator(t *testing.T) {

iterator/presplit_test.go → src/iterator/presplit_test.go

@@ -35,7 +35,7 @@ func TestNewPreSplitByRegexpIterator(t *testing.T) {
 			removeEmpty: true,
 		}},
 		{name: "", args: args{s: "a11b22c33d", reg: regexp.MustCompile(`\d`), re: false}, want: &PreSplitIterator{
-			a:           []string{"a", "", "b","", "c","", "d"},
+			a:           []string{"a", "", "b", "", "c", "", "d"},
 			head:        0,
 			tail:        0,
 			reg:         regexp.MustCompile(`\d`),
@@ -82,7 +82,7 @@ func TestNewPreSplitIterator(t *testing.T) {
 			removeEmpty: true,
 		}},
 		{name: "split by space(remove-empty)", args: args{s: "a b   c d", sep: " ", re: false}, want: &PreSplitIterator{
-			a:           []string{"a", "b","", "", "c", "d"},
+			a:           []string{"a", "b", "", "", "c", "d"},
 			head:        0,
 			tail:        0,
 			sep:         " ",
@@ -115,7 +115,7 @@ func TestPreSplitIterator_ToArray(t *testing.T) {
 		fields fields
 		want   []string
 	}{
-		{name: "contained", fields: fields{a: []string{"a","b","c"}}, want: []string{"a","b","c"}},
+		{name: "contained", fields: fields{a: []string{"a", "b", "c"}}, want: []string{"a", "b", "c"}},
 		{name: "empty", fields: fields{a: nil}, want: nil},
 	}
 	for _, tt := range tests {
@@ -295,12 +295,12 @@ func TestPreSplitIterator_ElementAt(t *testing.T) {
 		want    string
 		wantErr bool
 	}{
-		{name: "", fields: fields{a:[]string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: 1}, want: "1", wantErr: false},
-		{name: "", fields: fields{a:[]string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: 4}, want: "4", wantErr: false},
-		{name: "", fields: fields{a:[]string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: 5}, want: "", wantErr: true},
-		{name: "", fields: fields{a:[]string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: -5}, want: "", wantErr: true},
-		{name: "", fields: fields{a:[]string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: -4}, want: "1", wantErr: false},
-		{name: "", fields: fields{a:[]string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: -1}, want: "4", wantErr: false},
+		{name: "", fields: fields{a: []string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: 1}, want: "1", wantErr: false},
+		{name: "", fields: fields{a: []string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: 4}, want: "4", wantErr: false},
+		{name: "", fields: fields{a: []string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: 5}, want: "", wantErr: true},
+		{name: "", fields: fields{a: []string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: -5}, want: "", wantErr: true},
+		{name: "", fields: fields{a: []string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: -4}, want: "1", wantErr: false},
+		{name: "", fields: fields{a: []string{"1", "2", "3", "4"}, head: 0, tail: 0, sep: " ", reg: nil, l: 4, removeEmpty: false}, args: args{idx: -1}, want: "4", wantErr: false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -323,4 +323,4 @@ func TestPreSplitIterator_ElementAt(t *testing.T) {
 			}
 		})
 	}
-}
+}

option/option_test.go → src/option/option_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/xztaityozx/sel/option"
+	"github.com/xztaityozx/sel/src/option"
 )
 
 func TestInputFiles_Enumerate(t *testing.T) {
@@ -65,7 +65,8 @@ func TestInputFiles_Enumerate(t *testing.T) {
 	})
 
 	t.Run("スペシャルファイルはOpenできない", func(t *testing.T) {
-		if runtime.GOOS == "windows" {
+		if //goland:noinspection ALL
+		runtime.GOOS == "windows" {
 			t.Skip()
 		}
 		_, err := option.InputFiles{Files: []string{"/dev/null"}}.Enumerate()