isort 0.2.0 → 0.2.1

data/lib/isort/wrap_modes.rb

@@ -0,0 +1,240 @@
+# frozen_string_literal: true
+
+module Isort
+  # Wrap modes for handling long import lines
+  module WrapModes
+    # Mode 0: Grid - wraps with opening parenthesis on first line
+    # require 'a', 'b', 'c',
+    #         'd', 'e'
+    GRID = 0
+
+    # Mode 1: Vertical - one import per line after opening paren
+    # require(
+    #     'a',
+    #     'b',
+    #     'c',
+    # )
+    VERTICAL = 1
+
+    # Mode 2: Hanging indent - continuation lines have extra indent
+    # require 'a', 'b', 'c',
+    #     'd', 'e'
+    HANGING_INDENT = 2
+
+    # Mode 3: Vertical hanging indent - combines vertical and hanging
+    # require(
+    #     'a',
+    #     'b',
+    #     'c',
+    # )
+    VERTICAL_HANGING_INDENT = 3
+
+    # Mode 4: Vertical grid - like grid but vertical
+    # require(
+    #     'a', 'b',
+    #     'c', 'd',
+    # )
+    VERTICAL_GRID = 4
+
+    # Mode 5: Vertical grid grouped - groups related imports
+    # require('a', 'b',
+    #         'c', 'd')
+    VERTICAL_GRID_GROUPED = 5
+
+    # Mode 6: Vertical grid grouped with trailing comma
+    VERTICAL_GRID_GROUPED_NO_WRAP = 6
+
+    # Mode 7: NOQA - single line with comment to disable linting
+    NOQA = 7
+
+    # Default mode
+    DEFAULT = VERTICAL_HANGING_INDENT
+
+    # All available modes
+    MODES = {
+      grid: GRID,
+      vertical: VERTICAL,
+      hanging_indent: HANGING_INDENT,
+      vertical_hanging_indent: VERTICAL_HANGING_INDENT,
+      vertical_grid: VERTICAL_GRID,
+      vertical_grid_grouped: VERTICAL_GRID_GROUPED,
+      vertical_grid_grouped_no_wrap: VERTICAL_GRID_GROUPED_NO_WRAP,
+      noqa: NOQA
+    }.freeze
+
+    class << self
+      # Get mode by name or number
+      def get(mode)
+        case mode
+        when Integer
+          mode
+        when Symbol, String
+          MODES[mode.to_sym] || DEFAULT
+        else
+          DEFAULT
+        end
+      end
+
+      # Format a multi-import line according to the wrap mode
+      # for formatting long autoload statements or future multi-require support
+      def format_line(imports, mode: DEFAULT, line_length: 79, indent: "")
+        mode = get(mode)
+
+        case mode
+        when GRID
+          format_grid(imports, line_length, indent)
+        when VERTICAL
+          format_vertical(imports, indent)
+        when HANGING_INDENT
+          format_hanging_indent(imports, line_length, indent)
+        when VERTICAL_HANGING_INDENT
+          format_vertical_hanging_indent(imports, indent)
+        when VERTICAL_GRID
+          format_vertical_grid(imports, line_length, indent)
+        when VERTICAL_GRID_GROUPED
+          format_vertical_grid_grouped(imports, line_length, indent)
+        when NOQA
+          format_noqa(imports, indent)
+        else
+          format_vertical_hanging_indent(imports, indent)
+        end
+      end
+
+      # Check if a line needs wrapping based on line length
+      def needs_wrapping?(line, max_length: 79)
+        line.length > max_length
+      end
+
+      # Split a long import line into multiple lines
+      # Currently used for comments/documentation, as Ruby imports are typically single-line
+      def wrap_comment(comment, max_length: 79, indent: "")
+        return [comment] if comment.length <= max_length
+
+        words = comment.split(/\s+/)
+        lines = []
+        current_line = indent.dup
+
+        words.each do |word|
+          if current_line.length + word.length + 1 > max_length && current_line != indent
+            lines << current_line.rstrip
+            current_line = "#{indent}# #{word}"
+          else
+            current_line += current_line == indent ? "# #{word}" : " #{word}"
+          end
+        end
+
+        lines << current_line.rstrip unless current_line.strip.empty?
+        lines
+      end
+
+      private
+
+      def format_grid(imports, line_length, indent)
+        return imports.first if imports.size == 1
+
+        lines = []
+        current_line = indent.dup
+
+        imports.each_with_index do |imp, idx|
+          separator = idx < imports.size - 1 ? ", " : ""
+          potential = current_line + imp + separator
+
+          if potential.length > line_length && current_line != indent
+            lines << current_line.rstrip.chomp(",")
+            current_line = "#{indent}#{imp}#{separator}"
+          else
+            current_line = potential
+          end
+        end
+
+        lines << current_line.rstrip
+        lines.join("\n")
+      end
+
+      def format_vertical(imports, indent)
+        inner_indent = "#{indent}    "
+        result = ["#{indent}("]
+        imports.each do |imp|
+          result << "#{inner_indent}#{imp},"
+        end
+        result << "#{indent})"
+        result.join("\n")
+      end
+
+      def format_hanging_indent(imports, line_length, indent)
+        continuation_indent = "#{indent}    "
+        lines = []
+        current_line = indent.dup
+
+        imports.each_with_index do |imp, idx|
+          separator = idx < imports.size - 1 ? ", " : ""
+
+          if idx == 0
+            current_line += imp + separator
+          elsif current_line.length + imp.length + separator.length > line_length
+            lines << current_line.rstrip.chomp(",")
+            current_line = "#{continuation_indent}#{imp}#{separator}"
+          else
+            current_line += imp + separator
+          end
+        end
+
+        lines << current_line.rstrip
+        lines.join("\n")
+      end
+
+      def format_vertical_hanging_indent(imports, indent)
+        inner_indent = "#{indent}    "
+        result = ["#{indent}("]
+        imports.each do |imp|
+          result << "#{inner_indent}#{imp},"
+        end
+        result << "#{indent})"
+        result.join("\n")
+      end
+
+      def format_vertical_grid(imports, line_length, indent)
+        inner_indent = "#{indent}    "
+        result = ["#{indent}("]
+        current_line = inner_indent.dup
+
+        imports.each_with_index do |imp, idx|
+          separator = idx < imports.size - 1 ? ", " : ","
+
+          if current_line.length + imp.length + separator.length > line_length && current_line != inner_indent
+            result << current_line.rstrip
+            current_line = "#{inner_indent}#{imp}#{separator}"
+          else
+            current_line += current_line == inner_indent ? "#{imp}#{separator}" : " #{imp}#{separator}"
+          end
+        end
+
+        result << current_line.rstrip unless current_line.strip.empty?
+        result << "#{indent})"
+        result.join("\n")
+      end
+
+      def format_vertical_grid_grouped(imports, line_length, indent)
+        inner_indent = "#{indent}    "
+        current_line = "#{indent}("
+
+        imports.each_with_index do |imp, idx|
+          separator = idx < imports.size - 1 ? ", " : ""
+
+          if current_line.length + imp.length + separator.length > line_length
+            current_line += "\n#{inner_indent}#{imp}#{separator}"
+          else
+            current_line += imp + separator
+          end
+        end
+
+        current_line + ")"
+      end
+
+      def format_noqa(imports, indent)
+        line = imports.join(", ")
+        "#{indent}#{line}  # noqa"
+      end
+    end
+  end
+end

