Review fixes

flag_test.go

@@ -121,8 +121,8 @@ func TestFlagsFromEnv(t *testing.T) {
 		a := App{
 			Flags: []Flag{test.flag},
 			Action: func(ctx *Context) error {
-				if !reflect.DeepEqual(ctx.Value(test.flag.Names()[0]), test.output) {
-					t.Errorf("ex:%01d expected %q to be parsed as %#v, instead was %#v", i, test.input, test.output, ctx.Value(test.flag.Names()[0]))
+				if !reflect.DeepEqual(ctx.value(test.flag.Names()[0]), test.output) {
+					t.Errorf("ex:%01d expected %q to be parsed as %#v, instead was %#v", i, test.input, test.output, ctx.value(test.flag.Names()[0]))
 				}
 				return nil
 			},
@@ -1678,3 +1678,29 @@ func TestInt64Slice_Serialized_Set(t *testing.T) {
 		t.Fatalf("pre and post serialization do not match: %v != %v", sl0, sl1)
 	}
 }
+
+func TestTimestamp_set(t *testing.T) {
+	ts := Timestamp{
+		timestamp:  nil,
+		hasBeenSet: false,
+		layout:     "Jan 2, 2006 at 3:04pm (MST)",
+	}
+
+	time1 := "Feb 3, 2013 at 7:54pm (PST)"
+	if err := ts.Set(time1); err != nil {
+		t.Fatalf("Failed to parse time %s with layout %s", time1, ts.layout)
+	}
+	if ts.hasBeenSet == false {
+		t.Fatalf("hasBeenSet is not true after setting a time")
+	}
+
+	ts.hasBeenSet = false
+	ts.SetLayout(time.RFC3339)
+	time2 := "2006-01-02T15:04:05Z"
+	if err := ts.Set(time2); err != nil {
+		t.Fatalf("Failed to parse time %s with layout %s", time2, ts.layout)
+	}
+	if ts.hasBeenSet == false {
+		t.Fatalf("hasBeenSet is not true after setting a time")
+	}
+}

flag_timestamp.go

@@ -6,53 +6,58 @@ import (
 	"time"
 )
 
-
-// timestamp wrap to satisfy golang's flag interface.
-type timestampWrap struct {
+// Timestamp wrap to satisfy golang's flag interface.
+type Timestamp struct {
 	timestamp *time.Time
 	hasBeenSet bool
 	layout 	   string
 }
 
+// Timestamp constructor
+func NewTimestamp(timestamp time.Time) *Timestamp {
+	return &Timestamp{timestamp: &timestamp}
+}
+
 // Set the timestamp value directly
-func (t *timestampWrap) SetTimestamp(value time.Time) {
+func (t *Timestamp) SetTimestamp(value time.Time) {
 	if !t.hasBeenSet {
 		t.timestamp = &value
 		t.hasBeenSet = true
 	}
 }
 // Set the timestamp string layout for future parsing
-func (t *timestampWrap) SetLayout(layout string) {
+func (t *Timestamp) SetLayout(layout string) {
 	t.layout = layout
 }
 
 // Parses the string value to timestamp
-func (t *timestampWrap) Set(value string) error {
+func (t *Timestamp) Set(value string) error {
 	timestamp, err := time.Parse(t.layout, value)
 	if err != nil {
 		return err
 	}
 
 	t.timestamp = &timestamp
+	t.hasBeenSet = true
 	return nil
 }
 
 // String returns a readable representation of this value (for usage defaults)
-func (t *timestampWrap) String() string {
+func (t *Timestamp) String() string {
 	return fmt.Sprintf("%#v", t.timestamp)
 }
 
 // Value returns the timestamp value stored in the flag
-func (t *timestampWrap) Value() *time.Time {
+func (t *Timestamp) Value() *time.Time {
 	return t.timestamp
 }
 
 // Get returns the flag structure
-func (t *timestampWrap) Get() interface{} {
+func (t *Timestamp) Get() interface{} {
 	return *t
 }
 
-// TimestampFlag is a flag with type protobuf.timestamp
+// TimestampFlag is a flag with type time
 type TimestampFlag struct {
 	Name        string
 	Aliases     []string
@@ -62,7 +67,7 @@ type TimestampFlag struct {
 	Required    bool
 	Hidden      bool
 	Layout 	    string
-	Value       timestampWrap
+	Value       *Timestamp
 	DefaultText string
 	HasBeenSet  bool
 }
@@ -98,16 +103,32 @@ func (f *TimestampFlag) GetUsage() string {
 	return f.Usage
 }
 
-// GetValue returns the flag value
-func (f *TimestampFlag) GetValue() *time.Time {
-	return f.Value.timestamp
+// GetValue returns the flags value as string representation and an empty
+// string if the flag takes no value at all.
+func (f *TimestampFlag) GetValue() string {
+	if f.Value != nil {
+		return f.Value.timestamp.String()
+	}
+	return ""
 }
 
 // Apply populates the flag given the flag set and environment
 func (f *TimestampFlag) Apply(set *flag.FlagSet) error {
-	for _, name := range f.Names() {
+	if f.Layout == "" {
+		return fmt.Errorf("timestamp Layout is required")
+	}
+	f.Value = &Timestamp{}
 	f.Value.SetLayout(f.Layout)
-		set.Var(&f.Value, name, f.Usage)
+
+	if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
+		if err := f.Value.Set(val); err != nil {
+			return fmt.Errorf("could not parse %q as timestamp value for flag %s: %s", val, f.Name, err)
+		}
+		f.HasBeenSet = true
+	}
+
+	for _, name := range f.Names() {
+		set.Var(f.Value, name, f.Usage)
 	}
 	return nil
 }
@@ -124,7 +145,7 @@ func (c *Context) Timestamp(name string) *time.Time {
 func lookupTimestamp(name string, set *flag.FlagSet) *time.Time {
 	f := set.Lookup(name)
 	if f != nil {
-		return (f.Value.(*timestampWrap)).Value()
+		return (f.Value.(*Timestamp)).Value()
 	}
 	return nil
 }