Fixed help text display indentation
diff --git a/glide.go b/glide.go index e13a8d9..d6220fa 100644 --- a/glide.go +++ b/glide.go
@@ -134,12 +134,12 @@ ShortName: "init", Usage: "Initialize a new project, creating a glide.yaml file", Description: `This command starts from a project without Glide and - sets it up. It generates a glide.yaml file, parsing your codebase to guess - the dependencies to include. Once this step is done you may edit the - glide.yaml file to update imported dependency properties such as the version - or version range to include. + sets it up. It generates a glide.yaml file, parsing your codebase to guess + the dependencies to include. Once this step is done you may edit the + glide.yaml file to update imported dependency properties such as the version + or version range to include. - To fetch the dependencies you may run 'glide install'.`, + To fetch the dependencies you may run 'glide install'.`, Flags: []cli.Flag{ cli.BoolFlag{ Name: "skip-import", @@ -154,33 +154,33 @@ Name: "get", Usage: "Install one or more packages into `vendor/` and add dependency to glide.yaml.", Description: `Gets one or more package (like 'go get') and then adds that file - to the glide.yaml file. Multiple package names can be specified on one line. + to the glide.yaml file. Multiple package names can be specified on one line. - $ glide get github.com/Masterminds/cookoo/web + $ glide get github.com/Masterminds/cookoo/web - The above will install the project github.com/Masterminds/cookoo and add - the subpackage 'web'. + The above will install the project github.com/Masterminds/cookoo and add + the subpackage 'web'. - If a fetched dependency has a glide.yaml file, configuration from Godep, - GPM, or GB Glide that configuration will be used to find the dependencies - and versions to fetch. If those are not available the dependent packages will - be fetched as either a version specified elsewhere or the latest version. + If a fetched dependency has a glide.yaml file, configuration from Godep, + GPM, or GB Glide that configuration will be used to find the dependencies + and versions to fetch. If those are not available the dependent packages will + be fetched as either a version specified elsewhere or the latest version. - When adding a new dependency Glide will perform an update to work out the - the versions to use from the dependency tree. This will generate an updated - glide.lock file with specific locked versions to use. + When adding a new dependency Glide will perform an update to work out the + the versions to use from the dependency tree. This will generate an updated + glide.lock file with specific locked versions to use. - If you are storing the outside dependencies in your version control system - (VCS), also known as vendoring, there are a few flags that may be useful. - The '--update-vendored' flag will cause Glide to update packages when VCS - information is unavailable. This can be used with the '--strip-vcs' flag which - will strip VCS data found in the vendor directory. This is useful for - removing VCS data from transitive dependencies and initial setups. The - '--strip-vendor' flag will remove any nested 'vendor' folders and - 'Godeps/_workspace' folders after an update (along with undoing any Godep - import rewriting). Note, The Godeps specific functionality is deprecated and - will be removed when most Godeps users have migrated to using the vendor - folder.`, + If you are storing the outside dependencies in your version control system + (VCS), also known as vendoring, there are a few flags that may be useful. + The '--update-vendored' flag will cause Glide to update packages when VCS + information is unavailable. This can be used with the '--strip-vcs' flag which + will strip VCS data found in the vendor directory. This is useful for + removing VCS data from transitive dependencies and initial setups. The + '--strip-vendor' flag will remove any nested 'vendor' folders and + 'Godeps/_workspace' folders after an update (along with undoing any Godep + import rewriting). Note, The Godeps specific functionality is deprecated and + will be removed when most Godeps users have migrated to using the vendor + folder.`, Flags: []cli.Flag{ cli.BoolFlag{ Name: "insecure", @@ -259,12 +259,11 @@ ShortName: "rm", Usage: "Remove a package from the glide.yaml file, and regenerate the lock file.", Description: `This takes one or more package names, and removes references from the glide.yaml file. - This will rebuild the glide lock file with the following constraints: + This will rebuild the glide lock file with the following constraints: - - Dependencies are re-negotiated. Any that are no longer used are left out of the lock. - - Minor version re-nogotiation is performed on remaining dependencies. - - No updates are peformed. You may want to run 'glide up' to accomplish that. -`, + - Dependencies are re-negotiated. Any that are no longer used are left out of the lock. + - Minor version re-nogotiation is performed on remaining dependencies. + - No updates are peformed. You may want to run 'glide up' to accomplish that.`, Flags: []cli.Flag{ cli.BoolFlag{ Name: "delete,d", @@ -360,9 +359,7 @@ Description: `Given a directory, list all the relevant Go paths that are not vendored. Example: - - $ go test $(glide novendor) -`, + $ go test $(glide novendor)`, Flags: []cli.Flag{ cli.StringFlag{ Name: "dir,d", @@ -392,12 +389,12 @@ ShortName: "i", Usage: "Install a project's dependencies", Description: `This uses the native VCS of each packages to install - the appropriate version. There are two ways a projects dependencies can - be installed. When there is a glide.yaml file defining the dependencies but - no lock file (glide.lock) the dependencies are installed using the "update" - command and a glide.lock file is generated pinning all dependencies. If a - glide.lock file is already present the dependencies are installed or updated - from the lock file.`, + the appropriate version. There are two ways a projects dependencies can + be installed. When there is a glide.yaml file defining the dependencies but + no lock file (glide.lock) the dependencies are installed using the "update" + command and a glide.lock file is generated pinning all dependencies. If a + glide.lock file is already present the dependencies are installed or updated + from the lock file.`, Flags: []cli.Flag{ cli.BoolFlag{ Name: "delete", @@ -458,42 +455,41 @@ ShortName: "up", Usage: "Update a project's dependencies", Description: `This uses the native VCS of each package to try to - pull the most applicable updates. Packages with fixed refs (Versions or - tags) will not be updated. Packages with no ref or with a branch ref will - be updated as expected. + pull the most applicable updates. Packages with fixed refs (Versions or + tags) will not be updated. Packages with no ref or with a branch ref will + be updated as expected. - If a dependency has a glide.yaml file, update will read that file and - update those dependencies accordingly. Those dependencies are maintained in - a the top level 'vendor/' directory. 'vendor/foo/bar' will have its - dependencies stored in 'vendor/'. This behavior can be disabled with - '--no-recursive'. When this behavior is skipped a glide.lock file is not - generated because the full dependency tree cannot be known. + If a dependency has a glide.yaml file, update will read that file and + update those dependencies accordingly. Those dependencies are maintained in + a the top level 'vendor/' directory. 'vendor/foo/bar' will have its + dependencies stored in 'vendor/'. This behavior can be disabled with + '--no-recursive'. When this behavior is skipped a glide.lock file is not + generated because the full dependency tree cannot be known. - Glide will also import Godep, GB, and GPM files as it finds them in dependencies. - It will create a glide.yaml file from the Godeps data, and then update. This - has no effect if '--no-recursive' is set. + Glide will also import Godep, GB, and GPM files as it finds them in dependencies. + It will create a glide.yaml file from the Godeps data, and then update. This + has no effect if '--no-recursive' is set. - If you are storing the outside dependencies in your version control system - (VCS), also known as vendoring, there are a few flags that may be useful. - The '--update-vendored' flag will cause Glide to update packages when VCS - information is unavailable. This can be used with the '--strip-vcs' flag which - will strip VCS data found in the vendor directory. This is useful for - removing VCS data from transitive dependencies and initial setups. The - '--strip-vendor' flag will remove any nested 'vendor' folders and - 'Godeps/_workspace' folders after an update (along with undoing any Godep - import rewriting). Note, The Godeps specific functionality is deprecated and - will be removed when most Godeps users have migrated to using the vendor - folder. + If you are storing the outside dependencies in your version control system + (VCS), also known as vendoring, there are a few flags that may be useful. + The '--update-vendored' flag will cause Glide to update packages when VCS + information is unavailable. This can be used with the '--strip-vcs' flag which + will strip VCS data found in the vendor directory. This is useful for + removing VCS data from transitive dependencies and initial setups. The + '--strip-vendor' flag will remove any nested 'vendor' folders and + 'Godeps/_workspace' folders after an update (along with undoing any Godep + import rewriting). Note, The Godeps specific functionality is deprecated and + will be removed when most Godeps users have migrated to using the vendor + folder. - Note, Glide detects vendored dependencies. With the '--update-vendored' flag - Glide will update vendored dependencies leaving them in a vendored state. - Tertiary dependencies will not be vendored automatically unless the - '--strip-vcs' flag is used along with it. + Note, Glide detects vendored dependencies. With the '--update-vendored' flag + Glide will update vendored dependencies leaving them in a vendored state. + Tertiary dependencies will not be vendored automatically unless the + '--strip-vcs' flag is used along with it. - By default, packages that are discovered are considered transient, and are - not stored in the glide.yaml file. The --file=NAME.yaml flag allows you - to save the discovered dependencies to a YAML file. - `, + By default, packages that are discovered are considered transient, and are + not stored in the glide.yaml file. The --file=NAME.yaml flag allows you + to save the discovered dependencies to a YAML file.`, Flags: []cli.Flag{ cli.BoolFlag{ Name: "delete", @@ -571,11 +567,11 @@ Name: "tree", Usage: "Tree prints the dependencies of this project as a tree.", Description: `This scans a project's source files and builds a tree - representation of the import graph. + representation of the import graph. - It ignores testdata/ and directories that begin with . or _. Packages in - vendor/ are only included if they are referenced by the main project or - one of its dependencies.`, + It ignores testdata/ and directories that begin with . or _. Packages in + vendor/ are only included if they are referenced by the main project or + one of its dependencies.`, Action: func(c *cli.Context) { action.Tree(".", false) }, @@ -585,12 +581,11 @@ Usage: "List prints all dependencies that the present code references.", Description: `List scans your code and lists all of the packages that are used. - It does not use the glide.yaml. Instead, it inspects the code to determine what packages are - imported. + It does not use the glide.yaml. Instead, it inspects the code to determine what packages are + imported. - Directories that begin with . or _ are ignored, as are testdata directories. Packages in - vendor are only included if they are used by the project. - `, + Directories that begin with . or _ are ignored, as are testdata directories. Packages in + vendor are only included if they are used by the project.`, Action: func(c *cli.Context) { action.List(".", true) },