Rename path to directory

corral/cmd/cmd_add.pony

@@ -19,7 +19,7 @@ primitive CmdAdd
       "\nadd: adding: " + dd.locator.string() + " "
         + dd.version.string() + " " + ld.revision.string())
 
-    match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+    match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
       try
         bundle.add_dep(dd, ld)

corral/cmd/cmd_clean.pony

@@ -7,7 +7,7 @@ primitive CmdClean
   fun apply(ctx: Context, cmd: Command) =>
     //ctx.log.info("clean: " + cmd.string())
 
-    match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+    match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
       try
         let repos_dir = ctx.repo_cache

corral/cmd/cmd_fetch.pony

@@ -10,7 +10,7 @@ class CmdFetch
   new create(ctx': Context, cmd: Command) =>
     ctx = ctx'
     ctx.env.out.print("\nfetch:")
-    match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+    match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
       fetch_bundle_deps(bundle, bundle)
     | let err: Error =>

corral/cmd/cmd_info.pony

@@ -5,7 +5,10 @@ use "../util"
 
 primitive CmdInfo
   fun apply(ctx: Context, cmd: Command) =>
-    match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+    //ctx.log.info("info: " + cmd.string())
+    ctx.env.out.print("\ninfo: from dir " + ctx.directory)
+
+    match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
       ctx.env.out.print(
         "  information from " + Files.bundle_filename()

corral/cmd/cmd_init.pony

@@ -5,10 +5,11 @@ use "../util"
 
 primitive CmdInit
   fun apply(ctx: Context, cmd: Command) =>
-    ctx.env.out.print("\ninit: from dir " + ctx.path)
+    //ctx.log.info("init: " + cmd.string())
+    ctx.env.out.print("\ninit: from dir " + ctx.directory)
 
     // TODO: try to read first to convert/update existing file(s)
-    match BundleFile.create_bundle(ctx.env, ctx.path, ctx.log)
+    match BundleFile.create_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
       try
         bundle.save()?

corral/cmd/cmd_list.pony

@@ -5,9 +5,10 @@ use "../util"
 
 primitive CmdList
   fun apply(ctx: Context, cmd: Command) =>
-    ctx.env.out.print("\nlist: from dir " + ctx.path)
+    //ctx.log.info("list: " + cmd.string())
+    ctx.env.out.print("\nlist: from dir " + ctx.directory)
 
-    match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+    match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
 
       ctx.env.out.print(

corral/cmd/cmd_remove.pony

@@ -4,9 +4,10 @@ use "../util"
 
 primitive CmdRemove
   fun apply(ctx: Context, cmd: Command) =>
+    //ctx.log.info("remove: " + cmd.string())
     ctx.env.out.print("\nremove: removing: TODO")
 
-    match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+    match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
     | let bundle: Bundle =>
       try
         // TODO: lookup dep

corral/cmd/cmd_run.pony

@@ -8,6 +8,7 @@ class CmdRun
 
   new create(ctx': Context, cmd: Command) =>
     ctx = ctx'
+    //ctx.log.info("run: " + cmd.string())
 
     let argss = cmd.arg("args").string_seq()
     let args = recover val Array[String].create() .> append(argss) end
@@ -16,7 +17,7 @@ class CmdRun
 
     // Build a : separated path from bundle roots.
     let ponypath = recover val
-      match BundleFile.load_bundle(ctx.env, ctx.path, ctx.log)
+      match BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log)
       | let bundle: Bundle =>
         var ponypath' = recover trn String end
         let iter = bundle.bundle_roots().values()

corral/cmd/cmd_update.pony

@@ -14,7 +14,7 @@ primitive CmdUpdate
 
     ctx.env.out.print("\nupdate:")
 
-    match recover BundleFile.load_bundle(ctx.env, ctx.path, ctx.log) end
+    match recover BundleFile.load_bundle(ctx.env, ctx.directory, ctx.log) end
     | let bundle: Bundle iso =>
       _Updater(ctx).update_bundle_deps(consume bundle)
     | let err: Error =>

corral/cmd/context.pony

@@ -6,22 +6,22 @@ class val Context
   Contains options and environment for all commands.
   """
   let env: Env
-  let path: String
   let log: Log
   let quiet: Bool
   let nothing: Bool
+  let directory: String
   let repo_cache: FilePath
   let corral_base: FilePath
 
   new val create(env': Env,
-    path': String,
+    directory': String,
     log': Log,
     quiet': Bool, nothing': Bool, repo_cache': String, corral_base': String) ?
   =>
     env = env'
-    path = path'
     log = log'
     quiet = quiet'
     nothing = nothing'
+    directory = directory'    
     repo_cache = FilePath(env.root as AmbientAuth, repo_cache')?
     corral_base = FilePath(env.root as AmbientAuth, corral_base')?

corral/main.pony

@@ -43,7 +43,7 @@ actor Main
               + " skeletal information.",
             [
               OptionSpec.string(
-                "path",
+                "directory",
                 "The path where corral.json and dep-lock.json will be created."
                 where short' = 'p',
                 default' = "")
@@ -55,8 +55,8 @@ actor Main
               + " corral.json.",
             [
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ])?
@@ -75,8 +75,8 @@ actor Main
                 where short' = 'r',
                 default' = "")
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ],
@@ -88,8 +88,8 @@ actor Main
             "Removes one or more deps from the corral.",
             [
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ])?
@@ -98,8 +98,8 @@ actor Main
             "Lists the deps and packages, including corral details.",
             [
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ]
@@ -120,8 +120,8 @@ actor Main
                 where short' = 'r',
                 default' = false)
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ])?
@@ -131,8 +131,8 @@ actor Main
               + " best revisions.",
             [
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ])?
@@ -141,8 +141,8 @@ actor Main
             "Fetches one or more or all of the deps into the corral.",
             [
               OptionSpec.string(
-                "path",
-                "The path where both corral.json and dep-lock.json lives."
+                "directory",
+                "The path where both corral.json and dep-lock.json live."
                 where short' = 'p',
                 default' = "")
             ])?
@@ -179,17 +179,18 @@ actor Main
     let quiet = cmd.option("quiet").bool()
     let verbose = cmd.option("verbose").bool()
     let nothing = cmd.option("nothing").bool()
-    let path = match cmd.option("path").string()
+    let directory = match cmd.option("directory").string()
     | "" => Path.cwd()
-    | let path': String => Path.clean(path')
+    | let dir': String => Path.clean(dir')
     end
     let repo_cache = "./_repos"  // TODO: move default to user home and add flag
     let corral_base = "./_corral"
     //log.fine("Cmd: " + cmd.string())
 
     try
       let context =
-        recover Context(env, path, log, quiet, nothing, repo_cache, corral_base)? end
+        recover Context(env, directory, log,
+          quiet, nothing,repo_cache, corral_base)? end
 
       match cmd.fullname()
       | "corral/version" => env.out.print("corral " + Info.version())