Format .rb files outside of lib/

kateinoigakukun · kateinoigakukun · commit 2846a5475a21 · 2022-10-11T19:45:07.000+09:00
diff --git a/Rakefile b/Rakefile
@@ -13,21 +13,54 @@ BUILD_SOURCES = {
     type: "github",
     repo: "ruby/ruby",
     rev: "master",
-    patches: [],
-  },
+    patches: []
+  }
 }
 
-FULL_EXTS = "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib"
+FULL_EXTS =
+  "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib"
 
 BUILD_PROFILES = {
-  "minimal"          => { debug: false, default_exts: "", user_exts: [] },
-  "minimal-debug"    => { debug: true,  default_exts: "", user_exts: [] },
-  "minimal-js"       => { debug: false, default_exts: "", user_exts: ["js", "witapi"] },
-  "minimal-js-debug" => { debug: true,  default_exts: "", user_exts: ["js", "witapi"] },
-  "full"             => { debug: false, default_exts: FULL_EXTS, user_exts: [] },
-  "full-debug"       => { debug: true,  default_exts: FULL_EXTS, user_exts: [] },
-  "full-js"          => { debug: false, default_exts: FULL_EXTS, user_exts: ["js", "witapi"] },
-  "full-js-debug"    => { debug: true,  default_exts: FULL_EXTS, user_exts: ["js", "witapi"] },
+  "minimal" => {
+    debug: false,
+    default_exts: "",
+    user_exts: []
+  },
+  "minimal-debug" => {
+    debug: true,
+    default_exts: "",
+    user_exts: []
+  },
+  "minimal-js" => {
+    debug: false,
+    default_exts: "",
+    user_exts: %w[js witapi]
+  },
+  "minimal-js-debug" => {
+    debug: true,
+    default_exts: "",
+    user_exts: %w[js witapi]
+  },
+  "full" => {
+    debug: false,
+    default_exts: FULL_EXTS,
+    user_exts: []
+  },
+  "full-debug" => {
+    debug: true,
+    default_exts: FULL_EXTS,
+    user_exts: []
+  },
+  "full-js" => {
+    debug: false,
+    default_exts: FULL_EXTS,
+    user_exts: %w[js witapi]
+  },
+  "full-js-debug" => {
+    debug: true,
+    default_exts: FULL_EXTS,
+    user_exts: %w[js witapi]
+  }
 }
 
 BUILDS = [
@@ -40,7 +73,7 @@ BUILDS = [
   { src: "head", target: "wasm32-unknown-wasi", profile: "full-js" },
   { src: "head", target: "wasm32-unknown-wasi", profile: "full-js-debug" },
   { src: "head", target: "wasm32-unknown-emscripten", profile: "minimal" },
-  { src: "head", target: "wasm32-unknown-emscripten", profile: "full" },
+  { src: "head", target: "wasm32-unknown-emscripten", profile: "full" }
 ]
 
 LIB_ROOT = File.dirname(__FILE__)
@@ -51,9 +84,7 @@ namespace :build do
   BUILDS.each do |params|
     name = "#{params[:src]}-#{params[:target]}-#{params[:profile]}"
     source = BUILD_SOURCES[params[:src]].merge(name: params[:src])
-    options = params
-        .merge(BUILD_PROFILES[params[:profile]])
-        .merge(src: source)
+    options = params.merge(BUILD_PROFILES[params[:profile]]).merge(src: source)
     debug = options[:debug]
     options.delete :profile
     options.delete :user_exts
@@ -62,17 +93,25 @@ namespace :build do
       if debug
         t.crossruby.debugflags = %w[-g]
         t.crossruby.wasmoptflags = %w[-O3 -g]
-        t.crossruby.ldflags = %w[-Xlinker --stack-first -Xlinker -z -Xlinker stack-size=16777216]
+        t.crossruby.ldflags = %w[
+          -Xlinker
+          --stack-first
+          -Xlinker
+          -z
+          -Xlinker
+          stack-size=16777216
+        ]
       else
         t.crossruby.debugflags = %w[-g0]
         t.crossruby.ldflags = %w[-Xlinker -zstack-size=16777216]
       end
 
       toolchain = t.toolchain
-      t.crossruby.user_exts = BUILD_PROFILES[params[:profile]][:user_exts].map do |ext|
-        srcdir = File.join(LIB_ROOT, "ext", ext)
-        RubyWasm::CrossRubyExtProduct.new(srcdir, toolchain)
-      end
+      t.crossruby.user_exts =
+        BUILD_PROFILES[params[:profile]][:user_exts].map do |ext|
+          srcdir = File.join(LIB_ROOT, "ext", ext)
+          RubyWasm::CrossRubyExtProduct.new(srcdir, toolchain)
+        end
       unless TOOLCHAINS.key? toolchain.name
         TOOLCHAINS[toolchain.name] = toolchain
       end
@@ -91,15 +130,12 @@ namespace :build do
 
     release =
       if args[:tag]
-        url = "https://api.github.com/repos/ruby/ruby.wasm/releases/tags/#{args[:tag]}"
-        OpenURI.open_uri(url) do |f|
-          JSON.load(f.read)
-        end
+        url =
+          "https://api.github.com/repos/ruby/ruby.wasm/releases/tags/#{args[:tag]}"
+        OpenURI.open_uri(url) { |f| JSON.load(f.read) }
       else
         url = "https://api.github.com/repos/ruby/ruby.wasm/releases?per_page=1"
-        OpenURI.open_uri(url) do |f|
-          JSON.load(f.read)[0]
-        end
+        OpenURI.open_uri(url) { |f| JSON.load(f.read)[0] }
       end
 
     puts "Downloading from release \"#{release["tag_name"]}\""
@@ -114,7 +150,11 @@ namespace :build do
       url = asset["browser_download_url"]
       tarball = File.join("rubies", asset["name"])
       rm_rf tarball, verbose: false
-      downloader.download(url, tarball, "[%2d/%2d] Downloading #{File.basename(url)}" % [i + 1, assets.size])
+      downloader.download(
+        url,
+        tarball,
+        "[%2d/%2d] Downloading #{File.basename(url)}" % [i + 1, assets.size]
+      )
       sh "tar xzf #{tarball} -C ./rubies"
     end
   end
diff --git a/ext/js/extconf.rb b/ext/js/extconf.rb
@@ -1,3 +1,3 @@
 require "mkmf"
-$objs = ["js-core.o", "bindgen/rb-js-abi-host.o"]
+$objs = %w[js-core.o bindgen/rb-js-abi-host.o]
 create_makefile("js")
diff --git a/ext/js/lib/js.rb b/ext/js/lib/js.rb
@@ -1,16 +1,16 @@
 require "js.so"
 
 class JS::Object
-    def method_missing(sym, *args, &block)
-        if self[sym].typeof == "function"
-            self.call(sym, *args, &block)
-        else
-            super
-        end
+  def method_missing(sym, *args, &block)
+    if self[sym].typeof == "function"
+      self.call(sym, *args, &block)
+    else
+      super
     end
+  end
 
-    def respond_to_missing?(sym, include_private)
-        return true if super
-        self[sym].typeof == "function"
-    end
-end
+  def respond_to_missing?(sym, include_private)
+    return true if super
+    self[sym].typeof == "function"
+  end
+end
diff --git a/ext/witapi/extconf.rb b/ext/witapi/extconf.rb
@@ -1,3 +1,3 @@
 require "mkmf"
-$objs = ["witapi-core.o", "bindgen/rb-abi-guest.o"]
+$objs = %w[witapi-core.o bindgen/rb-abi-guest.o]
 create_makefile("witapi")
diff --git a/packages/npm-packages/ruby-wasm-wasi/test/test_unit.rb b/packages/npm-packages/ruby-wasm-wasi/test/test_unit.rb
@@ -1,2 +1,2 @@
 require_relative "./unit/test_js"
-require_relative "./unit/test_object"
+require_relative "./unit/test_object"
diff --git a/packages/npm-packages/ruby-wasm-wasi/test/unit/test_js.rb b/packages/npm-packages/ruby-wasm-wasi/test/unit/test_js.rb
@@ -5,7 +5,7 @@ class JS::TestJS < Test::Unit::TestCase
   def test_is_a?
     # A ruby object always returns false
     assert_false JS.is_a?(1, Integer)
-    assert_false JS.is_a?('x', String)
+    assert_false JS.is_a?("x", String)
     # A js object is not an instance of itself
     assert_false JS.is_a?(JS.global, JS.global)
     # globalThis is an instance of Object
diff --git a/packages/npm-packages/ruby-wasm-wasi/test/unit/test_object.rb b/packages/npm-packages/ruby-wasm-wasi/test/unit/test_object.rb
@@ -21,9 +21,13 @@ def assert_object_eql?(result, a, b)
   def test_eql?
     assert_object_eql? true, JS.eval("return 24;"), JS.eval("return 24;")
     assert_object_eql? true, JS.eval("return null;"), JS.eval("return null;")
-    assert_object_eql? true, JS.eval("return undefined;"), JS.eval("return undefined;")
+    assert_object_eql? true,
+                       JS.eval("return undefined;"),
+                       JS.eval("return undefined;")
     assert_object_eql? true, JS.eval("return 'x';"), JS.eval("return 'x';")
-    assert_object_eql? true, JS.eval("return null;"), JS.eval("return undefined;")
+    assert_object_eql? true,
+                       JS.eval("return null;"),
+                       JS.eval("return undefined;")
 
     assert_object_eql? false, JS.eval("return 24;"), JS.eval("return 42;")
     assert_object_eql? false, JS.eval("return NaN;"), JS.eval("return NaN;")
@@ -35,11 +39,21 @@ def assert_object_strictly_eql?(result, a, b)
   end
 
   def test_strictly_eql?
-    assert_object_strictly_eql? true, JS.eval("return 24;"), JS.eval("return 24;")
-    assert_object_strictly_eql? true, JS.eval("return null;"), JS.eval("return null;")
-    assert_object_strictly_eql? true, JS.eval("return undefined;"), JS.eval("return undefined;")
-    assert_object_strictly_eql? false, JS.eval("return new String('str');"), JS.eval("return 'str';")
-    assert_object_strictly_eql? false, JS.eval("return null;"), JS.eval("return undefined;")
+    assert_object_strictly_eql? true,
+                                JS.eval("return 24;"),
+                                JS.eval("return 24;")
+    assert_object_strictly_eql? true,
+                                JS.eval("return null;"),
+                                JS.eval("return null;")
+    assert_object_strictly_eql? true,
+                                JS.eval("return undefined;"),
+                                JS.eval("return undefined;")
+    assert_object_strictly_eql? false,
+                                JS.eval("return new String('str');"),
+                                JS.eval("return 'str';")
+    assert_object_strictly_eql? false,
+                                JS.eval("return null;"),
+                                JS.eval("return undefined;")
   end
 
   def test_to_s
@@ -76,13 +90,14 @@ def test_method_missing_with_block
     JS
     block_called = false
     # TODO: Support return value in block
-    result = obj.takeBlock do |a, b, c|
-      block_called = true
-      # TODO: Compare them as integers after introducing `JS::Object#to_i`
-      assert_equal 1.to_s, a.to_s
-      assert_equal 2.to_s, b.to_s
-      assert_equal 3.to_s, c.to_s
-    end
+    result =
+      obj.takeBlock do |a, b, c|
+        block_called = true
+        # TODO: Compare them as integers after introducing `JS::Object#to_i`
+        assert_equal 1.to_s, a.to_s
+        assert_equal 2.to_s, b.to_s
+        assert_equal 3.to_s, c.to_s
+      end
     assert_true block_called
   end
 
diff --git a/packages/wapm-packages/irb/gems/lib/io/console.rb b/packages/wapm-packages/irb/gems/lib/io/console.rb
@@ -1,9 +1,9 @@
 class IO
-    def winsize
-        [24, 80]
-    end
+  def winsize
+    [24, 80]
+  end
 
-    def wait_readable(timeout = nil)
-        false
-    end
+  def wait_readable(timeout = nil)
+    false
+  end
 end
diff --git a/packages/wapm-packages/irb/gems/lib/reline.rb b/packages/wapm-packages/irb/gems/lib/reline.rb
@@ -1,10 +1,10 @@
 module Reline
-    def self.get_screen_size
-        raise Errno::EINVAL
-    end
-    class Unicode
-        def self.calculate_width(str, allow_escape_code = false)
-            1
-        end
+  def self.get_screen_size
+    raise Errno::EINVAL
+  end
+  class Unicode
+    def self.calculate_width(str, allow_escape_code = false)
+      1
     end
+  end
 end
diff --git a/tasks/format.rake b/tasks/format.rake
@@ -1,7 +1,16 @@
 namespace :format do
   begin
     require "syntax_tree/rake_tasks"
-    SyntaxTree::Rake::WriteTask.new(:ruby)
+    SyntaxTree::Rake::WriteTask.new(
+      :ruby,
+      Rake::FileList[
+        "Rakefile",
+        "lib/**/*.rb",
+        "ext/**/*.rb",
+        "tasks/**/*.rb",
+        "packages/**/*.rb",
+      ],
+    )
   rescue LoadError
   end
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`require_relative "./unit/test_js"`
`2`		`-require_relative "./unit/test_object"`
	`2`	`+require_relative "./unit/test_object"`