diff --git a/Gemfile b/Gemfile index 4d8956b5..9e9bea90 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ platform :jruby do gem "tilt", "~> 2.0.7" group :development do + gem 'jbundler', '~> 0.9.3' gem "rake" gem "warbler", "~> 2.0.3" gem "jruby-jars", "9.1.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 52a2a138..0552bcc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,15 @@ GEM remote: https://rubygems.org/ specs: + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) bootstrap-sass (3.2.0.2) sass (~> 3.2) - chunky_png (1.3.5) + chunky_png (1.3.8) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) @@ -18,19 +24,40 @@ GEM sass (>= 3.2, < 3.5) cuba (3.8.1) rack (>= 1.6.0) - ffi (1.9.10-java) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + equalizer (0.0.11) + ffi (1.9.18-java) + ice_nine (0.11.2) + jar-dependencies (0.3.11) + jbundler (0.9.3) + bundler (~> 1.5) + jar-dependencies (~> 0.3) + maven-tools (~> 1.1) + ruby-maven (~> 3.3, >= 3.3.8) jruby-jars (9.1.12.0) jruby-rack (1.1.20) - multi_json (1.11.2) + maven-tools (1.1.6) + virtus (~> 1.0) + multi_json (1.12.1) rack (2.0.3) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rubyzip (1.2.0) - sass (3.4.21) - tilt (2.0.7) - warbler (2.0.3) + rake (12.0.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-maven (3.3.12) + ruby-maven-libs (~> 3.3.9) + ruby-maven-libs (3.3.9) + rubyzip (1.2.1) + sass (3.4.25) + thread_safe (0.3.6-java) + tilt (2.0.8) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + warbler (2.0.4) jruby-jars (>= 9.0.0.0) jruby-rack (>= 1.1.1, < 1.3) rake (>= 10.1.0) @@ -43,6 +70,7 @@ DEPENDENCIES bootstrap-sass (~> 3.2.0) compass cuba (~> 3.8.1) + jbundler (~> 0.9.3) jruby-jars (= 9.1.12.0) rack (~> 2.0.3) rake diff --git a/Jarfile b/Jarfile new file mode 100644 index 00000000..b4c1b205 --- /dev/null +++ b/Jarfile @@ -0,0 +1 @@ +jar 'technology.tabula:tabula', '1.0.0' \ No newline at end of file diff --git a/Jarfile.lock b/Jarfile.lock new file mode 100644 index 00000000..83c275b8 --- /dev/null +++ b/Jarfile.lock @@ -0,0 +1,20 @@ +--- +:runtime: +- technology.tabula:tabula:jar:1.0.0 +- org.apache.pdfbox:pdfbox-tools:jar:2.0.7 +- org.apache.commons:commons-csv:jar:1.4 +- commons-cli:commons-cli:jar:1.4 +- org.bouncycastle:bcprov-jdk15on:jar:1.56 +- jline:jline:jar:2.11 +- org.slf4j:slf4j-simple:jar:1.7.25 +- org.bouncycastle:bcmail-jdk15on:jar:1.56 +- org.apache.pdfbox:fontbox:jar:2.0.7 +- org.bouncycastle:bcpkix-jdk15on:jar:1.56 +- org.slf4j:slf4j-api:jar:1.7.25 +- commons-logging:commons-logging:jar:1.2 +- com.google.code.gson:gson:jar:2.8.0 +- org.yaml:snakeyaml:jar:1.18 +- org.apache.pdfbox:pdfbox:jar:2.0.7 +- net.sf.jsi:jsi:jar:1.1.0-SNAPSHOT +- org.apache.pdfbox:pdfbox-debugger:jar:2.0.7 +- net.sf.trove4j:trove4j:jar:3.0.3 diff --git a/README.md b/README.md index d14d0e77..f4621ed5 100644 --- a/README.md +++ b/README.md @@ -155,11 +155,12 @@ Tabula has bindings for JRuby and R. If you end up writing bindings for another gem install bundler bundle install + jruby -S jbundle install ~~~ **Then, start the development server:** - jruby -G -S rackup + jruby -G -r jbundler -S rackup (If you get encoding errors, set the `JAVA_OPTS` environment variable to `-Dfile.encoding=utf-8`) @@ -169,7 +170,7 @@ You can a couple some options when executing the server in this manner: TABULA_DATA_DIR="/tmp/tabula" \ TABULA_DEBUG=1 \ - jruby -G -S rackup + jruby -G -r jbundler -S rackup * `TABULA_DATA_DIR` controls where uploaded data for Tabula is stored. By default, data is stored in the OS-dependent application data directory for the current diff --git a/lib/jars/tabula-1.0.0-jar-with-dependencies.jar b/lib/jars/tabula-1.0.0-jar-with-dependencies.jar deleted file mode 100644 index 16ead898..00000000 Binary files a/lib/jars/tabula-1.0.0-jar-with-dependencies.jar and /dev/null differ diff --git a/webapp/tabula_web.rb b/webapp/tabula_web.rb index 166bffee..5557ce4f 100644 --- a/webapp/tabula_web.rb +++ b/webapp/tabula_web.rb @@ -9,8 +9,6 @@ require 'fileutils' require 'securerandom' -require_relative '../lib/jars/tabula-1.0.0-jar-with-dependencies.jar' - require_relative '../lib/tabula_java_wrapper.rb' java_import 'java.io.ByteArrayOutputStream' java_import 'java.util.zip.ZipEntry'