Rename options.NewOptions() to options.New()

spiegel-im-spiegel · spiegel-im-spiegel · commit 0976a01980b8 · 2017-11-07T22:52:17.000+09:00
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ T1ZprZqwRPOjiLJg9AwA/ArTwCPz7c2vmxlv7sRlRLUI6CdsOqhuO1KfYXrq7idI
 -----END PGP SIGNATURE-----
 `
 
-info, err := gpgpdump.Parse(strings.NewReader(openpgpStr), options.NewOptions())
+info, err := gpgpdump.Parse(strings.NewReader(openpgpStr), options.New())
 if err != nil {
 	return
 }
diff --git a/cli/gpgpdump/facade/facade.go b/cli/gpgpdump/facade/facade.go
@@ -83,7 +83,7 @@ func getBool(cmd *cobra.Command, name string) bool {
 }
 
 func parseOpt(cmd *cobra.Command) *options.Options {
-	return options.NewOptions(
+	return options.New(
 		options.Set(options.ArmorOpt, getBool(cmd, options.ArmorOpt)),
 		//options.Set(options.DebugOpt, getBool(cmd, options.DebugOpt)), //not use
 		//options.Set(options.GDumpOpt, getBool(cmd, options.GDumpOpt)), //not use
diff --git a/options/options.go b/options/options.go
@@ -38,8 +38,8 @@ type Options struct {
 //OptFunc is self-referential function for functional options pattern
 type OptFunc func(*Options)
 
-// NewOptions returns a new UI instance
-func NewOptions(opts ...OptFunc) *Options {
+// New returns a new Options instance
+func New(opts ...OptFunc) *Options {
 	o := &Options{}
 	o.options(opts...)
 	return o
diff --git a/options/options_test.go b/options/options_test.go
@@ -14,7 +14,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestNewOptions(t *testing.T) {
-	o := NewOptions()
+	o := New()
 	res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
@@ -23,7 +23,7 @@ func TestNewOptions(t *testing.T) {
 }
 
 func TestSetAllOpt(t *testing.T) {
-	o := NewOptions(
+	o := New(
 		Set(ArmorOpt, true),
 		Set(DebugOpt, true), //not use
 		Set(GDumpOpt, true), //not use
@@ -40,71 +40,71 @@ func TestSetAllOpt(t *testing.T) {
 }
 
 func TestArmorOpt(t *testing.T) {
-	o := NewOptions(Set(ArmorOpt, true))
+	o := New(Set(ArmorOpt, true))
 	res := "armor:true,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestDebugOpt(t *testing.T) {
-	o := NewOptions(Set(DebugOpt, true))
+	o := New(Set(DebugOpt, true))
 	res := "armor:false,debug:true,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestGDumpOpt(t *testing.T) {
-	o := NewOptions(Set(GDumpOpt, true))
+	o := New(Set(GDumpOpt, true))
 	res := "armor:false,debug:false,gdump:true,int:false,literal:false,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestIntegerOpt(t *testing.T) {
-	o := NewOptions(Set(IntegerOpt, true))
+	o := New(Set(IntegerOpt, true))
 	res := "armor:false,debug:false,gdump:false,int:true,literal:false,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestLiteralOpt(t *testing.T) {
-	o := NewOptions(Set(LiteralOpt, true))
+	o := New(Set(LiteralOpt, true))
 	res := "armor:false,debug:false,gdump:false,int:false,literal:true,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestMarkerOpt(t *testing.T) {
-	o := NewOptions(Set(MarkerOpt, true))
+	o := New(Set(MarkerOpt, true))
 	res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:true,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestPrivateOpt(t *testing.T) {
-	o := NewOptions(Set(PrivateOpt, true))
+	o := New(Set(PrivateOpt, true))
 	res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:true,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestUTCOpt(t *testing.T) {
-	o := NewOptions(Set(UTCOpt, true))
+	o := New(Set(UTCOpt, true))
 	res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:true"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
 	}
 }
 
 func TestFakeOpt(t *testing.T) {
-	o := NewOptions(Set("json", true))
+	o := New(Set("json", true))
 	res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"
 	if o.String() != res {
 		t.Errorf("Options()  = %v, want %v.", o.String(), res)
diff --git a/packet/parser.go b/packet/parser.go
@@ -28,7 +28,7 @@ func NewParser(reader io.Reader, o *options.Options) (*Parser, error) {
 		return nil, errors.Wrap(os.ErrInvalid, "error in packet.NewParser() function (null data)")
 	}
 	if o == nil {
-		o = options.NewOptions()
+		o = options.New()
 	}
 	var r io.Reader
 	var err error
diff --git a/packet/parser_test.go b/packet/parser_test.go
@@ -101,7 +101,7 @@ func TestParseNilOption(t *testing.T) {
 }
 
 func TestParseNilData(t *testing.T) {
-	opts := options.NewOptions(
+	opts := options.New(
 		options.Set(options.ArmorOpt, true),
 		options.Set(options.DebugOpt, true),
 	)
@@ -112,7 +112,7 @@ func TestParseNilData(t *testing.T) {
 }
 
 func TestParse(t *testing.T) {
-	opts := options.NewOptions(
+	opts := options.New(
 		options.Set(options.ArmorOpt, true),
 		options.Set(options.DebugOpt, true),
 		options.Set(options.UTCOpt, true),
diff --git a/packet/pubkey/parse_sig_test.go b/packet/pubkey/parse_sig_test.go
@@ -19,7 +19,7 @@ var (
 	pubkeySigName19b = "Multi-precision integer"
 )
 
-var cxtSig = context.NewContext(options.NewOptions(
+var cxtSig = context.NewContext(options.New(
 	options.Set(options.DebugOpt, true), //not use
 	options.Set(options.GDumpOpt, true), //not use
 	options.Set(options.IntegerOpt, true),
diff --git a/packet/pubkey/pubkey_ses_test.go b/packet/pubkey/pubkey_ses_test.go
@@ -27,7 +27,7 @@ var (
 	pubkeySesNameUn  = "Multi-precision integers of Unknown (pub 100)"
 )
 
-var cxtPub = context.NewContext(options.NewOptions(
+var cxtPub = context.NewContext(options.New(
 	options.Set(options.DebugOpt, true), //not use
 	options.Set(options.GDumpOpt, true), //not use
 	options.Set(options.IntegerOpt, true),
diff --git a/packet/tags/tags_test.go b/packet/tags/tags_test.go
@@ -21,7 +21,7 @@ var (
 
 func TestTag01(t *testing.T) {
 	op := &openpgp.OpaquePacket{Tag: 1, Contents: tag01Body}
-	cxt := context.NewContext(options.NewOptions())
+	cxt := context.NewContext(options.New())
 	i, err := NewTag(op, cxt).Parse()
 	if err != nil {
 		t.Errorf("NewTag() = %v, want nil error.", err)
@@ -43,7 +43,7 @@ func TestTag01(t *testing.T) {
 
 func TestTag02(t *testing.T) {
 	op := &openpgp.OpaquePacket{Tag: 2, Contents: tag02Body}
-	cxt := context.NewContext(options.NewOptions())
+	cxt := context.NewContext(options.New())
 	i, err := NewTag(op, cxt).Parse()
 	if err != nil {
 		t.Errorf("NewTag() = %v, want nil error.", err)
@@ -65,7 +65,7 @@ func TestTag02(t *testing.T) {
 
 func TestTagUnknown(t *testing.T) {
 	op := &openpgp.OpaquePacket{Tag: 99, Contents: []byte{0x01, 0x02, 0x03, 0x04}}
-	cxt := context.NewContext(options.NewOptions(
+	cxt := context.NewContext(options.New(
 		options.Set(options.DebugOpt, true),
 	))
 	name := "Unknown (tag 99)"
diff --git a/parse_test.go b/parse_test.go
@@ -22,7 +22,7 @@ T1ZprZqwRPOjiLJg9AwA/ArTwCPz7c2vmxlv7sRlRLUI6CdsOqhuO1KfYXrq7idI
 var (
 	openpgpData = []byte(openpgpStr)
 	reader      = strings.NewReader(openpgpStr)
-	optionss    = options.NewOptions()
+	optionss    = options.New()
 )
 
 func ExampleParse() {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ T1ZprZqwRPOjiLJg9AwA/ArTwCPz7c2vmxlv7sRlRLUI6CdsOqhuO1KfYXrq7idI`
