[WIP] Add option to skip versioning of js & css files

Test the approach mentioned in #12

Author: msanroman

glide.lock

@@ -2,3 +2,9 @@ package: .
 import:
 - package: github.com/aws/aws-sdk-go
   version: ~1.8.29
+- package: github.com/spf13/afero
+  version: ^1.2.0
+- package: golang.org/x/text
+  version: ^0.3.0
+  subpackages:
+  - transform

glide.yaml

@@ -43,7 +43,7 @@ func fatal(format string, a ...interface{}) {
 }
 
 // GetFileMd5 returns a checksum for a given file
-func GetFileMd5(file *os.File) (string, error) {
+func GetFileMd5(file io.Reader) (string, error) {
 	var fileHash string
 	hash := md5.New()
 	if _, err := io.Copy(hash, file); err != nil {
@@ -143,13 +143,31 @@ func UploadFile(file *os.File, filename string, bucket string) (err error) {
 	return nil
 }
 
+func ShouldVersionFile(filename string, skipVersioning bool) (bool) {
+	ext := filepath.Ext(filename)
+	return !skipVersioning && (ext == ".js" || ext == ".css")
+}
+
+func GetUploadFilename(file io.Reader, filename string, skipVersioning bool) (string, error) {
+	uploadFilename := filename
+	if ShouldVersionFile(filename, skipVersioning) {
+		checksum, errMd5 := GetFileMd5(file)
+		if errMd5 != nil {
+			return "", errMd5
+		}
+		uploadFilename = GetVersionedFilename(filename, checksum)
+	}
+	return uploadFilename, nil
+}
+
 // VersionAndUploadFiles will verion files and upload them to s3 and return
 // a map of filenames and their version hashes
 func VersionAndUploadFiles(
 	bucket string,
 	directory string,
 	filenames []string,
 	dryRun bool,
+	skipVersioning bool,
 ) (map[string]string, error) {
 	fileVersions := map[string]string{}
 
@@ -162,14 +180,9 @@ func VersionAndUploadFiles(
 		}
 		defer file.Close()
 
-		ext := filepath.Ext(filename)
-		uploadFilename := filename
-		if ext == ".js" || ext == ".css" {
-			checksum, errMd5 := GetFileMd5(file)
-			if errMd5 != nil {
-				return fileVersions, errMd5
-			}
-			uploadFilename = GetVersionedFilename(filename, checksum)
+		uploadFilename, err := GetUploadFilename(file, filename, skipVersioning)
+		if err != nil {
+			return fileVersions, err
 		}
 		bucketFilename := path.Join(directory, uploadFilename)
 		fileURL := GetFileURL(bucket, bucketFilename)
@@ -220,6 +233,7 @@ func main() {
 	format := flag.String("format", "json", "format of the output [json,csv]")
 	dryRun := flag.Bool("dry-run", false, "print the output only, skip file uploads and manifest creation")
 	printVersion := flag.Bool("v", false, "print the current buffer-static-upload version")
+	skipVersioning := flag.Bool("skip-versioning", false, "skip versioning uploaded files")
 	flag.Parse()
 
 	if *printVersion {
@@ -239,7 +253,7 @@ func main() {
 	fmt.Printf("Found %d files to upload and version:\n", len(files))
 
 	SetupS3Uploader()
-	fileVersions, err := VersionAndUploadFiles(*s3Bucket, *directory, files, *dryRun)
+	fileVersions, err := VersionAndUploadFiles(*s3Bucket, *directory, files, *dryRun, *skipVersioning)
 	if err != nil {
 		fatal("failed to upload files %s", err)
 	}

main.go

@@ -1,7 +1,10 @@
 package main
 
 import (
+	"os"
+	"fmt"
 	"testing"
+	"github.com/spf13/afero"
 )
 
 func TestGetFileURL(t *testing.T) {
@@ -21,3 +24,49 @@ func TestGetFileURL(t *testing.T) {
 		}
 	}
 }
+
+
+func TestShouldVersionFile(t *testing.T) {
+	tests := []struct {
+		filename		string
+		skipVersioning bool
+		expected       bool
+	} {
+		{ "bundle.js", false, true },
+		{ "bundle.js", true, false },
+		{ "assets.css", false, true },
+		{ "assets.css", true, false },
+		{ "another.file", false, false },
+	}
+
+	for _, test := range tests {
+		actual := ShouldVersionFile(test.filename, test.skipVersioning)
+		if actual != test.expected {
+			t.Errorf("ShouldVersionFile result was incorrect, got %t, expected %t for filename %s", actual, test.expected, test.filename)
+		}
+	}
+}
+
+func TestGetUploadFilename(t *testing.T) {
+	var AppFs = afero.NewMemMapFs()
+	filename := "bundle.js"
+	file, _ := AppFs.OpenFile(filename, os.O_CREATE, 0600)
+	file.WriteString("some JS content")
+	tests := []struct {
+		file afero.File
+		filename string
+		skipVersioning bool
+		expected string
+	} {
+		{ file, filename, false, "bundle.d41d8cd98f00b204e9800998ecf8427e.js" },
+		{ file, filename, true, "bundle.js" },
+	}
+
+	for _, test := range tests {
+		fmt.Print(file.Name())
+		actual, _ := GetUploadFilename(test.file, test.filename, test.skipVersioning)
+		if actual != test.expected {
+			t.Errorf("GetUploadFilename result was incorrect, got %s, expected %s", actual, test.expected)
+		}
+	}
+}