Use jar dependencies

README.md

@@ -2,6 +2,16 @@
 
 A thin wrapper around the VoltDB Java client.
 
+## Versions
+
+We've decided that vendoring the `voltdbclient-x.x.jar` in the Gem as a
+dependency is the right way to do it. We are using VoltDB 6.8 and for that
+reason that's the one that's vendored. We are open on doing a different thing if
+it's the right solution.
+
+If required we could do multiple releases with different vendored clients. Just
+open an issue.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,19 +26,6 @@ Or install it yourself as:
 
     $ gem install voltdbjruby
 
-Use `jbundler`, `lock_jar` or a similar to download and load the `voltdbclient`
-jar in the CLASSPATH. For example using `jbundler`:
-
-    echo "jar \"org.voltdb:voltdbclient\", \"6.8\"" > Jarfile
-
-Install out java dependencies
-
-    jruby -S jbundle install
-
-Then require `jbundler` in your code to load it in the CLASSPATH
-
-    require "jbundler"
-
 ## Usage
 
 ### Basic example

bin/console

@@ -6,5 +6,4 @@ require "pry"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
-
 Pry.start

bin/setup

@@ -4,8 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Create the Jarfile with the voltdbclient
-echo "jar \"org.voltdb:voltdbclient\", \"6.8\"" > Jarfile
-# Install our java dependencies
-jruby -S jbundle install

lib/voltdb.rb

@@ -1,3 +1,4 @@
+require "voltdbjruby_jars"
 require "forwardable"
 require "date"
 

lib/voltdbjruby_jars.rb

@@ -0,0 +1,10 @@
+# this is a generated file, to avoid over-writing it just delete this comment
+begin
+  require 'jar_dependencies'
+rescue LoadError
+  require 'org/voltdb/voltdbclient/6.8/voltdbclient-6.8.jar'
+end
+
+if defined? Jars
+  require_jar( 'org.voltdb', 'voltdbclient', '6.8' )
+end

spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require "jbundler"
 require "voltdb"
 require "pry"
 

voltdb.gemspec

@@ -14,16 +14,21 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/full360/voltdb-client-jruby"
   spec.license       = "MIT"
 
+  # This is important to get the jars installed
+  spec.platform      = "java"
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.requirements << "jar org.voltdb, voltdbclient, 6.8"
+
+  spec.add_development_dependency "jar-dependencies", "~> 0.3"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 12"
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "jbundler", "~> 0.9"
 end