Merge pull request #88 from embulk/fix-travis2

Fix travis to work with embulk 0.9.x

Author: sonots

.travis.yml

@@ -4,14 +4,14 @@ matrix:
     - env: EMBULK_VERSION=0.8.39
       rvm: jruby-9.1.5.0 # bundled jruby version
       jdk: openjdk7 # embulk 0.8.x uses jdk7
-#      - env: EMBULK_VERSION=0.9.15
-#        rvm: jruby-9.1.5.0 # bundled jruby version
-#        jdk: openjdk8 # embulk 0.9.x uses jdk8
-#      - env: EMBULK_VERSION=latest
-#        rvm: jruby-9.1.5.0 # ?
-#        jdk: openjdk8 # ?
-#    allow_failures:
-#      - env: EMBULK_VERSION=latest
-# before_install:
-#   - curl -o embulk.jar --create-dirs -L "http://dl.embulk.org/embulk-${EMBULK_VERSION}.jar"
-# script: bundle exec env RUBYOPT="-r $PWD/embulk.jar -r embulk" rake test
+    - env: EMBULK_VERSION=0.9.15
+      rvm: jruby-9.1.5.0 # bundled jruby version
+      jdk: openjdk8 # embulk 0.9.x uses jdk8
+    - env: EMBULK_VERSION=latest
+      rvm: jruby-9.1.5.0 # ?
+      jdk: openjdk8 # ?
+  allow_failures:
+    - env: EMBULK_VERSION=latest
+before_install:
+  - curl -o embulk.jar --create-dirs -L "http://dl.embulk.org/embulk-${EMBULK_VERSION}.jar"
+script: bundle exec env RUBYOPT="-r ./embulk.jar" rake test

README.md

@@ -444,16 +444,24 @@ $ embulk run -X page_size=1 -b . -l trace example/example.yml
 
 ### Run test:
 
+Place your embulk with `.jar` extension:
+
+```
+$ cp -a $(which embulk) embulk.jar
+```
+
+Run tests with `env RUBYOPT="-r ./embulk.jar`:
+
 ```
-$ bundle exec rake test
+$ bundle exec env RUBYOPT="-r ./embulk.jar" rake test
 ```
 
 To run tests which actually connects to BigQuery such as test/test\_bigquery\_client.rb,
 prepare a json\_keyfile at example/your-project-000.json, then
 
 ```
-$ bundle exec ruby test/test_bigquery_client.rb
-$ bundle exec ruby test/test_example.rb
+$ bundle exec env RUBYOPT="-r ./embulk.jar" ruby test/test_bigquery_client.rb
+$ bundle exec env RUBYOPT="-r ./embulk.jar" ruby test/test_example.rb
 ```
 
 ### Release gem:

embulk-output-bigquery.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'google-api-client'
   spec.add_dependency 'time_with_zone'
 
-  spec.add_development_dependency 'embulk', ['>= 0.8.2']
   spec.add_development_dependency 'bundler', ['>= 1.10.6']
   spec.add_development_dependency 'rake', ['>= 10.0']
 end

test/helper.rb

@@ -3,9 +3,14 @@
 require 'test/unit'
 require 'test/unit/rr'
 
-# require 'embulk/java/bootstrap'
 require 'embulk'
-Embulk.setup
+begin
+  # Embulk ~> 0.8.x
+  Embulk.setup
+rescue NotImplementedError
+  # Embulk ~> 0.9.x
+  require 'embulk/java/bootstrap'
+end
 Embulk.logger = Embulk::Logger.new('/dev/null')
 
 APP_ROOT = File.expand_path('../', __dir__)