Skip to content

Commit

Permalink
GH-45402: [CI][Dev][Ruby] Reformat codes before apply lint (#45403)
Browse files Browse the repository at this point in the history
### Rationale for this change

#45398 will apply Ruby lint. Before this change, some code needs to be reformatted to avoid format errors.

```bash
Ruby Format..............................................................Failed
- hook id: rubocop
- exit code: 1
- files were modified by this hook

Inspecting 79 files
..............................C................................................

Offenses:

c_glib/test/test-record-batch-datum.rb:52:101: C: [Corrected] Layout/LineLength: Line is too long. [107/100]
    assert_equal("RecordBatch(visible:   [\n" + "    true,\n" + "    false\n" + "  ]\n" + ")", @ datum.to_s)
                                                                                                    ^^^^^^^
c_glib/test/test-record-batch-datum.rb:53:1: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
@ datum.to_s)
^^^^^^^^^^^

79 files inspected, 2 offenses detected, 2 offenses corrected
Inspecting 79 files
..................C................................C.....................C.....

Offenses:

dev/release/01-prepare-test.rb:267:101: C: Layout/LineLength: Line is too long. [101/100]
              "+<p><a href=\"../#{@ previous_compatible_version}/r/\">#{@ previous_r_version}</a></p>",
                                                                                                    ^
c_glib/test/test-struct-field-options.rb:45:101: C: Layout/LineLength: Line is too long. [112/100]
    message = "[struct-field-options][set-field-ref]: Invalid: Dot path '[foo]' contained an unterminated index"
                                                                                                    ^^^^^^^^^^^^
ruby/red-arrow/test/test-table.rb:1524:21: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                    table1.join(table2, ...
                    ^^^^^^^^^^^^^^^^^^^

79 files inspected, 3 offenses detected, 1 offense corrected
Inspecting 79 files
......................C........................................................

Offenses:

c_glib/test/test-chunked-array-datum.rb:52:101: C: [Corrected] Layout/LineLength: Line is too long. [108/100]
    assert_equal("ChunkedArray([\n" + "  [\n" + "    true,\n" + "    false\n" + "  ]\n" + "])", @ datum.to_s)
                                                                                                    ^^^^^^^^
c_glib/test/test-chunked-array-datum.rb:53:1: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
@ datum.to_s)
^^^^^^^^^^^

79 files inspected, 2 offenses detected, 2 offenses corrected
Inspecting 79 files
..............C............................C....C..............................

Offenses:

c_glib/test/dataset/test-file-system-dataset.rb:98:30: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                             label: [ ...
                             ^^^^^^^^
dev/release/post-12-bump-versions-test.rb:305:101: C: Layout/LineLength: Line is too long. [103/100]
                "+<p><a href=\"../#{@ previous_compatible_version}/r/\">#{@ previous_r_version}</a></p>",
                                                                                                    ^^^
c_glib/test/test-array.rb:122:101: C: [Corrected] Layout/LineLength: Line is too long. [103/100]
                   build_int32_array([0, 1069547520, -1071644672, nil]).view(Arrow::FloatDataType.new))
                                                                                                    ^^^

79 files inspected, 3 offenses detected, 2 offenses corrected
Inspecting 79 files
...............................................................................

79 files inspected, no offenses detected
Inspecting 79 files
........................................................................C......

Offenses:

c_glib/test/test-large-list-array.rb:91:30: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                             [ ...
                             ^

79 files inspected, 1 offense detected, 1 offense corrected
Inspecting 79 files
...............................................................................

79 files inspected, no offenses detected
Inspecting 79 files
...............................C...............................................

Offenses:

c_glib/test/test-uint-array-builder.rb:35:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                                       Arrow::Buffer.new(values.pack("S*")),
                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:36:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                                       Arrow::Buffer.new([0b011].pack("C*")),
                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:37:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                                       -1))
                                       ^^
c_glib/test/test-uint-array-builder.rb:45:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                                       Arrow::Buffer.new(values.pack("L*")),
                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:46:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                                       Arrow::Buffer.new([0b011].pack("C*")),
                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:47:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
                                       -1))
                                       ^^

79 files inspected, 6 offenses detected, 6 offenses corrected

pre-commit hook(s) made changes.
If you are seeing this message in CI, reproduce locally with: `pre-commit run --all-files`.
To run `pre-commit` as part of git workflow, use `pre-commit install`.
All changes made by hooks:
diff --git a/c_glib/test/dataset/test-file-system-dataset.rb b/c_glib/test/dataset/test-file-system-dataset.rb
index 96deedf6b..0cd2a61ea 100644
--- a/c_glib/test/dataset/test-file-system-dataset.rb
+++ b/c_glib/test/dataset/test-file-system-dataset.rb
@@ -95,11 +95,11 @@ class TestDatasetFileSystemDataset < Test::Unit::TestCase
                                build_int32_array([2]),
                                build_int32_array([3]),
                              ],
-                             label: [
-                               build_string_array(["a", "a"]),
-                               build_string_array(["b"]),
-                               build_string_array(["c"]),
-                             ])
+                                 label: [
+                                   build_string_array(["a", "a"]),
+                                   build_string_array(["b"]),
+                                   build_string_array(["c"]),
+                                 ])

     return dataset, expected_table
   end
diff --git a/c_glib/test/test-array.rb b/c_glib/test/test-array.rb
index aa129a474..681544920 100644
--- a/c_glib/test/test-array.rb
+++ b/c_glib/test/test-array.rb
@@ -119,7 +119,8 @@ class TestArray < Test::Unit::TestCase
   sub_test_case("#view") do
     def test_valid
       assert_equal(build_float_array([0.0, 1.5, -2.5, nil]),
-                   build_int32_array([0, 1069547520, -1071644672, nil]).view(Arrow::FloatDataType.new))
+                   build_int32_array([0, 1069547520, -1071644672,
+nil]).view(Arrow::FloatDataType.new))
     end

     def test_invalid
diff --git a/c_glib/test/test-chunked-array-datum.rb b/c_glib/test/test-chunked-array-datum.rb
index b82f3eed8..17a2cbd1a 100644
--- a/c_glib/test/test-chunked-array-datum.rb
+++ b/c_glib/test/test-chunked-array-datum.rb
@@ -49,7 +49,8 @@ class TestChunkedArrayDatum < Test::Unit::TestCase
   end

   def test_to_string
-    assert_equal("ChunkedArray([\n" + "  [\n" + "    true,\n" + "    false\n" + "  ]\n" + "])", @ datum.to_s)
+    assert_equal("ChunkedArray([\n" + "  [\n" + "    true,\n" + "    false\n" + "  ]\n" + "])",
+                 @ datum.to_s)
   end

   def test_value
diff --git a/c_glib/test/test-large-list-array.rb b/c_glib/test/test-large-list-array.rb
index 2f7efab5a..fa9c92ec8 100644
--- a/c_glib/test/test-large-list-array.rb
+++ b/c_glib/test/test-large-list-array.rb
@@ -88,10 +88,10 @@ class TestLargeListArray < Test::Unit::TestCase

   def test_value_offsets
     array = build_large_list_array(Arrow::Int8DataType.new,
-                             [
-                               [-29, 29],
-                               [-1, 0, 1],
-                             ])
+                                   [
+                                     [-29, 29],
+                                     [-1, 0, 1],
+                                   ])
     assert_equal([0, 2, 5],
                  array.value_offsets)
   end
diff --git a/c_glib/test/test-record-batch-datum.rb b/c_glib/test/test-record-batch-datum.rb
index ec572e0f1..e2d9c0258 100644
--- a/c_glib/test/test-record-batch-datum.rb
+++ b/c_glib/test/test-record-batch-datum.rb
@@ -49,7 +49,8 @@ class TestRecordBatchDatum < Test::Unit::TestCase
   end

   def test_to_string
-    assert_equal("RecordBatch(visible:   [\n" + "    true,\n" + "    false\n" + "  ]\n" + ")", @ datum.to_s)
+    assert_equal("RecordBatch(visible:   [\n" + "    true,\n" + "    false\n" + "  ]\n" + ")",
+                 @ datum.to_s)
   end

   def test_value
diff --git a/c_glib/test/test-uint-array-builder.rb b/c_glib/test/test-uint-array-builder.rb
index 89621189b..3aa3a1c48 100644
--- a/c_glib/test/test-uint-array-builder.rb
+++ b/c_glib/test/test-uint-array-builder.rb
@@ -32,9 +32,9 @@ class TestUIntArrayBuilder < Test::Unit::TestCase
     values = [0, border_value]
     assert_equal(build_uint_array([*values, nil]),
                  Arrow::UInt16Array.new(3,
-                                       Arrow::Buffer.new(values.pack("S*")),
-                                       Arrow::Buffer.new([0b011].pack("C*")),
-                                       -1))
+                                        Arrow::Buffer.new(values.pack("S*")),
+                                        Arrow::Buffer.new([0b011].pack("C*")),
+                                        -1))
   end

   def test_uint32
@@ -42,9 +42,9 @@ class TestUIntArrayBuilder < Test::Unit::TestCase
     values = [0, border_value]
     assert_equal(build_uint_array([*values, nil]),
                  Arrow::UInt32Array.new(3,
-                                       Arrow::Buffer.new(values.pack("L*")),
-                                       Arrow::Buffer.new([0b011].pack("C*")),
-                                       -1))
+                                        Arrow::Buffer.new(values.pack("L*")),
+                                        Arrow::Buffer.new([0b011].pack("C*")),
+                                        -1))
   end

   def test_uint64
diff --git a/ruby/red-arrow/test/test-table.rb b/ruby/red-arrow/test/test-table.rb
index a69e92615..2117e60df 100644
--- a/ruby/red-arrow/test/test-table.rb
+++ b/ruby/red-arrow/test/test-table.rb
@@ -1521,10 +1521,10 @@ visible: false
                                       ["key2_right", [100, 20]],
                                       ["string", ["1-100", "2-20"]],
                                     ]),
-                    table1.join(table2,
-                                ["key1", "key2"],
-                                left_suffix: "_left",
-                                right_suffix: "_right"))
+                   table1.join(table2,
+                               ["key1", "key2"],
+                               left_suffix: "_left",
+                               right_suffix: "_right"))
     end
   end
 end
```

### What changes are included in this PR?

Reformat Ruby codes.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

No.

* GitHub Issue: #45402

Lead-authored-by: Hiroyuki Sato <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
hiroyuki-sato and kou authored Feb 3, 2025
1 parent 76a52c3 commit ddc4bde
Show file tree
Hide file tree
Showing 14 changed files with 59 additions and 37 deletions.
18 changes: 9 additions & 9 deletions c_glib/test/dataset/test-file-system-dataset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ def create_dataset
dataset = @factory.finish

expected_table = build_table(count: [
build_int32_array([1, 10]),
build_int32_array([2]),
build_int32_array([3]),
],
label: [
build_string_array(["a", "a"]),
build_string_array(["b"]),
build_string_array(["c"]),
])
build_int32_array([1, 10]),
build_int32_array([2]),
build_int32_array([3]),
],
label: [
build_string_array(["a", "a"]),
build_string_array(["b"]),
build_string_array(["c"]),
])

