mt-lang 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cffe1ff676e4ac5144fe70cf4e7be194072adc1291c59fa38678e1f4082e00f
-  data.tar.gz: 0bc2bf96c010bab477df55452c835bd82ff6e18ce96d2b3f18ce6fa648ae2f59
+  metadata.gz: e084e93ef653242052b06a0357bc6b67a9ec1f29f966dd4cff918218d950812e
+  data.tar.gz: a0a20b5e101aaef6f21e28487b24beaf116c60fa8b36f5cc1bf81ea716102124
 SHA512:
-  metadata.gz: 24e0c9b23bdde1e472073a5fcbf39ac5742bce6df1ccc7b1688a7fffed9ad71aa8f681056e582e3d310a338790045a23f292daf91872b511eaa92576fa320adf
-  data.tar.gz: 3e33af1f89a1c8571182fd11bbec65e10088c51f0f2105af131f50dccc77e93aa06cd05dd3aa4b666038d080f2dc52f4da9935686df8ec97d88b915d5663d91c
+  metadata.gz: '00458f0f8f2250b76f257643bafbd9868adc31c609ff73b35ae913aadacaefa14b782da12114f1f7bdad95534430e21f841baea279cbf90f1ea8a763b1c9d14b'
+  data.tar.gz: 243c6c9c8b9fd48c3ddc8fc4c6dad82a95666418e0d6f52df34733458bd7318deab8b9ba16b2a04e2418a4c259c80ac856121c44a4c23e9ef3bd50a351f061cb

data/lib/milk_tea/base.rb

@@ -3,7 +3,7 @@
 require "pathname"
 
 module MilkTea
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 
   def self.root
     @root ||= Pathname.new(File.expand_path("../..", __dir__))

data/lib/milk_tea/bindings/vendored_tools.rb

@@ -9,9 +9,10 @@ module MilkTea
     end
 
     def self.build_all!(root: MilkTea.root)
+      data = MilkTea.writable_root_for(root)
       results = all(root:).map do |tool|
         binary = tool.build!
-        install = tool.install_path(root:)
+        install = tool.install_path(root: data)
         FileUtils.mkdir_p(File.dirname(install))
         FileUtils.cp(binary, install)
         FileUtils.chmod(0o755, install)

data/lib/milk_tea/bindings/vendored_tracy.rb

@@ -5,8 +5,9 @@ require_relative "vendored_tool"
 module MilkTea
   module VendoredTracy
     def self.library(root: MilkTea.root)
