Fixed time utils and moved into their own package

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

src/arduino.cc/builder/setup_build_properties.go

@@ -39,6 +39,7 @@ import (
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"arduino.cc/properties"
+	"arduino.cc/timeutils"
 )
 
 type SetupBuildProperties struct{}
@@ -108,9 +109,9 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 
 	now := time.Now()
 	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_UTC] = strconv.FormatInt(now.Unix(), 10)
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_LOCAL] = strconv.FormatInt(utils.LocalUnix(now), 10)
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE] = strconv.Itoa(utils.TimezoneOffset())
-	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_DST] = strconv.Itoa(utils.DaylightSavingsOffset(now))
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_LOCAL] = strconv.FormatInt(timeutils.LocalUnix(now), 10)
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE] = strconv.Itoa(timeutils.TimezoneOffsetNoDST(now))
+	buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_DST] = strconv.Itoa(timeutils.DaylightSavingsOffset(now))
 
 	ctx.BuildProperties = buildProperties
 

src/arduino.cc/builder/utils/time.go renamed to src/arduino.cc/timeutils/time.go

@@ -1,6 +1,8 @@
 /*
  * This file is part of Arduino Builder.
  *
+ * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
+ *
  * Arduino Builder is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -23,24 +25,31 @@
  * the GNU General Public License.  This exception does not however
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
- *
- * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
  */
 
-package utils
+package timeutils
 
 import "time"
 
-func TimezoneOffset() int {
-	_, offset := time.Unix(0, 0).Zone()
-	return offset
+// TimezoneOffsetNoDST returns the timezone offset without the DST component
+func TimezoneOffsetNoDST(t time.Time) int {
+	_, winterOffset := time.Date(t.Year(), 1, 1, 0, 0, 0, 0, t.Location()).Zone()
+	_, summerOffset := time.Date(t.Year(), 7, 1, 0, 0, 0, 0, t.Location()).Zone()
+	if winterOffset > summerOffset {
+		winterOffset, summerOffset = summerOffset, winterOffset
+	}
+	return winterOffset
 }
 
+// DaylightSavingsOffset returns the DST offset of the specified time
 func DaylightSavingsOffset(t time.Time) int {
 	_, offset := t.Zone()
-	return offset - TimezoneOffset()
+	return offset - TimezoneOffsetNoDST(t)
 }
 
+// LocalUnix returns the unix timestamp of the specified time with the
+// local timezone offset and DST added
 func LocalUnix(t time.Time) int64 {
-	return t.Unix() + int64(TimezoneOffset()) + int64(DaylightSavingsOffset(t))
+	_, offset := t.Zone()
+	return t.Unix() + int64(offset)
 }

src/arduino.cc/builder/test/time_test.go renamed to src/arduino.cc/timeutils/time_test.go

@@ -1,6 +1,8 @@
 /*
  * This file is part of Arduino Builder.
  *
+ * Copyright 2016 Arduino LLC (http://www.arduino.cc/)
+ *
  * Arduino Builder is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -23,31 +25,30 @@
  * the GNU General Public License.  This exception does not however
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
- *
- * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
  */
 
-package test
+package timeutils
 
 import (
 	"testing"
 	"time"
 
-	"arduino.cc/builder/utils"
 	"github.com/stretchr/testify/require"
 )
 
 func TestTime(t *testing.T) {
 	loc, err := time.LoadLocation("CET")
-	NoError(t, err)
+	require.NoError(t, err)
 
 	firstJanuary2015CET := time.Date(2015, 1, 1, 0, 0, 0, 0, loc)
 	require.Equal(t, int64(1420066800), firstJanuary2015CET.Unix())
-	require.Equal(t, int64(1420066800+3600), utils.LocalUnix(firstJanuary2015CET))
-	require.Equal(t, 0, utils.DaylightSavingsOffset(firstJanuary2015CET))
+	require.Equal(t, int64(1420066800+3600), LocalUnix(firstJanuary2015CET))
+	require.Equal(t, 3600, TimezoneOffsetNoDST(firstJanuary2015CET))
+	require.Equal(t, 0, DaylightSavingsOffset(firstJanuary2015CET))
 
 	fall2015CET := time.Date(2015, 9, 23, 0, 0, 0, 0, loc)
 	require.Equal(t, int64(1442959200), fall2015CET.Unix())
-	require.Equal(t, int64(1442959200+3600+3600), utils.LocalUnix(fall2015CET))
-	require.Equal(t, 3600, utils.DaylightSavingsOffset(fall2015CET))
+	require.Equal(t, int64(1442959200+3600+3600), LocalUnix(fall2015CET))
+	require.Equal(t, 3600, TimezoneOffsetNoDST(fall2015CET))
+	require.Equal(t, 3600, DaylightSavingsOffset(fall2015CET))
 }