Merge pull request #73 from sourcerer-io/develop

release: alpha 0.0.1

Author: astansler

.gitignore

@@ -1,10 +1,14 @@
 .DS_Store
 .gradle/
 .idea/
+.sourcerer
 build/
 sourcerer-app.iml
 sourcerer-app.ipr
 sourcerer-app.iws
+app.iml
+app.ipr
+app.iws
 /confluence/target
 /dependencies
 /dist
@@ -16,4 +20,5 @@ sourcerer-app.iws
 /ultimate/dependencies
 /ultimate/ideaSDK
 /ultimate/out
-/ultimate/tmp
+/ultimate/tmp
+tmp_repo

build.gradle

@@ -1,24 +1,22 @@
 // Copyright 2017 Sourcerer Inc. All Rights Reserved.
 
 buildscript {
-    ext.kotlin_version = '1.1.4-2'
+    ext.kotlin_version = '1.1.51'
     repositories {
         mavenCentral()
         jcenter()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.1"
-        classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2"
+        classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.3"
+        classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.1"
     }
 }
 
 plugins {
     id 'de.fuerstenau.buildconfig' version '1.1.8'
 }
 
-
-
 apply plugin: "idea"
 apply plugin: "java"
 apply plugin: "kotlin"
@@ -27,19 +25,11 @@ apply plugin: "com.google.protobuf"
 apply plugin: "org.junit.platform.gradle.plugin"
 
 buildConfig {
-    ext.environment = project.hasProperty('env') &&
-        env == 'production' ? 'prod' : 'dev'
-
     clsName = 'BuildConfig'
     packageName = 'app'
 
     // API.
-    def apiBasePath = 'https://staging.eng.sourcerer.io/api/commit'
-    if (ext.environment == 'prod') {
-        apiBasePath = 'https://sourcerer.io/api/commit'
-    }
-    apiBasePath = project.hasProperty('api') ? api : apiBasePath
-
+    def apiBasePath = project.hasProperty('api') ? api : 'https://sourcerer.io/api/commit'
     buildConfigField 'String', 'API_BASE_PATH', apiBasePath
 
     // Common.
@@ -49,11 +39,21 @@ buildConfig {
     buildConfigField 'int', 'VERSION_CODE', '1'
     buildConfigField 'String', 'VERSION', '0.0.1'
 
+    // Logging.
+    buildConfigField 'String', 'LOG_LEVEL', project.hasProperty('log') ? log : 'info'
+
     // Google Analytics.
     buildConfigField 'String', 'GA_BASE_PATH', 'http://www.google-analytics.com'
     buildConfigField 'String', 'GA_TRACKING_ID', 'UA-107129190-2'
     buildConfigField 'boolean', 'IS_GA_ENABLED', 'true'
 
+    // Logging.
+    buildConfigField 'String', 'SENTRY_DSN', 'https://0263d6473bd24a9ba40e25aa5fb0a242:[email protected]/233260'
+    buildConfigField 'boolean', 'PRINT_STACK_TRACE', 'false'
+
+    // Models storage path.
+    buildConfigField 'String', 'LIBRARY_MODELS_URL', 'https://storage.googleapis.com/sourcerer-app/library-models/v1/'
+
     buildConfig
 }
 
@@ -65,39 +65,49 @@ junitPlatform {
     }
 }
 
+task cleanData {
+    delete 'build/libs/data'
+    delete 'build/kotlin/data'
+}
+
+test.dependsOn cleanData
+
 mainClassName = "app.MainKt"
 
 repositories {
     mavenCentral()
     jcenter()
     maven { url "http://dl.bintray.com/jetbrains/spek" }
+    flatDir {
+        dirs 'libs'
+    }
 }
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "com.beust:jcommander:1.72"
-    compile 'com.google.protobuf:protobuf-java:3.0.0'
-    compile group: 'commons-codec', name: 'commons-codec', version: '1.5'
+    compile 'com.google.protobuf:protobuf-java:3.4.0'
+    compile 'commons-codec:commons-codec:1.5'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.8.9'
     compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9'
     compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.9'
