Merge branch 'release/v0.10.0'

Author: andreaskoch

.travis.yml

@@ -1,3 +1,3 @@
 language: go
-go: 1.5
+go: tip
 install: make install

Dockerfile

@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -qy pandoc
 
 # Build
 ADD . /go
-RUN go run make.go -crosscompile
-RUN go run make.go -install
+RUN make install
+RUN make crosscompile
 
 # Data
 RUN mkdir /data

Makefile

@@ -1,12 +1,16 @@
-# The normal way to build allmark is just "go run make.go", which
-# works everywhere, even on systems without Make.
+build:
+	go build -o bin/files/allmark ./cli
 
 install:
-	go run make.go -install
+	go build -o bin/files/allmark ./cli
 
 test:
+	go test ./cli ./common/... ./dataaccess/... ./model/... ./services/... ./web/...
 
-	go run make.go -test
-
-fmt:
-	go run make.go -fmt
+crosscompile:
+	GOOS=linux GOARCH=amd64 go build -o bin/files/allmark_linux_amd64 ./cli
+	GOOS=linux GOARCH=arm GOARM=5 go build -o bin/files/allmark_linux_arm_5 ./cli
+	GOOS=linux GOARCH=arm GOARM=6 go build -o bin/files/allmark_linux_arm_6 ./cli
+	GOOS=linux GOARCH=arm GOARM=7 go build -o bin/files/allmark_linux_arm_7 ./cli
+	GOOS=darwin GOARCH=amd64 go build -o bin/files/allmark_darwin_amd64 ./cli
+	GOOS=windows GOARCH=amd64 go build -o bin/files/allmark_windows_amd64 ./cli

README.md

