Skip to content

Commit

Permalink
Drud 406 spelling corrections (ddev#213)
Browse files Browse the repository at this point in the history
* Adding aspell for spelling corrections.

* Spelling corrections.
  • Loading branch information
cyberswat authored and frodopwns committed Dec 12, 2016
1 parent 1f8feef commit ab3ed67
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Version 0.3.0 - Oct 27th 2016
- Changing file sync method to unison in order to get two-way syncing.
- Fixed issue in creating drud_default network on restart.
- Fixed linking issue where relative links started with two forward slashes.
- Colorize output of `drud secret` comands.
- Colorize output of `drud secret` commands.
- Added a `drud file delete` command.
- Added a `drud secret search` command.
- Added experimental support for startup hooks provided by https://github.com/drud/dcfg.
Expand Down
4 changes: 2 additions & 2 deletions cmd/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var configTest = []struct {
}{
{utils.RandomString(10) + ".yaml", "drudio", "production", "snuffleupagus", "drudapi.turtleduck.drud.io", "http"},
{utils.RandomString(10) + ".yaml", "nonsense", "staging", "barney", "drudapi.bowbell.drud.io", "https"},
{utils.RandomString(10) + ".yaml", "balogna", "default", "bigbird", "drudapi.genesis.drud.io", "https"},
{utils.RandomString(10) + ".yaml", "bologna", "default", "bigbird", "drudapi.genesis.drud.io", "https"},
}

// TestIntegrationConfigCreate makes sure that when a config does not exist one will be created
Expand Down Expand Up @@ -67,7 +67,7 @@ func TestIntegrationConfigSet(t *testing.T) {
}
}