return dataset, expected_table
end
Expand Down
3 changes: 2 additions & 1 deletion c_glib/test/test-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ def test_to_s

sub_test_case("#view") do
def test_valid
int32_array = build_int32_array([0, 1069547520, -1071644672, nil])
assert_equal(build_float_array([0.0, 1.5, -2.5, nil]),
build_int32_array([0, 1069547520, -1071644672, nil]).view(Arrow::FloatDataType.new))
int32_array.view(Arrow::FloatDataType.new))
end

def test_invalid
Expand Down
9 changes: 8 additions & 1 deletion c_glib/test/test-chunked-array-datum.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@ def test_false
end

def test_to_string
assert_equal("ChunkedArray([\n" + " [\n" + " true,\n" + " false\n" + " ]\n" + "])", @datum.to_s)
assert_equal(<<-DATUM.chomp, @datum.to_s)
ChunkedArray([
[
true,
false
]
])
DATUM
end

def test_value
Expand Down
8 changes: 4 additions & 4 deletions c_glib/test/test-large-list-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ def test_value_length

def test_value_offsets
array = build_large_list_array(Arrow::Int8DataType.new,
[
[-29, 29],
[-1, 0, 1],
])
[
[-29, 29],
[-1, 0, 1],
])
assert_equal([0, 2, 5],
array.value_offsets)
end
Expand Down
8 changes: 7 additions & 1 deletion c_glib/test/test-record-batch-datum.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ def test_false
end

