Skip to content

Commit

Permalink
chore: bump deps (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
rboyer authored Jan 31, 2023
1 parent 8e3b455 commit cc89473
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 101 deletions.
70 changes: 0 additions & 70 deletions .circleci/config.yml

This file was deleted.

28 changes: 28 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: safeio

on:
push:
branches:
main
pull_request:

jobs:
unit-tests:
name: unit-tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '1.19'
- run: go test ./...
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
3 changes: 1 addition & 2 deletions file.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package safeio

import (
"errors"
"io/ioutil"
"os"
"path/filepath"
)
Expand All @@ -20,7 +19,7 @@ func OpenFile(path string, perm os.FileMode) (*File, error) {
dir := filepath.Dir(path)
name := filepath.Base(path)

f, err := ioutil.TempFile(dir, name+".tmp")
f, err := os.CreateTemp(dir, name+".tmp")
if err != nil {
return nil, err
}
Expand Down
25 changes: 12 additions & 13 deletions file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package safeio

import (
"errors"
"io/ioutil"
"os"
"path/filepath"
"testing"
Expand All @@ -11,7 +10,7 @@ import (
)

func TestOpenFile_ok(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "safeio")
tmpDir, err := os.MkdirTemp("", "safeio")
require.NoError(t, err)
defer os.RemoveAll(tmpDir)

Expand All @@ -36,7 +35,7 @@ func TestOpenFile_ok(t *testing.T) {

// verify

read, err := ioutil.ReadFile(name)
read, err := os.ReadFile(name)
require.NoError(t, err)
require.Equal(t, data, read)

Expand All @@ -46,13 +45,13 @@ func TestOpenFile_ok(t *testing.T) {

// this was the only file

list, err := ioutil.ReadDir(tmpDir)
list, err := os.ReadDir(tmpDir)
require.NoError(t, err)
require.Equal(t, 1, len(list))
}

func TestOpenFile_elective_abort(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "safeio")
tmpDir, err := os.MkdirTemp("", "safeio")
require.NoError(t, err)
defer os.RemoveAll(tmpDir)

Expand All @@ -76,20 +75,20 @@ func TestOpenFile_elective_abort(t *testing.T) {

// verify

_, err = ioutil.ReadFile(name)
_, err = os.ReadFile(name)
require.True(t, os.IsNotExist(err))

// no files

list, err := ioutil.ReadDir(tmpDir)
list, err := os.ReadDir(tmpDir)
require.NoError(t, err)
require.Equal(t, 0, len(list))
}

var testErrDiskBroke = errors.New("disk broke!")

func TestOpenFile_writeErrorOnCommit_abort(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "safeio")
tmpDir, err := os.MkdirTemp("", "safeio")
require.NoError(t, err)
defer os.RemoveAll(tmpDir)

Expand Down Expand Up @@ -117,18 +116,18 @@ func TestOpenFile_writeErrorOnCommit_abort(t *testing.T) {

// verify

_, err = ioutil.ReadFile(name)
_, err = os.ReadFile(name)
require.True(t, os.IsNotExist(err))

// no files

list, err := ioutil.ReadDir(tmpDir)
list, err := os.ReadDir(tmpDir)
require.NoError(t, err)
require.Equal(t, 0, len(list))
}

func TestOpenFile_writeErrorOnWrite_abort(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "safeio")
tmpDir, err := os.MkdirTemp("", "safeio")
require.NoError(t, err)
defer os.RemoveAll(tmpDir)

Expand Down Expand Up @@ -162,12 +161,12 @@ func TestOpenFile_writeErrorOnWrite_abort(t *testing.T) {

// verify

_, err = ioutil.ReadFile(name)
_, err = os.ReadFile(name)
require.True(t, os.IsNotExist(err))

// no files

list, err := ioutil.ReadDir(tmpDir)
list, err := os.ReadDir(tmpDir)
require.NoError(t, err)
require.Equal(t, 0, len(list))
}
10 changes: 8 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
module github.com/rboyer/safeio

go 1.14
go 1.19

require github.com/stretchr/testify v1.4.0
require github.com/stretchr/testify v1.8.1

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
16 changes: 11 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
3 changes: 1 addition & 2 deletions safeio.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package safeio

import (
"io"
"io/ioutil"
"os"
"path/filepath"
)
Expand All @@ -27,7 +26,7 @@ func writeToTempFile(src io.Reader, path string, perm os.FileMode) (tempName str
dir := filepath.Dir(path)
name := filepath.Base(path)

f, err := ioutil.TempFile(dir, name+".tmp")
f, err := os.CreateTemp(dir, name+".tmp")
if err != nil {
return "", 0, err
}
Expand Down
13 changes: 6 additions & 7 deletions safeio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package safeio
import (
"bytes"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
Expand All @@ -12,7 +11,7 @@ import (
)

func TestWriteToFile_ok(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "safeio")
tmpDir, err := os.MkdirTemp("", "safeio")
require.NoError(t, err)
defer os.RemoveAll(tmpDir)

Expand All @@ -27,7 +26,7 @@ func TestWriteToFile_ok(t *testing.T) {

// verify

read, err := ioutil.ReadFile(name)
read, err := os.ReadFile(name)
require.NoError(t, err)
require.Equal(t, data, read)

Expand All @@ -37,13 +36,13 @@ func TestWriteToFile_ok(t *testing.T) {

// this was the only file

list, err := ioutil.ReadDir(tmpDir)
list, err := os.ReadDir(tmpDir)
require.NoError(t, err)
require.Equal(t, 1, len(list))
}

func TestWriteToFile_sourceFails(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "safeio")
tmpDir, err := os.MkdirTemp("", "safeio")
require.NoError(t, err)
defer os.RemoveAll(tmpDir)

Expand All @@ -59,12 +58,12 @@ func TestWriteToFile_sourceFails(t *testing.T) {
require.Equal(t, testErrDiskBroke, err)

// verify
_, err = ioutil.ReadFile(name)
_, err = os.ReadFile(name)
require.True(t, os.IsNotExist(err))

// no files

list, err := ioutil.ReadDir(tmpDir)
list, err := os.ReadDir(tmpDir)
require.NoError(t, err)
require.Equal(t, 0, len(list))
}
Expand Down

0 comments on commit cc89473

Please sign in to comment.