t-ruby 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8847929796ade811f3b9c3cd3ddcb86448e18927e40c2318e562dc9c35e312b
-  data.tar.gz: 526a69c0dc752147ed3a29b208ebb85cd019a20b03efbd21ed28a25d5badc37b
+  metadata.gz: af10457f1fd4a0f0f3290c1cfead779eeca70c90cf81fa18320532e8c079a529
+  data.tar.gz: 15f674d20a11d3bb305198822fdd398447c9a7915377c2000eb480b4ab92318c
 SHA512:
-  metadata.gz: 55d2c62ad5fd9071da3bfd363fad13e14d08f340c9ed8b19ab1c5b677db4a4e583dc8f183f67006efbfa44a2fbd1e0c77f14c6dd7af39b6c2d745978b938dcdf
-  data.tar.gz: 93d96b65f461f68dc3833a1be714b51a616edefc1b01e97d56016cddbba7a48843f098efa49634d3a55043c8ffca21bd47cad660200cd63fd75e5deb92a2811e
+  metadata.gz: c0f281354fe79043c23ce37760c8a177bcab6de92d135d499ae3757b27e0944daed045fc3ba3334b32ab82a0ea16e028b0076afb0d8964238b042f644f5a1e5c
+  data.tar.gz: 5f91cac0ffedca7444fb68e4974435a6c01157ec0373b7ebe430e240643802e946c02fb7d91da147e823db17982b342be8e5ca03b74c1ca8263312227da82d78

data/README.md

@@ -9,11 +9,11 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/CI-passing-brightgreen" alt="CI: passing" />
+  <a href="https://github.com/type-ruby/t-ruby/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/type-ruby/t-ruby/ci.yml?label=CI" alt="CI" /></a>
   <img src="https://img.shields.io/badge/ruby-3.0+-cc342d" alt="Ruby 3.0+" />
   <a href="https://rubygems.org/gems/t-ruby"><img src="https://img.shields.io/gem/v/t-ruby" alt="Gem Version" /></a>
   <img src="https://img.shields.io/gem/dt/t-ruby" alt="Downloads" />
-  <img src="https://img.shields.io/badge/coverage-90%25-brightgreen" alt="Coverage: 90%" />
+  <a href="https://coveralls.io/github/type-ruby/t-ruby?branch=main"><img src="https://coveralls.io/repos/github/type-ruby/t-ruby/badge.svg?branch=main" alt="Coverage" /></a>
 </p>
 
 <p align="center">

data/lib/t_ruby/cli.rb

@@ -13,7 +13,8 @@ module TRuby
         trc --watch, -w          Watch input files and recompile on change
         trc --decl <file.trb>    Generate .d.trb declaration file
         trc --lsp                Start LSP server (for IDE integration)
-        trc --version, -v        Show version
+        trc update               Update t-ruby to the latest version
+        trc --version, -v        Show version (and check for updates)
         trc --help, -h           Show this help
 
       Examples:
@@ -44,6 +45,12 @@ module TRuby
 
       if @args.include?("--version") || @args.include?("-v")
         puts "trc #{VERSION}"
+        check_for_updates
+        return
+      end
+
+      if @args.include?("update")
+        update_gem
         return
       end
 
@@ -78,6 +85,24 @@ module TRuby
 
     private
 
+    def check_for_updates
+      result = VersionChecker.check
+      return unless result
+
+      puts ""
+      puts "New version available: #{result[:latest]} (current: #{result[:current]})"
+      puts "Run 'trc update' to update"
+    end
+
+    def update_gem
+      puts "Updating t-ruby..."
+      if VersionChecker.update
+        puts "Successfully updated t-ruby!"
+      else
+        puts "Update failed. Try: gem install t-ruby"
+      end
+    end
+
     def init_project
       config_file = "trbconfig.yml"
       src_dir = "src"
@@ -105,7 +130,6 @@ module TRuby
           output:
             ruby_dir: #{build_dir}
             # rbs_dir: sig  # Optional: separate directory for .rbs files
-            preserve_structure: true
             # clean_before_build: false
 
           compiler:

data/lib/t_ruby/compiler.rb

@@ -38,29 +38,27 @@ module TRuby
       # Transform source to Ruby code
       output = @use_ir ? transform_with_ir(source, parser) : transform_legacy(source, parse_result)
 
-      out_dir = @config.out_dir
-      FileUtils.mkdir_p(out_dir)
-
-      base_filename = File.basename(input_path, ".trb")
-      output_path = File.join(out_dir, "#{base_filename}.rb")
+      # Compute output path (respects preserve_structure setting)
+      output_path = compute_output_path(input_path, @config.ruby_dir, ".rb")
+      FileUtils.mkdir_p(File.dirname(output_path))
 
       File.write(output_path, output)
 
       # Generate .rbs file if enabled in config
       if @config.compiler["generate_rbs"]