def test_to_string
assert_equal("RecordBatch(visible: [\n" + " true,\n" + " false\n" + " ]\n" + ")", @datum.to_s)
assert_equal(<<-DATUM.chomp, @datum.to_s)
RecordBatch(visible: [
true,
false
]
)
DATUM
end

def test_value
Expand Down
6 changes: 4 additions & 2 deletions c_glib/test/test-record-batch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ def setup
end

def test_valid
record_batch = Arrow::RecordBatch.new(@schema, @n_rows, [@uint8_value, @valid_name_value])
columns = [@uint8_value, @valid_name_value]
record_batch = Arrow::RecordBatch.new(@schema, @n_rows, columns)

assert do
record_batch.validate_full
Expand All @@ -253,7 +254,8 @@ def test_valid
def test_invalid
message = "[record-batch][validate-full]: Invalid: " +
"In column 1: Invalid: Invalid UTF8 sequence at string index 0"
record_batch = Arrow::RecordBatch.new(@schema, @n_rows, [@uint8_value, @invalid_name_value])
columns = [@uint8_value, @invalid_name_value]
record_batch = Arrow::RecordBatch.new(@schema, @n_rows, columns)

assert_raise(Arrow::Error::Invalid.new(message)) do
record_batch.validate_full
Expand Down
3 changes: 2 additions & 1 deletion c_glib/test/test-struct-field-options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ def test_set_dot_path
end

