feat(ST2.PackageControl): 2.0.1-beta pre-release

- fixes issues with many packages being installed and package control
   completely wigging out
 - fixed bug that prevented "Package Control.sublime-package" from being
   overwritten
 - made Merge-PackageControlSettings fancier to handle named values

core/SublimeHelpers.ps1

@@ -93,7 +93,11 @@ function Install-SublimePackageControl
     [Parameter(Mandatory = $false)]
     [ValidateRange(2,3)]
     [int]
-    $Version = 2
+    $Version = 2,
+
+    [Parameter(Mandatory = $false)]
+    [Switch]
+    $PreRelease = $false
   )
 
   # install package control
@@ -107,12 +111,15 @@ function Install-SublimePackageControl
     2 {
       $packageControl = Join-Path $packagesPath 'Package Control.sublime-package'
 
-      if (!(Test-Path $packageControl))
+      if (Test-Path $packageControl) { Remove-item $packageControl }
+
+      # http://wbond.net/sublime_packages/package_control/installation
+      $packageUrl = 'http://sublime.wbond.net/Package%20Control.sublime-package'
+      if ($PreRelease)
       {
-        # http://wbond.net/sublime_packages/package_control/installation
-        $packageUrl = 'http://sublime.wbond.net/Package%20Control.sublime-package'
-        Get-ChocolateyWebFile -url $packageUrl -fileFullPath $packageControl
+        $packageUrl = 'https://sublime.wbond.net/prerelease/Package%20Control.sublime-package'
       }
+      Get-ChocolateyWebFile -url $packageUrl -fileFullPath $packageControl
     }
 
     3 {
@@ -151,16 +158,31 @@ function Merge-PackageControlSettings
 
   $new = ConvertFrom-Json ([IO.File]::ReadAllText($FilePath))
 
-  # simple arrays
-  'installed_packages', 'repositories' |
+  $simpleArrays = @('installed_packages', 'repositories', 'channels',
+    'auto_upgrade_ignore', 'git_update_command', 'hg_update_command',
+    'dirs_to_ignore', 'files_to_ignore', 'files_to_include',
+    'files_to_ignore_binary', 'files_to_include_binary' )
+  $simpleArrays |
     ? { $new.$_ -ne $null } |
     % { Merge-JsonArray -Name $_ -Destination $existing -Array $new.$_ }
 
-  # maps
-  'package_name_map' |
+  $maps = @('package_name_map')
+  $maps |
     ? { $new.$_ -ne $null } |
     % { Merge-JsonSimpleMap -Name $_ -Destination $existing -SimpleMap $new.$_ }
 
+  $arrayOfMaps = @('certs')
+  $arrayOfMaps |
+    ? { $new.$_ -ne $null } |
+    % { Merge-JsonArrayOfSimpleMap -Name $_ -Destination $existing -Array $new.$_ }
+
+  $excluded = $simpleArrays + $maps + $arrayOfMaps
+  $new.PSObject.Properties |
+    ? { $excluded -inotcontains $_.Name } |
+    % {
+      Merge-JsonNamedValue -Name $_.Name -Destination $existing -Value $_.Value
+    }
+
   $json = $existing | ConvertTo-Json -Depth 10 | ConvertFrom-UnicodeEscaped
   Write-Verbose "Updated settings: `n`n$json`n"
   [IO.File]::WriteAllText($existingPath, $json, [System.Text.Encoding]::ASCII)