Merge pull request #1 from pjf/im_in_ur_pr83_changin_ur_files

Fixups for PR #83

.gitignore

@@ -3,6 +3,7 @@ CKAN/*/bin
 CKAN/*/obj
 test-results
 *.userprefs
+*.csproj.user
 TestResult.xml
 StyleCop.Cache
 ckan.exe

CKAN/CKAN/ModuleInstaller.cs

@@ -325,12 +325,12 @@ void InstallComponent (dynamic stanza, ZipFile zipfile, Dictionary<string, Insta
             else if (stanza.install_to == "Tutorial")
             {
                 installDir = Path.Combine(Path.Combine(KSP.GameDir(), "saves"), "training");
-                makeDirs = false;
+                makeDirs = true;
             }
             else if (stanza.install_to == "GameRoot")
             {
                 installDir = KSP.GameDir();
-                makeDirs = true;
+                makeDirs = false;
             } else {
                 // What is the best exception to use here??
                 throw new Exception("Unknown install location: " + stanza.install_to);
@@ -514,4 +514,4 @@ public ModuleNotFoundException (string mod, string ver = null) {
             version = ver;
         }
     }
-}
+}

CKAN/CKAN/Registry.cs

@@ -180,8 +180,7 @@ public CkanModule LatestAvailable(string module, KSPVersion ksp_version = null)
                 return available_modules[module].Latest(ksp_version);
             }
             catch (KeyNotFoundException) {
-                return null;
-//                throw new ModuleNotFoundException(module);
+                throw new ModuleNotFoundException(module);
             }
         }
 
@@ -252,4 +251,4 @@ public bool IsInstalled(string modName) {
             return true;
         }
     }
-}
+}

CKAN/CKAN/RelationshipResolver.cs

@@ -10,6 +10,9 @@ public struct RelationshipResolverOptions {
         public bool with_all_suggests;
     }
 
+	// Alas, it appears that structs cannot have defaults. Try
+	// DefaultOpts() to get friendly defaults.
+
     public class RelationshipResolver {
 
         // A list of all the mods we're going to install.
@@ -49,6 +52,19 @@ public RelationshipResolver (List<string> modules, RelationshipResolverOptions o
 
         }
 
+		/// <summary>
+		/// Returns the default options for relationship resolution.
+		/// </summary>
+		public static RelationshipResolverOptions DefaultOpts()
+		{
+			var opts = new RelationshipResolverOptions ();
+			opts.with_recommends = true;
+			opts.with_suggests = false;
+			opts.with_all_suggests = false;
+
+			return opts;
+		}
+
         // Resolve all relationships for a module.
         // May recurse to ResolveStanza.
         private void Resolve(CkanModule module, RelationshipResolverOptions options) {

CKAN/CKAN/Types/Version.cs

@@ -20,9 +20,9 @@ struct Comparison {
             public string remainder1;
             public string remainder2;
         }
-        
+
         public Version (string version_string) {
-             orig_string = version_string;
+            orig_string = version_string;
 
             // TODO: Can we get rid of $1 here? Does C# support (?:syntax)?
             Match match = Regex.Match (version_string, "^(([0-9]+):)?(.*)$");

CKAN/CmdLine/Main.cs

@@ -222,7 +222,7 @@ static int Upgrade(UpgradeOptions options)
                 if (options.modules.Count == 0)
                 {
                     // What? No files specified?
-                    User.WriteLine("Usage: ckan install [--with-suggests] [--with-all-suggests] [--no-recommends] Mod [Mod2, ...]");
+                    User.WriteLine("Usage: ckan upgrade [--with-suggests] [--with-all-suggests] [--no-recommends] Mod [Mod2, ...]");
                     return EXIT_BADOPT;
                 }
 

CKAN/GUI/ApplyChangesDialog.cs

@@ -58,10 +58,7 @@ private void CancelButton_Click(object sender, EventArgs e)
 
         private void ConfirmButton_Click(object sender, EventArgs e)
         {
-            var install_ops = new RelationshipResolverOptions();
-            install_ops.with_all_suggests =   false;
-            install_ops.with_suggests = false;
-            install_ops.with_recommends = false;
+            RelationshipResolverOptions install_ops = RelationshipResolver.DefaultOpts();
 
             m_InstallWorker.RunWorkerAsync(new KeyValuePair<List<KeyValuePair<CkanModule, GUIModChangeType>>, RelationshipResolverOptions>(m_Changeset, install_ops));
             m_InstallWorker = null;

CKAN/GUI/MainModList.cs

@@ -46,10 +46,7 @@ private List<KeyValuePair<CkanModule, GUIModChangeType>> ComputeChangeSetFromMod
                 }
             }
 
-            RelationshipResolverOptions options = new RelationshipResolverOptions();
-            options.with_all_suggests = false;
-            options.with_recommends = false;
-            options.with_suggests = false;
+            RelationshipResolverOptions options = RelationshipResolver.DefaultOpts();
 
             RelationshipResolver resolver = null;
             try

Spec.md

@@ -237,7 +237,7 @@ mandatory directives:
   Valid values for this entry are `GameData`, `Ships`, `Tutorial`,
   and `GameRoot` (which should be used sparingly, if at all).
   Paths will be preserved, but directories will *only*
-  be created when installing to `GameData`.
+  be created when installing to `GameData` or `Tutorial`.
 
 An install directive may also include the following optional fields: