Merge pull request #262 from gpetiot/dry-run-further

Allow the dry-run mode to continue even after some API call's response were expected by using placeholder values

Author: Guillaume Petiot

CHANGES.md

@@ -18,6 +18,7 @@
   a custom distrib archive file. (#255, @NathanReb)
 - Use int64 for timestamps. (#261, @gpetiot)
 - Define the order of packages (#263, @gpetiot)
+- Allow the dry-run mode to continue even after some API call's response were expected by using placeholder values (#262, @gpetiot)
 
 ### Security
 

lib/github.ml

@@ -18,6 +18,10 @@ module D = struct
   let token = "${token}"
 
   let pr_url = "${pr_url}"
+
+  let download_url = "${download_url}"
+
+  let release_id = 1
 end
 
 module Parse = struct
@@ -181,13 +185,17 @@ let run_with_auth ?(default_body = `Null) ~dry_run ~auth curl_t =
 let curl_create_release ~token ~dry_run version msg user repo =
   github_auth ~dry_run ~user token >>= fun auth ->
   let curl_t = Curl.create_release ~version ~msg ~user ~repo in
-  run_with_auth ~dry_run ~auth curl_t
+  let default_body = `Assoc [ ("id", `Int D.release_id) ] in
+  run_with_auth ~dry_run ~default_body ~auth curl_t
   >>= Github_v3_api.Release_response.release_id
 
 let curl_upload_archive ~token ~dry_run archive user repo release_id =
   let curl_t = Curl.upload_archive ~archive ~user ~repo ~release_id in
   github_auth ~dry_run ~user token >>= fun auth ->
-  run_with_auth ~dry_run ~auth curl_t
+  let default_body =
+    `Assoc [ ("browser_download_url", `String D.download_url) ]
+  in
+  run_with_auth ~dry_run ~default_body ~auth curl_t
   >>= Github_v3_api.Upload_response.browser_download_url
 
 let open_pr ~token ~dry_run ~title ~distrib_user ~user ~branch ~opam_repo body =

tests/bin/no_doc/run.t

@@ -121,7 +121,7 @@ We publish the documentation, calling publish doc explicitely should fail
 
 We do the whole process, calling publish doc implicitely should succeed
 
-    $  yes | dune-release --dry-run
+    $  yes "" | dune-release --dry-run
     [-] Building source archive
     => rmdir _build/whatever-0.1.0.build
     -: exec: git --git-dir .git rev-parse --verify 0.1.0
@@ -204,5 +204,43 @@ We do the whole process, calling publish doc implicitely should succeed
     -: exec: curl --user foo:${token} --location --silent --show-error --config -
          --dump-header - --data
          { "tag_name" : "0.1.0", "body" : "CHANGES:\n\n- Some other feature\n" }
-    dune-release: [ERROR] Could not retrieve release ID from response
-    [3]
+    [+] Succesfully created release with id 1
+    [?] Upload _build/whatever-0.1.0.tbz as release asset? [Y/n]
+    [-] Uploading _build/whatever-0.1.0.tbz as a release asset for 0.1.0 via github's API
+    -: exec: curl --user foo:${token} --location --silent --show-error --config -
+         --dump-header - --header Content-Type:application/x-tar --data-binary
+         @_build/whatever-0.1.0.tbz
+    -: write _build/whatever-0.1.0.url
+    => must exists _build/whatever-0.1.0.tbz
+    [-] Creating opam package description for whatever
+    dune-release: [WARNING] Could not find _build/whatever-0.1.0.url.
+    dune-release: [WARNING] using https://github.com/foo/whatever/releases/download/0.1.0/whatever-0.1.0.tbz for as url.src. Note that it might differ from the one generated by Github
+    [+] Wrote opam package description _build/whatever.0.1.0/opam
+    [-] Creating opam package description for whatever-lib
+    dune-release: [WARNING] Could not find _build/whatever-lib-0.1.0.url.
+    dune-release: [WARNING] using https://github.com/foo/whatever/releases/download/0.1.0/whatever-0.1.0.tbz for as url.src. Note that it might differ from the one generated by Github
+    [+] Wrote opam package description _build/whatever-lib.0.1.0/opam
+    ...
+    [-] Submitting
+    ...
+    => exists _build/whatever.0.1.0
+    => exists _build/whatever-lib.0.1.0
+    [-] Preparing pull request to ocaml/opam-repository
+    ...
+    [-] Fetching https://github.com/ocaml/opam-repository.git#master
+    => exec:
+         git --git-dir .git fetch https://github.com/ocaml/opam-repository.git master
+    => exec: git --git-dir .git rev-parse FETCH_HEAD
+    [-] Checking out a local release-whatever-0.1.0 branch
+    => exec: git --git-dir .git add packages/whatever/whatever.0.1.0
+    => exec: git --git-dir .git add packages/whatever-lib/whatever-lib.0.1.0
+    -: exec:
+    ...
+    -: exec:
+    ...
+    [?] Open PR to ocaml/opam-repository? [Y/n]
+    ...
+    -: exec: curl --user foo:${token} --silent --show-error --config - --dump-header
+         - --data
+    ...
+    -: exec: xdg-open ${pr_url}