Merge branch 'master' into q-benchmark

7 files changed, 24 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index c6c3d94..27c87cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,5 @@ win_build
 packages
 .idea/
 dist/windows/
-dist/
 _benchmark_data*
 *.benchmark-results
diff --git a/README.markdown b/README.markdown
index 85863af..9477de3 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,7 +3,7 @@
 # q - Text as Data
 q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).
 
-q treats ordinary files as database tables, and supports all SQL constructs, such as WHERE, GROUP BY, JOINs etc. It supports automatic column name and type detection, and q provides full support for multiple character encodings.
+q treats ordinary files as database tables, and supports all SQL constructs, such as `WHERE`, `GROUP BY`, `JOIN`s, etc. It supports automatic column name and type detection, and q provides full support for multiple character encodings.
 
 q's web site is [http://harelba.github.io/q/](http://harelba.github.io/q/). It contains everything you need to download and use q immediately.
 
@@ -14,7 +14,11 @@ Instructions for all OSs are [here](http://harelba.github.io/q/install.html).
 
 ## Examples
 
-![blah](doc/basic-examples.png)
+```
+q "SELECT COUNT(*) FROM ./clicks_file.csv WHERE c3 > 32.3"
+
+ps -ef | q -H "SELECT UID, COUNT(*) cnt FROM - GROUP BY UID ORDER BY cnt DESC LIMIT 3"
+```
 
 Go [here](http://harelba.github.io/q/examples.html) for more examples.
 
diff --git a/bin/q b/bin/q
index 507991d..fbd5879 100755
--- a/bin/q
+++ b/bin/q
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-#   Copyright (C) 2012-2018 Harel Ben-Attia
+#   Copyright (C) 2012-2019 Harel Ben-Attia
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-q_version = "1.8"
+q_version = "2.0.6"
 
 __all__ = [ 'QTextAsData' ]
 
diff --git a/dist/create-rpm b/dist/create-rpm
index 7d86661..db1a255 100755
--- a/dist/create-rpm
+++ b/dist/create-rpm
@@ -1,13 +1,13 @@
-#!/bin/bash
+#!/bin/bash -x
 
 #
 # Commit tag and Version number should be provided as input in the command line
 #
 #
 
-if [ $# -ne 1 ];
+if [ $# -ne 2 ];
 then
-	echo 'create-rpm <version>'
+	echo 'create-rpm <version> <based_on_tag>'
 	exit 1
 fi
 
@@ -27,6 +27,8 @@ mkdir -p ${rpm_build_area}/{SOURCES,SPECS,BUILD,RPMS,SRPMS,BUILDROOT}
 echo RPM build area is in ${rpm_build_area}
 
 VERSION=$1
+BASED_ON_TAG=$2
+
 REAL_PACKAGE_NAME=q
 RPM_PACKAGE_NAME=q-text-as-data
 
@@ -38,11 +40,13 @@ then
 	exit 1
 fi
 
-curl -o ${rpm_build_area}/SOURCES/q.tar.gz -L -R "https://github.com/harelba/q/tarball/${VERSION}"
+curl -o ${rpm_build_area}/SOURCES/q.tar.gz -L -R "https://github.com/harelba/q/tarball/$BASED_ON_TAG"
 mkdir -p ${rpm_build_area}/SOURCES
 pushd ${rpm_build_area}/SOURCES >/dev/null
 tar xvzf ./q.tar.gz --strip-components=1
 rm -vf ./q.tar.gz
+curl -o ./bin/q -L -R "https://github.com/harelba/packages-for-q/raw/master/single-binary/x86_64/${VERSION}/q"
+chmod +x ./bin/q
 popd >/dev/null
 find ${rpm_build_area}/ -ls
 
diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template
index ad3d0c2..8512aa2 100644
--- a/dist/q-text-as-data.spec.template
+++ b/dist/q-text-as-data.spec.template
@@ -10,7 +10,7 @@ Summary:	q - Text as Data
 Group:		Applications/Text
 License:	GPLv3
 URL:		https://github.com/harelba/q
-BuildArch:	noarch
+BuildArch:	x86_64
 
 %description
 q allows to perform SQL-like statements on tabular text data.
diff --git a/doc/basic-examples.png b/doc/basic-examples.png
deleted file mode 100644
index 6943d47..0000000
--- a/doc/basic-examples.png
+++ /dev/null
diff --git a/package-release b/package-release
index 0bbe604..f27186f 100755
--- a/package-release
+++ b/package-release
@@ -5,14 +5,15 @@ set -e
 base_folder=$(dirname $0)
 pushd ${base_folder} >/dev/null
 
-if [ $# -ne 1 ];
+if [ $# -ne 2 ];
 then
-	echo "Usage: $(dirname $0) <git-tag>"
+	echo "Usage: $(dirname $0) <version> <git-tag>"
 	echo
 	echo "Note that the git tag must be pushed to github before doing this."
 	exit 1
 fi
-TAG="$1"
+VERSION="$1"
+BASED_ON_TAG="$2"
 
 d=`pwd`
 cid1=`docker run -i -d -v ${d}:/q q-text-as-data-rpm-builder:0.1`
@@ -27,9 +28,9 @@ rm -rvf ${base_folder}/packages
 mkdir -p ${base_folder}/packages
 
 sleep 1
-docker exec -it ${cid1} /bin/bash -i -c "/q/dist/create-rpm ${TAG}"
+docker exec -it ${cid1} /bin/bash -i -c "/q/dist/create-rpm ${VERSION} ${BASED_ON_TAG}"
 
-docker cp ${cid1}:/q/dist/rpm_build_area/RPMS/noarch/q-text-as-data-${TAG}-1.el6.noarch.rpm ${base_folder}/packages/q-text-as-data-${TAG}-1.noarch.rpm
+docker cp ${cid1}:/q/dist/rpm_build_area/RPMS/x86_64/q-text-as-data-${VERSION}-1.el6.x86_64.rpm ${base_folder}/packages/q-text-as-data-${VERSION}-1.x86_64.rpm
 
-docker exec -it ${cid2} /bin/bash -i -c "cd /q/packages && alien ./q-text-as-data-${TAG}-1.noarch.rpm"
+docker exec -it ${cid2} /bin/bash -i -c "cd /q/packages && alien ./q-text-as-data-${VERSION}-1.x86_64.rpm"