Updated the readme for supporting multiple scripts. Included PSake update.

Author: eswann

README.md

@@ -57,10 +57,23 @@ These settings can be set manually or added to the AppSettings of your applicati
 ## Using the Runtime Manager
 
 ### Running Basic JavaScript
+Grab a runtime manager and use the ExecuteAsync method. 
 
     var manager = new RuntimeManager(new ManagerSettings());  
     await manager.ExecuteAsync("test", "var i = 0; i++;");
 
+### Running Multiple Scripts
+To run multiple scripts, use the ExecuteAsync that accepts an enumerable of scripts.  Scripts will be run in order.  
+Settings will be applied to all scripts in the collection.  Scripts can be actual code, a local file path or a Uri.
+
+    await manager.ExecuteAsync(new List<IncludeScript>
+                {
+                    new IncludeScript {Uri = ".\\TestMainScript.js", ScriptId = "testScript"},
+                    new IncludeScript {Code = "subject.TestString = 'test string3';", ScriptId = "testScript3"},
+                    new IncludeScript {Uri = "https://gist.githubusercontent.com/eswann/62fc90e542f7697263db/raw/026c42ef0043a70a8c3b720e3026ecee9c691a06/gistfile1.txt", ScriptId = "TestScript4"}
+                });
+    
+
 ### Execution Options
 Execution options are the new way of passing options to the ClearScript runtime manager.
 
@@ -101,8 +114,8 @@ Host types allow you to instantiate a .Net type or types in the JavaScript runti
             HostObjects = new List<HostObject> { new HostObject { Name = "subject", Target = subject } }, 
             HostTypes = new List<HostType> { hostType }});
 
-#### Passing in External Scripts
-External scripts can also be run by setting the IncludeScripts property on the ExecutionOptions.  These scripts are 
+#### Passing in Included Scripts
+Included scripts can also be run by setting the IncludeScripts property on the ExecutionOptions.  These scripts are 
 intended to set up reused libraries and will be run before the execution of the main script.  
 
 A script can be set up in a couple of ways:

deploy/extensions/psake.psm1

@@ -87,9 +87,7 @@ function Invoke-Task
                         Assert ((test-path "variable:$variable") -and ((get-variable $variable).Value -ne $null)) ($msgs.required_variable_not_set -f $variable, $taskName)
                     }
 
