prep for org switch

Author: b5

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: '2'
 jobs:
   build:
-    working_directory: /go/src/github.com/archivers-space/coverage
+    working_directory: /go/src/github.com/datatogether/coverage
     docker:
       - image: circleci/cci-demo-go-primary:0.0.2
         environment:
@@ -29,18 +29,18 @@ jobs:
             echo Failed waiting for Postgres && exit 1
       - run: 
           name: Make test results directory
-          command: mkdir -p /tmp/test-reports/archivers-space
+          command: mkdir -p /tmp/test-reports/datatogether
       - run:
           name: Install dependencies
           command: go-wrapper download && go-wrapper install && go get -v github.com/jstemmer/go-junit-report
       - run: 
           name: Run tests
-          command: go test -v -race ./... | tee /tmp/test-reports/archivers-space/original.txt ; test ${PIPESTATUS[0]} -eq 0
+          command: go test -v -race ./... | tee /tmp/test-reports/datatogether/original.txt ; test ${PIPESTATUS[0]} -eq 0
       - run: 
           name: Convert test output to junit-style xml
-          command: cat /tmp/test-reports/archivers-space/original.txt | go-junit-report > /tmp/test-reports/archivers-space/junit.xml
+          command: cat /tmp/test-reports/datatogether/original.txt | go-junit-report > /tmp/test-reports/datatogether/junit.xml
       - store_test_results:
-          path: /tmp/test-reports/archivers-space/junit.xml
+          path: /tmp/test-reports/datatogether/junit.xml
       - setup_remote_docker
       - run:
           name: Install Docker client
@@ -57,8 +57,8 @@ jobs:
           command: |
             if [ $CIRCLE_BRANCH = 'master' ]; then
               TAG=0.1.$CIRCLE_BUILD_NUM
-              docker build -t archivers/coverage:latest -t archivers/coverage:$TAG .
+              docker build -t datatogether/coverage:latest -t datatogether/coverage:$TAG .
               docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push archivers/coverage:$TAG
-              docker push archivers/coverage:latest
+              docker push datatogether/coverage:$TAG
+              docker push datatogether/coverage:latest
             fi

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 gin-bin
-content
+coverage
 coverage.out
 config.*.json
 *.env

Dockerfile

@@ -7,11 +7,11 @@ EXPOSE 3000
 # RUN go-wrapper install github.com/codegangsta/gin
 
 # Copy the local package files to the container’s workspace.
-ADD . /go/src/github.com/archivers-space/coverage
-# WORKDIR /go/src/github.com/archivers-space/coverage
+ADD . /go/src/github.com/datatogether/coverage
+# WORKDIR /go/src/github.com/datatogether/coverage
 # CMD ["gin", "-i"]
 
 # Install api binary globally within container 
-RUN go install github.com/archivers-space/coverage
+RUN go install github.com/datatogether/coverage
 # Set binary as entrypoint
 ENTRYPOINT /go/bin/coverage

Godeps/Godeps.json

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	conf "github.com/archivers-space/config"
+	conf "github.com/datatogether/config"
 	"os"
 	"path/filepath"
 )
@@ -101,7 +101,7 @@ func initConfig(mode string) (cfg *config, err error) {
 }
 
 func packagePath(path string) string {
-	return filepath.Join(os.Getenv("GOPATH"), "src/github.com/archivers-space/coverage", path)
+	return filepath.Join(os.Getenv("GOPATH"), "src/github.com/datatogether/coverage", path)
 }
 
 // requireConfigStrings panics if any of the passed in values aren't set

config.go

@@ -1,9 +1,9 @@
 package coverage
 
 import (
-	"github.com/archivers-space/archive"
-	"github.com/archivers-space/coverage/repositories"
-	"github.com/archivers-space/coverage/tree"
+	"github.com/datatogether/archive"
+	"github.com/datatogether/coverage/repositories"
+	"github.com/datatogether/coverage/tree"
 
 	"encoding/json"
 	"io/ioutil"

coverage/coverage.go

@@ -2,8 +2,8 @@ package coverage
 
 import (
 	"fmt"
-	"github.com/archivers-space/archive"
-	"github.com/archivers-space/coverage/tree"
+	"github.com/datatogether/archive"
+	"github.com/datatogether/coverage/tree"
 	"net/url"
 	"strings"
 )

coverage/coverage_requests.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/archivers-space/api/apiutil"
-	"github.com/archivers-space/coverage/coverage"
-	"github.com/archivers-space/coverage/tree"
+	"github.com/datatogether/api/apiutil"
+	"github.com/datatogether/coverage/coverage"
+	"github.com/datatogether/coverage/tree"
 	"net/http"
 	"strconv"
 	"strings"

coverage_handlers.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"database/sql"
-	"github.com/archivers-space/archive"
-	"github.com/archivers-space/coverage/coverage"
+	"github.com/datatogether/archive"
+	"github.com/datatogether/coverage/coverage"
 	"time"
 )
 
@@ -56,7 +56,7 @@ func calcSourceCoverage(db *sql.DB) error {
 
 	numPages := count / pageSize
 	for page := 0; page <= numPages; page++ {
-		sources, err := archive.ListSources(db, pageSize, pageSize*page)
+		sources, err := archive.ListSources(store, pageSize, pageSize*page)
 		if err != nil {
 			return err
 		}
@@ -75,7 +75,7 @@ func calcSourceCoverage(db *sql.DB) error {
 				s.Stats.ArchivedUrlCount = summary.Archived
 				s.Stats.UrlCount = summary.Descendants
 				log.Infof("updating source: %s - %s: %f%%", s.Id, s.Title, float32(summary.Archived)/float32(summary.Descendants)*100)
-				if err := s.Save(db); err != nil {
+				if err := s.Save(store); err != nil {
 					return err
 				}
 			}
@@ -95,7 +95,7 @@ func calcPrimerSourceCoverage(db *sql.DB) error {
 
 	numPages := int(count) / pageSize
 	for page := 0; page <= numPages; page++ {
-		primers, err := archive.ListPrimers(db, pageSize, pageSize*page)
+		primers, err := archive.ListPrimers(store, pageSize, pageSize*page)
 		if err != nil {
 			return err
 		}
@@ -123,7 +123,7 @@ func calcPrimerSourceCoverage(db *sql.DB) error {
 				p.Stats.SourcesUrlCount = urlCount
 				p.Stats.SourcesArchivedUrlCount = archivedCount
 				log.Infof("updating primer sources: %s - %s: %f%%", p.Id, p.ShortTitle, float32(p.Stats.SourcesArchivedUrlCount)/float32(p.Stats.SourcesUrlCount)*100)
-				if err := p.Save(appDB); err != nil {
+				if err := p.Save(store); err != nil {
 					return err
 				}
 			}