Skip to content

Commit

Permalink
core: use canonical import domain of gobot.io for all code
Browse files Browse the repository at this point in the history
Signed-off-by: deadprogram <[email protected]>
  • Loading branch information
deadprogram committed Dec 8, 2016
1 parent 5936be1 commit 953c325
Show file tree
Hide file tree
Showing 328 changed files with 972 additions and 834 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ before_install:
- sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
- sudo apt-get update
- sudo apt-get install --force-yes libcv-dev libcvaux-dev libhighgui-dev libopencv-dev libsdl2-dev libsdl2-image-dev libsdl2 libusb-dev xvfb unzip libgtk2.0-0
- cd $HOME/gopath/src/github.com/hybridgroup/gobot
- cd $HOME/gopath/src/gobot.io/x/gobot
- go get github.com/axw/gocov/gocov
- go get github.com/mattn/goveralls
- if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
---
- Dramatically increased test coverage and documentation
- api
- Conform to the [cppp.io](https://github.com/hybridgroup/cppp-io) spec
- Conform to the [cppp.io](https://gobot.io/x/cppp-io) spec
- Add support for basic middleware
- Add support for custom routes
- Add SSE support
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ The basics are as follows:

2. `go get` the upstream repo and set it up as the `upstream` remote and your own repo as the `origin` remote:

`go get github.com/hybridgroup/gobot`
`cd $GOPATH/src/github.com/hybridgroup/gobot`
`go get gobot.io/x/gobot`
`cd $GOPATH/src/gobot.io/x/gobot`
`git remote rename origin upstream`
`git remote add origin [email protected]/YOUR_GITHUB_NAME/gobot`

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PACKAGES := gobot gobot/api gobot/drivers/gpio gobot/drivers/i2c gobot/platforms/firmata/client gobot/platforms/intel-iot/edison gobot/platforms/intel-iot/joule gobot/sysfs $(shell ls ./platforms | sed -e 's/^/gobot\/platforms\//')
PACKAGES := gobot gobot/api gobot/drivers/gpio gobot/drivers/i2c gobot/platforms/firmata/client gobot/platforms/intel-iot/edison gobot/platforms/intel-iot/joule gobot/platforms/parrot/ardrone gobot/platforms/parrot/bebop gobot/platforms/parrot/minidrone gobot/sysfs $(shell ls ./platforms | sed -e 's/^/gobot\/platforms\//')
.PHONY: test cover robeaux examples

test:
for package in $(PACKAGES) ; do \
go test -a github.com/hybridgroup/$$package ; \
go test -a gobot.io/x/$$package ; \
done ; \

cover:
echo "mode: set" > profile.cov ; \
for package in $(PACKAGES) ; do \
go test -a -coverprofile=tmp.cov github.com/hybridgroup/$$package ; \
go test -a -coverprofile=tmp.cov gobot.io/x/$$package ; \
cat tmp.cov | grep -v "mode: set" >> profile.cov ; \
done ; \
rm tmp.cov ; \
Expand Down Expand Up @@ -41,7 +41,7 @@ examples:

deps:
go get -d -v github.com/bmizerany/pat
go get -d -v github.com/hybridgroup/go-ardrone/client
go get -d -v gobot.io/x/go-ardrone/client
go get -d -v github.com/currantlabs/gatt
go get -d -v github.com/tarm/serial
go get -d -v github.com/veandco/go-sdl2/sdl
Expand Down
90 changes: 45 additions & 45 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Want to use Javascript robotics? Check out our sister project Cylon.js (http://c

Want to use Ruby on robots? Check out our sister project Artoo (http://artoo.io)

[![GoDoc](https://godoc.org/github.com/hybridgroup/gobot?status.svg)](https://godoc.org/github.com/hybridgroup/gobot)
[![GoDoc](https://godoc.org/gobot.io/x/gobot?status.svg)](https://godoc.org/gobot.io/x/gobot)
[![Build Status](https://travis-ci.org/hybridgroup/gobot.png?branch=dev)](https://travis-ci.org/hybridgroup/gobot)
[![Coverage Status](https://coveralls.io/repos/github/hybridgroup/gobot/badge.svg?branch=dev)](https://coveralls.io/github/hybridgroup/gobot?branch=dev)
[![Go Report Card](https://goreportcard.com/badge/hybridgroup/gobot)](https://goreportcard.com/report/hybridgroup/gobot)

## Getting Started

Get the Gobot source with: `go get -d -u github.com/hybridgroup/gobot/...`
Get the Gobot source with: `go get -d -u gobot.io/x/gobot/...`

## Examples

Expand All @@ -27,9 +27,9 @@ package main
import (
"time"

"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/drivers/gpio"
"github.com/hybridgroup/gobot/platforms/firmata"
"gobot.io/x/gobot"
"gobot.io/x/gobot/drivers/gpio"
"gobot.io/x/gobot/platforms/firmata"
)

func main() {
Expand Down Expand Up @@ -61,8 +61,8 @@ import (
"fmt"
"time"

"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/platforms/sphero"
"gobot.io/x/gobot"
"gobot.io/x/gobot/platforms/sphero"
)

func main() {
Expand Down Expand Up @@ -93,8 +93,8 @@ You can use the entire Gobot framework as shown in the examples above ("Classic"
package main

import (
"github.com/hybridgroup/gobot/drivers/gpio"
"github.com/hybridgroup/gobot/platforms/intel-iot/edison"
"gobot.io/x/gobot/drivers/gpio"
"gobot.io/x/gobot/platforms/intel-iot/edison"
"time"
)

Expand Down Expand Up @@ -123,9 +123,9 @@ import (
"fmt"
"time"

"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/api"
"github.com/hybridgroup/gobot/platforms/sphero"
"gobot.io/x/gobot"
"gobot.io/x/gobot/api"
"gobot.io/x/gobot/platforms/sphero"
)

func NewSwarmBot(port string) *gobot.Robot {
Expand Down Expand Up @@ -182,36 +182,36 @@ func main() {
## Hardware Support
Gobot has a extensible system for connecting to hardware devices. The following robotics and physical computing platforms are currently supported:

- [Arduino](http://www.arduino.cc/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/firmata)
- Audio <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/audio)
- [Beaglebone Black](http://beagleboard.org/Products/BeagleBone+Black/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/beaglebone)
- [Bluetooth LE](https://www.bluetooth.com/what-is-bluetooth-technology/bluetooth-technology-basics/low-energy) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/ble)
- [C.H.I.P](http://www.nextthing.co/pages/chip) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/chip)
- [Digispark](http://digistump.com/products/1) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/digispark)
- [Intel Edison](http://www.intel.com/content/www/us/en/do-it-yourself/edison.html) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/intel-iot/edison)
- [Intel Joule](http://intel.com/joule/getstarted) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/intel-iot/joule)
- [Joystick](http://en.wikipedia.org/wiki/Joystick) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/joystick)
- [Keyboard](https://en.wikipedia.org/wiki/Computer_keyboard) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/keyboard)
- [Leap Motion](https://www.leapmotion.com/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/leapmotion)
- [MavLink](http://qgroundcontrol.org/mavlink/start) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/mavlink)
- [MegaPi](http://www.makeblock.com/megapi) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/megapi)
- [MQTT](http://mqtt.org/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/mqtt)
- [NATS](http://nats.io/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/nats)
- [Neurosky](http://neurosky.com/products-markets/eeg-biosensors/hardware/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/neurosky)
- [OpenCV](http://opencv.org/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/opencv)
- [Particle](https://www.particle.io/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/particle)
- [Parrot ARDrone 2.0](http://ardrone2.parrot.com/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/parrot/ardrone)
- [Parrot Bebop](http://www.parrot.com/usa/products/bebop-drone/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/parrot/bebop)
- [Parrot Minidrone](https://www.parrot.com/us/minidrones) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/parrot/minidrone)
- [Pebble](https://www.getpebble.com/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/pebble)
- [Raspberry Pi](http://www.raspberrypi.org/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/raspi)
- [Sphero](http://www.gosphero.com/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/sphero)
- [Sphero Ollie](http://www.gosphero.com/) <=> [Package](https://github.com/hybridgroup/gobot/tree/master/platforms/sphero/ollie)
- [Arduino](http://www.arduino.cc/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/firmata)
- Audio <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/audio)
- [Beaglebone Black](http://beagleboard.org/Products/BeagleBone+Black/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/beaglebone)
- [Bluetooth LE](https://www.bluetooth.com/what-is-bluetooth-technology/bluetooth-technology-basics/low-energy) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/ble)
- [C.H.I.P](http://www.nextthing.co/pages/chip) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/chip)
- [Digispark](http://digistump.com/products/1) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/digispark)
- [Intel Edison](http://www.intel.com/content/www/us/en/do-it-yourself/edison.html) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/intel-iot/edison)
- [Intel Joule](http://intel.com/joule/getstarted) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/intel-iot/joule)
- [Joystick](http://en.wikipedia.org/wiki/Joystick) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/joystick)
- [Keyboard](https://en.wikipedia.org/wiki/Computer_keyboard) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/keyboard)
- [Leap Motion](https://www.leapmotion.com/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/leapmotion)
- [MavLink](http://qgroundcontrol.org/mavlink/start) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/mavlink)
- [MegaPi](http://www.makeblock.com/megapi) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/megapi)
- [MQTT](http://mqtt.org/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/mqtt)
- [NATS](http://nats.io/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/nats)
- [Neurosky](http://neurosky.com/products-markets/eeg-biosensors/hardware/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/neurosky)
- [OpenCV](http://opencv.org/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/opencv)
- [Particle](https://www.particle.io/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/particle)
- [Parrot ARDrone 2.0](http://ardrone2.parrot.com/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/parrot/ardrone)
- [Parrot Bebop](http://www.parrot.com/usa/products/bebop-drone/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/parrot/bebop)
- [Parrot Minidrone](https://www.parrot.com/us/minidrones) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/parrot/minidrone)
- [Pebble](https://www.getpebble.com/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/pebble)
- [Raspberry Pi](http://www.raspberrypi.org/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/raspi)
- [Sphero](http://www.gosphero.com/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/sphero)
- [Sphero Ollie](http://www.gosphero.com/) <=> [Package](https://gobot.io/x/gobot/tree/master/platforms/sphero/ollie)

Support for many devices that use General Purpose Input/Output (GPIO) have
a shared set of drivers provided using the `gobot/drivers/gpio` package:

- [GPIO](https://en.wikipedia.org/wiki/General_Purpose_Input/Output) <=> [Drivers](https://github.com/hybridgroup/gobot/tree/master/drivers/gpio)
- [GPIO](https://en.wikipedia.org/wiki/General_Purpose_Input/Output) <=> [Drivers](https://gobot.io/x/gobot/tree/master/drivers/gpio)
- Analog Sensor
- Button
- Buzzer
Expand All @@ -238,7 +238,7 @@ a shared set of drivers provided using the `gobot/drivers/gpio` package:
Support for devices that use Inter-Integrated Circuit (I2C) have a shared set of
drivers provided using the `gobot/drivers/i2c` package:

- [I2C](https://en.wikipedia.org/wiki/I%C2%B2C) <=> [Drivers](https://github.com/hybridgroup/gobot/tree/master/drivers/i2c)
- [I2C](https://en.wikipedia.org/wiki/I%C2%B2C) <=> [Drivers](https://gobot.io/x/gobot/tree/master/drivers/i2c)
- Adafruit Motor Hat
- BlinkM
- Grove Digital Accelerometer
Expand All @@ -258,7 +258,7 @@ More platforms and drivers are coming soon...

Gobot includes a RESTful API to query the status of any robot running within a group, including the connection and device status, and execute device commands.

To activate the API, require the `github.com/hybridgroup/gobot/api` package and instantiate the `API` like this:
To activate the API, require the `gobot.io/x/gobot/api` package and instantiate the `API` like this:

```go
master := gobot.NewMaster()
Expand All @@ -274,13 +274,13 @@ You can also specify the api host and port, and turn on authentication:
server.Start()
```

You may access the [robeaux](https://github.com/hybridgroup/robeaux) React.js interface with Gobot by navigating to `http://localhost:3000/index.html`.
You may access the [robeaux](https://gobot.io/x/robeaux) React.js interface with Gobot by navigating to `http://localhost:3000/index.html`.

## CLI

Gobot uses the Gort [http://gort.io](http://gort.io) Command Line Interface (CLI) so you can access important features right from the command line. We call it "RobotOps", aka "DevOps For Robotics". You can scan, connect, update device firmware, and more!

Gobot also has its own CLI to generate new platforms, adaptors, and drivers. You can check it out at [https://github.com/hybridgroup/gobot/cli](https://github.com/hybridgroup/gobot/cli).
Gobot also has its own CLI to generate new platforms, adaptors, and drivers. You can check it out at [https://gobot.io/x/gobot/cli](https://gobot.io/x/gobot/cli).

## Documentation
We're busy adding documentation to our web site at http://gobot.io/ please check there as we continue to work on Gobot
Expand All @@ -290,12 +290,12 @@ Thank you!
## Need help?
* Join our mailing list: https://groups.google.com/forum/#!forum/gobotio
* IRC: `#gobotio @ irc.freenode.net`
* Issues: https://github.com/hybridgroup/gobot/issues
* Issues: https://gobot.io/x/gobot/issues
* twitter: [@gobotio](https://twitter.com/gobotio)

## Contributing
For our contribution guidelines, please go to [https://github.com/hybridgroup/gobot/blob/master/CONTRIBUTING.md
](https://github.com/hybridgroup/gobot/blob/master/CONTRIBUTING.md
For our contribution guidelines, please go to [https://gobot.io/x/gobot/blob/master/CONTRIBUTING.md
](https://gobot.io/x/gobot/blob/master/CONTRIBUTING.md
).

## License
Expand Down
4 changes: 2 additions & 2 deletions api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"

"github.com/bmizerany/pat"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/api/robeaux"
"gobot.io/x/gobot"
"gobot.io/x/gobot/api/robeaux"
)

// API represents an API server
Expand Down
4 changes: 2 additions & 2 deletions api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"testing"
"time"

"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/gobottest"
"gobot.io/x/gobot"
"gobot.io/x/gobot/gobottest"
)

func initTestAPI() *API {
Expand Down
2 changes: 1 addition & 1 deletion api/basic_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httptest"
"testing"

"github.com/hybridgroup/gobot/gobottest"
"gobot.io/x/gobot/gobottest"
)

func TestBasicAuth(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion api/cors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httptest"
"testing"

"github.com/hybridgroup/gobot/gobottest"
"gobot.io/x/gobot/gobottest"
)

func TestCORSIsOriginAllowed(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions api/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Example:
import (
"fmt"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/api"
"gobot.io/x/gobot"
"gobot.io/x/gobot/api"
)
func main() {
Expand All @@ -34,6 +34,6 @@ Example:
}
It follows Common Protocol for Programming Physical Input and Output (CPPP-IO) spec:
https://github.com/hybridgroup/cppp-io
https://gobot.io/x/cppp-io
*/
package api
2 changes: 1 addition & 1 deletion api/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package api
import (
"fmt"

"github.com/hybridgroup/gobot"
"gobot.io/x/gobot"
)

type NullReadWriteCloser struct{}
Expand Down
2 changes: 1 addition & 1 deletion ci/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ echo "mode: set" > profile.cov
touch tmp.cov
for package in "${PACKAGES[@]}"
do
go test -a -coverprofile=tmp.cov github.com/hybridgroup/$package
go test -a -coverprofile=tmp.cov gobot.io/x/$package
if [ $? -ne 0 ]
then
EXITCODE=1
Expand Down
14 changes: 7 additions & 7 deletions cli/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func driver() string {
import (
"time"
"github.com/hybridgroup/gobot"
"gobot.io/x/gobot"
)
const Hello string = "hello"
Expand Down Expand Up @@ -274,7 +274,7 @@ import (
"fmt"
"time"
"github.com/hybridgroup/gobot"
"gobot.io/x/gobot"
)
func main() {
Expand Down Expand Up @@ -313,8 +313,8 @@ import (
"testing"
"time"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/gobottest"
"gobot.io/x/gobot"
"gobot.io/x/gobot/gobottest"
)
var _ gobot.Driver = (*{{.UpperName}}Driver)(nil)
Expand Down Expand Up @@ -368,8 +368,8 @@ func adaptorTest() string {
import (
"testing"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/gobottest"
"gobot.io/x/gobot"
"gobot.io/x/gobot/gobottest"
)
var _ gobot.Adaptor = (*{{.UpperName}}Adaptor)(nil)
Expand Down Expand Up @@ -398,7 +398,7 @@ Gobot (http://gobot.io/) is a framework for robotics and physical computing usin
This repository contains the Gobot adaptor and driver for {{.Package}}.
For more information about Gobot, check out the github repo at
https://github.com/hybridgroup/gobot
https://gobot.io/x/gobot
## Installing
` + "```bash\ngo get path/to/repo/{{.Package}}\n```" + `
Expand Down
4 changes: 2 additions & 2 deletions cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"os"

"github.com/codegangsta/cli"
"github.com/hybridgroup/gobot"
"gobot.io/x/gobot"
)

func main() {
app := cli.NewApp()
app.Name = "gobot"
app.Author = "The Gobot team"
app.Email = "https://github.com/hybridgroup/gobot"
app.Email = "https://gobot.io/x/gobot"
app.Version = gobot.Version()
app.Usage = "Command Line Utility for generating new Gobot adaptors, drivers, and platforms"
app.Commands = []cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion commander_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gobot
import (
"testing"

"github.com/hybridgroup/gobot/gobottest"
"gobot.io/x/gobot/gobottest"
)

func TestCommaner(t *testing.T) {
Expand Down
Loading

0 comments on commit 953c325

Please sign in to comment.