feat(qri-ref): Cleanup return values, use varName package

cmd/init.go

@@ -10,6 +10,7 @@ import (
  "github.com/qri-io/dataset"
  "github.com/qri-io/ioes"
  "github.com/qri-io/qri/lib"
+ "github.com/qri-io/varName"
  "github.com/spf13/cobra"
 )
 
@@ -79,7 +80,7 @@ func (o *InitOptions) Run() (err error) {
  if err != nil {
  return err
  }
- suggestDataset := filepath.Base(pwd)
+ suggestDataset := varName.CreateVarNameFromString(filepath.Base(pwd))
 
  // Process flags for inputs, prompt for any that were not provided.
  var dsName, dsFormat string

cmd/save.go

@@ -105,7 +105,7 @@ type SaveOptions struct {
 // Complete adds any missing configuration that can only be added just before calling Run
 func (o *SaveOptions) Complete(f Factory, args []string) (err error) {
  o.Ref, err = GetDatasetRefString(f, args, 0)
- o.IsLinkedRef, _ = GetLinkedFilesysRef()
+ _, o.IsLinkedRef = GetLinkedFilesysRef()
 
  if o.IsLinkedRef {
  // Determine format of the body.

cmd/status.go

@@ -46,7 +46,7 @@ type StatusOptions struct {
 // Complete adds any missing configuration that can only be added just before calling Run
 func (o *StatusOptions) Complete(f Factory, args []string) (err error) {
  var ok bool
- ok, o.Selection = GetLinkedFilesysRef()
+ o.Selection, ok = GetLinkedFilesysRef()
  if !ok {
  return fmt.Errorf("this is not a linked working directory")
  }

cmd/use.go

@@ -6,6 +6,7 @@ import (
  "io/ioutil"
  "os"
  "path/filepath"
+ "strings"
 
  "github.com/qri-io/ioes"
  "github.com/qri-io/qri/lib"
@@ -138,7 +139,7 @@ func GetDatasetRefString(f Factory, args []string, index int) (string, error) {
  return args[index], nil
  }
  // If in a working directory that is linked to a dataset, use that link's reference.
- ok, data := GetLinkedFilesysRef()
+ data, ok := GetLinkedFilesysRef()
  if ok {
  return data, nil
  }
@@ -156,12 +157,12 @@ func GetDatasetRefString(f Factory, args []string, index int) (string, error) {
 
 // GetLinkedFilesysRef returns whether the current directory is linked to a dataset in your repo,
 // and the reference to that dataset.
-func GetLinkedFilesysRef() (bool, string) {
+func GetLinkedFilesysRef() (string, bool) {
  data, err := ioutil.ReadFile(QriRefFilename)
  if err == nil {
- return true, string(data)
+ return strings.TrimSpace(string(data)), true
  }
- return false, ""
+ return "", false
 }
 
 // DefaultSelectedRefList returns the list of currently selected dataset references