Merge pull request #10 from codinuum/develop

Develop

Dockerfile

@@ -3,10 +3,11 @@ FROM ubuntu:20.04
 MAINTAINER codinuum
 
 RUN set -x && \
-    useradd -r -s /bin/nologin cca && \
     mkdir -p /opt/cca/modules && \
     mkdir -p /var/lib/cca && \
-    mkdir /root/src
+    useradd -r -d /opt/cca -s /bin/nologin cca && \
+    chown -R cca:cca /opt/cca && \
+    chown -R cca:cca /var/lib/cca
 
 COPY LICENSE /opt/cca/
 COPY cca /opt/cca/
@@ -27,36 +28,39 @@ RUN set -x && \
             unixodbc \
             openjdk-8-jdk \
             python3 python3-dev \
-            python3-distutils \
-            python3-psutil \
             python3-pygit2 \
-            python3-distutils \
+            python3-svn \
+            python3-daemon \
+            python3-venv \
             wget ca-certificates \
             git rsync && \
     wget https://bootstrap.pypa.io/get-pip.py && \
     python3 get-pip.py && \
-    pip3 install pyodbc simplejson && \
+    pip3 install pyodbc setuptools build javalang && \
     rm get-pip.py
 
-RUN set -x && \
-    cd /root && \
-    git clone https://github.com/dajobe/redland-bindings && \
-    cd redland-bindings && \
-    ./autogen.sh --with-python=python3 && \
-    make install && \
-    cd /root && \
-    rm -r redland-bindings
-
 RUN set -x && \
     cd /root && \
     git clone https://github.com/openlink/virtuoso-opensource && \
     cd virtuoso-opensource && \
     ./autogen.sh && \
-    env CFLAGS='-O2 -m64' ./configure --prefix=/opt/virtuoso --with-layout=opt --with-readline=/usr --program-transform-name="s/isql/isql-v/" --disable-dbpedia-vad --disable-demo-vad --enable-fct-vad --enable-ods-vad --disable-sparqldemo-vad --disable-tutorial-vad --enable-isparql-vad --enable-rdfmappers-vad && \
+    env CFLAGS='-O2 -m64' ./configure --prefix=/opt/virtuoso --with-layout=opt --with-readline=/usr \
+    --program-transform-name="s/isql/isql-v/" --disable-dbpedia-vad --disable-demo-vad \
+    --enable-fct-vad --enable-ods-vad --disable-sparqldemo-vad --disable-tutorial-vad \
+    --enable-isparql-vad --enable-rdfmappers-vad && \
     make && make install && \
     cd /root && \
     rm -r virtuoso-opensource
 
+COPY python /root/python
+
+RUN set -x && \
+    cd /root/python && \
+    python3 -m build && \
+    pip3 install dist/cca-*.tar.gz && \
+    cd /root && \
+    rm -r python
+
 COPY src /root/src/
 
 RUN set -x && \
@@ -74,7 +78,10 @@ RUN set -x && \
     cp modules/Mfortran*.cmxs /opt/cca/modules/ && \
     cp modules/Mcpp*.cmxs /opt/cca/modules/ && \
     cd /root && \
-    rm -r src
+    rm -r src && \
+    echo 'test -r /root/.opam/opam-init/init.sh && . /root/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true' >> .bashrc && \
+    echo 'export PATH=/opt/cca/bin:${PATH}' >> .bashrc
+
 
 RUN set -x && \
     apt-get autoremove -y && \

README.md

@@ -52,8 +52,23 @@ You can run both Diff/AST and DiffViewer by the following line.
 
     $ ./cca.py diffast -c results --view samples/java/0/Test.java samples/java/1/Test.java
 