`36`	`36`	`-----END PGP SIGNATURE-----`
`37`	`37`	`
`38`	`38`
`39`		`-info, err := gpgpdump.Parse(strings.NewReader(openpgpStr), options.NewOptions())`
	`39`	`+info, err := gpgpdump.Parse(strings.NewReader(openpgpStr), options.New())`
`40`	`40`	`if err != nil {`
`41`	`41`	`return`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func getBool(cmd *cobra.Command, name string) bool {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`func parseOpt(cmd cobra.Command) options.Options {`
`86`		`- return options.NewOptions(`
	`86`	`+ return options.New(`
`87`	`87`	`options.Set(options.ArmorOpt, getBool(cmd, options.ArmorOpt)),`
`88`	`88`	`//options.Set(options.DebugOpt, getBool(cmd, options.DebugOpt)), //not use`
`89`	`89`	`//options.Set(options.GDumpOpt, getBool(cmd, options.GDumpOpt)), //not use`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func TestMain(m *testing.M) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`func TestNewOptions(t *testing.T) {`
`17`		`- o := NewOptions()`
	`17`	`+ o := New()`
`18`	`18`	`res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"`
`19`	`19`	`if o.String() != res {`
`20`	`20`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`@@ -23,7 +23,7 @@ func TestNewOptions(t *testing.T) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func TestSetAllOpt(t *testing.T) {`
`26`		`- o := NewOptions(`
	`26`	`+ o := New(`
`27`	`27`	`Set(ArmorOpt, true),`
`28`	`28`	`Set(DebugOpt, true), //not use`
`29`	`29`	`Set(GDumpOpt, true), //not use`
`@@ -40,71 +40,71 @@ func TestSetAllOpt(t *testing.T) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func TestArmorOpt(t *testing.T) {`
`43`		`- o := NewOptions(Set(ArmorOpt, true))`
	`43`	`+ o := New(Set(ArmorOpt, true))`
`44`	`44`	`res := "armor:true,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"`
`45`	`45`	`if o.String() != res {`
`46`	`46`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func TestDebugOpt(t *testing.T) {`
`51`		`- o := NewOptions(Set(DebugOpt, true))`
	`51`	`+ o := New(Set(DebugOpt, true))`
`52`	`52`	`res := "armor:false,debug:true,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"`
`53`	`53`	`if o.String() != res {`
`54`	`54`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func TestGDumpOpt(t *testing.T) {`
`59`		`- o := NewOptions(Set(GDumpOpt, true))`
	`59`	`+ o := New(Set(GDumpOpt, true))`
`60`	`60`	`res := "armor:false,debug:false,gdump:true,int:false,literal:false,marker:false,private:false,utc:false"`
`61`	`61`	`if o.String() != res {`
`62`	`62`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func TestIntegerOpt(t *testing.T) {`
`67`		`- o := NewOptions(Set(IntegerOpt, true))`
	`67`	`+ o := New(Set(IntegerOpt, true))`
`68`	`68`	`res := "armor:false,debug:false,gdump:false,int:true,literal:false,marker:false,private:false,utc:false"`
`69`	`69`	`if o.String() != res {`
`70`	`70`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func TestLiteralOpt(t *testing.T) {`
`75`		`- o := NewOptions(Set(LiteralOpt, true))`
	`75`	`+ o := New(Set(LiteralOpt, true))`
`76`	`76`	`res := "armor:false,debug:false,gdump:false,int:false,literal:true,marker:false,private:false,utc:false"`
`77`	`77`	`if o.String() != res {`
`78`	`78`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`func TestMarkerOpt(t *testing.T) {`
`83`		`- o := NewOptions(Set(MarkerOpt, true))`
	`83`	`+ o := New(Set(MarkerOpt, true))`
`84`	`84`	`res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:true,private:false,utc:false"`
`85`	`85`	`if o.String() != res {`
`86`	`86`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`func TestPrivateOpt(t *testing.T) {`
`91`		`- o := NewOptions(Set(PrivateOpt, true))`
	`91`	`+ o := New(Set(PrivateOpt, true))`
`92`	`92`	`res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:true,utc:false"`
`93`	`93`	`if o.String() != res {`
`94`	`94`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`func TestUTCOpt(t *testing.T) {`
`99`		`- o := NewOptions(Set(UTCOpt, true))`
	`99`	`+ o := New(Set(UTCOpt, true))`
`100`	`100`	`res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:true"`
`101`	`101`	`if o.String() != res {`
`102`	`102`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func TestFakeOpt(t *testing.T) {`
`107`		`- o := NewOptions(Set("json", true))`
	`107`	`+ o := New(Set("json", true))`
`108`	`108`	`res := "armor:false,debug:false,gdump:false,int:false,literal:false,marker:false,private:false,utc:false"`
`109`	`109`	`if o.String() != res {`
`110`	`110`	`t.Errorf("Options() = %v, want %v.", o.String(), res)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func NewParser(reader io.Reader, o options.Options) (Parser, error) {`
`28`	`28`	`return nil, errors.Wrap(os.ErrInvalid, "error in packet.NewParser() function (null data)")`
`29`	`29`	`}`
`30`	`30`	`if o == nil {`
`31`		`- o = options.NewOptions()`
	`31`	`+ o = options.New()`
`32`	`32`	`}`
`33`	`33`	`var r io.Reader`
`34`	`34`	`var err error`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func TestParseNilOption(t *testing.T) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func TestParseNilData(t *testing.T) {`
`104`		`- opts := options.NewOptions(`
	`104`	`+ opts := options.New(`
`105`	`105`	`options.Set(options.ArmorOpt, true),`
`106`	`106`	`options.Set(options.DebugOpt, true),`
`107`	`107`	`)`
`@@ -112,7 +112,7 @@ func TestParseNilData(t *testing.T) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func TestParse(t *testing.T) {`
`115`		`- opts := options.NewOptions(`
	`115`	`+ opts := options.New(`
`116`	`116`	`options.Set(options.ArmorOpt, true),`
`117`	`117`	`options.Set(options.DebugOpt, true),`
`118`	`118`	`options.Set(options.UTCOpt, true),`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ var (`
`19`	`19`	`pubkeySigName19b = "Multi-precision integer"`
`20`	`20`	`)`
`21`	`21`
`22`		`-var cxtSig = context.NewContext(options.NewOptions(`
	`22`	`+var cxtSig = context.NewContext(options.New(`
`23`	`23`	`options.Set(options.DebugOpt, true), //not use`
`24`	`24`	`options.Set(options.GDumpOpt, true), //not use`
`25`	`25`	`options.Set(options.IntegerOpt, true),`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ var (`
`27`	`27`	`pubkeySesNameUn = "Multi-precision integers of Unknown (pub 100)"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var cxtPub = context.NewContext(options.NewOptions(`
	`30`	`+var cxtPub = context.NewContext(options.New(`
`31`	`31`	`options.Set(options.DebugOpt, true), //not use`
`32`	`32`	`options.Set(options.GDumpOpt, true), //not use`
`33`	`33`	`options.Set(options.IntegerOpt, true),`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ T1ZprZqwRPOjiLJg9AwA/ArTwCPz7c2vmxlv7sRlRLUI6CdsOqhuO1KfYXrq7idI`
`22`	`22`	`var (`
`23`	`23`	`openpgpData = []byte(openpgpStr)`
`24`	`24`	`reader = strings.NewReader(openpgpStr)`
`25`		`- optionss = options.NewOptions()`
	`25`	`+ optionss = options.New()`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func ExampleParse() {`