-    compile "io.reactivex.rxjava2:rxjava:2.1.1"
-    compile 'com.github.kittinunf.fuel:fuel:1.9.0'
-    compile 'com.github.kittinunf.fuel:fuel-rxjava:1.9.0'
-    compile group: 'org.eclipse.jgit', name: 'org.eclipse.jgit',
-            version: '4.8.0.201706111038-r'
-    compile "org.slf4j:slf4j-nop:1.7.2"
+    compile 'io.reactivex.rxjava2:rxjava:2.1.6'
+    compile 'com.github.kittinunf.fuel:fuel:1.11.0'
+    compile 'com.github.kittinunf.fuel:fuel-rxjava:1.11.0'
+    compile 'org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r'
+    compile 'org.slf4j:slf4j-nop:1.7.2'
+    compile 'io.sentry:sentry:1.6.0'
 
     testCompile 'org.jetbrains.kotlin:kotlin-test'
-    testCompile 'org.jetbrains.spek:spek-api:1.1.4'
-    testCompile 'org.junit.platform:junit-platform-runner:1.0.0-RC2'
-    testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.4'
+    testCompile 'org.jetbrains.spek:spek-api:1.1.5'
+    testCompile 'org.junit.platform:junit-platform-runner:1.0.1'
+    testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.5'
 }
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:3.0.0"
+        artifact = "com.google.protobuf:protoc:3.4.0"
     }
 }
 

deploy/Jenkinsfile

