Pending changes

Author: dpaz

.travis.yml

@@ -16,7 +16,7 @@ install:
   - go get -v -t ./...
 
 script:
-  - make test
+  - make test-coverage
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -1,3 +1,7 @@
+COVERAGE_REPORT := coverage.txt
+COVERAGE_PROFILE := profile.out
+COVERAGE_MODE := atomic
+
 LINGUIST_PATH = .linguist
 
 $(LINGUIST_PATH):
@@ -6,8 +10,21 @@ $(LINGUIST_PATH):
 test: $(LINGUIST_PATH)
 	go test -v ./...
 
+test-coverage: $(LINGUIST_PATH)
+	@echo "mode: $(COVERAGE_MODE)" > $(COVERAGE_REPORT); \
+		for dir in `find . -name "*.go" | grep -o '.*/' | sort -u | grep -v './.linguist/'`; do \
+			go test $$dir -coverprofile=$(COVERAGE_PROFILE) -covermode=$(COVERAGE_MODE); \
+			if [ $$? != 0 ]; then \
+				exit 2; \
+			fi; \
+			if [ -f $(COVERAGE_PROFILE) ]; then \
+				tail -n +2 $(COVERAGE_PROFILE) >> $(COVERAGE_REPORT); \
+			  rm $(COVERAGE_PROFILE); \
+			fi; \
+	done;
+
 code-generate: $(LINGUIST_PATH)
 	go run internal/code-generator/main.go
 
 clean:
-	rm -rf $(LINGUIST_PATH)
+	rm -rf $(LINGUIST_PATH)

cli/enry/main.go

@@ -20,7 +20,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	enry.LoadGitAttributes()
+	enry.LoadGitattributes()
 
 	errors := false
 	out := make(map[string][]string, 0)

utils.go

@@ -84,20 +84,20 @@ func IsBinary(data []byte) bool {
 	return true
 }
 
-// LoadGitattributes reads and parse the file .gitattributes wich overrides the standards strategies
+// LoadGitattributes reads and parses the file .gitattributes which overrides the standard strategies
 func LoadGitattributes() {
-	rawAttributes, err := loadGitattributes(".gitattributes")
+	rawAttributes, err := loadRawGitattributes(".gitattributes")
 	if err == nil && len(rawAttributes) > 0 {
 		parseAttributes(rawAttributes)
 	}
 }
 
-func loadGitattributes(name string) (map[string]string, error) {
+func loadRawGitattributes(name string) (map[string]string, error) {
 	gitattributes := map[string]string{}
 	data, err := ioutil.ReadFile(name)
 	if err != nil {
 		if err != os.ErrNotExist {
-			log.Println(".gitattributes: " + err.Error())
+			log.Println(name + ": " + err.Error())
 		}
 
 		return nil, err

utils_test.go

@@ -82,7 +82,7 @@ func (s *EnryTestSuite) TestIsBinary() {
 	}
 }
 
-func (s *SimpleLinguistTestSuite) TestLoadLine() {
+func (s *EnryTestSuite) TestLoadLine() {
 	tests := []struct {
 		name     string
 		line     string
@@ -101,7 +101,7 @@ func (s *SimpleLinguistTestSuite) TestLoadLine() {
 	}
 }
 
-func (s *SimpleLinguistTestSuite) TestParseAttributes() {
+func (s *EnryTestSuite) TestParseAttributes() {
 	tests := []struct {
 		name       string
 		attributes map[string]string