refactor(config): Move config handling to core.ps1 #3242

r15ch13 · 2019-03-18T15:00:12Z

Migrate ~\.scoop to ~\.config\scoop\config.json
- ~\.config is used by other tools too
- Proper highlighting in text editor because of .json file extension
Remove hashtable and hashtable_val functions because ConvertFrom-Json is enough
- These functions are obsolete because ConvertFrom-Json can handle all data formats
Add PowerShell 6 time conversion to tests
Removes config.ps1 imports from bin\*.ps1 and libexec\*.ps1

~~~~scoop alias~~ requires changes to remove the hashtable specific stuff.~~

niheaven

Tested with no .scoop in $HOME, work fine with changed codes.

lib/core.ps1

niheaven · 2019-03-18T16:20:18Z

When moving config, there are two warn() which is defined below and give errors (warn not defined). Should replace with hardcode or put #message(L138-L189) at top of core.ps1.

niheaven · 2019-03-18T16:55:00Z

L83-L87: If config value is false, $scoopConfig.$name will be false and fall to else section even if there is $name in config...
Test case:

scoop config debug true # okay
scoop config debug false # okay
scoop config debug false # error

It can be fixed by replacing L83-L87 with

$scoopConfig | Add-Member -Force -NotePropertyMembers @{ $name = $value }

That is, force add note member (we want to set it, so force is okay, no matter if there is $name)

niheaven · 2019-03-18T17:13:49Z

Another implementation: pre-defined config file that contains all config options with default value, so we could only modify existing value, no need to add new ones. The pre-defined one can be put in scoop's root dir and copy to config home during first run. That may help users to know what configurable options is scoop having.

test/Scoop-Config.Tests.ps1

libexec/scoop-uninstall.ps1

lib/core.ps1

chawyehsu

LGTM

niheaven · 2019-03-27T03:53:36Z

There is only one thing remaining... Since set_config has output now, we should Out-Null it when we don't need, otherwise, e.g., scoop update will produce:

λ  scoop update
Updating Scoop...
Updating 'Ash258' bucket...
Updating 'dorado' bucket...
Updating 'extras' bucket...
Updating 'java' bucket...
Updating 'nerd-fonts' bucket...
Updating 'nih' bucket...
Updating 'rasa' bucket...
Updating 'versions' bucket...


SCOOP_BRANCH           : master
rootPath               : E:\Scoop
aria2-enabled          : False
msiextract_use_lessmsi : True
globalPath             : E:\ScoopG
debug                  : False
lastupdate             : 2019-03-27T11:20:17.0666758+08:00
cachePath              : E:\ScoopC
SCOOP_REPO             : https://github.com/lukesampson/scoop

Scoop was updated successfully!

Black lines above is added by scoop itself, that's messy, I think.

- Migrate ~\.scoop to ~\.config\scoop\config.json - Remove hashtable and hashtable_val functions because ConvertFrom-Json is enough - Add PowerShell 6 time conversion to tests

Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>

Encode file in "ASCII", since "UTF8" in Powershell 5 will be "UTF8-with-BOM", while "ASCII" be "UTF8". Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>

Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>

r15ch13 · 2019-05-09T18:27:33Z

Rebased onto develop and added missing | Out-Null redirections. Please test again 😄

niheaven

LGTM

- The main bucket of Scoop has been separated to https://github.com/ScoopInstaller/Main - Requires PowerShell 5 and newer #3330 - Improve and refactor decompression functions #3204 #3409 #3411 - Move scoop config from `~\.scoop` to `~\.config\scoop\config.json` #3242 - Add `scoop hold` and `scoop unhold` for excluding programs from updates #3444 - Refactored some Core functions #3314 #3416 - Small fix for starting processes on Windows 7 #3415 Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com> Co-authored-by: Chawye Hsu <h404bi@outlook.com> Co-authored-by: Jakub Čábera <cabera.jakub@gmail.com>

niheaven reviewed Mar 18, 2019

View reviewed changes

lib/core.ps1 Outdated Show resolved Hide resolved

lib/core.ps1 Outdated Show resolved Hide resolved

lib/core.ps1 Outdated Show resolved Hide resolved

niheaven mentioned this pull request Mar 18, 2019

feat(core): support loading basedirs from config #3121

Merged

1 task

chawyehsu reviewed Mar 22, 2019

View reviewed changes

