Skip to content

Commit

Permalink
Fix typos (#1194)
Browse files Browse the repository at this point in the history
  • Loading branch information
szepeviktor authored Mar 17, 2024
1 parent 45282c4 commit 5f89ad2
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
path: nimble-${{ matrix.target.name }}.tar.gz

create-github-release:
name: Create Github Release
name: Create GitHub Release
needs: [build]
runs-on: ubuntu-latest
permissions:
Expand Down
4 changes: 2 additions & 2 deletions changelog.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ development and test workflows.
- CTRL-C is now handled correctly in interactive prompts.
- Fixed issue where empty package list led to error.
- Fixed issue where file:// was prepended incorrectly.
- Fixed miscellaneous issues in version parsing, Github auth and briefClone.
- Fixed miscellaneous issues in version parsing, GitHub auth and briefClone.
- Miscellaneous cleanup of deprecated procs.

----
Expand Down Expand Up @@ -347,7 +347,7 @@ This release includes multiple bug fixes.
* Reverted patch that breaks binary stubs in Git Bash on Windows.
* The ``nimscriptapi.nim`` file is now statically compiled into the binary.
This should fix the "could not find nimscriptapi.nim" errors. The file can
still be overriden by placing a file named ``nimscriptapi.nim`` inside a
still be overridden by placing a file named ``nimscriptapi.nim`` inside a
``nimblepkg`` directory that is placed alongside the Nimble binary, or
by a ``nimscriptapi.nim`` file inside ``~/.nimble/pkgs/nimble-ver/nimblepkg/``.
For more information see the
Expand Down
2 changes: 1 addition & 1 deletion nimble.zsh-completion
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ _nimble() {
'(-d --depsOnly)'{-d,--depsOnly}'[Install only dependencies]'

if [ $#line -eq 0 ]; then
# if the command line is empty and "nimble tasks" is successfull, add custom tasks
# if the command line is empty and "nimble tasks" is successful, add custom tasks
tasks=$(nimble tasks)
if [ $? -eq 0 ]; then
compadd - $(echo $tasks | cut -f1 -d" " | tr '\n' ' ')
Expand Down
4 changes: 2 additions & 2 deletions readme.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ See the [Creating Packages](#creating-packages) section for more info on this.
Dependencies required for developing or testing a project can be installed by
passing `--depsOnly` without specifying a package name. Nimble will then install
any missing dependencies listed in the package's ``package.nimble`` file in the
current working directoy. Note that dependencies will be installed globally.
current working directory. Note that dependencies will be installed globally.

For example to install the dependencies for a Nimble project ``myPackage``:

Expand Down Expand Up @@ -1097,7 +1097,7 @@ Nimble includes a ``publish`` command which does this for you automatically.
package*, Nimble will build the files specified and install them appropriately.
* ``namedBin`` - A list of name:value files which should be built with specified
name, no file extension required. This option turns your package into a *binary
package*, Nimble will build the files specified and install them approriately.
package*, Nimble will build the files specified and install them appropriately.
`namedBin` entries override duplicates in `bin`.
* ``backend`` - Specifies the backend which will be used to build the files
listed in ``bin``. Possible values include: ``c``, ``cc``, ``cpp``, ``objc``,
Expand Down
6 changes: 3 additions & 3 deletions src/nimble.nim
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ proc processFreeDependencies(pkgInfo: PackageInfo,

# We add the reverse deps to the JSON file here because we don't want
# them added if the above errorenous condition occurs
# (unsatisfiable dependendencies).
# (unsatisfiable dependencies).
# N.B. NimbleData is saved in installFromDir.
for i in reverseDependencies:
addRevDep(options.nimbleData, i, pkgInfo)
Expand Down Expand Up @@ -1688,10 +1688,10 @@ proc lock(options: Options) =

pkgInfo.validateDevelopDependenciesVersionRanges(baseDeps, options)

# We need to seperate the graph into seperate tasks later
# We need to separate the graph into separate tasks later
var
errors = validateDevModeDepsWorkingCopiesBeforeLock(pkgInfo, options)
taskDepNames: Table[string, HashSet[string]] # We need to seperate the graph into seperate tasks later
taskDepNames: Table[string, HashSet[string]] # We need to separate the graph into separate tasks later
allDeps = baseDeps.toHashSet
lockDeps: AllLockFileDeps

Expand Down
2 changes: 1 addition & 1 deletion src/nimblepkg/lockfile.nim
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ proc writeLockFile*(fileName: string, packages: AllLockFileDeps) =
$lfjkVersion: %lockFileVersion,
$lfjkPackages: %packages[noTask]
}
# Store task graph seperate
# Store task graph separate
mainJsonNode[$lfjkTasks] = newJObject()
for task, deps in packages:
if task != noTask:
Expand Down
4 changes: 2 additions & 2 deletions src/nimblepkg/options.nim
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ Nimble Options:
--useSystemNim Use system nim and ignore nim from the lock
file if any
For more information read the Github readme:
For more information read the GitHub readme:
https://github.com/nim-lang/nimble#readme
"""

Expand Down Expand Up @@ -328,7 +328,7 @@ proc parseActionType*(action: string): ActionType =
result = actionCustom

proc initAction*(options: var Options, key: string) =
## Intialises `options.actions` fields based on `options.actions.typ` and
## Initialises `options.actions` fields based on `options.actions.typ` and
## `key`.
let keyNorm = key.normalize()
case options.action.typ
Expand Down
8 changes: 4 additions & 4 deletions src/nimblepkg/publish.nim
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ from net import SslCVerifyMode, newContext
type
Auth = object
user: string
token: string ## Github access token
token: string ## GitHub access token
http: HttpClient ## http client for doing API requests

const
Expand All @@ -34,7 +34,7 @@ proc createHeaders(a: Auth) =
})

proc requestNewToken(cfg: Config): string =
display("Info:", "Please create a new personal access token on Github in" &
display("Info:", "Please create a new personal access token on GitHub in" &
" order to allow Nimble to fork the packages repository.",
priority = HighPriority)
display("Hint:", "Make sure to give the access token access to public repos" &
Expand Down Expand Up @@ -167,7 +167,7 @@ proc publish*(p: PackageInfo, o: Options) =
var pkgsDir = getNimbleUserTempDir() / "nimble-packages-fork"
if not forkExists(auth):
createFork(auth)
display("Info:", "Waiting 10s to let Github create a fork",
display("Info:", "Waiting 10s to let GitHub create a fork",
priority = HighPriority)
os.sleep(10_000)

Expand Down Expand Up @@ -230,7 +230,7 @@ proc publish*(p: PackageInfo, o: Options) =
"No .git nor .hg directory found. Stopping.")

if url.len == 0:
url = promptCustom("Github URL of " & p.basicInfo.name & "?", "")
url = promptCustom("GitHub URL of " & p.basicInfo.name & "?", "")
if url.len == 0: userAborted()

let tags = promptCustom(
Expand Down
4 changes: 2 additions & 2 deletions src/nimblepkg/tools.nim
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ proc changeRoot*(origRoot, newRoot, path: string): string =
## Return value -> /home/test/bar/blah/2/foo.txt

## The additional check of `path.samePaths(origRoot)` is necessary to prevent
## a regression, where by ending the `srcDir` defintion in a nimble file in a
## a regression, where by ending the `srcDir` definition in a nimble file in a
## trailing separator would cause the `path.startsWith(origRoot)` evaluation to
## fail because of the value of `origRoot` would be longer than `path` due to
## the trailing separator. This would cause this method to throw during package
Expand Down Expand Up @@ -225,7 +225,7 @@ proc newSSLContext*(disabled: bool): SslContext =
when isMainModule:
import unittest

suite "getNameVersionCheksum":
suite "getNameVersionChecksum":
test "directory names without sha1 hashes":
check getNameVersionChecksum(
"/home/user/.nimble/libs/packagea-0.1") ==
Expand Down
2 changes: 1 addition & 1 deletion tests/testCommand/testOverride/myTester.nim
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo("overriden")
echo("overridden")
18 changes: 9 additions & 9 deletions tests/truncommand.nim
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ suite "nimble run":
cd "run":
let (output, exitCode) = execNimble(
"--debug", # Flag to enable debug verbosity in Nimble
"run", # Run command invokation
"run", # Run command invocation
"blahblah", # The command to run
)
check exitCode == QuitFailure
Expand All @@ -25,7 +25,7 @@ suite "nimble run":
cd "run":
let (output, exitCode) = execNimble(
"--debug", # Flag to enable debug verbosity in Nimble
"run", # Run command invokation
"run", # Run command invocation
"run", # The command to run
"--test", # First argument passed to the executed command
"check" # Second argument passed to the executed command.
Expand All @@ -52,7 +52,7 @@ suite "nimble run":
cd "run":
let (output, exitCode) = execNimble(
"--debug", # Flag to enable debug verbosity in Nimble
"run", # Run command invokation
"run", # Run command invocation
"--", # Flag to set run file to "" before next argument
"--test", # First argument passed to the executed command
"check" # Second argument passed to the executed command.
Expand Down Expand Up @@ -80,7 +80,7 @@ suite "nimble run":
test "Nimble options before executable name":
cd "run":
let (output, exitCode) = execNimble(
"run", # Run command invokation
"run", # Run command invocation
"--debug", # Flag to enable debug verbosity in Nimble
"run", # The executable to run
"--test" # First argument passed to the executed command
Expand All @@ -93,7 +93,7 @@ suite "nimble run":
test "Nimble options flags before --":
cd "run":
let (output, exitCode) = execNimble(
"run", # Run command invokation
"run", # Run command invocation
"--debug", # Flag to enable debug verbosity in Nimble
"--", # Separator for arguments
"--test" # First argument passed to the executed command
Expand All @@ -107,7 +107,7 @@ suite "nimble run":
cd "run":
let (output, exitCode) = execNimble(
"-d:sayWhee", # Compile flag to define a conditional symbol
"run", # Run command invokation
"run", # Run command invocation
"--debug", # Flag to enable debug verbosity in Nimble
"--", # Separator for arguments
"--test" # First argument passed to the executed command
Expand All @@ -122,7 +122,7 @@ suite "nimble run":
cd "run":
let (output, exitCode) = execNimble(
"--debug", # Flag to enable debug verbosity in Nimble
"run", # Run command invokation
"run", # Run command invocation
"-d:sayWhee", # Compile flag to define a conditional symbol
"run", # The executable to run
"--test" # First argument passed to the executed command
Expand All @@ -136,7 +136,7 @@ suite "nimble run":
test "Compilation flags before --":
cd "run":
let (output, exitCode) = execNimble(
"run", # Run command invokation
"run", # Run command invocation
"-d:sayWhee", # Compile flag to define a conditional symbol
"--debug", # Flag to enable debug verbosity in Nimble
"--", # Separator for arguments
Expand All @@ -152,7 +152,7 @@ suite "nimble run":
cd "run":
let (output, exitCode) = execNimble(
"-d:compileFlagBeforeRunCommand", # Compile flag to define a conditional symbol
"run", # Run command invokation
"run", # Run command invocation
"-d:sayWhee", # Compile flag to define a conditional symbol
"--debug", # Flag to enable debug verbosity in Nimble
"--", # Separator for arguments
Expand Down
4 changes: 2 additions & 2 deletions tests/ttestcommand.nim
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ suite "test command":
check outp.processOutput.inLines("Failing Second test")
check(not outp.processOutput.inLines("Third test"))

test "test command can be overriden":
test "test command can be overridden":
cd "testCommand/testOverride":
let (outp, exitCode) = execNimble("-d:CUSTOM", "test", "--runflag")
check exitCode == QuitSuccess
check outp.processOutput.inLines("overriden")
check outp.processOutput.inLines("overridden")
check outp.processOutput.inLines("true")

test "certain files are ignored":
Expand Down

0 comments on commit 5f89ad2

Please sign in to comment.