-      source = MilkTea.writable_root_for(root).join("third_party/tracy-upstream/public/TracyClient.cpp")
-      build = MilkTea.writable_root_for(root).join("tmp/tracy-lib")
+      data = MilkTea.writable_root_for(root)
+      source = data.join("third_party/tracy-upstream/public/TracyClient.cpp")
+      build = data.join("tmp/tracy-lib")
       MilkTea::VendoredCLibrary::Archive.new(
         name: "tracy",
         source_root: source.dirname,
@@ -20,11 +21,12 @@ module MilkTea
     end
 
     def self.profiler_tool(root: MilkTea.root)
-      upstream_root = root.join("third_party/tracy-upstream")
+      data = MilkTea.writable_root_for(root)
+      source_dir = data.join("third_party/tracy-upstream/profiler")
       MilkTea::VendoredTool.new(
         name: "tracy-profiler",
-        source_dir: upstream_root.join("profiler").to_s,
-        build_dir: MilkTea.writable_root_for(root).join("tmp/tracy-profiler-build").to_s,
+        source_dir: source_dir.to_s,
+        build_dir: data.join("tmp/tracy-profiler-build").to_s,
         output_binary_name: "tracy-profiler",
         cmake_args: ["-DLEGACY=ON"],
       )

data/lib/milk_tea/tooling/toolchain_cli.rb

@@ -11,9 +11,12 @@ module MilkTea
       @out = out
       @err = err
       @help_printer = help_printer
+      @quiet = false
     end
 
     def start
+      extract_options!
+
       subcommand = @argv.shift
       unless subcommand
         @err.puts("missing toolchain subcommand")
@@ -37,6 +40,29 @@ module MilkTea
 
     private
 
+    def extract_options!
+      remaining = []
+      until @argv.empty?
+        arg = @argv.first
+        case arg
+        when "-q", "--quiet"
+          @quiet = true
+          @argv.shift
+        when "--"
+          @argv.shift
+          remaining.concat(@argv)
+          @argv.clear
+        else
+          remaining << @argv.shift
+        end
+      end
+      @argv.replace(remaining)
+    end
+
+    def info(message)
+      @out.puts(message) unless @quiet
+    end
+
     def print_help
       @help_printer.call(@err)
     end
@@ -50,12 +76,39 @@ module MilkTea
 
       require_relative "../bindings"
 
-      results = UpstreamSources.bootstrap_all!
-      results.each do |result|
-        verb = result.status == :present ? "kept" : "bootstrapped"
-        @out.puts("#{verb} #{result.source.name} -> #{result.path}")
+      sources = UpstreamSources.default_sources(root: MilkTea.root)
+      info "Bootstrapping #{sources.length} vendored libraries..."
+      info ""
+
+      ok = 0
+      skipped = 0
+      failed = 0
+
+      sources.each do |source|
+        if source.complete?
+          info "  #{source.name} (already present)"
+          skipped += 1
+          next
+        end
+
+        info "  #{source.name} \e[2mcloning...\e[0m"
+        @out.flush
+        begin
+          result = source.bootstrap!
+          verb = result.status == :present ? "kept" : "bootstrapped"
+          info "\r  #{source.name} \e[32m#{verb}\e[0m"
+          ok += 1
+        rescue UpstreamSources::Error => e
+          info "\r  #{source.name} \e[31mfailed\e[0m"
+          @err.puts("    #{e.message}")
+          failed += 1
+        end
       end
-      0
+
+      info ""
+      total = ok + skipped + failed
+      info "#{total} source(s): #{ok} bootstrapped, #{skipped} skipped, #{failed} failed"
+      failed.zero? ? 0 : 1
     end
 
     def doctor_command
@@ -71,6 +124,7 @@ module MilkTea
       ar = ENV.fetch("AR", "ar")
       checks = []
 
+      info "Checking system tools..."
       checks << ["ruby", true, RUBY_DESCRIPTION]
       checks << ["cc", executable_available?(cc), cc]
       checks << ["ar", executable_available?(ar), ar]
@@ -80,6 +134,7 @@ module MilkTea
       checks << ["cmake", executable_available?(ENV.fetch("CMAKE", "cmake")), ENV.fetch("CMAKE", "cmake")]
       checks << ["ninja", executable_available?("ninja"), "ninja"]
 
+      info "Checking vendored libraries..."
       UpstreamSources.default_sources(root: MilkTea.root).each do |source|
         missing = source.sentinel_paths.reject do |relative_path|
           File.exist?(source.checkout_root.join(relative_path))
@@ -91,6 +146,7 @@ module MilkTea
         end
       end
 
+      info "Checking bindings..."
       RawBindings.default_registry(root: MilkTea.root)
         .select { |binding| binding.module_name.start_with?("std.c.") }
         .sort_by(&:name)
@@ -119,8 +175,9 @@ module MilkTea
         end
       end
 
+      info ""
       checks.each do |name, ok, detail|
-        @out.puts("#{ok ? 'ok' : 'fail'} #{name}: #{detail}")
+        @out.puts("#{ok ? "ok" : "fail"} #{name}: #{detail}")
       end
 
       checks.all? { |_, ok, _| ok } ? 0 : 1
@@ -135,9 +192,13 @@ module MilkTea
 
       require_relative "../bindings"
 
+      tools = VendoredTools.all(root: MilkTea.root)
+      info "Building #{tools.length} vendored tool(s)..."
+      info ""
+
       results = VendoredTools.build_all!(root: MilkTea.root)
       results.each do |result|
-        @out.puts("built #{result[:tool].name} -> #{result[:binary]}")
+        info "  #{result[:tool].name} \e[32mbuilt\e[0m -> #{result[:binary]}"
       end
       0
     rescue VendoredTool::Error => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mt-lang
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Long (Teefan) Tran
@@ -583,7 +583,7 @@ metadata:
   homepage_uri: https://teefan.github.io/mt-lang/
   source_code_uri: https://github.com/teefan/mt-lang
 post_install_message: |
-  Milk Tea 0.2.2 installed!
+  Milk Tea 0.2.4 installed!
 
   System requirements:
     - A C compiler (gcc or clang) must be available on PATH