Merge branch 'master' into gitparsing

Author: Patrick Thomson

.dockerignore

@@ -0,0 +1 @@
+Dockerfile

.gitmodules

@@ -1,12 +1,3 @@
-[submodule "vendor/hspec-expectations-pretty-diff"]
-	path = vendor/hspec-expectations-pretty-diff
-	url = https://github.com/rewinfrey/hspec-expectations-pretty-diff
 [submodule "vendor/haskell-tree-sitter"]
 	path = vendor/haskell-tree-sitter
 	url = https://github.com/tree-sitter/haskell-tree-sitter.git
-[submodule "vendor/proto3-suite"]
-	path = vendor/proto3-suite
-	url = https://github.com/joshvera/proto3-suite.git
-[submodule "vendor/proto3-wire"]
-	path = vendor/proto3-wire
-	url = https://github.com/joshvera/proto3-wire.git

.hlint.yaml

@@ -39,8 +39,6 @@
     name: Eta reduce
     within:
     - Language.Go.Assignment
-    - Language.MiniPython.Assignment
-    - Language.MiniRuby.Assignment
     - Language.PHP.Assignment
     - Language.Python.Assignment
     - Language.Ruby.Assignment

.travis.yml

@@ -35,3 +35,10 @@ install:
 script:
 - cabal new-build -j semantic-core semantic:exe:semantic
 - cabal new-test semantic:test semantic-core:spec
+- cabal new-run semantic:parse-examples
+
+# Any branch linked with a pull request will be built, as well as the non-PR
+# branches listed below:
+branches:
+  only:
+    - master

CONTRIBUTING.md

@@ -19,7 +19,7 @@ Please note that this project is released with a [Contributor Code of Conduct][c
 0. Create a new branch: `git checkout -b my-branch-name`
 0. Make your change, add tests, and make sure the tests still pass
 0. Push to your fork and [submit a pull request][pr]
-0. Pat your self on the back and wait for your pull request to be reviewed and merged.
+0. Pat yourself on the back and wait for your pull request to be reviewed and merged.
 
 Here are a few things you can do that will increase the likelihood of your pull request being accepted:
 
@@ -28,6 +28,8 @@ Here are a few things you can do that will increase the likelihood of your pull
 - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
 - Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
+Please be aware that contributions to Semantic may multiple cycles of code review—we are grateful for all community involvement, but because Semantic powers real systems, we must maintain a high standard of code quality. For reasons of compatibility with production uses of Semantic within GitHub, we may also reject or require modifications to changes that would affect these systems. We may also reject patches that don't fit with our vision of the project; should this be the case, we will be clear about our rationale.
+
 ## Resources
 
 - [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)

Dockerfile

@@ -0,0 +1,36 @@
+FROM haskell:8.6 as build
+WORKDIR /build
+RUN cabal new-update
+
+# Build our upstream dependencies after copying in only enough to tell cabal
+# what they are.  This will make these layers cache better even as we change the
+# code of semantic itself.
+COPY semantic.cabal .
+COPY cabal.project .
+COPY semantic-core/semantic-core.cabal ./semantic-core/
+COPY vendor ./vendor
+RUN cabal new-build --only-dependencies
+
+# Once the dependencies are built, copy in the rest of the code and compile
+# semantic itself.
+COPY . /build
+RUN cabal new-build semantic:exe:semantic
+
+# A fake `install` target until we can get `cabal new-install` to work
+RUN cp $(find dist-newstyle -name semantic -type f -perm -u=x) /usr/local/bin/semantic
+
+# Create a fresh image containing only the compiled CLI program, so that the
+# image isn't bulked up by all of the extra build state.
+FROM debian:stretch-slim
+
+RUN apt-get update && \
+  apt-get install -y \
+    libgmp10 \
+    && \
+  apt-get autoremove -y && \
+  apt-get clean -y && \
+  rm -rf /var/lib/apt/lists/*
+
+COPY --from=build /usr/local/bin/semantic /usr/local/bin/semantic
+
+ENTRYPOINT ["/usr/local/bin/semantic"]

README.md

@@ -118,7 +118,7 @@ cabal new-run semantic -- --help
 
 Architecturally, `semantic`:
 1. Reads blobs.
-2. Generates parse trees for those blobs with [tree-sitter][tree-sitter] (an incremental parsing system for programmings tools).
+2. Generates parse trees for those blobs with [tree-sitter][tree-sitter] (an incremental parsing system for programming tools).
 3. Assigns those trees into a generalized representation of syntax.
 4. Performs analysis, computes diffs, or just returns parse trees.
 5. Renders output in one of many supported formats.

cabal.project

@@ -1,3 +1,16 @@
-packages: vendor/* vendor/proto3-suite vendor/haskell-tree-sitter/languages/* semantic.cabal semantic-core/semantic-core.cabal
+packages: vendor/* vendor/haskell-tree-sitter/languages/* . semantic-core
 
-package proto3-suite
+source-repository-package
+  type: git
+  location: https://github.com/joshvera/proto3-suite.git
+  tag: 83f3352f0c7c94ea091e6087f60692eda9991fae
+
+source-repository-package
+  type: git
+  location: https://github.com/joshvera/proto3-wire.git
+  tag: 84664e22f01beb67870368f1f88ada5d0ad01f56
+
+source-repository-package
+  type: git
+  location: https://github.com/rewinfrey/hspec-expectations-pretty-diff
+  tag: 94af5871c24ba319f7f72fefa53c1a4d074c9a29

script/clone-example-repos

@@ -48,10 +48,13 @@ clone_repo "$python_examples/certbot" certbot/certbot bb8222200a8cbd39a3ce9584ce
 ts_examples="$dir/typescript/vendor/tree-sitter-typescript/examples"
 clone_repo "$ts_examples/desktop" desktop/desktop d1324f56d02dd9afca5d2e9da545905a7d41d671
 
+# Java examples are disabled because the assignment code is not yet
+# robust and for reasons of CI celerity.
+
 java_examples="$dir/java/vendor/tree-sitter-java/examples"
-clone_repo "$java_examples/elasticsearch" elastic/elasticsearch 4d62640bf116af7e825d89c7319a39c3f2f325b4
-clone_repo "$java_examples/guava" google/guava e24fddc5fff7fd36d33ea38737b6606a7e476845
-clone_repo "$java_examples/RxJava" ReactiveX/RxJava 8a6bf14fc9a61f7c1c0016ca217be02ca86211d2
+# clone_repo "$java_examples/elasticsearch" elastic/elasticsearch 4d62640bf116af7e825d89c7319a39c3f2f325b4
+# clone_repo "$java_examples/guava" google/guava e24fddc5fff7fd36d33ea38737b6606a7e476845
+# clone_repo "$java_examples/RxJava" ReactiveX/RxJava 8a6bf14fc9a61f7c1c0016ca217be02ca86211d2
 
 clone_repo "$ts_examples/npm" npm/npm ee147fbbca6f2707d3b16f4fa78f4c4606b2d9b1
 

semantic-core/semantic-core.cabal

@@ -35,7 +35,7 @@ library
   -- other-modules:
   -- other-extensions:
   build-depends:       algebraic-graphs            ^>= 0.3
-                     , base                         >= 4.11 && < 5
+                     , base                         >= 4.12 && < 5
                      , containers                  ^>= 0.6
                      , directory                   ^>= 1.3
                      , filepath                    ^>= 1.4