From fdd1990e89a6d741f5fbad32e2d920f02036b084 Mon Sep 17 00:00:00 2001 From: Laurence Withers Date: Fri, 12 Apr 2019 09:07:17 +0100 Subject: [PATCH] Reorganise ready to split into modules --- cmd/htpacker/inspector.go | 2 +- cmd/htpacker/pack.go | 2 +- {packer => cmd/htpacker/packer}/packer.go | 2 +- cmd/htpacker/yaml.go | 2 +- handler.go | 2 +- {internal/packed => packed}/load.go | 0 {internal/packed => packed}/packed.pb.go | 0 {internal/packed => packed}/packed.proto | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename {packer => cmd/htpacker/packer}/packer.go (99%) rename {internal/packed => packed}/load.go (100%) rename {internal/packed => packed}/packed.pb.go (100%) rename {internal/packed => packed}/packed.proto (100%) diff --git a/cmd/htpacker/inspector.go b/cmd/htpacker/inspector.go index a621699..b00b849 100644 --- a/cmd/htpacker/inspector.go +++ b/cmd/htpacker/inspector.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/lwithers/htpack/internal/packed" + "github.com/lwithers/htpack/packed" "github.com/spf13/cobra" ) diff --git a/cmd/htpacker/pack.go b/cmd/htpacker/pack.go index b67a619..7e6da09 100644 --- a/cmd/htpacker/pack.go +++ b/cmd/htpacker/pack.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/lwithers/htpack/packer" + "github.com/lwithers/htpack/cmd/htpacker/packer" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" ) diff --git a/packer/packer.go b/cmd/htpacker/packer/packer.go similarity index 99% rename from packer/packer.go rename to cmd/htpacker/packer/packer.go index aefdf60..c1011bf 100644 --- a/packer/packer.go +++ b/cmd/htpacker/packer/packer.go @@ -12,7 +12,7 @@ import ( "golang.org/x/sys/unix" "github.com/foobaz/go-zopfli/zopfli" - "github.com/lwithers/htpack/internal/packed" + "github.com/lwithers/htpack/packed" "github.com/lwithers/pkg/writefile" ) diff --git a/cmd/htpacker/yaml.go b/cmd/htpacker/yaml.go index 7273810..4b96740 100644 --- a/cmd/htpacker/yaml.go +++ b/cmd/htpacker/yaml.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/lwithers/htpack/packer" + "github.com/lwithers/htpack/cmd/htpacker/packer" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" ) diff --git a/handler.go b/handler.go index a2c29b5..d8f01e9 100644 --- a/handler.go +++ b/handler.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/lwithers/htpack/internal/packed" + "github.com/lwithers/htpack/packed" "golang.org/x/sys/unix" ) diff --git a/internal/packed/load.go b/packed/load.go similarity index 100% rename from internal/packed/load.go rename to packed/load.go diff --git a/internal/packed/packed.pb.go b/packed/packed.pb.go similarity index 100% rename from internal/packed/packed.pb.go rename to packed/packed.pb.go diff --git a/internal/packed/packed.proto b/packed/packed.proto similarity index 100% rename from internal/packed/packed.proto rename to packed/packed.proto