release: 0.0.2

anatolystansler · web-flow · commit 22394d74443e · 2017-12-06T18:51:21.000+03:00
release: 0.0.2
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at https://www.contributor-covenant.org/version/1/0/0/code-of-conduct.html
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,53 @@
+# Contribution
+
+We welcome contributions to [Sourcerer App](https://github.com/sourcerer-io/sourcerer-app) by the community.
+
+See [README](https://github.com/sourcerer-io/sourcerer-app) for more information about prerequirements and building project.
+
+## How to report a problem
+
+Please search before creating a new issue. Feel free to add issues related to the app or [sourcerer](https://sourcerer.io) site.
+
+## Submitting сhanges
+
+* Open a new issue in the [issue tracker](https://github.com/sourcerer-io/sourcerer-app/issues).
+* Fork and clone the repo with `git clone https://github.com/your-username/sourcerer-app.git`.
+* Create a new branch based off the `develop` branch.
+* Make changes.
+* Make sure all tests pass.
+* Submit a pull request, referencing any issues it addresses.
+
+We will review your Pull Request as soon as possible. Thank you for contributing!
+
+## Integration testing
+
+We will work on a special environment for contributors in the nearest future. For now one should use his personal or additional account on site.
+
+## Style guides
+### Commit messages
+
+Format:
+```type(component): message (jira issue tag, github issue number with #)```
+
+Message types:
+* **feat** is used when new feature is provided;
+* **wip** is used when making regular commit and changes don't match any other types;
+* **fix** is used when you fix a bug;
+* **chore** is used when changes are about organization, not about logic;
+* **docs** is used when you add/change documentation.
+Component is a decomposition unit your commit affected. Write message in present simple.
+
+Examples:
+feat(logger): add rotating
+chore: remove redundant commas, add copyright
+wip: pass models to routers
+fix: program exit is prevented when button is pressed (COMP-1, #123)
+
+### Kotlin style guide
+* Code has a column limit of 80 characters.
+* Inline comments should be indented with 2 spaces from code.
+
+We are using [Kotlin Coding Conventions](https://kotlinlang.org/docs/reference/coding-conventions.html).
+
+## Code of conduct
+We value input from each member of the community, however we urge you to abide by [code of conduct](https://github.com/sourcerer-io/sourcerer-app/blob/master/CODE_OF_CONDUCT.md).
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,7 @@
+Copyright 2017 Sourcerer, Inc. https://sourcerer.io
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Prerequirements
 
 * Sourcerer alpha/beta access
 * Linux or macOS
-* Java Platform ([JRE](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) for Linux or [JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) for macOS)
+* Java 8+ Platform ([JRE](http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html) for Linux or [JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) for macOS)
 * Git repositories with master branch with at least one commit
 
 Install/uninstall
@@ -26,7 +26,7 @@ Install/uninstall
 To install sourcerer run the following command:
 
 ```
-curl -s https://sourcerer.io/install | bash
+curl -s https://sourcerer.io/app/install | bash
 ```
 
 To remove sourcerer from your machine:
@@ -53,3 +53,8 @@ $ gradle build -Penv=production
 # Run the app
 $ java -jar build/libs/sourcerer-app.jar
 ```
+
+Contribution
+============
+
+We welcome contributions to Sourcerer App by the community. Check the [Contribution guide](https://github.com/sourcerer-io/sourcerer-app/blob/master/CONTRIBUTING.md)) for more information.
diff --git a/build.gradle b/build.gradle
@@ -36,10 +36,11 @@ buildConfig {
     buildConfigField 'String', 'PROFILE_URL', 'https://sourcerer.io/'
 
     // App version.
-    buildConfigField 'int', 'VERSION_CODE', '1'
-    buildConfigField 'String', 'VERSION', '0.0.1'
+    buildConfigField 'int', 'VERSION_CODE', '2'
+    buildConfigField 'String', 'VERSION', '0.0.2'
 
     // Logging.
+    buildConfigField 'String', 'ENV', project.hasProperty('env') ? env : 'production'
     buildConfigField 'String', 'LOG_LEVEL', project.hasProperty('log') ? log : 'info'
 
     // Google Analytics.
diff --git a/deploy/sourcerer-app.yaml b/deploy/sourcerer-app.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 kind: Service
 metadata:
   name: sourcerer-app
diff --git a/do.sh b/do.sh
@@ -47,7 +47,7 @@ build_jar_inside() {
   else
     API="https://sourcerer.io/api/commit"
   fi
-  gradle -Plog=$LOG -Papi=$API build
+  gradle -Penv=$NAMESPACE -Plog=$LOG -Papi=$API build
 }
 
 build_jar() {
diff --git a/src/install/install b/src/install/install
@@ -1,8 +1,8 @@
 # Copyright 2017 Sourcerer, Inc. All Rights Reserved.
-#
+# License: MIT, https://github.com/sourcerer-io/sourcerer-app/blob/master/LICENSE.md
+# Source code: https://github.com/sourcerer-io
 
 echo "Installing sourcerer app.."
-
 SERVER=$SERVER_EXT
 DOWNLOAD_URL=$SERVER/app/download
 SCRIPT_DIR=$HOME/.sourcerer
@@ -21,6 +21,9 @@ mkdir -p $JAR_DIR
 curl -s $DOWNLOAD_URL > $JAR_DIR/sourcerer.jar
 
 cat <<EOF > $SCRIPT_DIR/sourcerer
+# Copyright 2017 Sourcerer, Inc. All Rights Reserved.
+# License: MIT, https://github.com/sourcerer-io/sourcerer-app/blob/master/LICENSE.md
+# Source code: https://github.com/sourcerer-io
 
 if [ "\$1" = "--uninstall" ] ; then
   read -p "The script will uninstall sourcerer app. Proceed? [Y/n] " yesno < /dev/tty
@@ -37,20 +40,31 @@ if [ "\$1" = "--uninstall" ] ; then
   exit
 fi
 
-if ! which java > /dev/null ; then
+VERSION=0
+if which java > /dev/null ; then
+	VERSION_STR=\$(java -version 2>&1 | awk -F '"' '/version/ {print \$2}')
+	if [[ "\$VERSION_STR" > "9." ]]; then  # Format: 9.0.1
+	    VERSION=9
+	elif [[ "\$VERSION_STR" > "1.8." ]]; then  # Format: 1.8.1
+	    VERSION=8
+	else
+	    echo "Installed version of Java is not supported."
+	fi
+fi
+
+if [ \$VERSION = 0 ] ; then
   if [ `uname` = "Darwin" ] ; then
-    echo "Sourcerer requires JDK installed on the system. You can download it from here:"
+    echo "Sourcerer requires JDK 8+ installed on the system. You can download it from:"
     echo "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
   else
-    echo "Sourcerer requires JRE installed on the system. You can download it from here:"
+    echo "Sourcerer requires JRE 8+ installed on the system. You can download it from:"
     echo "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
   fi
   exit 1
 fi
 
 # 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
+if [ \$VERSION = 9 ] ; then
   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 "\$@"
@@ -59,13 +73,14 @@ EOF
 
 chmod +x $SCRIPT_DIR/sourcerer
 
-
 {
   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 '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'
+  echo 'We installed app to ~/.sourcerer/sourcerer.'
+  echo 'You can add it to $PATH or run specified command to finish installation:'
+  echo "sudo ln -s $SCRIPT_DIR/sourcerer /usr/local/bin/sourcerer"
+  echo 'Then run sourcerer to start hashing your repos!'
 }
diff --git a/src/main/kotlin/app/Logger.kt b/src/main/kotlin/app/Logger.kt
@@ -226,6 +226,7 @@ object Logger {
         val javaVendor = System.getProperty("java.vendor", default)
         val javaVersion = System.getProperty("java.version", default)
 
+        sentryContext.addTag("environment", BuildConfig.ENV)
         sentryContext.addTag("log-level", BuildConfig.LOG_LEVEL)
         sentryContext.addTag("version", BuildConfig.VERSION)
         sentryContext.addTag("version-code", BuildConfig.VERSION_CODE
diff --git a/src/main/kotlin/app/extractors/JavascriptExtractor.kt b/src/main/kotlin/app/extractors/JavascriptExtractor.kt
@@ -10,7 +10,7 @@ import app.model.DiffFile
 class JavascriptExtractor : ExtractorInterface {
     companion object {
         val LANGUAGE_NAME = "javascript"
-        val FILE_EXTS = listOf("js")
+        val FILE_EXTS = listOf("js", "jsx")
         val LIBRARIES = ExtractorInterface.getLibraries("js")
         val evaluator by lazy {
             ExtractorInterface.getLibraryClassifier(LANGUAGE_NAME)
diff --git a/src/main/kotlin/app/hashers/CodeLongevity.kt b/src/main/kotlin/app/hashers/CodeLongevity.kt
@@ -10,7 +10,6 @@ import app.model.Author
 import app.model.Repo
 import app.model.Fact
 import app.utils.FileHelper
-import app.utils.RepoHelper
 import io.reactivex.Observable
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.diff.DiffEntry
@@ -23,15 +22,12 @@ import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
 import org.eclipse.jgit.util.io.DisabledOutputStream
 
-import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.ObjectOutputStream
 import java.io.ObjectInputStream
 import java.io.Serializable
-import java.nio.file.Files
-import java.nio.file.Paths
 import java.lang.Exception
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -149,7 +145,7 @@ class CodeLongevity(private val serverRepo: Repo,
     val repo: Repository = git.repository
     val revWalk = RevWalk(repo)
     val head: RevCommit =
-        try { revWalk.parseCommit(repo.resolve(RepoHelper.MASTER_BRANCH)) }
+        try { revWalk.parseCommit(CommitCrawler.getDefaultBranchHead(git)) }
         catch(e: Exception) { throw Exception("No branch") }
 
     val df = DiffFormatter(DisabledOutputStream.INSTANCE)
diff --git a/src/main/kotlin/app/hashers/CommitCrawler.kt b/src/main/kotlin/app/hashers/CommitCrawler.kt
@@ -9,27 +9,69 @@ import app.model.DiffContent
 import app.model.DiffFile
 import app.model.DiffRange
 import app.model.Repo
-import app.utils.RepoHelper
 import io.reactivex.Observable
+import org.apache.commons.codec.digest.DigestUtils
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.diff.DiffEntry
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.diff.RawText
-import org.eclipse.jgit.errors.MissingObjectException
 import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.util.io.DisabledOutputStream
+import java.util.LinkedList
 
 object CommitCrawler {
+    private val MASTER_BRANCH = "refs/heads/master"
+    private val REMOTE_HEAD = "refs/remotes/origin/HEAD"
+
+    fun getDefaultBranchHead(git: Git): ObjectId {
+        val remoteHead = git.branchList()?.repository?.allRefs?.filter {
+            it.key.contains(REMOTE_HEAD)
+        }?.entries?.firstOrNull()?.value?.target?.objectId
+        if (remoteHead != null) {
+            Logger.debug { "Hashing from remote default branch" }
+            return remoteHead
+        }
+        val masterBranch = git.repository.resolve(MASTER_BRANCH)
+        if (masterBranch != null) {
+            Logger.debug { "Hashing from local master branch" }
+            return masterBranch
+        }
+        throw Exception("No remote default or local master branch found")
+    }
+
+    fun fetchRehashesAndEmails(git: Git):
+        Pair<LinkedList<String>, HashSet<String>> {
+        val head: RevCommit = RevWalk(git.repository)
+            .parseCommit(getDefaultBranchHead(git))
+
+        val revWalk = RevWalk(git.repository)
+        revWalk.markStart(head)
+
+        val commitsRehashes = LinkedList<String>()
+        val emails = hashSetOf<String>()
+
+        var commit: RevCommit? = revWalk.next()
+        while (commit != null) {
+            commitsRehashes.add(DigestUtils.sha256Hex(commit.name))
+            emails.add(commit.authorIdent.emailAddress)
+            commit.disposeBody()
+            commit = revWalk.next()
+        }
+        revWalk.dispose()
+
+        return Pair(commitsRehashes, emails)
+    }
+
     fun getObservable(git: Git, repo: Repo,
                       numCommits: Int = 0): Observable<Commit> {
         var curNumCommits = 0
         return Observable
             .create<Commit> { subscriber ->
                 try {
                     val revWalk = RevWalk(git.repository)
-                    val commitId = git.repository.resolve(RepoHelper.MASTER_BRANCH)
+                    val commitId = getDefaultBranchHead(git)
                     revWalk.markStart(revWalk.parseCommit(commitId))
                     for (revCommit in revWalk) {
                         subscriber.onNext(Commit(revCommit))
@@ -79,8 +121,6 @@ object CommitCrawler {
             formatter.setRepository(git.repository)
             formatter.setDetectRenames(true)
             formatter.scan(revCommitOld?.tree, revCommitNew?.tree)
-                // RENAME change type doesn't change file content.
-                .filter { it.changeType != DiffEntry.ChangeType.RENAME }
                 // Skip binary files.
                 .filter {
                     val id = if (it.changeType == DiffEntry.ChangeType.DELETE) {
diff --git a/src/main/kotlin/app/hashers/CommitHasher.kt b/src/main/kotlin/app/hashers/CommitHasher.kt
@@ -36,9 +36,6 @@ class CommitHasher(private val serverRepo: Repo = Repo(),
         val knownCommits = serverRepo.commits.toHashSet()
 
         observable
-            .takeWhile { new ->  // Hash until last known commit.
-                new.rehash != lastKnownCommit?.rehash
-            }
             // Don't hash known to server commits.
             .filter { commit -> !knownCommits.contains(commit) }
             // Hash only commits made by authors with specified emails.
diff --git a/src/main/kotlin/app/hashers/RepoHasher.kt b/src/main/kotlin/app/hashers/RepoHasher.kt
diff --git a/src/main/kotlin/app/ui/EmailState.kt b/src/main/kotlin/app/ui/EmailState.kt
diff --git a/src/main/kotlin/app/utils/Options.kt b/src/main/kotlin/app/utils/Options.kt
diff --git a/src/main/kotlin/app/utils/RepoHelper.kt b/src/main/kotlin/app/utils/RepoHelper.kt
diff --git a/src/test/kotlin/test/tests/hashers/CommitHasherTest.kt b/src/test/kotlin/test/tests/hashers/CommitHasherTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+apiVersion: v1`
`1`	`2`	`kind: Service`
`2`	`3`	`metadata:`
`3`	`4`	`name: sourcerer-app`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ build_jar_inside() {`
`47`	`47`	`else`
`48`	`48`	`API="https://sourcerer.io/api/commit"`
`49`	`49`	`fi`
`50`		`- gradle -Plog=$LOG -Papi=$API build`
	`50`	`+ gradle -Penv=$NAMESPACE -Plog=$LOG -Papi=$API build`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`build_jar() {`