WIP: separate cmd and package

README.md

@@ -6,7 +6,7 @@ Inspired by [tokei](https://github.com/Aaronepower/tokei).
 ## Installation
 
 ```
-$ go get github.com/hhatto/gocloc
+$ go get -u github.com/hhatto/gocloc/cmd/gocloc
 ```
 
 ## Usage

bspool.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import "sync"
 

file.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import (
 	"bufio"
@@ -30,7 +30,7 @@ func (cf ClocFiles) Less(i, j int) bool {
 	return cf[i].Code > cf[j].Code
 }
 
-func analyzeFile(filename string, language *Language) *ClocFile {
+func analyzeFile(filename string, language *Language, opts Options) *ClocFile {
 	if opts.Debug {
 		fmt.Printf("filename=%v\n", filename)
 	}

file_test.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import (
 	"io/ioutil"

language.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import (
 	"bufio"
@@ -284,7 +284,7 @@ func getFileTypeByShebang(path string) (shebangLang string, ok bool) {
 	return
 }
 
-func getFileType(path string) (ext string, ok bool) {
+func getFileType(path string, opts Options) (ext string, ok bool) {
 	ext = filepath.Ext(path)
 	base := filepath.Base(path)
 

language_test.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import "testing"
 

option.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import "regexp"
 
@@ -19,7 +19,6 @@ const OutputTypeDefault string = "default"
 const OutputTypeClocXml string = "cloc-xml"
 const OutputTypeSloccount string = "sloccount"
 
-var opts Options
 var ExcludeExts map[string]struct{}
 var IncludeLangs map[string]struct{}
 var reNotMatchDir *regexp.Regexp

utils.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import (
 	"crypto/md5"
@@ -55,7 +55,7 @@ func checkMD5Sum(path string) (ignore bool) {
 	return false
 }
 
-func getAllFiles(paths []string, languages map[string]*Language) (filenum, maxPathLen int) {
+func getAllFiles(paths []string, languages map[string]*Language, opts Options) (filenum, maxPathLen int) {
 	maxPathLen = 0
 	for _, root := range paths {
 		vcsInRoot := isVCSDir(root)
@@ -80,7 +80,7 @@ func getAllFiles(paths []string, languages map[string]*Language) (filenum, maxPa
 				return nil
 			}
 
-			if ext, ok := getFileType(path); ok {
+			if ext, ok := getFileType(path, opts); ok {
 				if targetExt, ok := Exts[ext]; ok {
 					// check exclude extension
 					if _, ok := ExcludeExts[targetExt]; ok {

utils_test.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import "testing"
 

xml.go

@@ -1,4 +1,4 @@
-package main
+package gocloc
 
 import (
 	"encoding/xml"