rubocop-rbs_inline 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c65d1d4e37ea73dd5b79770f8fc0918073146d2ffd98e0fd586d8aec79aae444
-  data.tar.gz: 5159368f17e584d01b6c7154bb26e12786abac1d76f48d1da2374390b4bf7b44
+  metadata.gz: 887dbca0ede20b0bc2f948c4468a1795bdd59a22e377602769c6b96cdefa628a
+  data.tar.gz: b12ec5654d6a54b2dd5389a67c47a8b4adcc8a6ff6784b6426b413fad8a8c0b0
 SHA512:
-  metadata.gz: 1361c8832f82fed8f3ad92943b3d3d563cd109a479b7b6095cc6e8f887712c8a2bcaa06d2a1fc67abab2e122f0a97dd0b181a34b134a16baa707498318d7ac71
-  data.tar.gz: 84151f32b0ad2aa4d5b948a0bd4350031cf0112f1548688689f71dc05eccc3f68a39d214494c2ee82f314300a871f80f51509d7c3c3a6564c19deaf08a4fef91
+  metadata.gz: c490a7ed73c4ca80d535ab4bff1e7399a26e414c5d72d86779e6def4d414194635bed3c4ce2e6c7432da78db5d19c32ce745502721d2c7b26b4426553703c9b8
+  data.tar.gz: bead6840e55e119ba47a58210ba622cd4874131477465790c06621080deb34bd02baa1c60e9029cecf3931211bd2f0ca57242dc2c389a953dff01120d054f080

data/.claude/hooks/pre-commit-check.sh

@@ -12,15 +12,19 @@ fi
 
 cd "$CLAUDE_PROJECT_DIR" || exit 1
 
+if [ "${CLAUDE_CODE_REMOTE:-}" = "true" ]; then
+  eval "$(rbenv init - bash)"
+fi
+
 echo "Running pre-commit checks..." >&2
 
 # Generate RBS and run all checks
-if ! "$CLAUDE_PROJECT_DIR/bin/rbs-inline" --opt-out --output=sig/ lib/ >&2; then
+if ! bundle exec rbs-inline --opt-out --output=sig/ lib/ >&2; then
     echo "Error: RBS generation failed" >&2
     exit 2
 fi
 
-if ! "$CLAUDE_PROJECT_DIR/bin/rake" >&2; then
+if ! bundle exec rake >&2; then
     echo "Error: rake checks failed" >&2
     exit 2
 fi

data/.claude/hooks/rbs-inline.sh

@@ -6,6 +6,10 @@ tool_name=$(echo "$input" | jq -r '.tool_name')
 
 cd "$CLAUDE_PROJECT_DIR" || exit 1
 
+if [ "${CLAUDE_CODE_REMOTE:-}" = "true" ]; then
+  eval "$(rbenv init - bash)"
+fi
+
 # Handle Edit or Write tools
 if [[ "$tool_name" == "Edit" || "$tool_name" == "Write" ]]; then
     file_path=$(echo "$input" | jq -r '.tool_input.file_path // ""')
@@ -20,7 +24,7 @@ if [[ "$tool_name" == "Edit" || "$tool_name" == "Write" ]]; then
 
     echo "Running rbs-inline for $file_path..." >&2
 
-    if ! "$CLAUDE_PROJECT_DIR/bin/rbs-inline" --opt-out --output=sig/ "$file_path" >&2; then
+    if ! bundle exec rbs-inline --opt-out --output=sig/ "$file_path" >&2; then
         echo "Warning: RBS generation failed for $file_path" >&2
         exit 0
     fi
@@ -39,12 +43,8 @@ if [[ "$tool_name" == "Bash" ]]; then
     fi
 
     # Extract source and destination paths from mv command
-    # Handle common patterns: mv src dest, git mv src dest
-    # Remove the mv/git mv prefix and get the paths
     paths=$(echo "$command" | sed -E 's/^[[:space:]]*(git[[:space:]]+)?mv[[:space:]]+//')
 
-    # Split into source and destination (simple case, space-separated)
-    # This handles: mv old.rb new.rb, mv old.rb dir/
     source_path=$(echo "$paths" | awk '{print $1}')
     dest_path=$(echo "$paths" | awk '{print $2}')
 
@@ -56,7 +56,6 @@ if [[ "$tool_name" == "Bash" ]]; then
     echo "Detected mv of Ruby file in lib/: $source_path -> $dest_path" >&2
 
     # Calculate the corresponding .rbs file path for the source
-    # Convert lib/path/to/file.rb to sig/path/to/file.rbs
     source_rbs=$(echo "$source_path" | sed -E 's|^(.*/)?lib/|sig/|; s|\.rb$|.rbs|')
 
     # Remove the old .rbs file if it exists
