Commit Graph

282 Commits

Author SHA1 Message Date
Alfredo Beaumont
1d9702d98e Merge pull request #120 from juanjux/fix/readme_grammar
Grammar and style changes.
2017-10-04 17:45:29 +02:00
Juanjo Alvarez
71b516a7bd
tmp
Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>
2017-10-04 17:25:03 +02:00
Juanjo Alvarez
6b2c55abb2
Grammar and style changes.
Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>
2017-10-04 17:25:01 +02:00
Alfredo Beaumont
8069f1b32e Merge pull request #119 from abeaumont/feature/improve-readme
docs: Some README fixes
2017-10-04 17:05:12 +02:00
Alfredo Beaumont
9caa35ac2e docs: Some README fixes
Signed-off-by: Alfredo Beaumont <alfredo.beaumont@gmail.com>
2017-10-04 16:53:26 +02:00
Alfredo Beaumont
1324e52107 Merge pull request #118 from abeaumont/feature/sync-with-linguist
data: Sync with linguist
2017-10-04 16:48:28 +02:00
Alfredo Beaumont
fd25e6d201 data: Sync with linguist
Signed-off-by: Alfredo Beaumont <alfredo.beaumont@gmail.com>
2017-10-04 16:26:56 +02:00
Alfredo Beaumont
95ef0a6cf3 Merge pull request #117 from abeaumont/feature/maven-publish-jar
Maven publish jar
2017-10-02 14:53:57 +02:00
Alfredo Beaumont
717ac138c0 build: Remove custom signing key 2017-10-02 14:33:21 +02:00
Alfredo Beaumont
3db3b2702a build: Fix artifact release code 2017-10-02 14:24:54 +02:00
Alfredo Beaumont
f3446a3f10 ci: Update encrypted GPG key 2017-10-02 14:24:33 +02:00
Miguel Molina
d6e70542da test
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-10-02 14:18:49 +02:00
Alfredo Beaumont
5b05a3bcc4 Merge pull request #115 from darkowlzz/sort-results
cli: sort the results
2017-10-02 12:27:22 +02:00
Alfredo Beaumont
0e34e06c8c Merge pull request #116 from darkowlzz/version-flag
cli: add version flag
2017-10-02 12:15:16 +02:00
Sunny
e889283017 cli: add version flag
Signed-off-by: Sunny <me@darkowlzz.space>
2017-09-30 19:18:00 +05:30
Sunny
b84e338f9e cli: sort the results
Adds `FileCount` and `FileCountList` types for storing language file and
their count which can be sorted based on the value of count.

