Merge pull request #175 from vmarkovtsev/master

Language stats

Author: vmarkovtsev

.appveyor.yml

@@ -2,7 +2,7 @@ version: "{build}"
 platform: x64
 image: Visual Studio 2017
 
-clone_folder: c:\gopath\src\gopkg.in\src-d\hercules.v6
+clone_folder: c:\gopath\src\gopkg.in\src-d\hercules.v7
 
 environment:
   GOPATH: c:\gopath
@@ -16,14 +16,14 @@ build_script:
   - go version
   - set PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;C:\msys64\usr\bin;C:\msys64\mingw64\bin;%GOPATH%\bin;%PATH%
   - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
-  - cd %GOPATH%\src\gopkg.in\src-d\hercules.v6
+  - cd %GOPATH%\src\gopkg.in\src-d\hercules.v7
   - go get -v github.com/golang/dep/cmd/dep
   - make
-  - 7z a c:\gopath\src\gopkg.in\src-d\hercules.v6\hercules.win64.zip %GOPATH%\bin\hercules.exe
+  - 7z a c:\gopath\src\gopkg.in\src-d\hercules.v7\hercules.win64.zip %GOPATH%\bin\hercules.exe
 
 test_script:
-  - go get -v -t -d gopkg.in/src-d/hercules.v6/...
-  - go test -v -tags disable_babelfish gopkg.in/src-d/hercules.v6/...
+  - go get -v -t -d gopkg.in/src-d/hercules.v7/...
+  - go test -v -tags disable_babelfish gopkg.in/src-d/hercules.v7/...
 
 artifacts:
   - name: hercules.win64.zip

.travis.yml

@@ -5,7 +5,7 @@ git:
   depth: 9999999
 
 language: go
-go_import_path: gopkg.in/src-d/hercules.v6
+go_import_path: gopkg.in/src-d/hercules.v7
 go:
   - 1.10.x
   - 1.11.x
@@ -24,10 +24,10 @@ cache:
     - $HOME/gopath/src
 before_cache:
   - cd $HOME/gopath
-  - mv $HOME/gopath/src/gopkg.in/src-d/hercules.v6/vendor $HOME/gopath/src/gopkg.in/src-d/.vendor
-  - rm -rf $HOME/gopath/src/gopkg.in/src-d/hercules.v6
-  - mkdir $HOME/gopath/src/gopkg.in/src-d/hercules.v6
-  - mv $HOME/gopath/src/gopkg.in/src-d/.vendor $HOME/gopath/src/gopkg.in/src-d/hercules.v6/vendor
+  - mv $HOME/gopath/src/gopkg.in/src-d/hercules.v7/vendor $HOME/gopath/src/gopkg.in/src-d/.vendor
+  - rm -rf $HOME/gopath/src/gopkg.in/src-d/hercules.v7
+  - mkdir $HOME/gopath/src/gopkg.in/src-d/hercules.v7
+  - mv $HOME/gopath/src/gopkg.in/src-d/.vendor $HOME/gopath/src/gopkg.in/src-d/hercules.v7/vendor
 
 matrix:
   fast_finish: true
@@ -69,7 +69,7 @@ script:
   - go vet -tags tensorflow ./...
   - golint -set_exit_status $(go list ./... | grep -v /vendor/)
   - flake8
-  - go test -coverpkg=all -v -coverprofile=coverage.txt -covermode=count gopkg.in/src-d/hercules.v6/... && sed -i '/cmd\/hercules\|core.go/d' coverage.txt
+  - go test -coverpkg=all -v -coverprofile=coverage.txt -covermode=count gopkg.in/src-d/hercules.v7/... && sed -i '/cmd\/hercules\|core.go/d' coverage.txt
   - $GOPATH/bin/hercules version
   - $GOPATH/bin/hercules --burndown --couples --devs --quiet --pb https://github.com/src-d/hercules > 1.pb
   - cp 1.pb 2.pb
@@ -95,7 +95,7 @@ jobs:
       os: osx
       osx_image: xcode9.3
       go: 1.11.x
