rake format

Author: kateinoigakukun

Rakefile

@@ -29,14 +29,14 @@ NPM_PACKAGES = [
     name: "ruby-head-wasm-wasi",
     ruby_version: "head",
     gemfile: "packages/npm-packages/ruby-head-wasm-wasi/Gemfile",
-    target: "wasm32-unknown-wasip1",
+    target: "wasm32-unknown-wasip1"
   },
   {
     name: "ruby-head-wasm-wasip2",
     ruby_version: "head",
     gemfile: "packages/npm-packages/ruby-head-wasm-wasip2/Gemfile",
     target: "wasm32-unknown-wasip2",
-    enable_component_model: true,
+    enable_component_model: true
   },
   {
     name: "ruby-3.4-wasm-wasi",

lib/ruby_wasm/build/executor.rb

@@ -152,11 +152,7 @@ def system(*args, chdir: nil, env: nil)
       kwargs = {}
       kwargs[:chdir] = chdir if chdir
       kwargs[:exception] = true
-      if env
-        Kernel.system(env, *args, **kwargs)
-      else
-        Kernel.system(*args, **kwargs)
-      end
+      env ? Kernel.system(env, *args, **kwargs) : Kernel.system(*args, **kwargs)
     end
   end
 

lib/ruby_wasm/build/toolchain.rb

@@ -19,7 +19,12 @@ def check_envvar(name)
     def self.get(target, options, build_dir = nil)
       case target
       when /^wasm32-unknown-wasi/
-        return RubyWasm::WASISDK.new(build_dir: build_dir, version: options[:wasi_sdk_version])
+        return(
+          RubyWasm::WASISDK.new(
+            build_dir: build_dir,
+            version: options[:wasi_sdk_version]
+          )
+        )
       when "wasm32-unknown-emscripten"
         return RubyWasm::Emscripten.new
       else
@@ -71,7 +76,8 @@ def initialize(
         @version = version
       end
 
-      @binaryen = Binaryen.new(build_dir: build_dir, binaryen_version: binaryen_version)
+      @binaryen =
+        Binaryen.new(build_dir: build_dir, binaryen_version: binaryen_version)
 
       @tools = {
         cc: "#{wasi_sdk_path}/bin/clang",
@@ -103,44 +109,55 @@ def download_url
       major, _ = @version.split(".").map(&:to_i)
       # @type var assets: Array[[Regexp, Array[String]]]
       assets = [
-        [/x86_64-linux/, [
-          "wasi-sdk-#{@version}-x86_64-linux.tar.gz",
-          # For wasi-sdk version < 23.0
-          "wasi-sdk-#{@version}-linux.tar.gz",
-        ]],
-        [/arm64e?-darwin/, [
-          "wasi-sdk-#{@version}-arm64-macos.tar.gz",
-          # For wasi-sdk version < 23.0
-          "wasi-sdk-#{@version}-macos.tar.gz",
-        ]],
-        [/x86_64-darwin/, [
-          "wasi-sdk-#{@version}-x86_64-macos.tar.gz",
-          # For wasi-sdk version < 23.0
-          "wasi-sdk-#{@version}-macos.tar.gz",
-        ]],
+        [
+          /x86_64-linux/,
+          [
+            "wasi-sdk-#{@version}-x86_64-linux.tar.gz",
+            # For wasi-sdk version < 23.0
+            "wasi-sdk-#{@version}-linux.tar.gz"
+          ]
+        ],
+        [
+          /arm64e?-darwin/,
+          [
+            "wasi-sdk-#{@version}-arm64-macos.tar.gz",
+            # For wasi-sdk version < 23.0
+            "wasi-sdk-#{@version}-macos.tar.gz"
+          ]
+        ],
+        [
+          /x86_64-darwin/,
+          [
+            "wasi-sdk-#{@version}-x86_64-macos.tar.gz",
+            # For wasi-sdk version < 23.0
+            "wasi-sdk-#{@version}-macos.tar.gz"
+          ]
+        ]
       ]
-      asset = assets.find do |os, candidates|
-        os =~ RUBY_PLATFORM
-      end
+      asset = assets.find { |os, candidates| os =~ RUBY_PLATFORM }
       if asset.nil?
         raise "unsupported platform for fetching WASI SDK: #{RUBY_PLATFORM}"
       end
       _, candidates = asset
-      candidates_urls = candidates.map do |candidate|
-        "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-#{major}/#{candidate}"
-      end
+      candidates_urls =
+        candidates.map do |candidate|
+          "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-#{major}/#{candidate}"
+        end
       require "net/http"
       # Find an asset that exists by checking HEAD response to see if the asset exists
       candidates_urls.each do |url_str|
         # @type var url: URI::HTTPS
         url = URI.parse(url_str)
-        ok = Net::HTTP.start(url.host, url.port, use_ssl: url.scheme == 'https') do |http|
-          response = http.head(url.request_uri)
-          next response.code == "302"
-        end
-        if ok
-          return url_str
-        end
+        ok =
+          Net::HTTP.start(
+            url.host,
+            url.port,
+            use_ssl: url.scheme == "https"
+          ) do |http|
+            response = http.head(url.request_uri)
+            next response.code == "302"
+          end
+        return url_str if ok
       end
       raise "WASI SDK asset not found: #{candidates_urls.join(", ")}"
     end
@@ -151,11 +168,21 @@ def install_wasi_sdk(executor)
         File.join(File.dirname(@wasi_sdk_path), "wasi-sdk-#{@version}.tar.gz")
       unless File.exist? wasi_sdk_tarball
         FileUtils.mkdir_p File.dirname(wasi_sdk_tarball)
-        executor.system "curl", "-fsSL", "-o", wasi_sdk_tarball, self.download_url
+        executor.system "curl",
+                        "-fsSL",
+                        "-o",
+                        wasi_sdk_tarball,
+                        self.download_url
       end
       unless File.exist? @wasi_sdk_path
         FileUtils.mkdir_p @wasi_sdk_path
-        executor.system "tar", "-C", @wasi_sdk_path, "--strip-component", "1", "-xzf", wasi_sdk_tarball
+        executor.system "tar",
+                        "-C",
+                        @wasi_sdk_path,
+                        "--strip-component",
+                        "1",
+                        "-xzf",
+                        wasi_sdk_tarball
       end
     end
 
@@ -218,20 +245,35 @@ def install(executor)
       binaryen_tarball = File.expand_path("../binaryen.tar.gz", @binaryen_path)
       unless File.exist? binaryen_tarball
         FileUtils.mkdir_p File.dirname(binaryen_tarball)
-        executor.system "curl", "-L", "-o", binaryen_tarball, self.download_url(@binaryen_version)
+        executor.system "curl",
+                        "-L",
+                        "-o",
+                        binaryen_tarball,
+                        self.download_url(@binaryen_version)
       end
 
       unless File.exist? @binaryen_path
         FileUtils.mkdir_p @binaryen_path
-        executor.system "tar", "-C", @binaryen_path, "--strip-component", "1", "-xzf", binaryen_tarball
+        executor.system "tar",
+                        "-C",
+                        @binaryen_path,
+                        "--strip-component",
+                        "1",
+                        "-xzf",
+                        binaryen_tarball
       end
     end
-
   end
 
   class Emscripten < Toolchain
     def initialize
-      @tools = { cc: "emcc", cxx: "em++", ld: "emcc", ar: "emar", ranlib: "emranlib" }
+      @tools = {
+        cc: "emcc",
+        cxx: "em++",
+        ld: "emcc",
+        ar: "emar",
+        ranlib: "emranlib"
+      }
       @name = "emscripten"
     end
 

lib/ruby_wasm/cli.rb

@@ -214,15 +214,17 @@ def compute_build_alias(options)
           end
           # FIXME: We should have a way to specify extensions to be included by users.
           # For now, assume all default extensions available in the head revision are available.
-          return {
-            name: "local",
-            src: {
-              type: "local",
-              path: src_name,
-              patches: []
-            },
-            all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS,
-          }
+          return(
+            {
+              name: "local",
+              src: {
+                type: "local",
+                path: src_name,
+                patches: []
+              },
+              all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS
+            }
+          )
         end
         # Otherwise, it's an unknown source.
         raise(
@@ -243,52 +245,56 @@ def self.build_config_aliases(root)
           src: {
             type: "github",
             repo: "ruby/ruby",
-            rev: "master",
+            rev: "master"
           },
           all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS,
-          wasi_sdk_version: "23.0",
+          wasi_sdk_version: "23.0"
         },
         {
           name: "3.4",
           src: {
             type: "tarball",
-            url: "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.gz",
+            url: "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.gz"
           },
-          all_default_exts: "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
-          wasi_sdk_version: "22.0",
+          all_default_exts:
+            "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+          wasi_sdk_version: "22.0"
         },
         {
           name: "3.3",
           src: {
             type: "tarball",
-            url: "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz",
+            url: "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz"
           },
-          all_default_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,openssl",
-          wasi_sdk_version: "22.0",
+          all_default_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,openssl",
+          wasi_sdk_version: "22.0"
         },
         {
           name: "3.2",
           src: {
             type: "tarball",
-            url: "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.gz",
+            url: "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.gz"
           },
-          all_default_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,openssl",
-          wasi_sdk_version: "22.0",
+          all_default_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,openssl",
+          wasi_sdk_version: "22.0"
         }
       ]
 
       # Set the name in the source config.
-      aliases.each do |config|
-        config[:src][:name] = config[:name]
-      end
+      aliases.each { |config| config[:src][:name] = config[:name] }
 
       # Apply bundled and user-specified `<root>/patches` directories.
       aliases.each do |config|
         patches_dirs = [bundled_patches_path, File.join(root, "patches")]
-        config[:src][:patches] = patches_dirs.flat_map do |patches_dir|
-          Dir[File.join(patches_dir, config[:name], "*.patch")]
-            .map { |p| File.expand_path(p) }
-        end.uniq
+        config[:src][:patches] = patches_dirs
+          .flat_map do |patches_dir|
+            Dir[File.join(patches_dir, config[:name], "*.patch")].map do |p|
+              File.expand_path(p)
+            end
+          end
+          .uniq
       end
 
       # Pin the revisions based on build_manifest.json if available.