-        rbs_dir = @config.rbs_dir
-        FileUtils.mkdir_p(rbs_dir)
+        rbs_path = compute_output_path(input_path, @config.rbs_dir, ".rbs")
+        FileUtils.mkdir_p(File.dirname(rbs_path))
         if @use_ir && parser.ir_program
-          generate_rbs_from_ir(base_filename, rbs_dir, parser.ir_program)
+          generate_rbs_from_ir_to_path(rbs_path, parser.ir_program)
         else
-          generate_rbs_file(base_filename, rbs_dir, parse_result)
+          generate_rbs_file_to_path(rbs_path, parse_result)
         end
       end
 
       # Generate .d.trb file if enabled in config (legacy support)
       # TODO: Add compiler.generate_dtrb option in future
       if @config.compiler.key?("generate_dtrb") && @config.compiler["generate_dtrb"]
-        generate_dtrb_file(input_path, out_dir)
+        generate_dtrb_file(input_path, @config.ruby_dir)
       end
 
       output_path
@@ -161,8 +159,70 @@ module TRuby
       @optimizer&.stats
     end
 
+    # Compute output path for a source file
+    # @param input_path [String] path to source file
+    # @param output_dir [String] base output directory
+    # @param new_extension [String] new file extension (e.g., ".rb", ".rbs")
+    # @return [String] computed output path (always preserves directory structure)
+    def compute_output_path(input_path, output_dir, new_extension)
+      relative = compute_relative_path(input_path)
+      base = relative.sub(/\.[^.]+$/, new_extension)
+      File.join(output_dir, base)
+    end
+
+    # Compute relative path from source directory
+    # @param input_path [String] path to source file
+    # @return [String] relative path preserving directory structure
+    def compute_relative_path(input_path)
+      # Use realpath to resolve symlinks (e.g., /var vs /private/var on macOS)
+      absolute_input = resolve_path(input_path)
+      source_dirs = @config.source_include
+
+      # Check if file is inside any source_include directory
+      if source_dirs.size > 1
+        # Multiple source directories: include the source dir name in output
+        # src/models/user.trb → src/models/user.trb
+        source_dirs.each do |src_dir|
+          absolute_src = resolve_path(src_dir)
+          next unless absolute_input.start_with?("#{absolute_src}/")
+
+          # Return path relative to parent of source dir (includes src dir name)
+          parent_of_src = File.dirname(absolute_src)
+          return absolute_input.sub("#{parent_of_src}/", "")
+        end
+      else
+        # Single source directory: exclude the source dir name from output
+        # src/models/user.trb → models/user.trb
+        src_dir = source_dirs.first
+        if src_dir
+          absolute_src = resolve_path(src_dir)
+          if absolute_input.start_with?("#{absolute_src}/")
+            return absolute_input.sub("#{absolute_src}/", "")
+          end
+        end
+      end
+
+      # File outside source directories: use path relative to current working directory
+      # external/foo.trb → external/foo.trb
+      cwd = resolve_path(".")
+      if absolute_input.start_with?("#{cwd}/")
+        return absolute_input.sub("#{cwd}/", "")
+      end
+
+      # Absolute path from outside cwd: use basename only
+      File.basename(input_path)
+    end
+
     private
 
+    # Resolve path to absolute path, following symlinks
+    # Falls back to expand_path if realpath fails (e.g., file doesn't exist yet)
+    def resolve_path(path)
+      File.realpath(path)
+    rescue Errno::ENOENT
+      File.expand_path(path)
+    end
+
     def setup_declaration_paths
       # Add default declaration paths
       @declaration_loader.add_search_path(@config.out_dir)
@@ -197,30 +257,29 @@ module TRuby
       end
     end
 
-    # Generate RBS from IR
-    def generate_rbs_from_ir(base_filename, out_dir, ir_program)
+    # Generate RBS from IR to a specific path
+    def generate_rbs_from_ir_to_path(rbs_path, ir_program)
       generator = IR::RBSGenerator.new
       rbs_content = generator.generate(ir_program)
-
-      rbs_path = File.join(out_dir, "#{base_filename}.rbs")
       File.write(rbs_path, rbs_content) unless rbs_content.strip.empty?
     end
 
-    # Legacy RBS generation
-    def generate_rbs_file(base_filename, out_dir, parse_result)
+    # Legacy RBS generation to a specific path
+    def generate_rbs_file_to_path(rbs_path, parse_result)
       generator = RBSGenerator.new
       rbs_content = generator.generate(
         parse_result[:functions] || [],
         parse_result[:type_aliases] || []
       )
-
-      rbs_path = File.join(out_dir, "#{base_filename}.rbs")
       File.write(rbs_path, rbs_content) unless rbs_content.empty?
     end
 
     def generate_dtrb_file(input_path, out_dir)
+      dtrb_path = compute_output_path(input_path, out_dir, DeclarationGenerator::DECLARATION_EXTENSION)
+      FileUtils.mkdir_p(File.dirname(dtrb_path))
+
       generator = DeclarationGenerator.new