def test_set_invalid
message = "[struct-field-options][set-field-ref]: Invalid: Dot path '[foo]' contained an unterminated index"
message = "[struct-field-options][set-field-ref]: " +
"Invalid: Dot path '[foo]' contained an unterminated index"
assert_raise(Arrow::Error::Invalid.new(message)) do
@options.field_ref = "[foo]"
end
Expand Down
12 changes: 6 additions & 6 deletions c_glib/test/test-uint-array-builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ def test_uint16
values = [0, border_value]
assert_equal(build_uint_array([*values, nil]),
Arrow::UInt16Array.new(3,
Arrow::Buffer.new(values.pack("S*")),
Arrow::Buffer.new([0b011].pack("C*")),
-1))
Arrow::Buffer.new(values.pack("S*")),
Arrow::Buffer.new([0b011].pack("C*")),
-1))
end

def test_uint32
border_value = 2 ** 16
values = [0, border_value]
assert_equal(build_uint_array([*values, nil]),
Arrow::UInt32Array.new(3,
Arrow::Buffer.new(values.pack("L*")),
Arrow::Buffer.new([0b011].pack("C*")),
-1))
Arrow::Buffer.new(values.pack("L*")),
Arrow::Buffer.new([0b011].pack("C*")),
-1))
end

def test_uint64
Expand Down
3 changes: 2 additions & 1 deletion dev/release/01-prepare-test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ def test_version_pre_tag
"-<p><a href=\"../r/\">#{@previous_r_version} (release)</a></p>",
"+<body><p><a href=\"../dev/r/\">#{@release_version}.9000 (dev)</a></p>",
"+<p><a href=\"../r/\">#{@release_version} (release)</a></p>",
"+<p><a href=\"../#{@previous_compatible_version}/r/\">#{@previous_r_version}</a></p>",
"+<p><a href=\"../#{@previous_compatible_version}/r/\">" +
"#{@previous_r_version}</a></p>",
]
],
},
Expand Down
3 changes: 2 additions & 1 deletion dev/release/post-12-bump-versions-test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,8 @@ def test_version_post_tag
"-<p><a href=\"../r/\">#{@previous_r_version} (release)</a></p>",
"+<body><p><a href=\"../dev/r/\">#{@release_version}.9000 (dev)</a></p>",
"+<p><a href=\"../r/\">#{@release_version} (release)</a></p>",
"+<p><a href=\"../#{@previous_compatible_version}/r/\">#{@previous_r_version}</a></p>",
"+<p><a href=\"../#{@previous_compatible_version}/r/\">" +
"#{@previous_r_version}</a></p>",
],
],
},
Expand Down
5 changes: 3 additions & 2 deletions ruby/red-arrow/test/each-raw-record/test-map-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,10 @@ def test_time64_micro

def test_time64_nano
unit = Arrow::TimeUnit::NANO
# 00:10:00.123456789
value = Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789)
records = [
# 00:10:00.123456789
[{"key1" => Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789), "key2" => nil}],
[{"key1" => value, "key2" => nil}],
[nil],
]
target = build({
Expand Down
5 changes: 3 additions & 2 deletions ruby/red-arrow/test/raw-records/test-map-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,10 @@ def test_time64_micro

def test_time64_nano
unit = Arrow::TimeUnit::NANO
# 00:10:00.123456789
value = Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789)
records = [
# 00:10:00.123456789
[{"key1" => Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789), "key2" => nil}],
[{"key1" => value, "key2" => nil}],
[nil],
]
target = build({
Expand Down
8 changes: 4 additions & 4 deletions ruby/red-arrow/test/test-table.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1521,10 +1521,10 @@ def setup
["key2_right", [100, 20]],
["string", ["1-100", "2-20"]],
]),
table1.join(table2,
["key1", "key2"],
left_suffix: "_left",
right_suffix: "_right"))
table1.join(table2,
["key1", "key2"],
left_suffix: "_left",
right_suffix: "_right"))
end
end
end
5 changes: 3 additions & 2 deletions ruby/red-arrow/test/values/test-map-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,10 @@ def test_time64_micro

def test_time64_nano
unit = Arrow::TimeUnit::NANO
# 00:10:00.123456789
value = Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789)
values = [
# 00:10:00.123456789
{"key1" => Arrow::Time.new(unit, (60 * 10) * 1_000_000_000 + 123_456_789), "key2" => nil},
{"key1" => value, "key2" => nil},
nil,
]
target = build({
Expand Down

0 comments on commit ddc4bde

Please sign in to comment.