From 0c5b6aa37c96ec116d47f743f76f1ef7d1a70ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arturo=20Filast=C3=B2?= Date: Thu, 3 May 2018 14:59:55 +0200 Subject: [PATCH] Rename gooni to probe-cli This is the command I used: ``` rg 'github.com/openobservatory/gooni' --files-with-matches \ | xargs sed -i '' 's/github.com\/openobservatory\/gooni/github.com\/ooni\/probe-cli/g' ``` --- cmd/ooni/main.go | 18 +++++++++--------- internal/cli/app/app.go | 4 ++-- internal/cli/geoip/geoip.go | 4 ++-- internal/cli/info/info.go | 2 +- internal/cli/list/list.go | 2 +- internal/cli/nettest/nettest.go | 2 +- internal/cli/root/root.go | 6 +++--- internal/cli/run/run.go | 8 ++++---- internal/cli/show/show.go | 2 +- internal/cli/upload/upload.go | 2 +- internal/cli/version/version.go | 2 +- internal/database/database.go | 2 +- internal/database/models.go | 2 +- internal/util/util.go | 2 +- nettests/groups/groups.go | 12 ++++++------ nettests/im/facebook_messenger.go | 2 +- nettests/im/telegram.go | 2 +- nettests/im/whatsapp.go | 2 +- .../http_header_field_manipulation.go | 2 +- .../middlebox/http_invalid_request_line.go | 2 +- nettests/nettests.go | 12 ++++++------ nettests/performance/dash.go | 2 +- nettests/performance/ndt.go | 2 +- nettests/websites/web_connectivity.go | 2 +- ooni.go | 8 ++++---- 25 files changed, 53 insertions(+), 53 deletions(-) diff --git a/cmd/ooni/main.go b/cmd/ooni/main.go index a7a7d20..e48b9b3 100644 --- a/cmd/ooni/main.go +++ b/cmd/ooni/main.go @@ -4,16 +4,16 @@ import ( // commands "github.com/apex/log" - _ "github.com/openobservatory/gooni/internal/cli/geoip" - _ "github.com/openobservatory/gooni/internal/cli/info" - _ "github.com/openobservatory/gooni/internal/cli/list" - _ "github.com/openobservatory/gooni/internal/cli/nettest" - _ "github.com/openobservatory/gooni/internal/cli/run" - _ "github.com/openobservatory/gooni/internal/cli/show" - _ "github.com/openobservatory/gooni/internal/cli/upload" - _ "github.com/openobservatory/gooni/internal/cli/version" + _ "github.com/ooni/probe-cli/internal/cli/geoip" + _ "github.com/ooni/probe-cli/internal/cli/info" + _ "github.com/ooni/probe-cli/internal/cli/list" + _ "github.com/ooni/probe-cli/internal/cli/nettest" + _ "github.com/ooni/probe-cli/internal/cli/run" + _ "github.com/ooni/probe-cli/internal/cli/show" + _ "github.com/ooni/probe-cli/internal/cli/upload" + _ "github.com/ooni/probe-cli/internal/cli/version" - "github.com/openobservatory/gooni/internal/cli/app" + "github.com/ooni/probe-cli/internal/cli/app" ) func main() { diff --git a/internal/cli/app/app.go b/internal/cli/app/app.go index aed0a5b..f84bfcc 100644 --- a/internal/cli/app/app.go +++ b/internal/cli/app/app.go @@ -3,8 +3,8 @@ package app import ( "os" - "github.com/openobservatory/gooni/internal/cli/root" - "github.com/openobservatory/gooni/internal/cli/version" + "github.com/ooni/probe-cli/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/version" ) // Run the app. This is the main app entry point diff --git a/internal/cli/geoip/geoip.go b/internal/cli/geoip/geoip.go index acdb458..82a1945 100644 --- a/internal/cli/geoip/geoip.go +++ b/internal/cli/geoip/geoip.go @@ -3,8 +3,8 @@ package geoip import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" - "github.com/openobservatory/gooni/utils" + "github.com/ooni/probe-cli/internal/cli/root" + "github.com/ooni/probe-cli/utils" ) func init() { diff --git a/internal/cli/info/info.go b/internal/cli/info/info.go index ac86bcd..ef80127 100644 --- a/internal/cli/info/info.go +++ b/internal/cli/info/info.go @@ -3,7 +3,7 @@ package info import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/root" ) func init() { diff --git a/internal/cli/list/list.go b/internal/cli/list/list.go index c0230a6..f8ed972 100644 --- a/internal/cli/list/list.go +++ b/internal/cli/list/list.go @@ -3,7 +3,7 @@ package list import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/root" ) func init() { diff --git a/internal/cli/nettest/nettest.go b/internal/cli/nettest/nettest.go index e10964c..39fc053 100644 --- a/internal/cli/nettest/nettest.go +++ b/internal/cli/nettest/nettest.go @@ -3,7 +3,7 @@ package nettest import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/root" ) func init() { diff --git a/internal/cli/root/root.go b/internal/cli/root/root.go index ab6f4f0..870c39d 100644 --- a/internal/cli/root/root.go +++ b/internal/cli/root/root.go @@ -3,9 +3,9 @@ package root import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - ooni "github.com/openobservatory/gooni" - "github.com/openobservatory/gooni/internal/log/handlers/batch" - "github.com/openobservatory/gooni/internal/log/handlers/cli" + ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/log/handlers/batch" + "github.com/ooni/probe-cli/internal/log/handlers/cli" "github.com/prometheus/common/version" ) diff --git a/internal/cli/run/run.go b/internal/cli/run/run.go index d427db1..0b0d87d 100644 --- a/internal/cli/run/run.go +++ b/internal/cli/run/run.go @@ -8,10 +8,10 @@ import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" - "github.com/openobservatory/gooni/internal/database" - "github.com/openobservatory/gooni/nettests" - "github.com/openobservatory/gooni/nettests/groups" + "github.com/ooni/probe-cli/internal/cli/root" + "github.com/ooni/probe-cli/internal/database" + "github.com/ooni/probe-cli/nettests" + "github.com/ooni/probe-cli/nettests/groups" ) func init() { diff --git a/internal/cli/show/show.go b/internal/cli/show/show.go index 78199c6..de919e3 100644 --- a/internal/cli/show/show.go +++ b/internal/cli/show/show.go @@ -3,7 +3,7 @@ package nettest import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/root" ) func init() { diff --git a/internal/cli/upload/upload.go b/internal/cli/upload/upload.go index d6d8606..208af91 100644 --- a/internal/cli/upload/upload.go +++ b/internal/cli/upload/upload.go @@ -3,7 +3,7 @@ package upload import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/root" ) func init() { diff --git a/internal/cli/version/version.go b/internal/cli/version/version.go index d791aa8..3deceda 100644 --- a/internal/cli/version/version.go +++ b/internal/cli/version/version.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/alecthomas/kingpin" - "github.com/openobservatory/gooni/internal/cli/root" + "github.com/ooni/probe-cli/internal/cli/root" ) const Version = "3.0.0-dev.0" diff --git a/internal/database/database.go b/internal/database/database.go index e860659..f2f0de6 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -4,7 +4,7 @@ import ( "github.com/apex/log" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" // this is needed to load the sqlite3 driver - "github.com/openobservatory/gooni/internal/bindata" + "github.com/ooni/probe-cli/internal/bindata" migrate "github.com/rubenv/sql-migrate" ) diff --git a/internal/database/models.go b/internal/database/models.go index 3e5da17..0e5dfab 100644 --- a/internal/database/models.go +++ b/internal/database/models.go @@ -7,7 +7,7 @@ import ( "github.com/apex/log" "github.com/jmoiron/sqlx" - "github.com/openobservatory/gooni/utils" + "github.com/ooni/probe-cli/utils" "github.com/pkg/errors" ) diff --git a/internal/util/util.go b/internal/util/util.go index a23788c..45358bb 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/openobservatory/gooni/internal/colors" + "github.com/ooni/probe-cli/internal/colors" ) // Log outputs a log message. diff --git a/nettests/groups/groups.go b/nettests/groups/groups.go index c3f9f1a..9aceb1d 100644 --- a/nettests/groups/groups.go +++ b/nettests/groups/groups.go @@ -4,12 +4,12 @@ import ( "encoding/json" "github.com/apex/log" - "github.com/openobservatory/gooni/internal/database" - "github.com/openobservatory/gooni/nettests" - "github.com/openobservatory/gooni/nettests/im" - "github.com/openobservatory/gooni/nettests/middlebox" - "github.com/openobservatory/gooni/nettests/performance" - "github.com/openobservatory/gooni/nettests/websites" + "github.com/ooni/probe-cli/internal/database" + "github.com/ooni/probe-cli/nettests" + "github.com/ooni/probe-cli/nettests/im" + "github.com/ooni/probe-cli/nettests/middlebox" + "github.com/ooni/probe-cli/nettests/performance" + "github.com/ooni/probe-cli/nettests/websites" ) // NettestGroup base structure diff --git a/nettests/im/facebook_messenger.go b/nettests/im/facebook_messenger.go index 0108824..d6d97b2 100644 --- a/nettests/im/facebook_messenger.go +++ b/nettests/im/facebook_messenger.go @@ -2,7 +2,7 @@ package im import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // FacebookMessenger test implementation diff --git a/nettests/im/telegram.go b/nettests/im/telegram.go index 8d3f450..6c2984b 100644 --- a/nettests/im/telegram.go +++ b/nettests/im/telegram.go @@ -2,7 +2,7 @@ package im import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // Telegram test implementation diff --git a/nettests/im/whatsapp.go b/nettests/im/whatsapp.go index 24c8b59..36a18c3 100644 --- a/nettests/im/whatsapp.go +++ b/nettests/im/whatsapp.go @@ -2,7 +2,7 @@ package im import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // WhatsApp test implementation diff --git a/nettests/middlebox/http_header_field_manipulation.go b/nettests/middlebox/http_header_field_manipulation.go index c416985..822909d 100644 --- a/nettests/middlebox/http_header_field_manipulation.go +++ b/nettests/middlebox/http_header_field_manipulation.go @@ -2,7 +2,7 @@ package middlebox import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // HTTPHeaderFieldManipulation test implementation diff --git a/nettests/middlebox/http_invalid_request_line.go b/nettests/middlebox/http_invalid_request_line.go index 8300fa1..947e64e 100644 --- a/nettests/middlebox/http_invalid_request_line.go +++ b/nettests/middlebox/http_invalid_request_line.go @@ -2,7 +2,7 @@ package middlebox import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // HTTPInvalidRequestLine test implementation diff --git a/nettests/nettests.go b/nettests/nettests.go index b93f357..ed3a0cd 100644 --- a/nettests/nettests.go +++ b/nettests/nettests.go @@ -7,12 +7,12 @@ import ( "github.com/apex/log" "github.com/measurement-kit/go-measurement-kit" - ooni "github.com/openobservatory/gooni" - "github.com/openobservatory/gooni/internal/cli/version" - "github.com/openobservatory/gooni/internal/colors" - "github.com/openobservatory/gooni/internal/database" - "github.com/openobservatory/gooni/internal/output" - "github.com/openobservatory/gooni/utils" + ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/cli/version" + "github.com/ooni/probe-cli/internal/colors" + "github.com/ooni/probe-cli/internal/database" + "github.com/ooni/probe-cli/internal/output" + "github.com/ooni/probe-cli/utils" ) // Nettest interface. Every Nettest should implement this. diff --git a/nettests/performance/dash.go b/nettests/performance/dash.go index b3e3a87..cced30c 100644 --- a/nettests/performance/dash.go +++ b/nettests/performance/dash.go @@ -2,7 +2,7 @@ package performance import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // Dash test implementation diff --git a/nettests/performance/ndt.go b/nettests/performance/ndt.go index 4c8159d..c9e8098 100644 --- a/nettests/performance/ndt.go +++ b/nettests/performance/ndt.go @@ -2,7 +2,7 @@ package performance import ( "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" ) // NDT test implementation diff --git a/nettests/websites/web_connectivity.go b/nettests/websites/web_connectivity.go index dd3394f..ed81742 100644 --- a/nettests/websites/web_connectivity.go +++ b/nettests/websites/web_connectivity.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/measurement-kit/go-measurement-kit" - "github.com/openobservatory/gooni/nettests" + "github.com/ooni/probe-cli/nettests" "github.com/pkg/errors" ) diff --git a/ooni.go b/ooni.go index ffcfcb0..a134a9d 100644 --- a/ooni.go +++ b/ooni.go @@ -10,10 +10,10 @@ import ( "github.com/apex/log" "github.com/jmoiron/sqlx" homedir "github.com/mitchellh/go-homedir" - "github.com/openobservatory/gooni/config" - "github.com/openobservatory/gooni/internal/database" - "github.com/openobservatory/gooni/internal/legacy" - "github.com/openobservatory/gooni/utils" + "github.com/ooni/probe-cli/config" + "github.com/ooni/probe-cli/internal/database" + "github.com/ooni/probe-cli/internal/legacy" + "github.com/ooni/probe-cli/utils" "github.com/pkg/errors" )