ADD profile name validation, compress deliverables

Author: RecuencoJones

.travis.yml

@@ -9,16 +9,17 @@ install:
 
 script:
 - go install ./...
-- gox -output="bin/{{.Dir}}_{{.OS}}_{{.Arch}}" ./...
+- gox -output="bin/{{.OS}}_{{.Arch}}/{{.Dir}}" ./...
 
 before_deploy:
 - export VERSION=`npmrc version`
+- for i in bin/*; do tar -zvcf "$i.tar.gz" "$i"; done
 
 deploy:
   provider: releases
   api_key: $GITHUB_TOKEN
   file_glob: true
-  file: bin/**/*
+  file: bin/*.tar.gz
   skip_cleanup: true
   name: npmrc $VERSION
   on:

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.2
+
+- Added profile name validation
+- Added copy to current directory
+- Updated help and readme
+- Updated .travis.yml to compress files before uploading
+
 ## 0.1.1
 
 - Added remove confirmation

README.md

@@ -15,8 +15,8 @@ go install ./...
 
 ## Installation from releases
 
-- Download the binary for your distribution
-- Rename it to `npmrc`
+- Download the file for your distribution
+- Extract it to get `npmrc`
 - Make it available in your path
 
 Happy `.npmrc` switching!
@@ -43,5 +43,13 @@ version     Display version
 | Env variable | Default value | Description |
 | --- | --- | --- |
 | NPMRC_DIR | `~` | Directory where profiles will be stored |
-| EDITOR | `vim` | Editor to use for creating/editing profiles |
+| EDITOR | `vi` | Editor to use for creating/editing profiles |
 | VIEWER | `cat` | Viewer to use for viewing profiles |
+
+## Profile name rules
+
+- Profile name must not start with `.`
+- Profile name must not contain spaces
+- Profile name must be of at least 1 character length
+
+[Check regex at regexr.com](https://regexr.com/3u5rg)

cmd/npmrc/copy.go

@@ -43,15 +43,29 @@ func CopyHandler(args []string, options CopyOptions) {
 
 // Copy source profile to destination profile
 func Copy(srcProfile, destProfile string) error {
+	var dest string
+
 	// check profile is valid
 	if !ProfileExists(srcProfile) {
 		fmt.Println("Error: Profile \"" + srcProfile + "\" does not exist")
 		os.Exit(1)
 	}
 
+	if destProfile == "." {
+		dir, err := os.Getwd()
+		if err != nil {
+			log.Fatal(err)
+			os.Exit(1)
+		}
+
+		dest = path.Join(dir, NpmrcFile)
+	} else {
+		ValidateProfile(destProfile)
+		dest = path.Join(Dir, NpmrcFile+"."+destProfile)
+	}
+
 	// copy from $npmrc_dir/.npmrc.$srcProfile to $npmrc_dir/.npmrc.$destProfile
 	source := path.Join(Dir, NpmrcFile+"."+srcProfile)
-	dest := path.Join(Dir, NpmrcFile+"."+destProfile)
 
 	return CP(source, dest)
 }
@@ -66,5 +80,9 @@ Alias: cp
 Available flags:
 
 verbose    Display additional output
-h          Display this message`)
+h          Display this message
+
+Details:
+
+If <destProfile> is ".", the selected profile is copied to current working directory.`)
 }

cmd/npmrc/edit.go

@@ -18,6 +18,8 @@ type EditOptions struct {
 func EditHandler(args []string, options EditOptions) {
 	profile := args[0]
 
+	ValidateProfile(profile)
+
 	if options.verbose {
 		if !ProfileExists(profile) {
 			fmt.Println("Creating profile \"" + profile + "\"")

cmd/npmrc/main.go

@@ -136,7 +136,7 @@ func main() {
 // Help display usage of npmrc command
 func Help() {
 	fmt.Println(`
-Usage: npmrc <command> [flags]
+Usage: npmrc <command>
 
 Available commands:
 
@@ -147,5 +147,13 @@ edit, ed    Create or update profiles
 copy, cp    Copy profiles
 remove, rm  Remove a profile
 help, h     Display this message
-version     Display version`)
+version     Display version
+
+Profile names:
+
+A profile names must comply with the following:
+
+- Must not start with "."
+- Must not contain spaces
+- Must be of at least 1 character length`)
 }

cmd/npmrc/validate.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"strings"
+)
+
+// IsProfileValid checks if a given profile name complies with the naming rules
+func IsProfileValid(profile string) (bool, []error) {
+	var errs []error
+
+	if strings.HasPrefix(profile, ".") {
+		err := errors.New("Profile name cannot start with \".\"")
+
+		errs = append(errs, err)
+	}
+
+	if strings.Contains(profile, " ") {
+		err := errors.New("Profile name cannot contain spaces")
+
+		errs = append(errs, err)
+	}
+
+	if len(profile) < 1 {
+		err := errors.New("Profile name must be at least one character long")
+
+		errs = append(errs, err)
+	}
+
+	return len(errs) == 0, errs
+}
+
+// ValidateProfile aborts execution if profile is non compliant
+func ValidateProfile(profile string) {
+	isValid, errors := IsProfileValid(profile)
+
+	if !isValid {
+		for _, err := range errors {
+			fmt.Println(err)
+		}
+		os.Exit(1)
+	}
+}

cmd/npmrc/variables.go

@@ -4,7 +4,7 @@ import homedir "github.com/mitchellh/go-homedir"
 
 // NpmrcFile base name
 const (
-	Version   = "0.1.1"
+	Version   = "0.1.2"
 	NpmrcFile = ".npmrc"
 )