comparison vext.sml @ 1721:bf8a5ce8fb62 vext

Update vext; providers -> services

     Particular Programs Ltd shall not be used in advertising or
     otherwise to promote the sale, use or other dealings in this
     Software without prior written authorization.
 *)
 
-val vext_version = "0.9.1"
+val vext_version = "0.9.2"
 
 
 datatype vcs =
          HG |
          GIT
 
 datatype source =
-         URL of string |
-         PROVIDER of {
+         URL_SOURCE of string |
+         SERVICE_SOURCE of {
              service : string,
              owner : string option,
              repo : string option
          }
 

                       anon = lookup_optional_string pjson ["anon"],
                       auth = lookup_optional_string pjson ["auth"]
                   }
                 }
             val loaded = 
-                case lookup_optional json ["providers"] of
+                case lookup_optional json ["services"] of
                     NONE => []
                   | SOME (Json.OBJECT pl) => map (fn (k, v) => load v k) pl
-                  | _ => raise Fail "Object expected for providers in config"
+                  | _ => raise Fail "Object expected for services in config"
             val newly_loaded =
                 List.filter (fn p => not (List.exists (fn pp => #service p =
                                                                 #service pp)
                                                       previously_loaded))
                             loaded

             SOME { login, ... } => SOME login
           | NONE => NONE
                                           
     fun remote_url (context : context) vcs source libname =
         case source of
-            URL u => u
-          | PROVIDER { service, owner, repo } =>
+            URL_SOURCE u => u
+          | SERVICE_SOURCE { service, owner, repo } =>
             provider_url { vcs = vcs,
                            service = service,
                            owner = owner,
                            repo = case repo of
                                       SOME r => r

                     "hg" => HG
                   | "git" => GIT
                   | other => raise Fail ("Unknown version-control system \"" ^
                                          other ^ "\""),
           source = case (url, service, owner, repo) of
-                       (SOME u, NONE, _, _) => URL u
+                       (SOME u, NONE, _, _) => URL_SOURCE u
                      | (NONE, SOME ss, owner, repo) =>
-                       PROVIDER { service = ss, owner = owner, repo = repo }
+                       SERVICE_SOURCE { service = ss, owner = owner, repo = repo }
                      | _ => raise Fail ("Must have exactly one of service " ^
                                         "or url string"),
           pin = case lock_pin of
                     SOME p => PINNED p
                   | NONE =>