-      go_import_path: gopkg.in/src-d/hercules.v6
+      go_import_path: gopkg.in/src-d/hercules.v7
       before_install:
         - wget -O protoc.zip https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-osx-x86_64.zip
         - unzip -d ~/.local protoc.zip && rm protoc.zip
@@ -117,7 +117,7 @@ jobs:
     - stage: deploy
       os: linux
       go: 1.11.x
-      go_import_path: gopkg.in/src-d/hercules.v6
+      go_import_path: gopkg.in/src-d/hercules.v7
       before_install:
         - wget -O protoc.zip https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip
         - unzip -d ~/.local protoc.zip && rm protoc.zip

Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 ENV GOPATH /root
 ENV PROTOBUF_VERSION 3.5.1
 
-COPY . /root/src/gopkg.in/src-d/hercules.v6
+COPY . /root/src/gopkg.in/src-d/hercules.v7
 RUN apt-get update && \
     apt-get install -y --no-install-suggests --no-install-recommends software-properties-common && \
     add-apt-repository -y ppa:gophers/archive && \
@@ -14,13 +14,13 @@ RUN apt-get update && \
     locale-gen en_US.UTF-8 && \
     export PATH=/usr/lib/go-1.10/bin:/root/bin:$PATH && \
     go get -v github.com/golang/dep/cmd/dep && \
-    cd /root/src/gopkg.in/src-d/hercules.v6 && \
+    cd /root/src/gopkg.in/src-d/hercules.v7 && \
     export CGO_CXXFLAGS=-std=c++14 && \
     curl -L "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-$(go env GOOS)-x86_64-1.7.0.tar.gz" | tar -C /usr/local -xz && \
     make && \
     rm /usr/local/bin/protoc && rm /usr/local/readme.txt && rm -rf /usr/local/include/google && \
     cp /root/bin/hercules /usr/local/bin && \