@@ -1,6 +1,6 @@
 podTemplate(label: 'build-pod-sourcerer-app',
     containers: [
-        containerTemplate(name: 'jnlp', image: 'gcr.io/cloud-solutions-images/jenkins-k8s-slave', args: '${computer.jnlpmac} ${computer.name}'),
+        containerTemplate(name: 'jnlp', image: 'gcr.io/sourcerer-1377/jenkins-slave:v4', args: '${computer.jnlpmac} ${computer.name}'),
         containerTemplate(name: 'gradle', image: 'gcr.io/sourcerer-1377/gradle:4.2.0', ttyEnabled: true, command: 'tail -f /dev/null')
     ],
     envVars: [
@@ -12,11 +12,15 @@ podTemplate(label: 'build-pod-sourcerer-app',
     ]
 ) {
   node('build-pod-sourcerer-app') {
-    def namespace = 'staging'
-    def benv = 'development'
+    def namespace = 'sandbox'
+    def plog = 'debug'
+
     if (env.BRANCH_NAME == 'master') {
-      benv = 'production'
       namespace = 'production'
+      plog = 'info'
+    } else if (env.BRANCH_NAME == 'develop') {
+      namespace = 'staging'
+      plog = 'info'
     }
 
     stage('checkout') {
@@ -25,7 +29,7 @@ podTemplate(label: 'build-pod-sourcerer-app',
 
     stage('build jar and test') {
       container('gradle') {
-        sh("ENV=${benv} ./do.sh build_jar_inside")
+        sh("LOG=${plog} NAMESPACE=${namespace} ./do.sh build_jar_inside")
       }
     }
 

deploy/production_env.sh

@@ -0,0 +1 @@
+export REPLICAS="2"

deploy/sandbox_env.sh

@@ -0,0 +1 @@
+export REPLICAS="1"

deploy/sourcerer-app-staging.yaml

@@ -16,15 +16,15 @@ kind: Deployment
 metadata:
   name: sourcerer-app
 spec:
-  replicas: 2
+  replicas: $REPLICAS
   template:
     metadata:
       labels:
         app: sourcerer-app
     spec:
       containers:
       - name: sourcerer-app
-        image: gcr.io/sourcerer-1377/sourcerer-app:CONTAINER_TAG
+        image: gcr.io/sourcerer-1377/sourcerer-app:$CONTAINER_TAG
         imagePullPolicy: Always
         resources:
           requests:

deploy/sourcerer-app-production.yaml renamed to deploy/sourcerer-app.yaml

@@ -0,0 +1 @@
+export REPLICAS="1"

deploy/staging_env.sh

@@ -4,6 +4,8 @@
 #----- Helpers -----#
 #-------------------#
 
+set -x
+
 usage() {
     echo "$0 [COMMAND] [ARGUMENTS]"
     echo "  Commands:"
@@ -22,8 +24,8 @@ shift
 ARGUMENTS=${@}
 
 TAG="${CONTAINER_TAG:-latest}"
-NAMESPACE="${NAMESPACE:-staging}"
-ENV="${ENV:-development}"
+NAMESPACE="${NAMESPACE:-sandbox}"
+LOG="${LOG:-debug}"
 VOLUME="${BUILD_VOLUME:-$PWD}"
 PROJECT=sourcerer-app
 PORT=3182
@@ -36,12 +38,22 @@ GRADLE_VERSION=4.2.0
 
 # run only inside build container
 build_jar_inside() {
-  gradle -Penv=$ENV build
+  if [ "$NAMESPACE" == "sandbox" ]; then
+    API="https://sandbox.eng.sourcerer.io/api/commit"
+  elif [ "$NAMESPACE" == "staging" ]; then
+    API="https://staging.eng.sourcerer.io/api/commit"
+  elif [ "$NAMESPACE" == "local" ]; then
+    API="http://localhost:3181"
+  else
+    API="https://sourcerer.io/api/commit"
+  fi
+  gradle -Plog=$LOG -Papi=$API build
 }
 
 build_jar() {
-  docker run -i -v $VOLUME:/home/gradle/app --workdir=/home/gradle/app -e ENV=$ENV \
-  gradle:$GRADLE_VERSION \
+  docker run -i -v $VOLUME:/home/gradle/app --workdir=/home/gradle/app \
+    -e LOG=$LOG -e NAMESPACE=$NAMESPACE \
+    gradle:$GRADLE_VERSION \
     ./do.sh build_jar_inside
 }
 
@@ -50,7 +62,8 @@ build_prod_inside() {
 }
 
 deploy() {
-  sed "s#CONTAINER_TAG#$TAG#" ./deploy/sourcerer-app-$NAMESPACE.yaml > /tmp/deploy.yaml
+  source ./deploy/${NAMESPACE}_env.sh
+  envsubst < ./deploy/sourcerer-app.yaml > /tmp/deploy.yaml
   kubectl --namespace=$NAMESPACE apply -f /tmp/deploy.yaml
 }
 

do.sh

@@ -5,8 +5,8 @@ echo "Installing sourcerer app.."
 
 SERVER=$SERVER_EXT
 DOWNLOAD_URL=$SERVER/app/download
-JAR_DIR=/usr/local/lib
-SCRIPT_DIR=/usr/local/bin
+SCRIPT_DIR=$HOME/.sourcerer
+JAR_DIR=$SCRIPT_DIR
 
 if [ -f $SCRIPT_DIR/sourcerer ] ; then
   read -p "Previous version of sourcerer is detected. Reinstall it? [Y/n] " yesno < /dev/tty
@@ -16,6 +16,8 @@ if [ -f $SCRIPT_DIR/sourcerer ] ; then
   fi
 fi
 
+mkdir -p $SCRIPT_DIR
+mkdir -p $JAR_DIR
 curl -s $DOWNLOAD_URL > $JAR_DIR/sourcerer.jar
 
 cat <<EOF > $SCRIPT_DIR/sourcerer
@@ -27,8 +29,9 @@ if [ "\$1" = "--uninstall" ] ; then
     exit
   fi
 
+  rm -f /usr/local/bin/sourcerer
   rm $SCRIPT_DIR/sourcerer
-  rm $JAR_DIR/sourcerer.jar
+  rm -r $JAR_DIR
 
   echo "Done!"
   exit
@@ -45,10 +48,24 @@ if ! which java > /dev/null ; then
   exit 1
 fi
 
-java -jar $JAR_DIR/sourcerer.jar "\$@"
+# Java 9 requires additional parameters.
+version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
+if [[ "$version" > "9." ]]; then  # Version example for Java 9: 9.0.1
+  java --add-modules java.activation --add-opens java.base/java.nio=ALL-UNNAMED -jar $JAR_DIR/sourcerer.jar "\$@"
+else
+  java -jar $JAR_DIR/sourcerer.jar "\$@"
+fi
 EOF
 
 chmod +x $SCRIPT_DIR/sourcerer
 
-echo "Done!"
-echo "Run sourcerer to start hashing your repos!"
+
+{
+  rm -f /usr/local/bin/sourcerer 2> /dev/null &&
+  ln -s $SCRIPT_DIR/sourcerer /usr/local/bin/sourcerer 2> /dev/null &&
+  echo "Done!" &&
+  echo "Run sourcerer to start hashing your repos!"
+} || {
+  echo 'We installed app to $HOME/.sourcerer/sourcerer.'
+  echo 'You can add it to $PATH or ln it to /usr/local/bin'
+}