Merge pull request #24 from essentialkaos/develop

Version 1.4.0
essentialkaos · Apr 26, 2023 · fefdb71 · fefdb71
2 parents f9dc922 + 854cd4e
commit fefdb71
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,3 +70,16 @@ jobs:
           COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           parallel-finished: true
+
+  Typos:
+    name: Typos
+    runs-on: ubuntu-latest
+
+    needs: Go
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Check spelling
+        uses: crate-ci/typos@master
diff --git a/.testdata/data-cpio.tar b/.testdata/data-cpio.tar
diff --git a/.typos.toml b/.typos.toml
@@ -0,0 +1,2 @@
+[files]
+extend-exclude = ["go.sum"]
diff --git a/README.md b/README.md
@@ -40,12 +40,11 @@ package main
 
 import (
   "fmt"
-
-  "github.com/essentialkaos/npck/tgz"
+  "github.com/essentialkaos/npck"
 )
 
 func main() {
-  err := tgz.Unpack("file.tar.gz", "/home/john")
+  err := npck.Unpack("file.tar.gz", "/home/john")
 
   if err != nil {
     panic("Can't unpack file: %v", err)

diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.19
 require (
 	github.com/cyphar/filepath-securejoin v0.2.3
 	github.com/essentialkaos/check v1.4.0
-	github.com/essentialkaos/ek/v12 v12.64.0
-	github.com/klauspost/compress v1.16.4
+	github.com/essentialkaos/ek/v12 v12.64.1
+	github.com/klauspost/compress v1.16.5
 	github.com/pierrec/lz4/v4 v4.1.17
 	github.com/ulikunitz/xz v0.5.11
 )

diff --git a/go.sum b/go.sum
@@ -3,10 +3,10 @@ github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk=
 github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0=
-github.com/essentialkaos/ek/v12 v12.64.0 h1:5HgBltCfY4uwsSFSv+yVBns6UIzXbiNEE31kcm/0UyA=
-github.com/essentialkaos/ek/v12 v12.64.0/go.mod h1:9MlSuHpewu7OZ9tM9dLFHvoA8dflBIUPCA0Ctt97wRs=
-github.com/klauspost/compress v1.16.4 h1:91KN02FnsOYhuunwU4ssRe8lc2JosWmizWa91B5v1PU=
-github.com/klauspost/compress v1.16.4/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/essentialkaos/ek/v12 v12.64.1 h1:XjIF4GHCgVIY0S0KEz8g1OrNrRoHGU+vAUXSYIKNIbI=
+github.com/essentialkaos/ek/v12 v12.64.1/go.mod h1:PFJckNu+x4mHqsjndUeYRDPgDgvZEgcjpy1RpCYtx4g=
+github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
+github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

diff --git a/tar/tar.go b/tar/tar.go
@@ -130,6 +130,17 @@ func createDir(h *tar.Header, path string) error {
 
 // createFile creates new file
 func createFile(h *tar.Header, r io.Reader, path string) error {
+	dir := filepath.Dir(path)
+	_, err := os.Stat(dir)
+
+	if os.IsNotExist(err) {
+		err := os.MkdirAll(dir, 0755)
+
+		if err != nil {
+			return err
+		}
+	}
+
 	fd, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, h.FileInfo().Mode())
 
 	if err != nil {

diff --git a/tar/tar_test.go b/tar/tar_test.go
@@ -25,34 +25,46 @@ func Test(t *testing.T) { TestingT(t) }
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
-type TarSuite struct {
-	Dir string
-}
+type TarSuite struct{}
 
 var _ = Suite(&TarSuite{})
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
-func (s *TarSuite) SetUpSuite(c *C) {
-	s.Dir = c.MkDir()
+func (s *TarSuite) TestUnpack(c *C) {
+	dir := c.MkDir()
+	err := Unpack("../.testdata/data.tar", dir)
+
+	c.Assert(err, IsNil)
+
+	c.Assert(fsutil.IsExist(dir+"/data"), Equals, true)
+	c.Assert(fsutil.GetMode(dir+"/data"), Equals, os.FileMode(0700))
+
+	c.Assert(fsutil.IsExist(dir+"/data/payload.txt"), Equals, true)
+	c.Assert(fsutil.GetMode(dir+"/data/payload.txt"), Equals, os.FileMode(0644))
+
+	c.Assert(hash.FileHash(dir+"/data/payload.txt"), Equals, "918c03a211adc19a466c9db22efa575efb6c488fd41c70e57b1ec0920f1a1d8c")
 }
 
-func (s *TarSuite) TestUnpack(c *C) {
-	err := Unpack("../.testdata/data.tar", s.Dir)
+func (s *TarSuite) TestCPIOUnpack(c *C) {
+	dir := c.MkDir()
+	err := Unpack("../.testdata/data-cpio.tar", dir)
 
 	c.Assert(err, IsNil)
 
-	c.Assert(fsutil.IsExist(s.Dir+"/data"), Equals, true)
-	c.Assert(fsutil.GetMode(s.Dir+"/data"), Equals, os.FileMode(0700))
+	c.Assert(fsutil.IsExist(dir+"/data"), Equals, true)
+	c.Assert(fsutil.GetMode(dir+"/data"), Equals, os.FileMode(0755))
 
-	c.Assert(fsutil.IsExist(s.Dir+"/data/payload.txt"), Equals, true)
-	c.Assert(fsutil.GetMode(s.Dir+"/data/payload.txt"), Equals, os.FileMode(0644))
+	c.Assert(fsutil.IsExist(dir+"/data/payload.txt"), Equals, true)
+	c.Assert(fsutil.GetMode(dir+"/data/payload.txt"), Equals, os.FileMode(0644))
 
-	c.Assert(hash.FileHash(s.Dir+"/data/payload.txt"), Equals, "918c03a211adc19a466c9db22efa575efb6c488fd41c70e57b1ec0920f1a1d8c")
+	c.Assert(hash.FileHash(dir+"/data/payload.txt"), Equals, "918c03a211adc19a466c9db22efa575efb6c488fd41c70e57b1ec0920f1a1d8c")
 }
 
 func (s *TarSuite) TestErrors(c *C) {
-	err := Unpack("../.testdata/unknown.tar", s.Dir)
+	dir := c.MkDir()
+
+	err := Unpack("../.testdata/unknown.tar", dir)
 	c.Assert(err, NotNil)
 
 	err = Unpack("../.testdata/data.tar", "/unknown")