Initial commit

Includes "applesoft decode" command to convert Applesoft bytes to
listings.

cmd/applesoft.go

@@ -0,0 +1,27 @@
+// Copyright © 2016 Zellyn Hunter <zellyn@gmail.com>
+
+package cmd
+
+import "github.com/spf13/cobra"
+
+// applesoftCmd represents the applesoft command
+var applesoftCmd = &cobra.Command{
+	Use:   "applesoft",
+	Short: "work with applesoft programs",
+	Long: `diskii applesoft contains the subcommands useful for working
+	with Applesoft programs.`,
+}
+
+func init() {
+	RootCmd.AddCommand(applesoftCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// applesoftCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// applesoftCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/decode.go

@@ -0,0 +1,67 @@
+// Copyright © 2016 Zellyn Hunter <zellyn@gmail.com>
+
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+	"github.com/zellyn/diskii/lib/applesoft"
+	"github.com/zellyn/diskii/lib/helpers"
+)
+
+var location uint16      // flag for starting location in memory
+var rawControlCodes bool // flag for whether to skip escaping control codes
+
+// decodeCmd represents the decode command
+var decodeCmd = &cobra.Command{
+	Use:   "decode filename",
+	Short: "convert a binary applesoft program to a LISTing",
+	Long: `
+decode converts a binary Applesoft program to a text LISTing.
+
+Examples:
+decode filename # read filename
+decode -        # read stdin`,
+	Run: func(cmd *cobra.Command, args []string) {
+		if err := runDecode(args); err != nil {
+			fmt.Fprintln(os.Stderr, err.Error())
+			os.Exit(-1)
+		}
+	},
+}
+
+// runDecode performs the actual decode logic.
+func runDecode(args []string) error {
+	if len(args) != 1 {
+		return fmt.Errorf("decode expects one argument: the filename (or - for stdin)")
+	}
+	contents, err := helpers.FileContentsOrStdIn(args[0])
+	if err != nil {
+		return err
+	}
+	listing, err := applesoft.Decode(contents, location)
+	if err != nil {
+		return err
+	}
+	if rawControlCodes {
+		os.Stdout.WriteString(listing.String())
+	} else {
+		os.Stdout.WriteString(applesoft.ChevronControlCodes(listing.String()))
+	}
+	return nil
+}
+
+func init() {
+	applesoftCmd.AddCommand(decodeCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// decodeCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	decodeCmd.Flags().Uint16VarP(&location, "location", "l", 0x801, "Starting program location in memory")
+	decodeCmd.Flags().BoolVarP(&rawControlCodes, "raw", "r", false, "Print raw control codes (no escaping)")
+}

cmd/root.go

@@ -0,0 +1,61 @@
+// Copyright © 2016 Zellyn Hunter <zellyn@gmail.com>
+
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var cfgFile string
+
+// RootCmd represents the base command when called without any subcommands
+var RootCmd = &cobra.Command{
+	Use:   "diskii",
+	Short: "Operate on Apple II disk images and their contents",
+	Long: `diskii is a commandline tool for working with Apple II disk
+images.
+
+Eventually, it aims to be a comprehensive disk image manipulation tool.`,
+}
+
+// Execute adds all child commands to the root command sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	if err := RootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(-1)
+	}
+}
+
+func init() {
+	cobra.OnInitialize(initConfig)
+
+	// Here you will define your flags and configuration settings.
+	// Cobra supports Persistent Flags, which, if defined here,
+	// will be global for your application.
+
+	RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.diskii.yaml)")
+	// Cobra also supports local flags, which will only run
+	// when this action is called directly.
+	// RootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}
+
+// initConfig reads in config file and ENV variables if set.
+func initConfig() {
+	if cfgFile != "" { // enable ability to specify config file via flag
+		viper.SetConfigFile(cfgFile)
+	}
+
+	viper.SetConfigName(".diskii") // name of config file (without extension)
+	viper.AddConfigPath("$HOME")   // adding home directory as first search path
+	viper.AutomaticEnv()           // read in environment variables that match
+
+	// If a config file is found, read it in.
+	if err := viper.ReadInConfig(); err == nil {
+		fmt.Println("Using config file:", viper.ConfigFileUsed())
+	}
+}