Signed-off-by: Sunny <me@darkowlzz.space>
2017-09-30 18:52:30 +05:30
Alfredo Beaumont
ded6d367fe Merge pull request #112 from abeaumont/fix/darwin-shared-lib-build
build: Fix cross compilation of darwin shared library
2017-09-29 08:39:00 +02:00
Vadim Markovtsev
250519bb51 Add the external test linguist dir from env var
This allows to use a cached directory with linguist instead of cloning and speeds up the tests by -10s on my local machine.

Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
2017-09-28 23:51:38 +02:00
Alfredo Beaumont
4892115416 build: Fix cross compilation of darwin shared library 2017-09-28 18:07:55 +02:00
Alfredo Beaumont
557cc51f55 Merge pull request #109 from abeaumont/feature/publish-libraries
build: Add support to publish x86-64 libs for both linux and darwin.
2017-09-28 17:24:38 +02:00
Alfredo Beaumont
26685f9861 build: Add support to publish x86-64 libs for both linux and darwin. 2017-09-28 15:18:47 +02:00
Alfredo Beaumont
39ee680819 Merge pull request #107 from bzz/java/build-use-sbt-wrapper
Java: build using sbt wrapper
2017-09-27 12:12:29 +02:00
Alexander Bezzubov
e6cf6af6d9
Java: self-contained build, using sbt wrapper
Signed-off-by: Alexander Bezzubov <bzz@apache.org>
2017-09-22 19:10:08 +02:00
Alfredo Beaumont
3d63a636bb Merge pull request #106 from bzz/test/empty-content
Add failing test for empty file content
2017-09-22 18:31:44 +02:00
Miguel Molina
9a36e8f398 enry-java: allow empty file contents
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-09-22 19:00:19 +03:00
Alexander Bezzubov
b020f78841
Add test for empty file content 2017-09-22 17:39:02 +02:00
Alfredo Beaumont
a6faaaf012 Merge pull request #99 from mcarmonaa/fix/enry-java
fix getLanguage when arguments are null
2017-09-07 15:57:34 +02:00
Manuel Carmona
1d7b975743 fix getLanguage when arguments are null 2017-09-07 14:17:56 +02:00
Alfredo Beaumont
e1b2326b22 Merge pull request #98 from erizocosmico/fix/fat-jar
enry-java: publish fat jar without any classifiers in assembly task
2017-09-07 12:26:04 +02:00
Miguel Molina
818f77fc42
enry-java: publish fat jar without any classifiers in assembly task
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-09-04 11:49:14 +02:00
Alfredo Beaumont
0fe0a97f67 Merge pull request #97 from abeaumont/fix/travis-api-key
travis: Fix binary deployment
2017-08-23 18:56:38 +02:00
Alfredo Beaumont
fd6a2f2132 travis: Fix binary deployment 2017-08-23 13:05:57 +02:00
Alfredo Beaumont
554c9254ae Merge pull request #96 from bzz/add-unknown-lang
Java bindings: add some convenience
2017-08-11 17:42:49 +02:00
Alexander Bezzubov
0a6ed07591 Convenience: Enry.unknownLanguage and Guess.toString/.equals/.hashCode 2017-08-11 15:29:18 +02:00
Alfredo Beaumont
2c6a48ef9e Merge pull request #94 from bzz/publish-full-jar
Java bindings: make final jar publishable
2017-08-11 15:16:40 +02:00
Alexander Bezzubov
b73364d147 Add ability to publish final jar locally 2017-08-11 15:09:14 +02:00
Alfredo Beaumont
9b33af75ed Merge pull request #95 from erizocosmico/test/get-language-by-filename
add a test for getLanguageByFilename
2017-08-11 13:06:38 +02:00
Miguel Molina
5bde175c91
add a test for getLanguageByFilename
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-11 12:27:51 +02:00
Alexander Bezzubov
0c60da0f48 Add convenience sbt runner 2017-08-11 10:02:25 +02:00
Alfredo Beaumont
574cae8a84 Merge pull request #92 from erizocosmico/feature/java-impl
java bindings for Enry
2017-08-09 17:18:59 +02:00
Miguel Molina
4da1c5605c
rename result and sure in Guess to language and safe
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-09 11:29:45 +02:00
Miguel Molina
61827a3630
remove references to maven usage in both README and travis.yml
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-09 10:14:47 +02:00
Miguel Molina
2825eb22e6
get jnaerator from a jitpack jar
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-08 18:20:16 +02:00
Miguel Molina
f53abe6bc2
travis configuration
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-08 18:02:01 +02:00
Miguel Molina
d8fc4fe92f
java implementation of enry
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-08 18:01:54 +02:00
Miguel Molina
33ff3ba8cd
add C exports for enry
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
2017-08-08 18:00:42 +02:00
Alfredo Beaumont
156619f926 Merge pull request #93 from abeaumont/fix/get-language-by-content-with-filename
common: Add filename parameter to GetLanguageByContent function
2017-08-08 17:42:43 +02:00
Alfredo Beaumont
c9122aad9f common: Use underscore as parameter name for unused parameters 2017-08-08 14:58:01 +02:00
Alfredo Beaumont
0990c2868d common: Add filename parameter to GetLanguageByContent function
Internal code needs the filename to select a matcher, so not passing
any filename means no language will ever be found otherwise.
2017-08-08 11:58:02 +02:00
Alfredo Beaumont
bac0ef279c Merge pull request #88 from abeaumont/fix/ignore-symlinks-while-dirwalking
cli: Ignore symlinks inside a directory walk
2017-08-02 10:51:36 +02:00