Skip to content

Commit 6a8650b

Browse files
committed
Adjustment for Embulk v0.9.X
1 parent 41705e6 commit 6a8650b

File tree

4 files changed

+32
-27
lines changed

4 files changed

+32
-27
lines changed

.github/workflows/check.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
jruby_version:
12-
- 9.3.15.0
13-
- 9.4.8.0
12+
- 9.1.17.0
1413
fail-fast: false
1514
steps:
1615
- uses: actions/checkout@v4
@@ -19,15 +18,15 @@ jobs:
1918
with:
2019
java-version: 8
2120
distribution: "temurin"
22-
- name: download jruby
23-
run: "curl -L -o jruby.jar https://repo1.maven.org/maven2/org/jruby/jruby-complete/${{ matrix.jruby_version }}/jruby-complete-${{ matrix.jruby_version }}.jar"
24-
#
25-
# For avoiding permission denied. install gems into `gems` directory
26-
#
27-
- name: bundle install
28-
run: "env GEM_HOME=gems java -jar jruby.jar -S bundle install"
29-
21+
- uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: 'jruby-${{ matrix.jruby_version }}'
24+
bundler-cache: false
3025
- name: install embulk.jar
31-
run: "curl -L -o embulk.jar https://github.com/embulk/embulk/releases/download/v0.11.4/embulk-0.11.4.jar"
26+
run: "curl -L -o embulk.jar https://github.com/embulk/embulk/releases/download/v0.9.25/embulk-0.9.25.jar"
27+
- name: chmod embulk.jar
28+
run: "chmod a+x embulk.jar"
29+
- name: bundle install
30+
run: "./embulk.jar bundle install --path vendor/bundle"
3231
- name: rake test
33-
run: 'env GEM_HOME=gems RUBYOPT="-r ./embulk.jar -r rubygems" java -jar jruby.jar -S bundle exec rake test'
32+
run: 'bundle exec env RUBYOPT="-r ./embulk.jar -r embulk -r embulk/java/bootstrap" rake test'

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
source 'https://rubygems.org/'
22

33
gemspec
4-
gem 'embulk', '= 0.11.4'
4+
gem 'embulk', '< 0.10'
5+
gem 'liquid', '= 4.0.0' # the version included in embulk.jar
56
gem 'embulk-parser-none'
67
gem 'embulk-parser-jsonl'
78
gem 'pry-nav'
89
gem 'test-unit'
910
gem 'test-unit-rr'
11+
gem 'rake', '10.4.2'

embulk-output-bigquery.gemspec

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@ Gem::Specification.new do |spec|
1414
spec.test_files = spec.files.grep(%r{^(test|spec)/})
1515
spec.require_paths = ["lib"]
1616

17-
# the latest version
18-
spec.add_dependency 'google-apis-storage_v1'
19-
spec.add_dependency 'google-apis-bigquery_v2'
17+
# TODO
18+
# signet 0.12.0 and google-api-client 0.33.0 require >= Ruby 2.4.
19+
# Embulk 0.9 use JRuby 9.1.X.Y and it's compatible with Ruby 2.3.
20+
# So, force install signet < 0.12 and google-api-client < 0.33.0
21+
# Also, representable version >= 3.1.0 requires Ruby version >= 2.4
22+
spec.add_dependency 'signet', '~> 0.7', '< 0.12.0'
23+
spec.add_dependency 'google-api-client','< 0.33.0'
2024
spec.add_dependency 'time_with_zone'
21-
spec.add_dependency 'thwait'
22-
# activesupport require Ruby >= 2.7.0
23-
# jruby-9.3.0.0 is MRI 2.6 compatible
24-
spec.add_dependency 'activesupport', "< 7.0"
25+
spec.add_dependency "representable", ['~> 3.0.0', '< 3.1']
26+
# faraday 1.1.0 require >= Ruby 2.4.
27+
# googleauth 0.9.0 requires faraday ~> 0.12
28+
spec.add_dependency "faraday", '~> 0.12'
2529

2630
spec.add_development_dependency 'bundler', ['>= 1.10.6']
2731
spec.add_development_dependency 'rake', ['>= 10.0']

test/helper.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
require 'test/unit'
55
require 'test/unit/rr'
66

7-
# Embulk 0.10.x introduced new bootstrap mechanism.
8-
# https://github.com/embulk/embulk/blob/641f35fec064cca7b1a7314d634a4b64ef8637f1/embulk-ruby/test/vanilla/run-test.rb#L8-L13
9-
static_initializer = Java::org.embulk.EmbulkDependencyClassLoader.staticInitializer().useSelfContainedJarFiles()
10-
static_initializer.java_send :initialize
11-
12-
require 'embulk/java/bootstrap'
137
require 'embulk'
14-
8+
begin
9+
# Embulk ~> 0.8.x
10+
Embulk.setup
11+
rescue NotImplementedError, NoMethodError, NameError
12+
# Embulk ~> 0.9.x
13+
require 'embulk/java/bootstrap'
14+
end
1515
Embulk.logger = Embulk::Logger.new('/dev/null')
1616

1717
APP_ROOT = File.expand_path('../', __dir__)

0 commit comments

Comments
 (0)