Skip to content

Commit 0682b75

Browse files
committed
Merge pull request #20 from hone/subdirs
Move rbfiles to subdirs as per mruby/mruby#2943
2 parents 51c30ca + f95e9ff commit 0682b75

12 files changed

Lines changed: 3 additions & 3 deletions

File tree

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ desc "generate a release tarball"
6868
task :release do
6969
require 'tmpdir'
7070
require 'fileutils'
71-
require_relative 'mrblib/version'
71+
require_relative 'mrblib/mruby-cli/version'
7272

7373
# since we're in the mruby/
7474
release_dir = "releases/v#{MRubyCLI::Version::VERSION}"

bintest/mruby-cli.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
end
5454

5555
assert('version') do
56-
require_relative '../mrblib/version'
56+
require_relative '../mrblib/mruby-cli/version'
5757
output, status = Open3.capture2("#{BIN_PATH}", "--version")
5858
assert_true status.success?, "Process did not exit cleanly"
5959
assert_include output, "mruby-cli version #{MRubyCLI::Version::VERSION}"
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def option(long_opt)
3131

3232
return nil unless option
3333
if retn = @parsed_opts[option.long]
34-
if option.value
34+
if option.value
3535
return retn unless retn.empty?
3636
else
3737
return retn
File renamed without changes.

0 commit comments

Comments
 (0)