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

bin/checkhashes.ps1

@@ -42,7 +42,6 @@ param(
 
 . "$PSScriptRoot\..\lib\core.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\config.ps1"
 . "$PSScriptRoot\..\lib\buckets.ps1"
 . "$PSScriptRoot\..\lib\autoupdate.ps1"
 . "$PSScriptRoot\..\lib\json.ps1"

bin/checkurls.ps1

@@ -28,7 +28,6 @@ param(
 
 . "$PSScriptRoot\..\lib\core.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
-. "$PSScriptRoot\..\lib\config.ps1"
 . "$PSScriptRoot\..\lib\install.ps1"
 
 $Dir = Resolve-Path $Dir

bin/checkver.ps1

@@ -65,7 +65,6 @@ param(
 
 . "$psscriptroot\..\lib\core.ps1"
 . "$psscriptroot\..\lib\manifest.ps1"
-. "$psscriptroot\..\lib\config.ps1"
 . "$psscriptroot\..\lib\buckets.ps1"
 . "$psscriptroot\..\lib\autoupdate.ps1"
 . "$psscriptroot\..\lib\json.ps1"

bin/scoop.ps1

@@ -3,7 +3,6 @@ param($cmd)
 
 set-strictmode -off
 
-. "$psscriptroot\..\lib\config.ps1"
 . "$psscriptroot\..\lib\core.ps1"
 . "$psscriptroot\..\lib\git.ps1"
 . "$psscriptroot\..\lib\buckets.ps1"

lib/core.ps1

@@ -18,6 +18,15 @@ $globaldir = $env:SCOOP_GLOBAL, "$env:ProgramData\scoop" | Select-Object -first
 #       Use at your own risk.
 $cachedir = $env:SCOOP_CACHE, "$scoopdir\cache" | Select-Object -first 1
 
+$configHome = $env:XDG_CONFIG_HOME, "$env:USERPROFILE\.config" | Select-Object -First 1
+$configFile = "$configHome\scoop\config.json"
+if ((Test-Path "$env:USERPROFILE\.scoop") -and !(Test-Path $configFile)) {
+    New-Item -ItemType Directory (Split-Path -Path $configFile) -ErrorAction Ignore | Out-Null
+    Move-Item "$env:USERPROFILE\.scoop" $configFile
+    write-host "WARN  Scoop configuration has been migrated from '~/.scoop'" -f darkyellow
+    write-host "WARN  to '$configFile'" -f darkyellow
+}
+
 # Note: Github disabled TLS 1.0 support on 2018-02-23. Need to enable TLS 1.2
 # for all communication with api.github.com
 function Optimize-SecurityProtocol {
@@ -58,6 +67,83 @@ function Show-DeprecatedWarning {
     Write-Host "      -> $($Invocation.PSCommandPath):$($Invocation.ScriptLineNumber):$($Invocation.OffsetInLine)" -ForegroundColor DarkGray
 }
 
+function load_cfg($file) {
+    if(!(Test-Path $file)) {
+        return $null
+    }
+
+    try {
+        return (Get-Content $file -Raw | ConvertFrom-Json -ErrorAction Stop)
+    } catch {
+        Write-Host "ERROR loading $file`: $($_.exception.message)"
+    }
+}
+
+$scoopConfig = load_cfg $configFile
+
+function get_config($name, $default) {
+    if($null -eq $scoopConfig.$name -and $null -ne $default) {
+        return $default
+    }
+    return $scoopConfig.$name
+}
+
+function set_config($name, $value) {
+    if($null -eq $scoopConfig -or $scoopConfig.Count -eq 0) {
+        ensure (Split-Path -Path $configFile) | Out-Null
+        $scoopConfig = New-Object PSObject
+        $scoopConfig | Add-Member -MemberType NoteProperty -Name $name -Value $value
+    } else {
+        if($value -eq [bool]::TrueString -or $value -eq [bool]::FalseString) {
+            $value = [System.Convert]::ToBoolean($value)
+        }
+        if($null -eq $scoopConfig.$name) {
+            $scoopConfig | Add-Member -MemberType NoteProperty -Name $name -Value $value
+        } else {
+            $scoopConfig.$name = $value
+        }
+    }
+
+    if($null -eq $value) {
+        $scoopConfig.PSObject.Properties.Remove($name)
+    }
+
+    ConvertTo-Json $scoopConfig | Set-Content $configFile -Encoding ASCII
+    return $scoopConfig
+}
+
+function setup_proxy() {
+    # note: '@' and ':' in password must be escaped, e.g. 'p@ssword' -> p\@ssword'
+    $proxy = get_config 'proxy'
+    if(!$proxy) {
+        return
+    }
+    try {
+        $credentials, $address = $proxy -split '(?<!\\)@'
+        if(!$address) {
+            $address, $credentials = $credentials, $null # no credentials supplied
+        }
+
+        if($address -eq 'none') {
+            [net.webrequest]::defaultwebproxy = $null
+        } elseif($address -ne 'default') {
+            [net.webrequest]::defaultwebproxy = new-object net.webproxy "http://$address"
+        }
+
+        if($credentials -eq 'currentuser') {
+            [net.webrequest]::defaultwebproxy.credentials = [net.credentialcache]::defaultcredentials
+        } elseif($credentials) {
+            $username, $password = $credentials -split '(?<!\\):' | ForEach-Object { $_ -replace '\\([@:])','$1' }
+            [net.webrequest]::defaultwebproxy.credentials = new-object net.networkcredential($user, $pass)
+        }
+    } catch {
+        warn "Failed to use proxy '$proxy': $($_.exception.message)"
+    }
+}
+
+setup_proxy
+
+
 # helper functions
 function coalesce($a, $b) { if($a) { return $a } $b }
 

libexec/scoop-alias.ps1

@@ -25,91 +25,92 @@ param(
 
 . "$psscriptroot\..\lib\core.ps1"
 . "$psscriptroot\..\lib\help.ps1"
-. "$psscriptroot\..\lib\config.ps1"
 . "$psscriptroot\..\lib\install.ps1"
 
 $script:config_alias = "alias"
 
 function init_alias_config {
-  $aliases = get_config $script:config_alias
-  if(!$aliases) {
-    $aliases = @{}
-  }
+    $aliases = get_config $script:config_alias
+    if(!$aliases) {
+        $aliases = @{}
+    }
 
-  $aliases
+    return $aliases
 }
 
 function add_alias($name, $command) {
-  if(!$command) {
-    abort "Can't create an empty alias."
-  }
+    if(!$command) {
+        abort "Can't create an empty alias."
+    }
 
-  # get current aliases from config
-  $aliases = init_alias_config
-  if($aliases.containskey($name)) {
-    abort "Alias $name already exists."
-  }
+    # get current aliases from config
+    $aliases = init_alias_config
+    if($aliases.$name) {
+        abort "Alias $name already exists."
+    }
 
-  $alias_file = "scoop-$name"
+    $alias_file = "scoop-$name"
 
-  # generate script
-  $shimdir = shimdir $false
-  $script =
+    # generate script
+    $shimdir = shimdir $false
+    $script =
 @"
 # Summary: $description
 $command
 "@
-  $script | out-file "$shimdir\$alias_file.ps1" -encoding utf8
+    $script | out-file "$shimdir\$alias_file.ps1" -encoding utf8
 
-  # add alias to config
-  $aliases += @{ $name = $alias_file }
-  set_config $script:config_alias $aliases
+    # add alias to config
+    $aliases | Add-Member -MemberType NoteProperty -Name $name -Value $alias_file
+
+    set_config $script:config_alias $aliases | Out-Null
 }
 
 function rm_alias($name) {
-  $aliases = init_alias_config
-  if(!$name) {
-    abort "Which alias should be removed?"
-  }
+    $aliases = init_alias_config
+    if(!$name) {
+        abort "Which alias should be removed?"
+    }
 
-  if($aliases.containskey($name)) {
-    "Removing alias $name..."
+    if($aliases.$name) {
+        "Removing alias $name..."
 
-    rm_shim $aliases.get_item($name) (shimdir $false)
+        rm_shim $aliases.$name (shimdir $false)
 
-    $aliases.remove($name)
-    set_config $script:config_alias $aliases
-  }
-  else { abort "Alias $name doesn't exist." }
+        $aliases.PSObject.Properties.Remove($name)
+        set_config $script:config_alias $aliases | Out-Null
+    } else {
+        abort "Alias $name doesn't exist."
+    }
 }
 
 function list_aliases {
-  $aliases = @()
-
-  (init_alias_config).GetEnumerator() | ForEach-Object {
-    $content = Get-Content (command_path $_.name)
-    $command = ($content | Select-Object -Skip 1).Trim()
-    $summary = (summary $content).Trim()
-
-    $aliases += New-Object psobject -Property @{Name=$_.name; Summary=$summary; Command=$command}
-  }
-
-  if(!$aliases.count) {
-    warn "No aliases founds."
-  }
-  $aliases = $aliases.GetEnumerator() | Sort-Object Name
-  if($verbose) {
-    return $aliases | Select-Object Name, Command, Summary | Format-Table -autosize -wrap
-  } else {
-    return $aliases | Select-Object Name, Command | Format-Table -autosize -hidetablehead -wrap
-  }
+    $aliases = @()
+
+    (init_alias_config).PSObject.Properties.GetEnumerator() | ForEach-Object {
+        $content = Get-Content (command_path $_.Name)
+        $command = ($content | Select-Object -Skip 1).Trim()
+        $summary = (summary $content).Trim()
+
+        $aliases += New-Object psobject -Property @{Name=$_.name; Summary=$summary; Command=$command}
+    }
+
+    if(!$aliases.count) {
+        warn "No aliases founds."
+    }
+    $aliases = $aliases.GetEnumerator() | Sort-Object Name
+    if($verbose) {
+        return $aliases | Select-Object Name, Command, Summary | Format-Table -autosize -wrap
+    } else {
+        return $aliases | Select-Object Name, Command | Format-Table -autosize -hidetablehead -wrap
+    }
 }
 
 switch($opt) {
-  "add" { add_alias $name $command }
-  "rm" { rm_alias $name }
-  "list" { list_aliases }
-  default { my_usage; exit 1 }
+    "add" { add_alias $name $command }
+    "rm" { rm_alias $name }
+    "list" { list_aliases }
+    default { my_usage; exit 1 }
 }
 
 exit 0