1
1
mirror of https://github.com/harelba/q.git synced 2024-10-03 22:39:52 +03:00

Fixed RPM creation + some docs

This commit is contained in:
Harel Ben-Attia 2014-12-12 10:36:06 -05:00
parent 6ec9d5d8ef
commit f56270a2f9
8 changed files with 36 additions and 23 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ build
q.spec
q.1
*.pyc
.vagrant

2
dist/create-rpm vendored
View File

@ -48,6 +48,6 @@ curl -o ~/rpmbuild/SOURCES/q-${COMMIT_HASH}.tar.gz -L -R "https://github.com/har
cat ${RPM_PACKAGE_NAME}.spec.template | sed "s/VERSION_PLACEHOLDER/$VERSION/g" | sed "s/COMMIT_HASH_PLACEHOLDER/${COMMIT_HASH}/g" | sed "s/SHORT_HASH_PLACEHOLDER/${SHORT_HASH}/g" > ~/rpmbuild/SPECS/${RPM_PACKAGE_NAME}.spec
rpmbuild --noclean -v -bb ~/rpmbuild/SPECS/${RPM_PACKAGE_NAME}.spec
rpmbuild -v -bb ~/rpmbuild/SPECS/${RPM_PACKAGE_NAME}.spec
popd

4
dist/pre-requisites vendored
View File

@ -2,4 +2,6 @@
sudo apt-get install gem
sudo gem install ruby-ronn
pyinstaller
sudo apt-get install rpm
sudo apt-get install alien
pyinstaller (For windows version creation)

View File

@ -11,7 +11,7 @@ Group: Applications/Text
License: GPLv3
URL: https://github.com/harelba/q
Source: q-COMMIT_HASH_PLACEHOLDER.tar.gz
BuildArch: x86_64
BuildArch: noarch
%description
q allows to perform SQL-like statements on tabular text data.
@ -22,15 +22,13 @@ q allows to perform SQL-like statements on tabular text data.
%build
ls -ltr
pyinstaller -D --distpath=compiled-dist bin/q
ronn doc/USAGE.markdown
%install
rm -vrf ${RPM_BUILD_ROOT}/
export DONT_STRIP=1
install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
install -d -m 0755 ${RPM_BUILD_ROOT}%{_libdir}/q-text-as-data
install -Dm 0644 compiled-dist/q/* ${RPM_BUILD_ROOT}%{_libdir}/q-text-as-data/
install -Dm 0644 bin/q ${RPM_BUILD_ROOT}%{_libdir}/q-text-as-data/
ln -s %{_libdir}/q-text-as-data/q ${RPM_BUILD_ROOT}%{_bindir}/q
install -d -m 0755 ${RPM_BUILD_ROOT}%{_mandir}/man1/
install -m 0644 doc/USAGE ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1
@ -45,8 +43,7 @@ gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1
%doc %_mandir/man1/q.1.gz
%changelog
*Sat Nov 29 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1
- Changed to use compiled version of q
*Fri Dec 12 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1
- Moved stuff from create-rpm script into the rpm spec itself
*Sat Jun 14 2014 Harel Ben-Attia <harelba@gmail.com> 1.4.0-1
- Changed RPM package name to q-text-as-data

View File

@ -1,8 +1,4 @@
Copyright (C) 1992, 1997-2002, 2004-2014 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
Copyright (C) 2012-2014 Harel Ben-Attia (harelba@gmail.com, @harelba on twitter)
Harel Ben-Attia <harelba@gmail.com> wrote the main program

View File

@ -1,6 +1,9 @@
# q - Treating Text as a Database
## Change log
**Fri Dec 12 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1**
- TBD
**Sat Jun 14 2014 Harel Ben-Attia <harelba@gmail.com> 1.4.0-1**
- 2.5x Speed improvement due to better bulk loading
- Output header support

View File

@ -1,7 +1,3 @@
Copyright (C) 1992, 1997-2002, 2004-2014 Free Software Foundation, Inc.
Copyright (C) 2012-2014 Harel Ben-Attia (harelba@gmail.com, @harelba on twitter)
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
Thank you Jens Neu for writing the initial RPM package spec
Thank you Jens Neu for writing the initial RPM package spec, and to https://github.com/barsnick for additional RPM help

View File

@ -56,7 +56,7 @@ Options:
Same as -d <tab>. Just a shorthand for handling
standard tab delimited file You can use $'\t' if you
want (this is how Linux expects to provide tabs in the
command line)
command line
-e ENCODING, --encoding=ENCODING
Input file encoding. Defaults to UTF-8. set to none
for not setting any encoding - faster, but at your own
@ -67,8 +67,8 @@ Options:
data types
-m MODE, --mode=MODE
Data parsing mode. fluffy, relaxed and strict. In
strict mode, the -c column-count parameter must
be supplied as well
strict mode, the -c column-count parameter must be
supplied as well
-c COLUMN_COUNT, --column-count=COLUMN_COUNT
Specific column count when using relaxed or strict
mode
@ -77,6 +77,20 @@ Options:
strips leading whitespace off values, in order to
provide out-of-the-box usability for simple use cases.
If you need to preserve whitespace, use this flag.
--disable-double-double-quoting
Disable support for double double-quoting for escaping
the double quote character. By default, you can use ""
inside double quoted fields to escape double quotes.
Mainly for backward compatibility.
--disable-escaped-double-quoting
Disable support for escaped double-quoting for
escaping the double quote character. By default, you
can use \" inside double quoted fields to escape
double quotes. Mainly for backward compatibility.
-w INPUT_QUOTING_MODE, --input-quoting-mode=INPUT_QUOTING_MODE
Input quoting mode. Possible values are all, minimal
and none. Note the slightly misleading parameter name,
and see the matching -W parameter for output quoting.
Output Options:
-D OUTPUT_DELIMITER, --output-delimiter=OUTPUT_DELIMITER
@ -102,6 +116,11 @@ Options:
-E OUTPUT_ENCODING, --output-encoding=OUTPUT_ENCODING
Output encoding. Defaults to 'none', leading to
selecting the system/terminal encoding
-W OUTPUT_QUOTING_MODE, --output-quoting-mode=OUTPUT_QUOTING_MODE
Output quoting mode. Possible values are all, minimal,
nonnumeric and none. Note the slightly misleading
parameter name, and see the matching -w parameter for
input quoting.
Query Related Options:
-q QUERY_FILENAME, --query-filename=QUERY_FILENAME
@ -111,7 +130,6 @@ Options:
-Q QUERY_ENCODING, --query-encoding=QUERY_ENCODING
query text encoding. Experimental. Please send your
feedback on this
````
### Table names