data/test_local.rb

@@ -0,0 +1,106 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Quick script to test isort locally
+# Usage: bundle exec ruby test_local.rb
+
+$LOAD_PATH.unshift File.expand_path("lib", __dir__)
+require "isort"
+require "tempfile"
+
+puts "=" * 60
+puts "Testing isort locally"
+puts "=" * 60
+
+# Create a test file with unsorted imports
+test_content = <<~RUBY
+  require 'yaml'
+  require_relative 'helper'
+  require 'json'
+  include Enumerable
+  require 'csv'
+  extend ActiveSupport::Concern
+  require_relative 'version'
+
+  class MyApp
+    def run
+      puts "Hello"
+    end
+  end
+RUBY
+
+tempfile = Tempfile.new(["test_isort", ".rb"])
+tempfile.write(test_content)
+tempfile.flush
+
+puts "\n📄 Original file:"
+puts "-" * 40
+puts test_content
+
+puts "\n🔍 Running --check mode:"
+puts "-" * 40
+processor = Isort::FileProcessor.new(tempfile.path)
+would_change = processor.check
+puts would_change ? "File needs sorting" : "File is already sorted"
+
+puts "\n📝 Running --diff mode:"
+puts "-" * 40
+diff_output = processor.diff
+if diff_output
+  puts diff_output
+else
+  puts "No changes needed"
+end
+
+puts "\n✅ Running sort:"
+puts "-" * 40
+processor2 = Isort::FileProcessor.new(tempfile.path)
+changed = processor2.process
+
+puts "\n📄 Sorted file:"
+puts "-" * 40
+puts File.read(tempfile.path)
+
+puts "\n🔄 Testing idempotency (running again):"
+puts "-" * 40
+processor3 = Isort::FileProcessor.new(tempfile.path)
+changed_again = processor3.process
+puts changed_again ? "File changed (NOT idempotent!)" : "No changes (idempotent ✓)"
+
+# Test skip directive
+puts "\n🚫 Testing skip directive:"
+puts "-" * 40
+skip_content = <<~RUBY
+  require 'yaml' # isort:skip
+  require 'json'
+  require 'csv'
+RUBY
+
+tempfile2 = Tempfile.new(["test_skip", ".rb"])
+tempfile2.write(skip_content)
+tempfile2.flush
+
+puts "Original:"
+puts skip_content
+Isort::FileProcessor.new(tempfile2.path).process
+puts "\nAfter sorting (yaml should stay first due to skip):"
+puts File.read(tempfile2.path)
+
+# Test section-based grouping
+puts "\n📦 Section-based grouping:"
+puts "-" * 40
+puts "Imports are grouped by section:"
+puts "  1. stdlib (json, csv, yaml...)"
+puts "  2. thirdparty (rails, active_support...)"
+puts "  3. firstparty (include, extend, autoload, using)"
+puts "  4. localfolder (require_relative)"
+
+# Cleanup
+tempfile.close
+tempfile.unlink
+tempfile2.close
+tempfile2.unlink
+
+puts "\n" + "=" * 60
+puts "All tests completed!"
+puts "=" * 60

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isort
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - abhinvv1
@@ -87,11 +87,20 @@ files:
 - README.md
 - Rakefile
 - exe/isort
+- isort-0.2.0.gem
 - lib/isort.rb
+- lib/isort/file_processor.rb
+- lib/isort/import_block.rb
+- lib/isort/import_statement.rb
+- lib/isort/parser.rb
+- lib/isort/section.rb
+- lib/isort/syntax_validator.rb
 - lib/isort/version.rb
+- lib/isort/wrap_modes.rb
 - sample.rb
 - sig/isort.rbs
 - sig/isort/file_sorter.rbs
+- test_local.rb
 homepage: https://github.com/abhinvv1/isort
 licenses:
 - MIT
@@ -99,6 +108,7 @@ metadata:
   homepage_uri: https://github.com/abhinvv1/isort
   source_code_uri: https://github.com/abhinvv1/isort
   changelog_uri: https://github.com/abhinvv1/isort
+  github_repo: ssh://github.com/abhinvv1/isort
 post_install_message: 
 rdoc_options: []
 require_paths: