From 3dadfbdf338af0e72eefada7bbcb997b62a3798e Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 13 Aug 2018 01:22:04 +0800
Subject: cleanup root dir

---
 build.sc      |  2 +-
 ci/upload.sc  | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ci/version.sc | 37 +++++++++++++++++++++++++++++++++++++
 docs/build.sc |  2 +-
 upload.sc     | 52 ----------------------------------------------------
 version.sc    | 37 -------------------------------------
 6 files changed, 91 insertions(+), 91 deletions(-)
 create mode 100644 ci/upload.sc
 create mode 100644 ci/version.sc
 delete mode 100644 upload.sc
 delete mode 100644 version.sc

diff --git a/build.sc b/build.sc
index ae4f097..7e5631f 100644
--- a/build.sc
+++ b/build.sc
@@ -1,6 +1,6 @@
 import mill._, scalalib._
 import ammonite.ops._, ujson.Js
-import $file.upload, $file.version
+import $file.ci.upload, $file.ci.version
 import $file.example.compress.build
 import $file.example.compress2.build
 import $file.example.compress3.build
diff --git a/ci/upload.sc b/ci/upload.sc
new file mode 100644
index 0000000..6c47295
--- /dev/null
+++ b/ci/upload.sc
@@ -0,0 +1,52 @@
+#!/usr/bin/env amm
+import ammonite.ops._
+import scalaj.http._
+
+@main
+def shorten(longUrl: String) = {
+  println("shorten longUrl " + longUrl)
+  val shortUrl = Http("https://git.io")
+    .postForm(Seq("url" -> longUrl))
+    .asString
+    .headers("Location")
+    .head
+  println("shorten shortUrl " + shortUrl)
+  shortUrl
+}
+@main
+def apply(uploadedFile: Path,
+          tagName: String,
+          uploadName: String,
+          authKey: String): String = {
+  val body = Http("https://api.github.com/repos/lihaoyi/cask/releases/tags/" + tagName)
+    .header("Authorization", "token " + authKey)
+    .asString.body
+
+  val parsed = ujson.read(body)
+
+  println(body)
+
+  val snapshotReleaseId = parsed("id").num.toInt
+
+
+  val uploadUrl =
+    s"https://uploads.github.com/repos/lihaoyi/cask/releases/" +
+      s"$snapshotReleaseId/assets?name=$uploadName"
+
+  val res = Http(uploadUrl)
+    .header("Content-Type", "application/octet-stream")
+    .header("Authorization", "token " + authKey)
+    .timeout(connTimeoutMs = 5000, readTimeoutMs = 60000)
+    .postData(read.bytes! uploadedFile)
+    .asString
+
+  println(res.body)
+  val longUrl = ujson.read(res.body)("browser_download_url").str.toString
+
+  println("Long Url " + longUrl)
+
+  val shortUrl = shorten(longUrl)
+
+  println("Short Url " + shortUrl)
+  shortUrl
+}
diff --git a/ci/version.sc b/ci/version.sc
new file mode 100644
index 0000000..4e73530
--- /dev/null
+++ b/ci/version.sc
@@ -0,0 +1,37 @@
+import ammonite.ops.{%%, pwd}
+
+val isMasterCommit = {
+  sys.env.get("TRAVIS_PULL_REQUEST") == Some("false") &&
+    (sys.env.get("TRAVIS_BRANCH") == Some("master") || sys.env("TRAVIS_TAG") != "")
+}
+
+def gitHead =
+  sys.env.get("TRAVIS_COMMIT").getOrElse(
+    %%('git, "rev-parse", "HEAD")(pwd).out.string.trim()
+  )
+
+
+
+def publishVersion = {
+  val tag =
+    try Option(
+      %%('git, 'describe, "--exact-match", "--tags", "--always", gitHead)(pwd).out.string.trim()
+    )
+    catch{case e => None}
+
+  val dirtySuffix = %%('git, 'diff)(pwd).out.string.trim() match{
+    case "" => ""
+    case s => "-DIRTY" + Integer.toHexString(s.hashCode)
+  }
+
+  tag match{
+    case Some(t) => (t, t)
+    case None =>
+      val latestTaggedVersion = %%('git, 'describe, "--abbrev=0", "--always", "--tags")(pwd).out.trim
+
+      val commitsSinceLastTag =
+        %%('git, "rev-list", gitHead, "--not", latestTaggedVersion, "--count")(pwd).out.trim.toInt
+
+      (latestTaggedVersion, s"$latestTaggedVersion-$commitsSinceLastTag-${gitHead.take(6)}$dirtySuffix")
+  }
+}
diff --git a/docs/build.sc b/docs/build.sc
index 28598dc..012e13c 100644
--- a/docs/build.sc
+++ b/docs/build.sc
@@ -3,7 +3,7 @@ import $ivy.{`org.pegdown:pegdown:1.6.0`, `com.lihaoyi::scalatags:0.6.5`}
 import $file.pageStyles, pageStyles._
 import $file.pages, pages._
 import scalatags.Text.all._
-import $file.^.version
+import $file.^.ci.version
 import ammonite.ops._
 import collection.JavaConverters._
 import org.pegdown.{PegDownProcessor, ToHtmlSerializer, LinkRenderer, Extensions}
diff --git a/upload.sc b/upload.sc
deleted file mode 100644
index 6c47295..0000000
--- a/upload.sc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env amm
-import ammonite.ops._
-import scalaj.http._
-
-@main
-def shorten(longUrl: String) = {
-  println("shorten longUrl " + longUrl)
-  val shortUrl = Http("https://git.io")
-    .postForm(Seq("url" -> longUrl))
-    .asString
-    .headers("Location")
-    .head
-  println("shorten shortUrl " + shortUrl)
-  shortUrl
-}
-@main
-def apply(uploadedFile: Path,
-          tagName: String,
-          uploadName: String,
-          authKey: String): String = {
-  val body = Http("https://api.github.com/repos/lihaoyi/cask/releases/tags/" + tagName)
-    .header("Authorization", "token " + authKey)
-    .asString.body
-
-  val parsed = ujson.read(body)
-
-  println(body)
-
-  val snapshotReleaseId = parsed("id").num.toInt
-
-
-  val uploadUrl =
-    s"https://uploads.github.com/repos/lihaoyi/cask/releases/" +
-      s"$snapshotReleaseId/assets?name=$uploadName"
-
-  val res = Http(uploadUrl)
-    .header("Content-Type", "application/octet-stream")
-    .header("Authorization", "token " + authKey)
-    .timeout(connTimeoutMs = 5000, readTimeoutMs = 60000)
-    .postData(read.bytes! uploadedFile)
-    .asString
-
-  println(res.body)
-  val longUrl = ujson.read(res.body)("browser_download_url").str.toString
-
-  println("Long Url " + longUrl)
-
-  val shortUrl = shorten(longUrl)
-
-  println("Short Url " + shortUrl)
-  shortUrl
-}
diff --git a/version.sc b/version.sc
deleted file mode 100644
index 4e73530..0000000
--- a/version.sc
+++ /dev/null
@@ -1,37 +0,0 @@
-import ammonite.ops.{%%, pwd}
-
-val isMasterCommit = {
-  sys.env.get("TRAVIS_PULL_REQUEST") == Some("false") &&
-    (sys.env.get("TRAVIS_BRANCH") == Some("master") || sys.env("TRAVIS_TAG") != "")
-}
-
-def gitHead =
-  sys.env.get("TRAVIS_COMMIT").getOrElse(
-    %%('git, "rev-parse", "HEAD")(pwd).out.string.trim()
-  )
-
-
-
-def publishVersion = {
-  val tag =
-    try Option(
-      %%('git, 'describe, "--exact-match", "--tags", "--always", gitHead)(pwd).out.string.trim()
-    )
-    catch{case e => None}
-
-  val dirtySuffix = %%('git, 'diff)(pwd).out.string.trim() match{
-    case "" => ""
-    case s => "-DIRTY" + Integer.toHexString(s.hashCode)
-  }
-
-  tag match{
-    case Some(t) => (t, t)
-    case None =>
-      val latestTaggedVersion = %%('git, 'describe, "--abbrev=0", "--always", "--tags")(pwd).out.trim
-
-      val commitsSinceLastTag =
-        %%('git, "rev-list", gitHead, "--not", latestTaggedVersion, "--count")(pwd).out.trim.toInt
-
-      (latestTaggedVersion, s"$latestTaggedVersion-$commitsSinceLastTag-${gitHead.take(6)}$dirtySuffix")
-  }
-}
-- 
cgit v1.2.3