Skip to content

Commit 6fffcf2

Browse files
committed
renamed java_args.rb to java_opts.rb and renamed methods
1 parent 16119be commit 6fffcf2

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# frozen_string_literal: false
22
# class to parse java_args.txt or java_args in config.yml
3-
class JavaArgs
4-
attr_reader :java
3+
class JavaOpts
4+
attr_reader :jvm_opts
55

66
def initialize(sketch_root)
77
arg_file = File.join(sketch_root, 'data/java_args.txt')
8-
@java = []
8+
@jvm_opts = []
99
if FileTest.exist?(arg_file)
10-
@java += File.read(arg_file).split(/\s+/)
10+
@jvm_opts += File.read(arg_file).split(/\s+/)
1111
elsif Processing::RP_CONFIG['java_args']
12-
@java += Processing::RP_CONFIG['java_args'].split(/\s+/)
12+
@jvm_opts += Processing::RP_CONFIG['java_args'].split(/\s+/)
1313
end
1414
end
1515

1616
# wrap java args for jruby
1717
def jruby
18-
return [] if java.length == 0
19-
java.map { |arg| "-J#{arg}" }
18+
return [] if jvm_opts.length == 0
19+
jvm_opts.map { |arg| "-J#{arg}" }
2020
end
2121
end

lib/jruby_art/runner.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
require_relative '../jruby_art/config'
77
require_relative '../jruby_art/version'
88
require_relative '../jruby_art/installer'
9-
require_relative '../jruby_art/java_args'
9+
require_relative '../jruby_art/java_opts'
1010

1111
# processing wrapper module
1212
module Processing
@@ -131,6 +131,10 @@ def setup(choice)
131131
def show_help
132132
puts HELP_MESSAGE
133133
end
134+
135+
def show_version
136+
puts format('JRubyArt version %s', JRubyArt::VERSION)
137+
end
134138

135139
private
136140

@@ -142,10 +146,10 @@ def show_help
142146
def spin_up(starter_script, sketch, args)
143147
runner = "#{K9_ROOT}/lib/jruby_art/runners/#{starter_script}"
144148
@options.nojruby = true if Processing::RP_CONFIG['JRUBY'] == 'false'
145-
java_args = JavaArgs.new(SKETCH_ROOT)
149+
opts = JavaOpts.new(SKETCH_ROOT)
146150
if @options.nojruby
147151
command = ['java',
148-
java_args.java,
152+
opts.jvm_opts,
149153
'-cp',
150154
jruby_complete,
151155
'org.jruby.Main',
@@ -154,7 +158,7 @@ def spin_up(starter_script, sketch, args)
154158
args].flatten
155159
else
156160
command = ['jruby',
157-
java_args.jruby,
161+
opts.jruby,
158162
runner,
159163
sketch,
160164
args].flatten
@@ -197,7 +201,7 @@ def host_os
197201
WIN_PATTERNS.find { |r| detect_os =~ r }
198202
raise "unknown os: #{detect_os.inspect}" if Regexp.last_match.nil?
199203
:windows
200-
end
204+
end
201205
end
202206
end # class Runner
203207
end # module Processing

0 commit comments

Comments
 (0)