v0.2.1

ReadMe.Md

@@ -22,6 +22,9 @@ For example, the Punycode representation of a legal domain
 name `1❤️.ws`  is `xn--1-7iqv272g.ws`.
 
 ## What's new
+### v0.2.1 (25/05/23)
+* refactored cli args.
+
 ### v0.2.0 (22/05/23)
 * support unicode encoding of punycode
 

cmd/punycoder/main.go

@@ -11,33 +11,38 @@ import (
 )
 
 func main() {
-	flag.Usage = punycoderUsage
+	flag.Usage = printUsage
 	modeAscii := true
 	modeUnicode := flag.Bool("u", false, "convert to unicode")
 	if *modeUnicode == true {
 		modeAscii = false
 	}
 	modeVersion := flag.Bool("v", false, "print punycoder version")
 	modeUsage := flag.Bool("h", false, "print usage")
-	flag.Parse()
-
-	if *modeVersion {
-		printVersion()
-	} else if *modeUsage {
-		punycoderUsage()
-	} else if *modeUnicode {
-		host := parseHost(flag.Args())
-		fmt.Println(punycoder.EncodeUnicode(host))
-	} else if modeAscii {
-		host := parseHost(flag.Args())
-		fmt.Println(punycoder.EncodeAscii(host))
+	err := parseFlags()
+
+	if err != nil {
+		printUsage()
 	} else {
-		punycoderUsage()
+		if *modeVersion {
+			printVersion()
+		} else if *modeUsage {
+			printUsage()
+		} else if *modeUnicode {
+			host := parseHost(flag.Args())
+			fmt.Println(punycoder.EncodeUnicode(host))
+		} else if modeAscii {
+			host := parseHost(flag.Args())
+			fmt.Println(punycoder.EncodeAscii(host))
+		} else {
+			printUsage()
+		}
 	}
 }
 
-func punycoderUsage() {
-	fmt.Fprintf(os.Stdout, "Usage: punycoder host | [-u] host | [-v] | [-h]\n")
+func printUsage() {
+	printVersion()
+	fmt.Fprintf(os.Stdout, "Usage: punycoder host [-v] | [-h] | [-u] host \n")
 	flag.PrintDefaults()
 }
 
@@ -54,3 +59,34 @@ func parseHost(args []string) string {
 	}
 	return host
 }
+
+// ParseFlags parses the command line args, allowing flags to be
+// specified after positional args.
+func parseFlags() error {
+	return parseFlagSet(flag.CommandLine, os.Args[1:])
+}
+
+// ParseFlagSet works like flagset.Parse(), except positional arguments are not
+// required to come after flag arguments.
+func parseFlagSet(flagset *flag.FlagSet, args []string) error {
+	var positionalArgs []string
+	for {
+		if err := flagset.Parse(args); err != nil {
+			return err
+		}
+		// Consume all the flags that were parsed as flags.
+		args = args[len(args)-flagset.NArg():]
+		if len(args) == 0 {
+			break
+		}
+		// There's at least one flag remaining and it must be a positional arg since
+		// we consumed all args that were parsed as flags. Consume just the first
+		// one, and retry parsing, since subsequent args may be flags.
+		positionalArgs = append(positionalArgs, args[0])
+		args = args[1:]
+	}
+	// Parse just the positional args so that flagset.Args()/flagset.NArgs()
+	// return the expected value.
+	// Note: This should never return an error.
+	return flagset.Parse(positionalArgs)
+}

punycoder.go

@@ -4,7 +4,7 @@ import (
 	"golang.org/x/net/idna"
 )
 
-const Version string = "v0.2.0"
+const Version string = "v0.2.1"
 
 func EncodeAscii(p string) string {
 	al, _ := idna.ToASCII(p)