@@ -66,7 +65,6 @@ if [[ "$tool_name" == "Bash" ]]; then
     fi
 
     # Determine the new .rb file path
-    # If dest is a directory, append the source filename
     if [[ -d "$dest_path" ]]; then
         dest_file="$dest_path/$(basename "$source_path")"
     else
@@ -83,7 +81,7 @@ if [[ "$tool_name" == "Bash" ]]; then
     if [[ -f "$dest_file" ]]; then
         echo "Running rbs-inline for $dest_file..." >&2
 
-        if ! "$CLAUDE_PROJECT_DIR/bin/rbs-inline" --opt-out --output=sig/ "$dest_file" >&2; then
+        if ! bundle exec rbs-inline --opt-out --output=sig/ "$dest_file" >&2; then
             echo "Warning: RBS generation failed for $dest_file" >&2
             exit 0
         fi

data/.claude/hooks/setup.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
-set -euo pipefail
+set -eu
 
-# Only run in Claude Code on the web (remote environment)
-if [ "${CLAUDE_CODE_REMOTE:-}" != "true" ]; then
-  exit 0
-fi
+if [ "${CLAUDE_CODE_REMOTE:-}" = "true" ]; then
+  eval "$(rbenv init - bash)"
 
-# Bundler 4.0 + Ruby 3.3 compatibility workaround:
-# Bundler 4.0's vendored net-http-persistent uses CGI.unescape which
-# references @@accept_charset before it's initialized in Ruby 3.3.
-# Pre-loading the CGI library via RUBYOPT resolves this.
-echo 'export RUBYOPT="-rcgi"' >> "$CLAUDE_ENV_FILE"
+  # Set the latest installed Ruby version as the global default
+  rbenv global `rbenv versions --bare | sort -rV | head -1`
 
-RUBYOPT="-rcgi" bundle install
+  echo 'eval "$(rbenv init - bash)"' >> "$CLAUDE_ENV_FILE"
+  echo 'export RUBYOPT="-rcgi"' >> "$CLAUDE_ENV_FILE"
+  RUBYOPT="-rcgi" bundle install
+  bundle exec rbs collection install --frozen
+fi

data/.vscode/settings.json