@@ -5,18 +5,18 @@
 package main
 
 import (
-	"allmark.io/modules/common/buildinfo"
-	"allmark.io/modules/common/config"
-	"allmark.io/modules/common/logger/console"
-	"allmark.io/modules/common/logger/loglevel"
-	"allmark.io/modules/common/shutdown"
-	"allmark.io/modules/common/util/fsutil"
-	"allmark.io/modules/dataaccess/filesystem"
-	"allmark.io/modules/services/initialization"
-	"allmark.io/modules/services/parser"
-	"allmark.io/modules/services/thumbnail"
-	"allmark.io/modules/web/server"
 	"fmt"
+
+	"github.com/andreaskoch/allmark/common/config"
+	"github.com/andreaskoch/allmark/common/logger/console"
+	"github.com/andreaskoch/allmark/common/logger/loglevel"
+	"github.com/andreaskoch/allmark/common/shutdown"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
+	"github.com/andreaskoch/allmark/dataaccess/filesystem"
+	"github.com/andreaskoch/allmark/services/initialization"
+	"github.com/andreaskoch/allmark/services/parser"
+	"github.com/andreaskoch/allmark/services/thumbnail"
+	"github.com/andreaskoch/allmark/web/server"
 	// "github.com/davecheney/profile"
 	"flag"
 	"os"
@@ -37,6 +37,8 @@ const (
 	CommandNameVersion = "version"
 )
 
+var version = "v0.10.0-dev"
+
 var (
 	serveFlags       = flag.NewFlagSet("serve-flags", flag.ContinueOnError)
 	secure           = serveFlags.Bool("secure", false, "Use HTTPs only")
@@ -141,7 +143,7 @@ func parseCommandLineArguments(args []string, commandHandler func(commandName, r
 func printUsageInformation(args []string) {
 	executeableName := args[0]
 
-	fmt.Fprintf(os.Stderr, "%s - %s (Version: %s)\n", executeableName, "The standalone markdown webserver", buildinfo.Version())
+	fmt.Fprintf(os.Stderr, "%s - %s (Version: %s)\n", executeableName, "The standalone markdown webserver", version)
 	fmt.Fprintf(os.Stderr, "\nUsage:\n%s %s %s\n", executeableName, "<command>", "<repository path>")
 	fmt.Fprintf(os.Stderr, "\nAvailable commands:\n")
 	fmt.Fprintf(os.Stderr, "  %7s  %s\n", CommandNameInit, "Initialize the configuration")
@@ -239,7 +241,7 @@ func initialize(repositoryPath string) bool {
 }
 
 func printVersionInformation() {
-	fmt.Println(buildinfo.Version())
+	fmt.Println(version)
 }
 
 func isCommandlineFlag(argument string) bool {

bin/download.md

@@ -15,10 +15,10 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"allmark.io/modules/common/certificates"
-	"allmark.io/modules/common/logger/loglevel"
-	"allmark.io/modules/common/ports"
-	"allmark.io/modules/common/util/fsutil"
+	"github.com/andreaskoch/allmark/common/certificates"
+	"github.com/andreaskoch/allmark/common/logger/loglevel"
+	"github.com/andreaskoch/allmark/common/ports"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
 	"github.com/abbot/go-http-auth"
 	"github.com/mitchellh/go-homedir"
 )

src/allmark.io/cmd/allmark/allmark.go renamed to cli/allmark.go

@@ -7,7 +7,7 @@
 package console
 
 import (
-	"allmark.io/modules/common/logger/loglevel"
+	"github.com/andreaskoch/allmark/common/logger/loglevel"
 	"fmt"
 	"io"
 	"log"

src/allmark.io/modules/common/certificates/cert.go renamed to common/certificates/cert.go

@@ -5,7 +5,7 @@
 package console
 
 import (
-	"allmark.io/modules/common/logger/loglevel"
+	"github.com/andreaskoch/allmark/common/logger/loglevel"
 	"bytes"
 	"strings"
 	"testing"

src/allmark.io/modules/common/config/config.go renamed to common/config/config.go

@@ -5,7 +5,7 @@
 package logger
 
 import (
-	"allmark.io/modules/common/logger/loglevel"
+	"github.com/andreaskoch/allmark/common/logger/loglevel"
 )
 
 type Logger interface {

src/allmark.io/modules/common/config/constants.go renamed to common/config/constants.go

@@ -5,7 +5,7 @@
 package paths
 
 import (
-	"allmark.io/modules/common/route"
+	"github.com/andreaskoch/allmark/common/route"
 )
 
 type PatherFactory interface {

src/allmark.io/modules/common/config/constants_windows.go renamed to common/config/constants_windows.go

@@ -5,7 +5,7 @@
 package paths
 
 import (
-	"allmark.io/modules/common/route"
+	"github.com/andreaskoch/allmark/common/route"
 )
 
 type Pather interface {

src/allmark.io/modules/common/config/json.go renamed to common/config/json.go

@@ -5,7 +5,7 @@
 package tree
 
 import (
-	"allmark.io/modules/common/route"
+	"github.com/andreaskoch/allmark/common/route"
 )
 
 func RouteToPath(route route.Route) Path {

src/allmark.io/modules/common/config/json_test.go renamed to common/config/json_test.go

@@ -5,7 +5,7 @@
 package tree
 
 import (
-	"allmark.io/modules/common/route"
+	"github.com/andreaskoch/allmark/common/route"
 	"testing"
 )
 

src/allmark.io/modules/common/content/contentprovider.go renamed to common/content/contentprovider.go

@@ -5,8 +5,8 @@
 package dataaccess
 
 import (
-	"allmark.io/modules/common/content"
-	"allmark.io/modules/common/route"
+	"github.com/andreaskoch/allmark/common/content"
+	"github.com/andreaskoch/allmark/common/route"
 )
 
 // A File represents a file ressource that is associated with an Item.

src/allmark.io/modules/common/logger/console/console.go renamed to common/logger/console/console.go

@@ -5,10 +5,10 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/content"
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/util/fsutil"
-	"allmark.io/modules/common/util/hashutil"
+	"github.com/andreaskoch/allmark/common/content"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
+	"github.com/andreaskoch/allmark/common/util/hashutil"
 	"fmt"
 	"io"
 	"io/ioutil"

src/allmark.io/modules/common/logger/console/console_test.go renamed to common/logger/console/console_test.go

@@ -5,9 +5,9 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/content"
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/util/hashutil"
+	"github.com/andreaskoch/allmark/common/content"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/util/hashutil"
 	"fmt"
 )
 

src/allmark.io/modules/common/logger/logger.go renamed to common/logger/logger.go

@@ -5,10 +5,10 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/logger"
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/util/fsutil"
-	"allmark.io/modules/dataaccess"
+	"github.com/andreaskoch/allmark/common/logger"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
+	"github.com/andreaskoch/allmark/dataaccess"
 	"fmt"
 	"io/ioutil"
 	"path/filepath"

src/allmark.io/modules/common/logger/loglevel/loglevel.go renamed to common/logger/loglevel/loglevel.go

@@ -5,8 +5,8 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/dataaccess"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/dataaccess"
 	"fmt"
 )
 

src/allmark.io/modules/common/paths/factory.go renamed to common/paths/factory.go

@@ -5,10 +5,10 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/content"
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/util/hashutil"
-	"allmark.io/modules/dataaccess"
+	"github.com/andreaskoch/allmark/common/content"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/util/hashutil"
+	"github.com/andreaskoch/allmark/dataaccess"
 	"fmt"
 )
 

src/allmark.io/modules/common/paths/paths.go renamed to common/paths/paths.go

@@ -5,11 +5,11 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/config"
-	"allmark.io/modules/common/logger"
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/util/fsutil"
-	"allmark.io/modules/dataaccess"
+	"github.com/andreaskoch/allmark/common/config"
+	"github.com/andreaskoch/allmark/common/logger"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
+	"github.com/andreaskoch/allmark/dataaccess"
 	"fmt"
 	"path/filepath"
 )

src/allmark.io/modules/common/ports/ports.go renamed to common/ports/ports.go

@@ -5,9 +5,9 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/tree"
-	"allmark.io/modules/dataaccess"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/tree"
+	"github.com/andreaskoch/allmark/dataaccess"
 	"fmt"
 )
 

src/allmark.io/modules/common/route/route.go renamed to common/route/route.go

@@ -10,11 +10,11 @@ import (
 	"runtime"
 	"time"
 
-	"allmark.io/modules/common/config"
-	"allmark.io/modules/common/logger"
-	"allmark.io/modules/common/route"
-	"allmark.io/modules/common/util/fsutil"
-	"allmark.io/modules/dataaccess"
+	"github.com/andreaskoch/allmark/common/config"
+	"github.com/andreaskoch/allmark/common/logger"
+	"github.com/andreaskoch/allmark/common/route"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
+	"github.com/andreaskoch/allmark/dataaccess"
 )
 
 type Repository struct {

src/allmark.io/modules/common/route/route_child_test.go renamed to common/route/route_child_test.go

@@ -5,8 +5,8 @@
 package filesystem
 
 import (
-	"allmark.io/modules/common/config"
-	"allmark.io/modules/common/util/fsutil"
+	"github.com/andreaskoch/allmark/common/config"
+	"github.com/andreaskoch/allmark/common/util/fsutil"
 	"io/ioutil"
 	"path/filepath"
 	"strings"