-                    Exec $task.Action `
-                        -maxRetries               $task.MaxRetries `
-                        -retryTriggerErrorPattern $task.RetryTriggerErrorPattern
+                    & $task.Action
 
                     if ($task.PostAction) {
                         & $task.PostAction
@@ -143,7 +141,7 @@ function Exec
 
     do {
         try {
-            $global:lastexitcode = 0                 
+            $global:lastexitcode = 0
             & $cmd
             if ($lastexitcode -ne 0) {
                 throw ("Exec: " + $errorMessage)
@@ -298,6 +296,7 @@ function Framework {
         [Parameter(Position=0,Mandatory=1)][string]$framework
     )
     $psake.context.Peek().config.framework = $framework
+    ConfigureBuildEnvironment
 }
 
 # .ExternalHelp  psake.psm1-help.xml
@@ -311,16 +310,20 @@ function Invoke-psake {
         [Parameter(Position = 4, Mandatory = 0)][hashtable] $parameters = @{},
         [Parameter(Position = 5, Mandatory = 0)][hashtable] $properties = @{},
         [Parameter(Position = 6, Mandatory = 0)][alias("init")][scriptblock] $initialization = {},
-        [Parameter(Position = 7, Mandatory = 0)][switch] $nologo = $false
+        [Parameter(Position = 7, Mandatory = 0)][switch] $nologo = $false,
+        [Parameter(Position = 8, Mandatory = 0)][switch] $detailedDocs = $false
     )
     try {
         if (-not $nologo) {
-            "psake version {0}`nCopyright (c) 2010 James Kovacs`n" -f $psake.version
+            "psake version {0}`nCopyright (c) 2010-2014 James Kovacs & Contributors`n" -f $psake.version
         }
 
-        # If the default.ps1 file exists and the given "buildfile" isn 't found assume that the given
-        # $buildFile is actually the target Tasks to execute in the default.ps1 script.
-        if ($buildFile -and !(test-path $buildFile -pathType Leaf) -and (test-path $psake.config_default.buildFileName -pathType Leaf)) {
+        if (!$buildFile) {
+          $buildFile = $psake.config_default.buildFileName
+        }
+        elseif (!(test-path $buildFile -pathType Leaf) -and (test-path $psake.config_default.buildFileName -pathType Leaf)) {
+            # If the $config.buildFileName file exists and the given "buildfile" isn 't found assume that the given
+            # $buildFile is actually the target Tasks to execute in the $config.buildFileName script.
             $taskList = $buildFile.Split(', ')
             $buildFile = $psake.config_default.buildFileName
         }
@@ -349,12 +352,12 @@ function Invoke-psake {
 
         LoadConfiguration $psake.build_script_dir
 
-        LoadModules
-
         $stopwatch = [System.Diagnostics.Stopwatch]::StartNew()
 
         set-location $psake.build_script_dir
 
+        LoadModules
+
         $frameworkOldValue = $framework
         . $psake.build_script_file.FullName
 
@@ -372,8 +375,8 @@ function Invoke-psake {
             . $includeFilename
         }
 
-        if ($docs) {
-            WriteDocumentation
+        if ($docs -or $detailedDocs) {
+            WriteDocumentation($detailedDocs)
             CleanupEnvironment
             return
         }
@@ -437,14 +440,14 @@ function Invoke-psake {
         $psake.build_success = $false
 
         # if we are running in a nested scope (i.e. running a psake script from a psake script) then we need to re-throw the exception
-        # so that the parent script will fail otherwise the parent script will report a successful build 
+        # so that the parent script will fail otherwise the parent script will report a successful build
         $inNestedScope = ($psake.context.count -gt 1)
         if ( $inNestedScope ) {
             throw $_
         } else {
-	        if (!$psake.run_by_psake_build_tester) {
-	            WriteColoredOutput $error_message -foregroundcolor Red
-	        }
+            if (!$psake.run_by_psake_build_tester) {
+                WriteColoredOutput $error_message -foregroundcolor Red
+            }
         }
     } finally {
         CleanupEnvironment
@@ -557,6 +560,7 @@ function ConfigureBuildEnvironment {
         throw ($msgs.error_invalid_framework -f $framework)
     }
     $versions = $null
+    $buildToolsVersions = $null
     switch ($versionPart) {
         '1.0' {
             $versions = @('v1.0.3705')
@@ -578,7 +582,7 @@ function ConfigureBuildEnvironment {
         }
         '4.5.1' {
             $versions = @('v4.0.30319')
-            $buildToolsVersions = @('12.0')
+            $buildToolsVersions = @('14.0', '12.0')
         }
         default {
             throw ($msgs.error_unknown_framework -f $versionPart, $framework)
@@ -617,11 +621,16 @@ function ConfigureBuildEnvironment {
             }
         }
     }
+    $frameworkDirs = @()
     if ($buildToolsVersions -ne $null) {
-        $frameworkDirs = @($buildToolsVersions | foreach { (Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\$_" -Name $buildToolsKey).$buildToolsKey })
+        foreach($ver in $buildToolsVersions) {
+            if (Test-Path "HKLM:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\$ver") {
+                $frameworkDirs += (Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\MSBuild\ToolsVersions\$ver" -Name $buildToolsKey).$buildToolsKey
+            }
+        }
     }
     $frameworkDirs = $frameworkDirs + @($versions | foreach { "$env:windir\Microsoft.NET\$bitness\$_\" })
-    
+
     for ($i = 0; $i -lt $frameworkDirs.Count; $i++) {
         $dir = $frameworkDirs[$i]
         if ($dir -Match "\$\(Registry:HKEY_LOCAL_MACHINE(.*?)@(.*)\)") {
@@ -631,7 +640,7 @@ function ConfigureBuildEnvironment {
             $frameworkDirs[$i] = $dir
         }
     }
-    
+
     $frameworkDirs | foreach { Assert (test-path $_ -pathType Container) ($msgs.error_no_framework_install_dir_found -f $_)}
 
     $env:path = ($frameworkDirs -join ";") + ";$env:path"
@@ -738,7 +747,7 @@ function ResolveError
     }
 }
 
-function WriteDocumentation {
+function WriteDocumentation($showDetailed) {
     $currentContext = $psake.context.Peek()
 
     if ($currentContext.tasks.default) {
@@ -747,7 +756,7 @@ function WriteDocumentation {
         $defaultTaskDependencies = @()
     }
 
-    $currentContext.tasks.Keys | foreach-object {
+    $docs = $currentContext.tasks.Keys | foreach-object {
         if ($_ -eq "default") {
             return
         }
@@ -760,33 +769,41 @@ function WriteDocumentation {
             "Depends On" = $task.DependsOn -join ", "
             Default = if ($defaultTaskDependencies -contains $task.Name) { $true }
         }
-    } | sort 'Name' | format-list -property Name,Alias,Description,"Depends On",Default
+    }
+    if ($showDetailed) {
+        $docs | sort 'Name' | format-list -property Name,Alias,Description,"Depends On",Default
+    } else {
+        $docs | sort 'Name' | format-table -autoSize -wrap -property Name,Alias,"Depends On",Default,Description
+    }
+
 }
 
 function WriteTaskTimeSummary($invokePsakeDuration) {
-    "-" * 70
-    "Build Time Report"
-    "-" * 70
-    $list = @()
-    $currentContext = $psake.context.Peek()
-    while ($currentContext.executedTasks.Count -gt 0) {
-        $taskKey = $currentContext.executedTasks.Pop()
-        $task = $currentContext.tasks.$taskKey
-        if ($taskKey -eq "default") {
-            continue
+    if ($psake.context.count -gt 0) {
+        "-" * 70
+        "Build Time Report"
+        "-" * 70
+        $list = @()
+        $currentContext = $psake.context.Peek()
+        while ($currentContext.executedTasks.Count -gt 0) {
+            $taskKey = $currentContext.executedTasks.Pop()
+            $task = $currentContext.tasks.$taskKey
+            if ($taskKey -eq "default") {
+                continue
+            }
+            $list += new-object PSObject -property @{
+                Name = $task.Name;
+                Duration = $task.Duration
+            }
         }
+        [Array]::Reverse($list)
         $list += new-object PSObject -property @{
-            Name = $task.Name;
-            Duration = $task.Duration
+            Name = "Total:";
+            Duration = $invokePsakeDuration
         }
+        # using "out-string | where-object" to filter out the blank line that format-table prepends
+        $list | format-table -autoSize -property Name,Duration | out-string -stream | where-object { $_ }
     }
-    [Array]::Reverse($list)
-    $list += new-object PSObject -property @{
-        Name = "Total:";
-        Duration = $invokePsakeDuration
-    }
-    # using "out-string | where-object" to filter out the blank line that format-table prepends
-    $list | format-table -autoSize -property Name,Duration | out-string -stream | where-object { $_ }
 }
 
 DATA msgs {
@@ -821,7 +838,7 @@ convertfrom-stringdata @'
 import-localizeddata -bindingvariable msgs -erroraction silentlycontinue
 
 $script:psake = @{}
-$psake.version = "4.3.1" # contains the current version of psake
+$psake.version = "4.4.1" # contains the current version of psake
 $psake.context = new-object system.collections.stack # holds onto the current state of all variables
 $psake.run_by_psake_build_tester = $false # indicates that build is being run by psake-BuildTester
 $psake.config_default = new-object psobject -property @{
@@ -840,4 +857,4 @@ $psake.build_script_dir = "" # contains a string with fully-qualified path to cu
 
 LoadConfiguration
 
-export-modulemember -function Invoke-psake, Invoke-Task, Task, Properties, Include, FormatTaskName, TaskSetup, TaskTearDown, Framework, Assert, Exec -variable psake
+export-modulemember -function Invoke-psake, Invoke-Task, Task, Properties, Include, FormatTaskName, TaskSetup, TaskTearDown, Framework, Assert, Exec -variable psake