Create installer demo - references #1251

fsprojects · Nov 23, 2015 · 74d86aa · 74d86aa
1 parent 221d14d
commit 74d86aa
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 2.27.8 - 23.11.2015
+#### 2.27.9 - 23.11.2015
 * Create installer demo - https://github.com/fsprojects/Paket/issues/1251
 
 #### 2.27.7 - 23.11.2015

diff --git a/integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs b/integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs
@@ -13,11 +13,12 @@ open Paket.Domain
 
 [<Test>]
 let ``#1251 full installer demoe``() = 
+    prepare "i001251-installer-demo"
     let deps = """source https://nuget.org/api/v2
     nuget FAKE
     nuget FSharp.Formatting"""
 
-    let dependenciesFile = DependenciesFile.FromCode deps
+    let dependenciesFile = DependenciesFile.FromCode(scenarioTempPath "i001251-installer-demo",deps)
     let force = false
     let packagesToInstall = 
         // get from references file

diff --git a/integrationtests/Paket.IntegrationTests/TestHelper.fs b/integrationtests/Paket.IntegrationTests/TestHelper.fs
@@ -14,7 +14,7 @@ let integrationTestPath = FullName(__SOURCE_DIRECTORY__ + "../../../integrationt
 let scenarioTempPath scenario = Path.Combine(integrationTestPath,scenario,"temp")
 let originalScenarioPath scenario = Path.Combine(integrationTestPath,scenario,"before")
 
-let paket command scenario =
+let prepare scenario =
     let originalScenarioPath = originalScenarioPath scenario
     let scenarioPath = scenarioTempPath scenario
     CleanDir scenarioPath
@@ -26,6 +26,11 @@ let paket command scenario =
     Directory.GetFiles(scenarioPath, "*.templatetemplate", SearchOption.AllDirectories)
     |> Seq.iter (fun f -> File.Move(f, Path.ChangeExtension(f, "template")))
 
+let paket command scenario =
+    let originalScenarioPath = originalScenarioPath scenario
+    let scenarioPath = scenarioTempPath scenario
+    prepare scenario
+
     let result =
         ExecProcessAndReturnMessages (fun info ->
           info.FileName <- paketToolPath

diff --git a/integrationtests/scenarios/i001251-installer-demo/before/paket.lock b/integrationtests/scenarios/i001251-installer-demo/before/paket.lock
@@ -0,0 +1,4 @@
+NUGET
+  remote: https://nuget.org/api/v2
+  specs:
+    FAKE (>= 4.9.3)
diff --git a/src/Paket.Core/DependenciesFile.fs b/src/Paket.Core/DependenciesFile.fs
@@ -714,6 +714,9 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
         File.WriteAllText(fileName, this.ToString())
         tracefn "Dependencies files saved to %s" fileName
 
+    static member FromCode(rootPath,code:string) : DependenciesFile = 
+        DependenciesFile(DependenciesFileParser.parseDependenciesFile (Path.Combine(rootPath,Constants.DependenciesFileName)) <| code.Replace("\r\n","\n").Replace("\r","\n").Split('\n'))
+
     static member FromCode(code:string) : DependenciesFile = 
         DependenciesFile(DependenciesFileParser.parseDependenciesFile "" <| code.Replace("\r\n","\n").Replace("\r","\n").Split('\n'))