Refactor greg and hdate into stable standalone packages

hebcal · Dec 13, 2022 · 310bf86 · 310bf86
1 parent b902ddb
commit 310bf86
Show file tree

Hide file tree

Showing 40 changed files with 44 additions and 1,680 deletions.
diff --git a/dafyomi/dafyomi.go b/dafyomi/dafyomi.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hebcal/hebcal-go/greg"
-	"github.com/hebcal/hebcal-go/hdate"
+	"github.com/hebcal/greg"
+	"github.com/hebcal/hdate"
 )
 
 // Daf represents a page of Talmud, such as Pesachim 103

diff --git a/dafyomi/dafyomi_test.go b/dafyomi/dafyomi_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/dafyomi"
-	"github.com/hebcal/hebcal-go/hdate"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/event/dafyomi.go b/event/dafyomi.go
@@ -4,8 +4,8 @@ import (
 	"strconv"
 
 	"github.com/hebcal/gematriya"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/dafyomi"
-	"github.com/hebcal/hebcal-go/hdate"
 	"github.com/hebcal/hebcal-go/locales"
 )
 

diff --git a/event/event.go b/event/event.go
@@ -1,7 +1,7 @@
 // Hebcal's event package provides an interface for calendar events.
 package event
 
-import "github.com/hebcal/hebcal-go/hdate"
+import "github.com/hebcal/hdate"
 
 // Hebcal - A Jewish Calendar Generator
 // Copyright (c) 2022 Michael J. Radwin

diff --git a/event/event_test.go b/event/event_test.go
@@ -3,8 +3,8 @@ package event_test
 import (
 	"testing"
 
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/event"
-	"github.com/hebcal/hebcal-go/hdate"
 	"github.com/hebcal/hebcal-go/sedra"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/event/hdate.go b/event/hdate.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/hebcal/gematriya"
-	"github.com/hebcal/hebcal-go/hdate"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/locales"
 )
 

diff --git a/event/holiday.go b/event/holiday.go
@@ -3,7 +3,7 @@ package event
 import (
 	"regexp"
 
-	"github.com/hebcal/hebcal-go/hdate"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/locales"
 )
 

diff --git a/event/molad.go b/event/molad.go
@@ -3,7 +3,7 @@ package event
 import (
 	"fmt"
 
-	"github.com/hebcal/hebcal-go/hdate"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/molad"
 )
 

diff --git a/event/myomi.go b/event/myomi.go
@@ -3,7 +3,7 @@ package event
 import (
 	"strconv"
 
-	"github.com/hebcal/hebcal-go/hdate"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/locales"
 	"github.com/hebcal/hebcal-go/mishnayomi"
 )

diff --git a/event/parsha.go b/event/parsha.go
@@ -3,7 +3,7 @@ package event
 import (
 	"strings"
 
-	"github.com/hebcal/hebcal-go/hdate"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/locales"
 	"github.com/hebcal/hebcal-go/sedra"
 )

diff --git a/event/yyomi.go b/event/yyomi.go
@@ -4,8 +4,8 @@ import (
 	"strconv"
 
 	"github.com/hebcal/gematriya"
+	"github.com/hebcal/hdate"
 	"github.com/hebcal/hebcal-go/dafyomi"
-	"github.com/hebcal/hebcal-go/hdate"
 	"github.com/hebcal/hebcal-go/locales"
 )
 

diff --git a/go.mod b/go.mod
@@ -2,10 +2,12 @@ module github.com/hebcal/hebcal-go
 
 go 1.13
 
-require github.com/stretchr/testify v1.8.0
+require github.com/stretchr/testify v1.8.1
 
 require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/hebcal/gematriya v1.0.1
+	github.com/hebcal/greg v1.0.0
+	github.com/hebcal/hdate v1.0.0
 	github.com/nathan-osman/go-sunrise v1.1.0
 )
diff --git a/go.sum b/go.sum
@@ -5,15 +5,21 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/hebcal/gematriya v1.0.1 h1:lktI5tX4lxg2o2OIEQXGYiMWxL9VkbfOXa+/kamjrLQ=
 github.com/hebcal/gematriya v1.0.1/go.mod h1:hQJm5ggDgm45RsnaaSrYB387VIBDI0Kcq5wglx7KVpI=
+github.com/hebcal/greg v1.0.0 h1:F38VvHeYwhLIBtMQ4tl97jOfQhzeKX53Sa1T63RE31k=
+github.com/hebcal/greg v1.0.0/go.mod h1:HhnDLPDm/dgcrANH5WYN9ol0tlkK/6mJVkWDIYhkKJM=
+github.com/hebcal/hdate v1.0.0 h1:2SOJDvN3CvFTOuuH84UbOVy+Nt7enIZbnOjNxaMF1jI=
+github.com/hebcal/hdate v1.0.0/go.mod h1:EXz7O48tnOqmTHC9wat7JJ2+f7OLZ2c4m+x4gnaiLcQ=
 github.com/nathan-osman/go-sunrise v1.1.0 h1:ZqZmtmtzs8Os/DGQYi0YMHpuUqR/iRoJK+wDO0wTCw8=
 github.com/nathan-osman/go-sunrise v1.1.0/go.mod h1:RcWqhT+5ShCZDev79GuWLayetpJp78RSjSWxiDowmlM=
 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/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 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 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.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

diff --git a/greg/greg.go b/greg/greg.go