@@ -1,8 +1,13 @@
 {
     "cSpell.words": [
+        "argname",
+        "Autocorrection",
         "bindir",
         "blockarg",
+        "boolish",
         "Ivar",
+        "ivars",
+        "ivasgn",
         "KOMIYA",
         "kwarg",
         "kwoptarg",
@@ -13,6 +18,7 @@
         "restarg",
         "rubocop",
         "rubygems",
+        "sclass",
         "strscan",
         "Takeshi",
         "tk0miya"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.5.4 (2026-03-30)
+
+### Internal
+
+- Extracted `ASTUtils` module to consolidate shared AST helper methods across cops.
+- Removed duplicate RBS type definitions from `sig/gems` and fixed hidden type errors.
+- Fixed node type annotations to use `RuboCop::AST::Node` instead of `Parser::AST::Node`.
+- Removed binstubs; use `bundle exec` instead.
 ## 1.5.3 (2026-03-02)
 
 ### Enhancements

data/CLAUDE.md

@@ -10,23 +10,23 @@ rubocop-rbs_inline is a RuboCop extension gem that provides cops for validating
 
 ```bash
 # Run tests
-bin/rspec
-bin/rspec spec/rubocop/cop/style/rbs_inline/invalid_comment_spec.rb      # single file
-bin/rspec spec/rubocop/cop/style/rbs_inline/invalid_comment_spec.rb:8     # single example
+bundle exec rspec
+bundle exec rspec spec/rubocop/cop/style/rbs_inline/invalid_comment_spec.rb      # single file
+bundle exec rspec spec/rubocop/cop/style/rbs_inline/invalid_comment_spec.rb:8     # single example
 
 # Lint
-bin/rake rubocop
-bin/rake rubocop:autocorrect       # safe autocorrect
-bin/rake rubocop:autocorrect_all   # all autocorrect
+bundle exec rake rubocop
+bundle exec rake rubocop:autocorrect       # safe autocorrect
+bundle exec rake rubocop:autocorrect_all   # all autocorrect
 
 # Type check
-bin/rake rbs:check                 # runs steep check
+bundle exec rake rbs:check                 # runs steep check
 
 # Default rake task (runs specs, rubocop, and type check)
-bin/rake
+bundle exec rake
 
 # Generate a new cop
-bin/rake 'new_cop[Style/RbsInline/CopName]'
+bundle exec rake 'new_cop[Style/RbsInline/CopName]'
 ```
 
 ## Architecture

data/Rakefile

@@ -35,6 +35,7 @@ end
 namespace :rbs do
   desc 'Do type check using Steep'
   task :check do
-    sh 'bin/steep', 'check'
+    sh 'rbs', '-Isig', 'validate'
+    sh 'bundle', 'exec', 'steep', 'check'
   end
 end

data/Steepfile

@@ -7,6 +7,8 @@ target :lib do
 
   check 'lib'
 
-  configure_code_diagnostics(D::Ruby.strict)
+  configure_code_diagnostics(D::Ruby.strict) do |hash|
+    hash[D::Ruby::ImplicitBreakValueMismatch] = nil
+  end
   implicitly_returns_nil!
 end

data/lib/rubocop/cop/rbs_inline_cops.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'style/rbs_inline/ast_utils'
 require_relative 'style/rbs_inline/source_code_helper'
 require_relative 'style/rbs_inline/comment_parser'
 require_relative 'style/rbs_inline/data_class_comment_alignment'

data/lib/rubocop/cop/style/rbs_inline/ast_utils.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      module RbsInline
+        module ASTUtils
+          # @rbs node: RuboCop::AST::Node
+          # @rbs default: Integer
+          def end_line(node, default:) #: Integer
+            location = node.location #: untyped
+            location.end&.line || default
+          end
+
+          # @rbs node: RuboCop::AST::Node
+          def name_location(node) #: untyped
+            location = node.location #: untyped
+            location.name
+          end
+
+          # @rbs node: RuboCop::AST::Node
+          def source!(node) #: String
+            node.source || raise
+          end
+
+          #: (RuboCop::AST::SymbolNode) -> Symbol
+          #: (RuboCop::AST::StrNode) -> Symbol
+          #: (RuboCop::AST::Node) -> Symbol?
+          def value_to_sym(node)
+            case node
+            when RuboCop::AST::SymbolNode
+              node.value
+            when RuboCop::AST::StrNode
+              case (v = node.value)
+              when String
+                v.to_sym
+              else
+                value_to_sym(v)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/style/rbs_inline/data_class_comment_alignment.rb

@@ -26,6 +26,7 @@ module RuboCop
         #   )
         #
         class DataClassCommentAlignment < Base
+          include ASTUtils
           include RangeHelp
           include SourceCodeHelper
           extend AutoCorrector
@@ -46,7 +47,12 @@ module RuboCop
           def data_define?(node) #: bool
             return false unless node.method_name == :define
 
-            node.receiver.is_a?(RuboCop::AST::ConstNode) && node.receiver.short_name == :Data
+            case (r = node.receiver)
+            when RuboCop::AST::ConstNode
+              r.short_name == :Data
+            else
+              false
+            end
           end
 
           # @rbs arg: RuboCop::AST::Node
@@ -72,7 +78,7 @@ module RuboCop
           def check_annotation_alignment(node) #: void
             annotated = data_attributes(node).filter_map do |arg|
               comment = inline_type_comment(arg.location.line)
-              [arg, comment] if comment
+              [arg, comment] if comment #: [RuboCop::AST::Node, Parser::Source::Comment]
             end
             return if annotated.size < 2
 
@@ -98,7 +104,7 @@ module RuboCop
             last_arg = node.arguments.last
             max_end_col = node.arguments.map do |arg|
               comma_length = arg.equal?(last_arg) ? 0 : 1
-              arg.location.column + arg.source.length + comma_length
+              arg.location.column + source!(arg).length + comma_length
             end.max || 0 # steep:ignore
 
             max_end_col + 2
@@ -111,8 +117,9 @@ module RuboCop
           def correct_alignment(corrector, arg, comment, expected_col) #: void # rubocop:disable Metrics/AbcSize
             line = arg.location.line
             line_source = source_code_at(line)
-            content_end_col = line_source[...comment.location.column].rstrip.length
-            padding = [expected_col - content_end_col, 1].max
+            source = line_source[...comment.location.column] || raise
+            content_end_col = source.rstrip.length
+            padding = [expected_col - content_end_col, 1].max || raise
 
             line_begin = processed_source.buffer.line_range(line).begin_pos
             replace_start = line_begin + content_end_col

data/lib/rubocop/cop/style/rbs_inline/invalid_comment.rb

@@ -72,7 +72,7 @@ module RuboCop
             comments.reject do |comment|
               if (match = comment.text.match(/\A#(\s+)@rbs!(\s+|\Z)/))
                 in_embedded = true
-                indent = match[1].size
+                indent = match[1].to_s.size
                 line = comment.loc.line
                 true
               elsif in_embedded && comment.loc.line == line + 1 &&

data/lib/rubocop/cop/style/rbs_inline/keyword_separator.rb

@@ -37,12 +37,12 @@ module RuboCop
             @method_annotation_lines = Set.new #: Set[Integer]
           end
 
-          # @rbs node: Parser::AST::Node
+          # @rbs node: RuboCop::AST::DefNode
           def on_def(node) #: void
             collect_method_annotation_comments(node.loc.line)
           end
 
-          # @rbs node: Parser::AST::Node
+          # @rbs node: RuboCop::AST::DefNode
           def on_defs(node) #: void
             collect_method_annotation_comments(node.loc.line)
           end

data/lib/rubocop/cop/style/rbs_inline/method_comment_spacing.rb

@@ -93,7 +93,8 @@ module RuboCop
             first_comment = comment.comments.first or return false
             line_number = first_comment.location.start_line
             line = processed_source.lines[line_number - 1] or return false
-            !line[0, first_comment.location.start_column].strip.empty?
+            source = line[0, first_comment.location.start_column] || raise
+            !source.strip.empty?
           end
 
           # @rbs comment: RBS::Inline::AnnotationParser::ParsingResult
@@ -164,9 +165,9 @@ module RuboCop
 
           # @rbs comment: RBS::Inline::AnnotationParser::ParsingResult
           def skip_only_annotation?(comment) #: bool
-            annotations = []
+            annotations = [] #: Array[RBS::Inline::AST::Annotations::t]
             comment.each_annotation { |a| annotations << a }
-            annotations.any? && annotations.all? { |a| a.is_a?(RBS::Inline::AST::Annotations::Skip) }
+            annotations.any? && annotations.all?(RBS::Inline::AST::Annotations::Skip)
           end
 
           # @rbs line_number: Integer

data/lib/rubocop/cop/style/rbs_inline/missing_data_class_annotation.rb

@@ -20,7 +20,8 @@ module RuboCop
         #     :visibility  #: Symbol
         #   )
         #
-        class MissingDataClassAnnotation < Base
+        class MissingDataClassAnnotation < Base # rubocop:disable Metrics/ClassLength
+          include ASTUtils
           include RangeHelp
           include SourceCodeHelper
           extend AutoCorrector
@@ -44,7 +45,12 @@ module RuboCop
           def data_define?(node) #: bool
             return false unless node.method_name == :define
 
-            node.receiver.is_a?(RuboCop::AST::ConstNode) && node.receiver.short_name == :Data
+            case (r = node.receiver)
+            when RuboCop::AST::ConstNode
+              r.short_name == :Data
+            else
+              false
+            end
           end
 
           # @rbs arg: RuboCop::AST::Node
@@ -80,8 +86,11 @@ module RuboCop
                 add_offense(arg)
               else
                 replacement = build_multiline_replacement(node)
-                add_offense(arg) { |corrector| corrector.replace(node.loc.begin.join(node.loc.end), replacement) }
-                corrected = true
+                loc = node.loc
+                if loc.begin && loc.end
+                  add_offense(arg) { _1.replace(loc.begin.join(loc.end), replacement) }
+                  corrected = true
+                end
               end
             end
           end
@@ -89,7 +98,7 @@ module RuboCop
           # @rbs node: RuboCop::AST::SendNode
           def longest_argname(node) #: String
             last_index = node.arguments.size - 1
-            args = node.arguments.each_with_index.map { |a, i| i < last_index ? "#{a.source}," : a.source }
+            args = node.arguments.each_with_index.map { |a, i| i < last_index ? "#{a.source}," : a.source.to_s }
             args.max_by(&:length) || ''
           end
 
@@ -102,7 +111,7 @@ module RuboCop
             args_source = node.arguments.each_with_index.map do |arg, i|
               comma = i < last_index ? ',' : ''
               prefix = "#{base_indent}  #{arg.source}#{comma}"
-              padding = ' ' * (longest.length - arg.source.length - comma.length + 2)
+              padding = ' ' * (longest.length - source!(arg).length - comma.length + 2)
               data_attribute?(arg) ? "#{prefix}#{padding}#: untyped" : prefix
             end.join("\n")
 
@@ -139,7 +148,7 @@ module RuboCop
             line = arg.location.line
             line_source = source_code_at(line)
             content_end_col = line_source.rstrip.length
-            padding = [annotation_column(node) - content_end_col, 1].max
+            padding = [annotation_column(node) - content_end_col, 1].max || raise
             line_begin = processed_source.buffer.line_range(line).begin_pos
             insert_pos = line_begin + content_end_col
 
@@ -151,7 +160,7 @@ module RuboCop
             last_arg = node.arguments.last
             max_end_col = node.arguments.map do |arg|
               comma_length = arg.equal?(last_arg) ? 0 : 1
-              arg.location.column + arg.source.length + comma_length
+              arg.location.column + source!(arg).length + comma_length
             end.max || 0 # steep:ignore
 
             max_end_col + 2