-    cp -r /root/src/gopkg.in/src-d/hercules.v6/*.py /root/src/gopkg.in/src-d/hercules.v6/internal /usr/local/bin && \
+    cp -r /root/src/gopkg.in/src-d/hercules.v7/*.py /root/src/gopkg.in/src-d/hercules.v7/internal /usr/local/bin && \
     sed -i 's/parser.add_argument("--backend",/parser.add_argument("--backend", default="Agg",/' /usr/local/bin/labours.py && \
     echo '#!/bin/bash\n\
 \n\
@@ -30,7 +30,7 @@ echo\n\' > /browser && \
     chmod +x /browser && \
     curl https://bootstrap.pypa.io/get-pip.py | python3 - pip==18.1 && \
     pip3 install --no-cache-dir --no-build-isolation cython && \
-    pip3 install --no-cache-dir --no-build-isolation -r /root/src/gopkg.in/src-d/hercules.v6/requirements.txt https://github.com/mind/wheels/releases/download/tf1.7-cpu/tensorflow-1.7.0-cp36-cp36m-linux_x86_64.whl && \
+    pip3 install --no-cache-dir --no-build-isolation -r /root/src/gopkg.in/src-d/hercules.v7/requirements.txt https://github.com/mind/wheels/releases/download/tf1.7-cpu/tensorflow-1.7.0-cp36-cp36m-linux_x86_64.whl && \
     rm -rf /root/* && \
     apt-get remove -y software-properties-common golang-1.10-go python3-dev libyaml-dev libxml2-dev curl git make unzip g++ && \
     apt-get remove -y *-doc *-man && \

Makefile

@@ -11,7 +11,7 @@ BBLFSH_DEP =
 all: ${GOPATH}/bin/hercules${EXE}
 
 test: all
-	go test gopkg.in/src-d/hercules.v6
+	go test gopkg.in/src-d/hercules.v7
 
 ${GOPATH}/bin/protoc-gen-gogo${EXE}:
 	go get -v github.com/gogo/protobuf/protoc-gen-gogo
@@ -42,4 +42,4 @@ vendor/gopkg.in/bblfsh/client-go.v2/tools/include:
 endif
 
 ${GOPATH}/bin/hercules${EXE}: vendor *.go */*.go */*/*.go */*/*/*.go internal/pb/pb.pb.go internal/pb/pb_pb2.py cmd/hercules/plugin_template_source.go ${BBLFSH_DEP}
-	go get -tags "$(TAGS)" -ldflags "-X gopkg.in/src-d/hercules.v6.BinaryGitHash=$(shell git rev-parse HEAD)" gopkg.in/src-d/hercules.v6/cmd/hercules
+	go get -tags "$(TAGS)" -ldflags "-X gopkg.in/src-d/hercules.v7.BinaryGitHash=$(shell git rev-parse HEAD)" gopkg.in/src-d/hercules.v7/cmd/hercules

README.md

@@ -4,7 +4,7 @@
 <h1 align="center">Hercules</h1>
 <p align="center">
       Fast, insightful and highly customizable Git history analysis.<br><br>
-      <a href="http://godoc.org/gopkg.in/src-d/hercules.v6"><img src="https://godoc.org/gopkg.in/src-d/hercules.v6?status.svg" alt="GoDoc"></a>
+      <a href="http://godoc.org/gopkg.in/src-d/hercules.v7"><img src="https://godoc.org/gopkg.in/src-d/hercules.v7?status.svg" alt="GoDoc"></a>
       <a href="https://travis-ci.org/src-d/hercules"><img src="https://travis-ci.org/src-d/hercules.svg?branch=master" alt="Travis build Status"></a>
       <a href="https://ci.appveyor.com/project/vmarkovtsev/hercules"><img src="https://ci.appveyor.com/api/projects/status/49f0lm3v2y6xyph3?svg=true" alt="AppVeyor build status"></a>
       <a href="https://hub.docker.com/r/srcd/hercules"><img src="https://img.shields.io/docker/build/srcd/hercules.svg" alt="Docker build status"></a>
@@ -59,8 +59,8 @@ Numpy and Scipy can be installed on Windows using http://www.lfd.uci.edu/~gohlke
 You are going to need Go (>= v1.10), [`protoc`](https://github.com/google/protobuf/releases),
 and [`dep`](https://github.com/golang/dep).
 ```
-go get -d gopkg.in/src-d/hercules.v6/cmd/hercules
-cd $GOPATH/src/gopkg.in/src-d/hercules.v6
+go get -d gopkg.in/src-d/hercules.v7/cmd/hercules
+cd $GOPATH/src/gopkg.in/src-d/hercules.v7
 make
 ```
 

cmd/hercules/combine.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/spf13/cobra"
-	"gopkg.in/src-d/hercules.v6"
-	"gopkg.in/src-d/hercules.v6/internal/pb"
+	"gopkg.in/src-d/hercules.v7"
+	"gopkg.in/src-d/hercules.v7/internal/pb"
 )
 
 // combineCmd represents the combine command

cmd/hercules/plugin.template

@@ -24,7 +24,7 @@ import (
 
   "github.com/gogo/protobuf/proto"
   "gopkg.in/src-d/go-git.v4"
-  "gopkg.in/src-d/hercules.v6"
+  "gopkg.in/src-d/hercules.v7"
 )
 
 // {{.name}} contains the intermediate state which is mutated by Consume(). It should implement

cmd/hercules/root.go

@@ -34,8 +34,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/storage"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem"
 	"gopkg.in/src-d/go-git.v4/storage/memory"
-	"gopkg.in/src-d/hercules.v6"
-	"gopkg.in/src-d/hercules.v6/internal/pb"
+	"gopkg.in/src-d/hercules.v7"
+	"gopkg.in/src-d/hercules.v7/internal/pb"
 )
 
 // oneLineWriter splits the output data by lines and outputs one on top of another using '\r'.

contrib/_plugin_example/churn_analysis.go

@@ -13,7 +13,7 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"gopkg.in/src-d/go-git.v4/utils/merkletrie"
-	"gopkg.in/src-d/hercules.v6"
+	"gopkg.in/src-d/hercules.v7"
 )
 
 // ChurnAnalysis contains the intermediate state which is mutated by Consume(). It should implement

core.go

@@ -4,12 +4,12 @@ import (
 	"github.com/spf13/pflag"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"gopkg.in/src-d/hercules.v6/internal/core"
-	"gopkg.in/src-d/hercules.v6/internal/plumbing"
-	"gopkg.in/src-d/hercules.v6/internal/plumbing/identity"
-	"gopkg.in/src-d/hercules.v6/internal/plumbing/uast"
-	"gopkg.in/src-d/hercules.v6/internal/yaml"
-	"gopkg.in/src-d/hercules.v6/leaves"
+	"gopkg.in/src-d/hercules.v7/internal/core"
+	"gopkg.in/src-d/hercules.v7/internal/plumbing"
+	"gopkg.in/src-d/hercules.v7/internal/plumbing/identity"
+	"gopkg.in/src-d/hercules.v7/internal/plumbing/uast"
+	"gopkg.in/src-d/hercules.v7/internal/yaml"
+	"gopkg.in/src-d/hercules.v7/leaves"
 )
 
 // ConfigurationOptionType represents the possible types of a ConfigurationOption's value.

internal/burndown/file.go

@@ -5,8 +5,8 @@ import (
 	"log"
 	"math"
 
-	"gopkg.in/src-d/hercules.v6/internal"
-	"gopkg.in/src-d/hercules.v6/internal/rbtree"
+	"gopkg.in/src-d/hercules.v7/internal"
+	"gopkg.in/src-d/hercules.v7/internal/rbtree"
 )
 
 // Updater is the function which is called back on File.Update().

internal/burndown/file_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/src-d/hercules.v6/internal/rbtree"
+	"gopkg.in/src-d/hercules.v7/internal/rbtree"
 )
 
 func updateStatusFile(status map[int]int64, _, previousTime, delta int) {

internal/core/forks.go

@@ -9,7 +9,7 @@ import (
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"gopkg.in/src-d/hercules.v6/internal/toposort"
+	"gopkg.in/src-d/hercules.v7/internal/toposort"
 )
 
 // OneShotMergeProcessor provides the convenience method to consume merges only once.

internal/core/pipeline.go

@@ -18,8 +18,8 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"gopkg.in/src-d/go-git.v4/plumbing/storer"
-	"gopkg.in/src-d/hercules.v6/internal/pb"
-	"gopkg.in/src-d/hercules.v6/internal/toposort"
+	"gopkg.in/src-d/hercules.v7/internal/pb"
+	"gopkg.in/src-d/hercules.v7/internal/toposort"
 )
 
 // ConfigurationOptionType represents the possible types of a ConfigurationOption's value.

internal/core/pipeline_test.go

@@ -14,8 +14,8 @@ import (
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
-	"gopkg.in/src-d/hercules.v6/internal/pb"
-	"gopkg.in/src-d/hercules.v6/internal/test"
+	"gopkg.in/src-d/hercules.v7/internal/pb"
+	"gopkg.in/src-d/hercules.v7/internal/test"
 )
 
 type testPipelineItem struct {

internal/core/registry_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/src-d/go-git.v4"
-	"gopkg.in/src-d/hercules.v6/internal/test"
+	"gopkg.in/src-d/hercules.v7/internal/test"
 )
 
 func getRegistry() *PipelineItemRegistry {

internal/global_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/src-d/hercules.v6/internal/core"
-	uast_items "gopkg.in/src-d/hercules.v6/internal/plumbing/uast"
-	"gopkg.in/src-d/hercules.v6/internal/test"
-	"gopkg.in/src-d/hercules.v6/leaves"
+	"gopkg.in/src-d/hercules.v7/internal/core"
+	uast_items "gopkg.in/src-d/hercules.v7/internal/plumbing/uast"
+	"gopkg.in/src-d/hercules.v7/internal/test"
+	"gopkg.in/src-d/hercules.v7/leaves"
 )
 
 func TestPipelineSerialize(t *testing.T) {