Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Commit

Permalink
moved to gobuffalo/buffalo
Browse files Browse the repository at this point in the history
  • Loading branch information
markbates committed Dec 29, 2016
1 parent 15bc443 commit 03af855
Show file tree
Hide file tree
Showing 72 changed files with 195 additions and 195 deletions.
174 changes: 87 additions & 87 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apt-get update
RUN curl -sL https://deb.nodesource.com/setup_7.x | bash
RUN apt-get install -y build-essential nodejs

ENV BP=$GOPATH/src/github.com/markbates/buffalo
ENV BP=$GOPATH/src/github.com/gobuffalo/buffalo

RUN mkdir -p $BP
WORKDIR $BP
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Buffalo [![GoDoc](https://godoc.org/github.com/markbates/buffalo?status.svg)](https://godoc.org/github.com/markbates/buffalo) [![Build Status](https://travis-ci.org/markbates/buffalo.svg?branch=master)](https://travis-ci.org/markbates/buffalo) [![Code Climate](https://codeclimate.com/github/markbates/buffalo/badges/gpa.svg)](https://codeclimate.com/github/markbates/buffalo)
# Buffalo [![GoDoc](https://godoc.org/github.com/gobuffalo/buffalo?status.svg)](https://godoc.org/github.com/gobuffalo/buffalo) [![Build Status](https://travis-ci.org/gobuffalo/buffalo.svg?branch=master)](https://travis-ci.org/gobuffalo/buffalo) [![Code Climate](https://codeclimate.com/github/gobuffalo/buffalo/badges/gpa.svg)](https://codeclimate.com/github/gobuffalo/buffalo)

Buffalo is Go web framework. Yeah, I hate the word "framework" too! Buffalo is different though. Buffalo doesn't want to re-invent wheels like routing and templating. Buffalo is glue that wraps all of the best packages available and makes them all play nicely together.

Expand All @@ -15,7 +15,7 @@ Please visit [http://gobuffalo.io](http://gobuffalo.io) for the latest documenta
## Installation

```text
$ go get -u github.com/markbates/buffalo/buffalo
$ go get -u github.com/gobuffalo/buffalo/buffalo
```

## Generating a new Project
Expand Down
6 changes: 3 additions & 3 deletions SHOULDERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ Thank you to the following **GIANTS**:

* [github.com/kardianos/osext](https://github.com/kardianos/osext)

* [github.com/markbates/buffalo/render](https://github.com/markbates/buffalo/render)
* [github.com/gobuffalo/buffalo/render](https://github.com/gobuffalo/buffalo/render)

* [github.com/markbates/buffalo/render/helpers](https://github.com/markbates/buffalo/render/helpers)
* [github.com/gobuffalo/buffalo/render/helpers](https://github.com/gobuffalo/buffalo/render/helpers)

* [github.com/markbates/buffalo/render/resolvers](https://github.com/markbates/buffalo/render/resolvers)
* [github.com/gobuffalo/buffalo/render/resolvers](https://github.com/gobuffalo/buffalo/render/resolvers)

* [github.com/markbates/going/defaults](https://github.com/markbates/going/defaults)

Expand Down
16 changes: 8 additions & 8 deletions buffalo/cmd/app_generators.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"os/exec"

"github.com/markbates/buffalo/buffalo/cmd/generate"
"github.com/gobuffalo/buffalo/buffalo/cmd/generate"
"github.com/markbates/gentronics"
)

Expand All @@ -22,7 +22,7 @@ func newAppGenerator(data gentronics.Data) *gentronics.Generator {
g.Add(gentronics.NewFile("templates/application.html", nApplicationHTML))
g.Add(&gentronics.RemoteFile{
File: gentronics.NewFile("public/assets/images/logo.svg", ""),
RemotePath: "https://raw.githubusercontent.com/markbates/buffalo/master/logo.svg",
RemotePath: "https://raw.githubusercontent.com/gobuffalo/buffalo/master/logo.svg",
})
g.Add(gentronics.NewFile(".gitignore", nGitignore))
g.Add(gentronics.NewCommand(goGet("github.com/markbates/refresh/...")))
Expand Down Expand Up @@ -71,9 +71,9 @@ const nApp = `package actions
import (
"os"
"github.com/markbates/buffalo"
"github.com/gobuffalo/buffalo"
{{#if withPop }}
"github.com/markbates/buffalo/middleware"
"github.com/gobuffalo/buffalo/middleware"
"{{modelsPath}}"
{{/if}}
"github.com/markbates/going/defaults"
Expand Down Expand Up @@ -112,8 +112,8 @@ import (
"net/http"
rice "github.com/GeertJohan/go.rice"
"github.com/markbates/buffalo/render"
"github.com/markbates/buffalo/render/resolvers"
"github.com/gobuffalo/buffalo/render"
"github.com/gobuffalo/buffalo/render/resolvers"
)
var r *render.Engine
Expand All @@ -137,7 +137,7 @@ func assetsPath() http.FileSystem {

const nHomeHandler = `package actions
import "github.com/markbates/buffalo"
import "github.com/gobuffalo/buffalo"
// HomeHandler is a default handler to serve up
// a home page.
Expand Down Expand Up @@ -174,7 +174,7 @@ const nIndexHTML = `<div class="row">
<div class="col-md-10">
<h1>Welcome to Buffalo! [v{{version}}]</h1>
<h2>
<a href="https://github.com/markbates/buffalo"><i class="fa fa-github" aria-hidden="true"></i> https://github.com/markbates/buffalo</a>
<a href="https://github.com/gobuffalo/buffalo"><i class="fa fa-github" aria-hidden="true"></i> https://github.com/gobuffalo/buffalo</a>
</h2>
<h2>
<a href="http://gobuffalo.io"><i class="fa fa-book" aria-hidden="true"></i> Documentation</a>
Expand Down
2 changes: 1 addition & 1 deletion buffalo/cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package cmd

import (
"github.com/markbates/buffalo/buffalo/cmd/generate"
"github.com/gobuffalo/buffalo/buffalo/cmd/generate"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion buffalo/cmd/generate/goth.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import (
"fmt"
"os"
"github.com/markbates/buffalo"
"github.com/gobuffalo/buffalo"
"github.com/markbates/goth"
"github.com/markbates/goth/gothic"
{{#each providers}}
Expand Down
2 changes: 1 addition & 1 deletion buffalo/cmd/generate/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func NewResourceGenerator(data gentronics.Data) *gentronics.Generator {

var rAction = `package actions
import "github.com/markbates/buffalo"
import "github.com/gobuffalo/buffalo"
type {{camel}}Resource struct{
buffalo.Resource
Expand Down
2 changes: 1 addition & 1 deletion buffalo/cmd/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cmd

// Version is the current version of the buffalo binary
var Version = "0.5.1"
var Version = "0.6.0"
2 changes: 1 addition & 1 deletion buffalo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package main

import "github.com/markbates/buffalo/buffalo/cmd"
import "github.com/gobuffalo/buffalo/buffalo/cmd"

func main() {
cmd.Execute()
Expand Down
2 changes: 1 addition & 1 deletion context.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gorilla/websocket"

"github.com/markbates/buffalo/render"
"github.com/gobuffalo/buffalo/render"
)

// Context holds on to information as you
Expand Down
2 changes: 1 addition & 1 deletion default_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/gorilla/schema"
"github.com/gorilla/websocket"
"github.com/markbates/buffalo/render"
"github.com/gobuffalo/buffalo/render"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion default_context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"golang.org/x/net/websocket"

"github.com/markbates/buffalo/render"
"github.com/gobuffalo/buffalo/render"
"github.com/markbates/willie"
"github.com/pkg/errors"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/actions/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actions
import (
"os"

"github.com/markbates/buffalo"
"github.com/gobuffalo/buffalo"
"github.com/markbates/going/defaults"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/actions/home.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package actions

import "github.com/markbates/buffalo"
import "github.com/gobuffalo/buffalo"

func HomeHandler(c buffalo.Context) error {
return c.Render(200, r.HTML("index.html"))
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/actions/home_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package actions_test
import (
"testing"

"github.com/markbates/buffalo/examples/hello-world/actions"
"github.com/gobuffalo/buffalo/examples/hello-world/actions"
"github.com/markbates/willie"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions examples/hello-world/actions/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"

rice "github.com/GeertJohan/go.rice"
"github.com/markbates/buffalo/render"
"github.com/markbates/buffalo/render/resolvers"
"github.com/gobuffalo/buffalo/render"
"github.com/gobuffalo/buffalo/render/resolvers"
)

var r *render.Engine
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/grifts/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package grifts
import (
"os"

"github.com/markbates/buffalo/examples/hello-world/actions"
"github.com/gobuffalo/buffalo/examples/hello-world/actions"
. "github.com/markbates/grift/grift"
"github.com/olekukonko/tablewriter"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"os"

"github.com/markbates/buffalo/examples/hello-world/actions"
"github.com/gobuffalo/buffalo/examples/hello-world/actions"
"github.com/markbates/going/defaults"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/html-crud/actions/actions_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actions_test

import (
"github.com/markbates/buffalo/examples/html-crud/models"
"github.com/gobuffalo/buffalo/examples/html-crud/models"
"github.com/markbates/pop"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/html-crud/actions/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net/http"
"os"

"github.com/markbates/buffalo"
"github.com/markbates/buffalo/examples/html-crud/models"
"github.com/markbates/buffalo/middleware"
"github.com/gobuffalo/buffalo"
"github.com/gobuffalo/buffalo/examples/html-crud/models"
"github.com/gobuffalo/buffalo/middleware"
"github.com/markbates/going/defaults"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/html-crud/actions/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"

rice "github.com/GeertJohan/go.rice"
"github.com/markbates/buffalo/render"
"github.com/markbates/buffalo/render/resolvers"
"github.com/gobuffalo/buffalo/render"
"github.com/gobuffalo/buffalo/render/resolvers"
)

var r *render.Engine
Expand Down
4 changes: 2 additions & 2 deletions examples/html-crud/actions/users.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package actions

import (
"github.com/markbates/buffalo"
"github.com/markbates/buffalo/examples/html-crud/models"
"github.com/gobuffalo/buffalo"
"github.com/gobuffalo/buffalo/examples/html-crud/models"
"github.com/markbates/pop"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions examples/html-crud/actions/users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package actions_test
import (
"testing"

"github.com/markbates/buffalo/examples/html-crud/actions"
"github.com/markbates/buffalo/examples/html-crud/models"
"github.com/gobuffalo/buffalo/examples/html-crud/actions"
"github.com/gobuffalo/buffalo/examples/html-crud/models"
"github.com/markbates/pop"
"github.com/markbates/willie"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion examples/html-crud/grifts/db.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package grifts

import (
"github.com/markbates/buffalo/examples/html-crud/models"
"github.com/gobuffalo/buffalo/examples/html-crud/models"
. "github.com/markbates/grift/grift"
"github.com/markbates/pop"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/html-crud/grifts/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package grifts
import (
"os"

"github.com/markbates/buffalo/examples/html-crud/actions"
"github.com/gobuffalo/buffalo/examples/html-crud/actions"
. "github.com/markbates/grift/grift"
"github.com/olekukonko/tablewriter"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/html-crud/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"os"

"github.com/markbates/buffalo/examples/html-crud/actions"
"github.com/gobuffalo/buffalo/examples/html-crud/actions"
"github.com/markbates/going/defaults"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/html-resource/actions/actions_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actions_test

import (
"github.com/markbates/buffalo/examples/html-resource/models"
"github.com/gobuffalo/buffalo/examples/html-resource/models"
"github.com/markbates/pop"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/html-resource/actions/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net/http"
"os"

"github.com/markbates/buffalo"
"github.com/markbates/buffalo/examples/html-resource/models"
"github.com/markbates/buffalo/middleware"
"github.com/gobuffalo/buffalo"
"github.com/gobuffalo/buffalo/examples/html-resource/models"
"github.com/gobuffalo/buffalo/middleware"
"github.com/markbates/going/defaults"
)

Expand Down
4 changes: 2 additions & 2 deletions examples/html-resource/actions/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"

rice "github.com/GeertJohan/go.rice"
"github.com/markbates/buffalo/render"
"github.com/markbates/buffalo/render/resolvers"
"github.com/gobuffalo/buffalo/render"
"github.com/gobuffalo/buffalo/render/resolvers"
)

var r *render.Engine
Expand Down
4 changes: 2 additions & 2 deletions examples/html-resource/actions/users.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package actions

import (
"github.com/markbates/buffalo"
"github.com/markbates/buffalo/examples/html-resource/models"
"github.com/gobuffalo/buffalo"
"github.com/gobuffalo/buffalo/examples/html-resource/models"
"github.com/markbates/pop"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions examples/html-resource/actions/users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package actions_test
import (
"testing"

"github.com/markbates/buffalo/examples/html-resource/actions"
"github.com/markbates/buffalo/examples/html-resource/models"
"github.com/gobuffalo/buffalo/examples/html-resource/actions"
"github.com/gobuffalo/buffalo/examples/html-resource/models"
"github.com/markbates/pop"
"github.com/markbates/willie"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion examples/html-resource/grifts/db.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package grifts

import (
"github.com/markbates/buffalo/examples/html-resource/models"
"github.com/gobuffalo/buffalo/examples/html-resource/models"
. "github.com/markbates/grift/grift"
"github.com/markbates/pop"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/html-resource/grifts/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package grifts
import (
"os"

"github.com/markbates/buffalo/examples/html-resource/actions"
"github.com/gobuffalo/buffalo/examples/html-resource/actions"
. "github.com/markbates/grift/grift"
"github.com/olekukonko/tablewriter"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/html-resource/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"os"

"github.com/markbates/buffalo/examples/html-resource/actions"
"github.com/gobuffalo/buffalo/examples/html-resource/actions"
"github.com/markbates/going/defaults"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/json-crud/actions/actions_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package actions_test

import (
"github.com/markbates/buffalo/examples/json-crud/models"
"github.com/gobuffalo/buffalo/examples/json-crud/models"
"github.com/markbates/pop"
)

Expand Down
Loading

0 comments on commit 03af855

Please sign in to comment.