Merge pull request #14 from delphi-hub/develop

Develop

Author: bhermann

.gitignore

@@ -1,4 +1,6 @@
 *.class
 *.log
+repos
 project/target
 target
+.idea

.gitmodules

@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 The Delphi Team (represented by Ben Hermann)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

LICENSE

@@ -26,12 +26,26 @@ This source code repository bundles all of Delphi's components and provides an u
 You need a running instance of [ElasticSearch](https://www.elastic.co/downloads/elasticsearch) on your local machine on port 9200.
 
 ### Running Delphi locally
-After you started ElasticSearch, it is simply a matter of typing
+After you started ElasticSearch, you can run delphi by following the below steps
+
+* Cloning the projects. Needs to be done only for the first time.
+```
+sbt clone-all
+```
+* After that, just use run command
+
 ```
 sbt run
 ```
+    
 into your terminal. SBT will compile and start all necessary services to run Delphi.
 
+* Delphi components can be deleted in case all cloned components needs to be deleted using
+
+```
+sbt delete
+```
+    
 ## Components
 
 ### delphi-crawler

README.md

@@ -2,30 +2,82 @@ name := "delphi"
 version := "1.0.0-SNAPSHOT"
 scalaVersion := "2.12.4"
 
+import sys.process._
+import java.io.File
 
 
+lazy val repos = List("delphi-webapi", "delphi-crawler", "delphi-cli", "delphi-management")
+lazy val delphiRepos = "repos"
+
+def cloneAll = Command.command("clone-all") {
+  state =>
+    Process(s"mkdir -p $delphiRepos").!
+    val currDir = System.getProperty("user.dir")
+    for (repo <- repos) {
+      val bash = "/bin/bash"
+      val op = "-c"
+      val clone = s"git clone https://github.com/delphi-hub/$repo"
+      Process(Seq(bash, op, clone), new File(currDir + "/" + delphiRepos)).!
+    }
+    state
+}
+
+
+
+
+
+def delete = Command.command("delete") {
+  state =>
+    val currDir = System.getProperty("user.dir")
+    val cmd = "rm -rf " + currDir + "/" + delphiRepos
+    Process(cmd).!
+    state
+}
+
+
+lazy val currentBranch = taskKey[String]("Get current git branch")
+
+currentBranch := {
+  Process("git rev-parse --abbrev-ref HEAD").!!
+}
+
+
+lazy val pull = taskKey[Unit]("Pull Changes")
+
+pull := {
+  val branch = currentBranch.value
+  for (repo <- repos) {
+    BuildUtils.pull(repo, branch)
+  }
+
+}
+
+Compile / compile := ((Compile / compile) dependsOn pull).value
+
+commands += cloneAll
+commands += delete
 lazy val root = (project in file("."))
-                .aggregate(cli, crawler, management, webapi, webapp)
+  .aggregate(crawler,webapi,cli,management,webapp)
 
 
+lazy val webapi = Project(
+id = "webapi",
+base = file("repos/delphi-webapi"))
+
 lazy val cli = Project(
-    id = "cli",
-    base = file("delphi-cli"))
+  id = "cli",
+  base = file("repos/delphi-cli"))
 
 lazy val crawler = Project(
-        id = "crawler",
-        base = file("delphi-crawler"))
+  id = "crawler",
+  base = file("repos/delphi-crawler"))
 
 lazy val management = Project(
-        id = "management",
-        base = file("delphi-management"))
+  id = "management",
+  base = file("repos/delphi-management"))
 
 lazy val webapp = Project(
-        id = "webapp",
-        base = file("delphi-webapp"))
-
-lazy val webapi = Project(
-        id = "webapi",
-        base = file("delphi-webapi"))
+  id = "webapp",
+  base = file("repos/delphi-webapp"))
 
 addCommandAlias("run", "; all webapi/run crawler/run webapp/run management/run")

build.sbt

@@ -0,0 +1,12 @@
+import sys.process._
+import java.io._
+object BuildUtils {
+  def pull(repo: String, branch: String) = {
+    val bash="/bin/bash"
+    val op="-c"
+    val checkout=s"git checkout $branch"
+    val gitPull="git pull"
+    Process(Seq(bash,op,checkout,gitPull),new File(repo)).!
+  }
+
+}

delphi-cli

@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.1.6

delphi-crawler

@@ -14,4 +14,8 @@ resolvers += "Typesafe Repository" at "https://repo.typesafe.com/typesafe/releas
 
 // coverage
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
-addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.12")
+addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.12")
+
+
+// scalastyle
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")