+## Installing parsers and Diff/AST
+
+### Requirements
+
+* [OCaml](http://ocaml.org/) (>=4.11.1)
+* [OPAM](https://opam.ocaml.org/)
+
+### Installation
+
+The following will install `parsesrc` and `diffast`.
+
+    $ opam install cca
+
 ## Building parsers and Diff/AST
 
+You can also build parsers and Diff/AST in person.
+
 ### Requirements
 
 * GNU make

cca.py

@@ -3,7 +3,7 @@
 '''
   A driver script for CCA container image
 
-  Copyright 2020 Codinuum Software Lab <https://codinuum.com>
+  Copyright 2021 Codinuum Software Lab <https://codinuum.com>
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,12 +21,14 @@
 import os
 import sys
 import time
+import shutil
 from datetime import datetime, timedelta
-from subprocess import Popen, call
+from subprocess import Popen, run
 from threading import Thread
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
 
 IMAGE_NAME = 'codinuum/cca'
+#IMAGE_NAME = 'ccax'
 
 #
 
@@ -37,9 +39,13 @@
 CCA_SOURCE_DIR = CCA_VAR+'/source'
 CCA_CACHE_DIR = CCA_VAR+'/cache'
 
+CCA_WORK_DIR_NAME = '__CCA__'
+
 CONTAINER_CMD = 'docker'
 
+TIMEOUT = 5
 BUFSIZE = 0 # unbuffered
+STAT_NAME = 'status'
 
 DEFAULT_CACHE_DIR = os.path.join(os.environ['HOME'], '.cca', 'cache')
 
@@ -77,10 +83,35 @@
         tzname = time.tzname[0]
         offset = STDOFFSET
 
-    TZ = '%s%s%s' % (tzname, SIGN, offset)
+    TZ = '{}{}{}'.format(tzname, SIGN, offset)
 
 ###
 
+def progress(proc, stat_path, timeout=TIMEOUT):
+    stat_mtime = None
+
+    print('\nMonitoring thread started.')
+
+    while True:
+        try:
+            st = os.stat(stat_path)
+            if st.st_mtime != stat_mtime and st.st_size > 0:
+                with open(stat_path, 'r') as f:
+                    mes = f.read()
+                    print('[{}]'.format(mes))
+
+                stat_mtime = st.st_mtime
+
+        except OSError as e:
+            pass
+
+        if proc.poll() is not None:
+            break
+
+    proc.wait()
+    if proc.returncode > 0:
+        print('Execution failed: {}'.format(proc.returncode))
+
 def ensure_dir(dpath):
     if not os.path.isdir(dpath):
         try:
@@ -95,8 +126,8 @@ def get_image_name(image_name, devel=False):
     image = image_name+suffix
     return image
 
-def run_diffast(original, modified, cache=DEFAULT_CACHE_DIR, clear_cache=False, view=False,
-                dry_run=False, devel=False, image=IMAGE_NAME, verbose=False):
+def run_diffast(container_cmd, original, modified, cache=DEFAULT_CACHE_DIR, clear_cache=False, view=False,
+                dry_run=False, devel=False, image=IMAGE_NAME, verbose=False, debug=False):
 
     if dry_run:
         verbose = True
@@ -108,7 +139,7 @@ def run_diffast(original, modified, cache=DEFAULT_CACHE_DIR, clear_cache=False,
     if not dry_run:
         ensure_dir(cache)
 
-    cca_cmd_path = '%s/bin/%s.opt' % (CCA_HOME, 'diffast')
+    cca_cmd_path = '{}/bin/{}.opt'.format(CCA_HOME, 'diffast')
     cca_cmd = cca_cmd_path
     if clear_cache:
         cca_cmd += ' -clearcache'
@@ -128,22 +159,22 @@ def run_diffast(original, modified, cache=DEFAULT_CACHE_DIR, clear_cache=False,
     vol_opt = '-v "{}:{}"'.format(common_path, CCA_SOURCE_DIR)
     vol_opt += ' -v "{}:{}"'.format(cache, CCA_CACHE_DIR)
 
-    run_cmd = '%s run' % CONTAINER_CMD
+    run_cmd = '{} run'.format(container_cmd)
     run_cmd += ' --rm'
     run_cmd += ' -t'
 
     if TZ:
-        run_cmd += ' -e "TZ=%s"' % TZ
+        run_cmd += ' -e "TZ={}"'.format(TZ)
 
-    run_cmd += ' %s' % vol_opt
-    run_cmd += ' %s %s' % (get_image_name(image, devel=devel), cca_cmd)
+    run_cmd += ' {}'.format(vol_opt)
+    run_cmd += ' {} {}'.format(get_image_name(image, devel=devel), cca_cmd)
 
     if verbose:
         print(run_cmd)
 
     if not dry_run:
         try:
-            rc = call(run_cmd, bufsize=BUFSIZE, shell=True, universal_newlines=True)
+            rc = run(run_cmd, bufsize=BUFSIZE, shell=True, universal_newlines=True)
 
             if view:
                 app_path = os.path.join(os.path.dirname(sys.argv[0]),
@@ -156,7 +187,7 @@ def run_diffast(original, modified, cache=DEFAULT_CACHE_DIR, clear_cache=False,
                     view_cmd = 'open -n {} --args{}{}'.format(app_path, cache_opt, files_opt)
                     if verbose:
                         print(view_cmd)
-                    rc = call(view_cmd, shell=True)
+                    rc = run(view_cmd, shell=True)
                 else:
                     print('DiffViewer not found. See diffviewer/README.md.')
 
@@ -167,48 +198,70 @@ def run_diffast(original, modified, cache=DEFAULT_CACHE_DIR, clear_cache=False,
             print('Execution failed: {}'.format(e))
 
 
+def gen_work_dir_name():
+    dt = datetime.now()
+    ts = '{:04}{:02}{:02}{:02}{:02}{:02}'.format(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
+    dn = '{}{}'.format(CCA_WORK_DIR_NAME, ts)
+    return dn
+
 def update(args):
-    cmd = '%s pull %s' % (CONTAINER_CMD, get_image_name(args.image, devel=args.devel))
+    cmd = '{} pull {}'.format(args.container_cmd, get_image_name(args.image, devel=args.devel))
     if args.verbose or args.dry_run:
         print(cmd)
     if not args.dry_run:
         try:
-            call(cmd, shell=True)
+            run(cmd, shell=True)
         except OSError as e:
             print('Execution failed: {}'.format(e))
 
 def diffast(args):
-    run_diffast(args.original, args.modified, cache=args.cache, clear_cache=args.force, view=args.view,
-                dry_run=args.dry_run, devel=args.devel, image=args.image, verbose=args.verbose)
+    run_diffast(args.container_cmd,
+                args.original, args.modified, cache=args.cache, clear_cache=args.force, view=args.view,
+                dry_run=args.dry_run, devel=args.devel, image=args.image, verbose=args.verbose, debug=args.debug)
 
 
 
 def main():
-    parser = ArgumentParser(description='CCA driver',
+    parser = ArgumentParser(description='A CCA driver',
+                            add_help=False,
                             formatter_class=ArgumentDefaultsHelpFormatter)
 
     parser.add_argument('-n', '--dry-run', dest='dry_run', action='store_true',
                         help='only print container commands')
 
+    parser.add_argument('--container-command', dest='container_cmd', metavar='CMD',
+                        help='specify container command', default=CONTAINER_CMD)
+
     parser.add_argument('-i', '--image', dest='image', type=str, metavar='IMAGE', default=IMAGE_NAME,
                         help='specify container image')
 
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
-                        help='be verbose')
+                        help='enable verbose printing')
+
+    parser.add_argument('-d', '--debug', dest='debug', action='store_true',
+                        help='enable debug printing')
 
     parser.add_argument('-x', '--experimental', dest='devel', action='store_true',
                         help='use experimental image')
 
-    subparsers = parser.add_subparsers(title='subcommands')
+    p = ArgumentParser(add_help=True)
+
+    subparsers = p.add_subparsers(title='subcommands')
+
+    # Docker image update
 
     parser_update = subparsers.add_parser('update',
                                           description='Update docker image of CCA',
+                                          parents=[parser],
                                           formatter_class=ArgumentDefaultsHelpFormatter)
 
     parser_update.set_defaults(func=update)
 
+    # Diff/AST
+
     parser_diffast = subparsers.add_parser('diffast',
                                            description='Compare two programs',
+                                           parents=[parser],
                                            formatter_class=ArgumentDefaultsHelpFormatter)
 
     parser_diffast.add_argument('original', type=str, metavar='ORIGINAL', help='original source file')
@@ -226,14 +279,15 @@ def main():
 
     parser_diffast.set_defaults(func=diffast)
 
+    #
 
-    args = parser.parse_args()
+    args = p.parse_args()
 
     try:
         args.func(args)
     except:
         #raise
-        parser.print_help()
+        p.print_help()
 
 
 if __name__ == '__main__':