// TestUnitConfigSet uses internal functions to test teh config set operation
// TestUnitConfigSet uses internal functions to test the config set operation
func TestUnitConfigSet(t *testing.T) {
var err error

Expand Down
2 changes: 1 addition & 1 deletion cmd/legacy_restart.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var LegacyReconfigCmd = &cobra.Command{
},
Run: func(cmd *cobra.Command, args []string) {
if activeApp == "" {
log.Fatalln("Must set app flag to dentoe which app you want to work with.")
log.Fatalln("Must set app flag to denote which app you want to work with.")
}

app := local.NewLegacyApp(activeApp, activeDeploy)
Expand Down
2 changes: 1 addition & 1 deletion cmd/legacy_workon.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
var LegacyWorkonCmd = &cobra.Command{
Use: "workon",
Short: "Set a site to work on",
Long: `If you select an app to workon you cant skip the acticeApp and activeDeploy args.`,
Long: `If you select an app to workon you cant skip the activeApp and activeDeploy args.`,
Run: func(cmd *cobra.Command, args []string) {
var parts []string
var answer int
Expand Down
6 changes: 3 additions & 3 deletions cmd/local_add.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ var addCmd = &cobra.Command{
log.Fatal(err)
}

// get deploy that hasd the passed in name
// get deploy that has the passed in name
deploy := app.GetDeploy(args[1])
if deploy == nil {
log.Fatalln("Deploy", args[1], "does not exist.")
Expand All @@ -164,7 +164,7 @@ var addCmd = &cobra.Command{
deploy,
)

// Gather data, files, src resoruces in parallel
// Gather data, files, src resources in parallel

// limit logical processors to 3
runtime.GOMAXPROCS(3)
Expand Down Expand Up @@ -252,7 +252,7 @@ var addCmd = &cobra.Command{
log.Fatalln(dcErr)
}

// use the docker client to wait for the containers to spin up then print a linik to the app
// use the docker client to wait for the containers to spin up then print a link to the app
client, _ := utils.GetDockerClient()
var publicPort int64
Loop:
Expand Down
2 changes: 1 addition & 1 deletion cmd/local_exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var localExecCmd = &cobra.Command{
nameContainer := fmt.Sprintf("%s-%s-%s-%s", appClient, cfg.ActiveApp, cfg.ActiveDeploy, serviceType)

if !utils.IsRunning(nameContainer) {
log.Fatal("App not runnign locally. Try `drud local add`.")
log.Fatal("App not running locally. Try `drud local add`.")
}

composeLOC := path.Join(basePath, "docker-compose.yaml")
Expand Down
2 changes: 1 addition & 1 deletion cmd/local_ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var localSSHCmd = &cobra.Command{
nameContainer := fmt.Sprintf("%s-%s-%s-%s", appClient, cfg.ActiveApp, cfg.ActiveDeploy, serviceType)

if !utils.IsRunning(nameContainer) {
log.Fatal("App not runnign locally. Try `drud local add`.")
log.Fatal("App not running locally. Try `drud local add`.")
}

composeLOC := path.Join(basePath, "docker-compose.yaml")
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func Execute() {
}
}

// prepopulate tokenfile so i dont have to check for its existence everywhere
// prepopulate tokenfile so I don't have to check for its existence everywhere
if _, err := os.Stat(tokenLocation); os.IsNotExist(err) {
f, ferr := os.Create(tokenLocation)
if ferr != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func posString(slice []string, element string) int {
return -1
}

// containsString returns true iff slice contains element
// containsString returns true if slice contains element
func containsString(slice []string, element string) bool {
return !(posString(slice, element) == -1)
}
Expand Down Expand Up @@ -246,7 +246,7 @@ func getMAC() (string, error) {
return macADDR, nil
}

// ParseConfigFlag is needed in order to get teh value of the flag before cobra can
// ParseConfigFlag is needed in order to get the value of the flag before cobra can
func ParseConfigFlag() string {
value := ""

Expand Down
6 changes: 3 additions & 3 deletions cms/config/wordpress.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if ( ! defined( 'DB_HOST' ) )
define( 'DB_HOST', "{{ $config.DatabaseHost }}" );
// ======================================================
// Additonal DB settings, you do not want to change these
// Additional DB settings, you do not want to change these
// ======================================================
if (file_exists(__DIR__ . '/custom.settings.php')) {
include __DIR__ . '/custom.settings.php';
Expand Down Expand Up @@ -162,7 +162,7 @@ if ( !defined( 'DISALLOW_FILE_MODS' ) ) // updates
// =====================================
// WP - Core only updates the core files
// No Akisemet or Hello Dolly
// No Akismet or Hello Dolly
// =====================================
if ( !defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) )
define( 'CORE_UPGRADE_SKIP_NEW_BUNDLED', true );
Expand All @@ -183,7 +183,7 @@ if ( file_exists( dirname( __FILE__ ) . '/memcached.php' ) )
$memcached_servers = include( dirname( __FILE__ ) . '/memcached.php' );
// ===========================================================================================
// This can be used to programatically set the stage when deploying (e.g. production, staging)
// This can be used to programmatically set the stage when deploying (e.g. production, staging)
// ===========================================================================================
define( 'WP_STAGE', 'xxxx' );
define( 'STAGING_DOMAIN', 'xxxx' ); // Does magic in WP Stack to handle staging domain rewriting
Expand Down
2 changes: 1 addition & 1 deletion docs/drud_get_file.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Download a file stored in Drud.
### Synopsis


Downlload a file stored remotely in the Drud system to your local system.
Download a file stored remotely in the Drud system to your local system.

```
drud get file [/path/to/filename]
Expand Down
2 changes: 1 addition & 1 deletion docs/drud_init.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ drud init

### SEE ALSO
* [drud](drud.md) - A CLI for interacting with Drud.
* [drud init local](drud_init_local.md) - Initialize machien for local development.
* [drud init local](drud_init_local.md) - Initialize machine for local development.

###### Auto generated by spf13/cobra on 16-Feb-2016
4 changes: 2 additions & 2 deletions docs/drud_init_local.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## drud init local

Initialize machien for local development.
Initialize machine for local development.

### Synopsis


Ensures machine has requirements and setup for workign with Drud appls locally.
Ensures machine has requirements and setup for working with Drud applications locally.

```
drud init local
Expand Down
2 changes: 1 addition & 1 deletion docs/drud_list_applications_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ List application types.
### Synopsis


List the application tempaltes that have been created for your use.
List the application templates that have been created for your use.

```
drud list applications types
Expand Down
2 changes: 1 addition & 1 deletion docs/drud_put_file.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Upload a file to the Drud file storage system.
### Synopsis


Push a file to yor org's storage space in the Drud system.
Push a file to your organizations storage space in the Drud system.

```
drud put file [/path/to/filename] [optional remote dest]
Expand Down
2 changes: 1 addition & 1 deletion local/databags.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (d Databag) GetRepoDetails(env string) (RepoDetails, error) {
return details, nil
}

// SiteEnv models the iner contents of a databag
// SiteEnv models the inner contents of a databag
type SiteEnv struct {
ActiveTheme string `yaml:"active_theme"`
AdminMail string `yaml:"admin_mail"`
Expand Down
8 changes: 4 additions & 4 deletions local/legacy.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func NewLegacyApp(name string, environment string) *LegacyApp {
}
}

// RenderComposeYAML returns teh contents of a docker compose config for this app
// RenderComposeYAML returns the contents of a docker compose config for this app
func (l LegacyApp) RenderComposeYAML() (string, error) {
var doc bytes.Buffer
var err error
Expand Down Expand Up @@ -118,7 +118,7 @@ func (l LegacyApp) ComposeFileExists() bool {
return true
}

// AbsPath returnt he full path from root to the app directory
// AbsPath return the full path from root to the app directory
func (l LegacyApp) AbsPath() string {
homedir, err := utils.GetHomeDir()
if err != nil {
Expand Down Expand Up @@ -417,7 +417,7 @@ func (l *LegacyApp) FindPorts() error {
return err
}

// Config creates the apps config file adding thigns like database host, name, and password
// Config creates the apps config file adding things like database host, name, and password
// as well as other sensitive data like salts.
func (l *LegacyApp) Config() error {
basePath := l.AbsPath()
Expand Down Expand Up @@ -534,7 +534,7 @@ func (l *LegacyApp) Cleanup() error {
args := []string{action, c.ID}
_, err := utils.RunCommand("docker", args)
if err != nil {
return fmt.Errorf("Could nnot %s container %s: %s", action, c.Names[0], err)
return fmt.Errorf("Could not %s container %s: %s", action, c.Names[0], err)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions local/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

// App is an interface apps for Drud Local must implement to use shared functionality
type App interface {
RenderComposeYAML() (string, error) // returns contents for docke rcompose config
RenderComposeYAML() (string, error) // returns contents for docker compose config
RelPath() string // returns path from root dir ('$HOME/.drud') to app
GetRepoDetails() (RepoDetails, error) // retuirns struct with branch, org, host, etc...
GetRepoDetails() (RepoDetails, error) // returns struct with branch, org, host, etc...
ContainerName() string
AbsPath() string
GetName() string
Expand Down

0 comments on commit ab3ed67

Please sign in to comment.