test/Scoop-Config.Tests.ps1 Outdated Show resolved Hide resolved

r15ch13 force-pushed the refactor-config branch 3 times, most recently from 5c7cb51 to 69fea43 Compare March 25, 2019 15:34

niheaven reviewed Mar 25, 2019

View reviewed changes

libexec/scoop-uninstall.ps1 Outdated Show resolved Hide resolved

niheaven reviewed Mar 25, 2019

View reviewed changes

lib/core.ps1 Outdated Show resolved Hide resolved

chawyehsu approved these changes Mar 26, 2019

View reviewed changes

Deide mentioned this pull request Mar 29, 2019

XDG Base Directories #3285

Closed

chawyehsu mentioned this pull request Apr 26, 2019

[Discussion] Next steps #3393

Closed

niheaven mentioned this pull request Apr 28, 2019

Deleting SCOOP_BRANCH not switch to master #3401

Closed

r15ch13 added this to the Finish or fix PRs and other issues milestone Apr 28, 2019

r15ch13 and others added 13 commits May 9, 2019 20:24

refactor(config): Move configuration handling to core.ps1

2f35e2a

- Migrate ~\.scoop to ~\.config\scoop\config.json - Remove hashtable and hashtable_val functions because ConvertFrom-Json is enough - Add PowerShell 6 time conversion to tests

refactor(bin/libexec): remove config.ps1 imports

5bbbc90

refactor(config): Fix config value removing

e168bdb

refactor(alias): Apply config changes to scoop-alias command

391a5d4

refactor(core): Prefer $XDG_CONFIG_HOME over ~\.config

07b6165

Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>

refactor(core): Use ASCII encoding because of PowerShell 5

3d97e5c

Encode file in "ASCII", since "UTF8" in Powershell 5 will be "UTF8-with-BOM", while "ASCII" be "UTF8". Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>

refactor(core): ensure config path exists

9be8fb6

Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>

refactor(core): Remove hard-coded path

eed3d6b

refactor(config): Fix set_config function

6caee6a

refactor(config): Add more tests for load_config and get_config

519af17

refactor(config): Fix set_config

049aaf9

refactor(config): Fix warning message

c1ec895

fix(config): fix set_config check for existing property

d788f9a

r15ch13 added 5 commits May 9, 2019 20:25

fix(config): fix datetime tests for PowerShell 6

e8c4fd4

fix(config): Test for DateTime object instead for actual Time

35edae2

fix(config): More tests for set_config

5e93c88

refactor(config): Better output for scoop config command

d0de794

refactor(config): Redirect set_config output to Out-Null

ae9d802

r15ch13 force-pushed the refactor-config branch from daaf88d to ae9d802 Compare May 9, 2019 18:26

r15ch13 changed the base branch from master to develop May 9, 2019 18:26

fix(config): Remove config.ps1 imports

4cc63c1

chawyehsu approved these changes May 10, 2019

View reviewed changes

niheaven approved these changes May 10, 2019

View reviewed changes

r15ch13 merged commit 7699bea into develop May 10, 2019

r15ch13 deleted the refactor-config branch May 11, 2019 16:44

r15ch13 mentioned this pull request May 11, 2019

Bucket extraction and refactoring #3449

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(config): Move config handling to core.ps1 #3242

refactor(config): Move config handling to core.ps1 #3242

r15ch13 commented Mar 18, 2019 •

edited

Loading

niheaven left a comment

niheaven commented Mar 18, 2019

niheaven commented Mar 18, 2019

niheaven commented Mar 18, 2019 •

edited

Loading

chawyehsu left a comment

niheaven commented Mar 27, 2019

r15ch13 commented May 9, 2019

niheaven left a comment

refactor(config): Move config handling to core.ps1 #3242

refactor(config): Move config handling to core.ps1 #3242

Conversation

r15ch13 commented Mar 18, 2019 • edited Loading

niheaven left a comment

Choose a reason for hiding this comment

niheaven commented Mar 18, 2019

niheaven commented Mar 18, 2019

niheaven commented Mar 18, 2019 • edited Loading

chawyehsu left a comment

Choose a reason for hiding this comment

niheaven commented Mar 27, 2019

r15ch13 commented May 9, 2019

niheaven left a comment

Choose a reason for hiding this comment

r15ch13 commented Mar 18, 2019 •

edited

Loading

niheaven commented Mar 18, 2019 •

edited

Loading