Merging from master/v1

dkolbly · May 22, 2016 · 6d6f7da · 6d6f7da
1 parent b35c8a9
commit 6d6f7da
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,7 +57,7 @@
   makes it easier to script around apps built using `cli` since they can trust
   that a 0 exit code indicated a successful execution.
 - cleanups based on [Go Report Card
-  feedback](https://goreportcard.com/report/github.com/codegangsta/cli)
+  feedback](https://goreportcard.com/report/github.com/urfave/cli)
 
 ## [1.16.0] - 2016-05-02
 ### Added
@@ -317,28 +317,28 @@ signature of `func(*cli.Context) error`, as defined by `cli.ActionFunc`.
 ### Added
 - Initial implementation.
 
-[Unreleased]: https://github.com/codegangsta/cli/compare/v1.17.0...HEAD
-[1.17.0]: https://github.com/codegangsta/cli/compare/v1.16.0...v1.17.0
-[1.16.0]: https://github.com/codegangsta/cli/compare/v1.15.0...v1.16.0
-[1.15.0]: https://github.com/codegangsta/cli/compare/v1.14.0...v1.15.0
-[1.14.0]: https://github.com/codegangsta/cli/compare/v1.13.0...v1.14.0
-[1.13.0]: https://github.com/codegangsta/cli/compare/v1.12.0...v1.13.0
-[1.12.0]: https://github.com/codegangsta/cli/compare/v1.11.1...v1.12.0
-[1.11.1]: https://github.com/codegangsta/cli/compare/v1.11.0...v1.11.1
-[1.11.0]: https://github.com/codegangsta/cli/compare/v1.10.2...v1.11.0
-[1.10.2]: https://github.com/codegangsta/cli/compare/v1.10.1...v1.10.2
-[1.10.1]: https://github.com/codegangsta/cli/compare/v1.10.0...v1.10.1
-[1.10.0]: https://github.com/codegangsta/cli/compare/v1.9.0...v1.10.0
-[1.9.0]: https://github.com/codegangsta/cli/compare/v1.8.0...v1.9.0
-[1.8.0]: https://github.com/codegangsta/cli/compare/v1.7.1...v1.8.0
-[1.7.1]: https://github.com/codegangsta/cli/compare/v1.7.0...v1.7.1
-[1.7.0]: https://github.com/codegangsta/cli/compare/v1.6.0...v1.7.0
-[1.6.0]: https://github.com/codegangsta/cli/compare/v1.5.0...v1.6.0
-[1.5.0]: https://github.com/codegangsta/cli/compare/v1.4.1...v1.5.0
-[1.4.1]: https://github.com/codegangsta/cli/compare/v1.4.0...v1.4.1
-[1.4.0]: https://github.com/codegangsta/cli/compare/v1.3.1...v1.4.0
-[1.3.1]: https://github.com/codegangsta/cli/compare/v1.3.0...v1.3.1
-[1.3.0]: https://github.com/codegangsta/cli/compare/v1.2.0...v1.3.0
-[1.2.0]: https://github.com/codegangsta/cli/compare/v1.1.0...v1.2.0
-[1.1.0]: https://github.com/codegangsta/cli/compare/v1.0.0...v1.1.0
-[1.0.0]: https://github.com/codegangsta/cli/compare/v0.1.0...v1.0.0
+[Unreleased]: https://github.com/urfave/cli/compare/v1.17.0...HEAD
+[1.17.0]: https://github.com/urfave/cli/compare/v1.16.0...v1.17.0
+[1.16.0]: https://github.com/urfave/cli/compare/v1.15.0...v1.16.0
+[1.15.0]: https://github.com/urfave/cli/compare/v1.14.0...v1.15.0
+[1.14.0]: https://github.com/urfave/cli/compare/v1.13.0...v1.14.0
+[1.13.0]: https://github.com/urfave/cli/compare/v1.12.0...v1.13.0
+[1.12.0]: https://github.com/urfave/cli/compare/v1.11.1...v1.12.0
+[1.11.1]: https://github.com/urfave/cli/compare/v1.11.0...v1.11.1
+[1.11.0]: https://github.com/urfave/cli/compare/v1.10.2...v1.11.0
+[1.10.2]: https://github.com/urfave/cli/compare/v1.10.1...v1.10.2
+[1.10.1]: https://github.com/urfave/cli/compare/v1.10.0...v1.10.1
+[1.10.0]: https://github.com/urfave/cli/compare/v1.9.0...v1.10.0
+[1.9.0]: https://github.com/urfave/cli/compare/v1.8.0...v1.9.0
+[1.8.0]: https://github.com/urfave/cli/compare/v1.7.1...v1.8.0
+[1.7.1]: https://github.com/urfave/cli/compare/v1.7.0...v1.7.1
+[1.7.0]: https://github.com/urfave/cli/compare/v1.6.0...v1.7.0
+[1.6.0]: https://github.com/urfave/cli/compare/v1.5.0...v1.6.0
+[1.5.0]: https://github.com/urfave/cli/compare/v1.4.1...v1.5.0
+[1.4.1]: https://github.com/urfave/cli/compare/v1.4.0...v1.4.1
+[1.4.0]: https://github.com/urfave/cli/compare/v1.3.1...v1.4.0
+[1.3.1]: https://github.com/urfave/cli/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/urfave/cli/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/urfave/cli/compare/v1.1.0...v1.2.0
+[1.1.0]: https://github.com/urfave/cli/compare/v1.0.0...v1.1.0
+[1.0.0]: https://github.com/urfave/cli/compare/v0.1.0...v1.0.0
diff --git a/README.md b/README.md
@@ -1,13 +1,17 @@
-[![Build Status](https://travis-ci.org/codegangsta/cli.svg?branch=master)](https://travis-ci.org/codegangsta/cli)
-[![GoDoc](https://godoc.org/github.com/codegangsta/cli?status.svg)](https://godoc.org/github.com/codegangsta/cli)
-[![codebeat](https://codebeat.co/badges/0a8f30aa-f975-404b-b878-5fab3ae1cc5f)](https://codebeat.co/projects/github-com-codegangsta-cli)
-[![Go Report Card](https://goreportcard.com/badge/codegangsta/cli)](https://goreportcard.com/report/codegangsta/cli)
-[![top level coverage](https://gocover.io/_badge/github.com/codegangsta/cli?0 "top level coverage")](http://gocover.io/github.com/codegangsta/cli) /
-[![altsrc coverage](https://gocover.io/_badge/github.com/codegangsta/cli/altsrc?0 "altsrc coverage")](http://gocover.io/github.com/codegangsta/cli/altsrc)
+[![Build Status](https://travis-ci.org/urfave/cli.svg?branch=master)](https://travis-ci.org/urfave/cli)
+[![GoDoc](https://godoc.org/github.com/urfave/cli?status.svg)](https://godoc.org/github.com/urfave/cli)
+[![codebeat](https://codebeat.co/badges/0a8f30aa-f975-404b-b878-5fab3ae1cc5f)](https://codebeat.co/projects/github-com-urfave-cli)
+[![Go Report Card](https://goreportcard.com/badge/urfave/cli)](https://goreportcard.com/report/urfave/cli)
+[![top level coverage](https://gocover.io/_badge/github.com/urfave/cli?0 "top level coverage")](http://gocover.io/github.com/urfave/cli) /
+[![altsrc coverage](https://gocover.io/_badge/github.com/urfave/cli/altsrc?0 "altsrc coverage")](http://gocover.io/github.com/urfave/cli/altsrc)
 
 
 # cli
 
+**Notice:** This is the library formally known as
+`github.com/codegangsta/cli` -- Github will automatically redirect requests
+to this repository, but we recommend updating your references for clarity.
+
 cli is a simple, fast, and fun package for building command line apps in Go. The goal is to enable developers to write fast and distributable command line applications in an expressive way.
 
 ## Overview
@@ -25,7 +29,7 @@ instructions](http://golang.org/doc/install.html).
 
 To install cli, simply run:
 ```
-$ go get github.com/codegangsta/cli
+$ go get github.com/urfave/cli
 ```
 
 Make sure your `PATH` includes to the `$GOPATH/bin` directory so your commands can be easily used:
@@ -44,13 +48,13 @@ that, please use whatever version pinning of your preference, such as via
 `gopkg.in`:
 
 ```
-$ go get gopkg.in/codegangsta/cli.v2
+$ go get gopkg.in/urfave/cli.v2
 ```
 
 ``` go
 ...
 import (
-  "gopkg.in/codegangsta/cli.v2" // imports as package "cli"
+  "gopkg.in/urfave/cli.v2" // imports as package "cli"
 )
 ...
 ```
@@ -62,13 +66,13 @@ to avoid any unexpected compatibility pains once `v2` becomes `master`, then
 pinning to the `v1` branch is an acceptable option, e.g.:
 
 ```
-$ go get gopkg.in/codegangsta/cli.v1
+$ go get gopkg.in/urfave/cli.v1
 ```
 
 ``` go
 ...
 import (
-  "gopkg.in/codegangsta/cli.v1" // imports as package "cli"
+  "gopkg.in/urfave/cli.v1" // imports as package "cli"
 )
 ...
 ```
@@ -82,7 +86,7 @@ package main
 
 import (
   "os"
-  "github.com/codegangsta/cli"
+  "github.com/urfave/cli"
 )
 
 func main() {
@@ -102,7 +106,7 @@ import (
   "fmt"
   "os"
 
-  "github.com/codegangsta/cli"
+  "github.com/urfave/cli"
 )
 
 func main() {
@@ -136,7 +140,7 @@ import (
   "fmt"
   "os"
 
-  "github.com/codegangsta/cli"
+  "github.com/urfave/cli"
 )
 
 func main() {
@@ -254,7 +258,7 @@ app.Action = func(c *cli.Context) error {
 ...
 ```
 
-See full list of flags at http://godoc.org/github.com/codegangsta/cli
+See full list of flags at http://godoc.org/github.com/urfave/cli
 
 #### Placeholder Values
 
@@ -473,7 +477,7 @@ package main
 import (
   "os"
 
-  "github.com/codegangsta/cli"
+  "github.com/urfave/cli"
 )
 
 func main() {
@@ -573,7 +577,7 @@ import (
   "io"
   "os"
 
-  "github.com/codegangsta/cli"
+  "github.com/urfave/cli"
 )
 
 func main() {
@@ -622,8 +626,16 @@ VERSION:
 
 ## Contribution Guidelines
 
-Feel free to put up a pull request to fix a bug or maybe add a feature. I will give it a code review and make sure that it does not break backwards compatibility. If I or any other collaborators agree that it is in line with the vision of the project, we will work with you to get the code into a mergeable state and merge it into the master branch.
+Feel free to put up a pull request to fix a bug or maybe add a feature. I will
+give it a code review and make sure that it does not break backwards
+compatibility. If I or any other collaborators agree that it is in line with
+the vision of the project, we will work with you to get the code into
+a mergeable state and merge it into the master branch.
 
-If you have contributed something significant to the project, I will most likely add you as a collaborator. As a collaborator you are given the ability to merge others pull requests. It is very important that new code does not break existing code, so be careful about what code you do choose to merge. If you have any questions feel free to link @codegangsta to the issue in question and we can review it together.
+If you have contributed something significant to the project, we will most
+likely add you as a collaborator. As a collaborator you are given the ability
+to merge others pull requests. It is very important that new code does not
+break existing code, so be careful about what code you do choose to merge.
 
-If you feel like you have contributed to the project but have not yet been added as a collaborator, I probably forgot to add you. Hit @codegangsta up over email and we will get it figured out.
+If you feel like you have contributed to the project but have not yet been
+added as a collaborator, we probably forgot to add you, please open an issue.
diff --git a/altsrc/flag.go b/altsrc/flag.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 // FlagInputSourceExtension is an extension interface of cli.Flag that

diff --git a/altsrc/flag_test.go b/altsrc/flag_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 type testApplyInputSource struct {

diff --git a/altsrc/input_source_context.go b/altsrc/input_source_context.go
@@ -3,7 +3,7 @@ package altsrc
 import (
 	"time"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 // InputSourceContext is an interface used to allow

diff --git a/altsrc/map_input_source.go b/altsrc/map_input_source.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 // MapInputSource implements InputSourceContext to return

diff --git a/altsrc/yaml_command_test.go b/altsrc/yaml_command_test.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 func TestCommandYamlFileTest(t *testing.T) {

diff --git a/altsrc/yaml_file_loader.go b/altsrc/yaml_file_loader.go
@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 
 	"gopkg.in/yaml.v2"
 )

diff --git a/runtests b/runtests
@@ -10,7 +10,7 @@ from subprocess import check_call, check_output
 
 
 PACKAGE_NAME = os.environ.get(
-    'CLI_PACKAGE_NAME', 'github.com/codegangsta/cli'
+    'CLI_PACKAGE_NAME', 'github.com/urfave/cli'
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ from subprocess import check_call, check_output @@
     PACKAGE_NAME = os.environ.get(
-        'CLI_PACKAGE_NAME', 'github.com/codegangsta/cli'
+        'CLI_PACKAGE_NAME', 'github.com/urfave/cli'
     )
@@ Expand Down @@