-      generator.generate_file(input_path, out_dir)
+      generator.generate_file_to_path(input_path, dtrb_path)
     end
 
     # Copy .rb file to output directory and generate .rbs signature
@@ -229,28 +288,25 @@ module TRuby
         raise ArgumentError, "File not found: #{input_path}"
       end
 
-      out_dir = @config.out_dir
-      FileUtils.mkdir_p(out_dir)
-
-      base_filename = File.basename(input_path, ".rb")
-      output_path = File.join(out_dir, "#{base_filename}.rb")
+      # Compute output path (respects preserve_structure setting)
+      output_path = compute_output_path(input_path, @config.ruby_dir, ".rb")
+      FileUtils.mkdir_p(File.dirname(output_path))
 
       # Copy the .rb file to output directory
       FileUtils.cp(input_path, output_path)
 
       # Generate .rbs file if enabled in config
       if @config.compiler["generate_rbs"]
-        rbs_dir = @config.rbs_dir
-        FileUtils.mkdir_p(rbs_dir)
-        generate_rbs_from_ruby(base_filename, rbs_dir, input_path)
+        rbs_path = compute_output_path(input_path, @config.rbs_dir, ".rbs")
+        FileUtils.mkdir_p(File.dirname(rbs_path))
+        generate_rbs_from_ruby_to_path(rbs_path, input_path)
       end
 
       output_path
     end
 
-    # Generate RBS from Ruby file using rbs prototype
-    def generate_rbs_from_ruby(base_filename, out_dir, input_path)
-      rbs_path = File.join(out_dir, "#{base_filename}.rbs")
+    # Generate RBS from Ruby file using rbs prototype to a specific path
+    def generate_rbs_from_ruby_to_path(rbs_path, input_path)
       result = `rbs prototype rb #{input_path} 2>/dev/null`
       File.write(rbs_path, result) unless result.strip.empty?
     end

data/lib/t_ruby/config.rb

@@ -19,7 +19,6 @@ module TRuby
       "output" => {
         "ruby_dir" => "build",
         "rbs_dir" => nil,
-        "preserve_structure" => true,
         "clean_before_build" => false,
       },
       "compiler" => {
@@ -72,12 +71,6 @@ module TRuby
       @output["rbs_dir"] || ruby_dir
     end
 
-    # Check if source directory structure should be preserved in output
-    # @return [Boolean] true if structure should be preserved
-    def preserve_structure?
-      @output["preserve_structure"] != false
-    end
-
     # Check if output directory should be cleaned before build
     # @return [Boolean] true if should clean before build
     def clean_before_build?

data/lib/t_ruby/declaration_generator.rb

@@ -64,6 +64,23 @@ module TRuby
       output_path
     end
 
+    # Generate declaration file to a specific output path
+    def generate_file_to_path(input_path, output_path)
+      unless File.exist?(input_path)
+        raise ArgumentError, "File not found: #{input_path}"
+      end
+
+      unless input_path.end_with?(".trb")
+        raise ArgumentError, "Expected .trb file, got: #{input_path}"
+      end
+
+      source = File.read(input_path)
+      content = generate(source)
+
+      File.write(output_path, content)
+      output_path
+    end
+
     private
 
     def generate_type_alias(type_alias)

data/lib/t_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TRuby
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/lib/t_ruby/version_checker.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "json"
+require "uri"
+
+module TRuby
+  class VersionChecker
+    GEM_NAME = "t-ruby"
+    RUBYGEMS_API = "https://rubygems.org/api/v1/gems/#{GEM_NAME}.json".freeze
+
+    def self.check
+      new.check
+    end
+
+    def self.update
+      new.update
+    end
+
+    def check
+      latest = fetch_latest_version
+      return nil unless latest
+
+      current = Gem::Version.new(VERSION)
+      latest_version = Gem::Version.new(latest)
+
+      return nil if current >= latest_version
+
+      { current: VERSION, latest: latest }
+    end
+
+    def update
+      system("gem install #{GEM_NAME}")
+    end
+
+    private
+
+    def fetch_latest_version
+      uri = URI(RUBYGEMS_API)
+      response = Net::HTTP.get_response(uri)
+
+      return nil unless response.is_a?(Net::HTTPSuccess)
+
+      data = JSON.parse(response.body)
+      data["version"]
+    rescue StandardError
+      nil
+    end
+  end
+end

data/lib/t_ruby.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "t_ruby/version"
+require_relative "t_ruby/version_checker"
 require_relative "t_ruby/config"
 
 # Core infrastructure (must be loaded first)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Y. Fred Kim
@@ -65,6 +65,7 @@ files:
 - lib/t_ruby/type_inferencer.rb
 - lib/t_ruby/union_type_parser.rb
 - lib/t_ruby/version.rb
+- lib/t_ruby/version_checker.rb
 - lib/t_ruby/watcher.rb
 homepage: https://type-ruby.github.io
 licenses: