isort 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a046b9382cc4f3416cfd1105cfb5c248c04a634cb0f9a3a95cb9c4ddab8938e2
-  data.tar.gz: 0ff466bd33cff96343da32c8483e9f5fc64cc437c3fd02674951434b25762027
+  metadata.gz: 6c121d3b6fba0a8fcf8a644eb26ebce0e35b11452cb1a3a644dfbee265a6bd1d
+  data.tar.gz: a80ae99d0f3d627407f7ccdd377365d10412ef9ade8b196b839285cee916a935
 SHA512:
-  metadata.gz: 0e3e720fca7b0947fc2f7c164898651863a0b816e5ec9316f51ada1e06fc86ef72066cad22a2a0ae0f531667afe54445dab638da9e226f2baeb81c18de851d7c
-  data.tar.gz: ebac9c17a54d5f0e499daece31cad74375f5969443326c1d47769a2b7b9fa081e1df27386b516baf71301606a28cc0174abe5426d296f7dca76a5cb87c41438c
+  metadata.gz: 4a92208a0dfd4b76459832abb07ee6878976adfd8c40f8dd249bd330c1d2717e046bd4427a1078a43ff113c3d6adf82b994f3b4dcdf30471f1b1d17a1e54d3d1
+  data.tar.gz: 5ca8c19a71ed5c79135ed98b8f0ca74fe74a7b0ccb22d1de67d93e8fb75192d5f2f69957ab776a231989064a45b966ec2fb9f6a3cea02791acd5740939680635

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [Unreleased]
+## [Released]
 
 ## [0.1.3] - 2024-12-28
 
@@ -17,4 +17,3 @@
 
 ### Added
 - Import sorting functionality support for a whole directory
-- 

data/README.md

@@ -14,6 +14,8 @@ gem install isort
 
 ```bash
 isort --file path/to/your/file.rb
+or
+isort -f path/to/your/file.rb
 ```
 
 ### In Ruby Code
@@ -35,7 +37,7 @@ sorter.sort_and_format_imports
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/yourusername/isort.
+Bug reports and pull requests are welcome on GitHub at https://github.com/abhinvv1/isort.
 
 ## License
 

data/lib/isort/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isort
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/isort.rb

@@ -1,8 +1,5 @@
-# frozen_string_literal: true
-
-require_relative "isort/version"
-
 require 'optparse'
+require_relative "isort/version"
 
 module Isort
   class Error < StandardError; end
@@ -35,12 +32,12 @@ module Isort
       lines = File.readlines(@file_path)
 
       # Separate and group lines
-      requires = extract_lines(lines, /^require\s/)
-      require_relatives = extract_lines(lines, /^require_relative\s/)
-      includes = extract_lines(lines, /^include\s/)
-      extends = extract_lines(lines, /^extend\s/)
-      autoloads = extract_lines(lines, /^autoload\s/)
-      usings = extract_lines(lines, /^using\s/)
+      requires = extract_lines_with_comments(lines, /^require\s/)
+      require_relatives = extract_lines_with_comments(lines, /^require_relative\s/)
+      includes = extract_lines_with_comments(lines, /^include\s/)
+      extends = extract_lines_with_comments(lines, /^extend\s/)
+      autoloads = extract_lines_with_comments(lines, /^autoload\s/)
+      usings = extract_lines_with_comments(lines, /^using\s/)
       others = lines.reject { |line| [requires, require_relatives, includes, extends, autoloads, usings].flatten.include?(line) }
 
       # Format and sort each group
@@ -52,11 +49,16 @@ module Isort
       formatted_imports << format_group("autoload", autoloads)
       formatted_imports << format_group("using", usings)
 
+      return if [requires, require_relatives, includes, extends, autoloads, usings].all?(&:empty?)
+
       # Combine formatted imports with the rest of the file
-      sorted_content = (formatted_imports + others).join
+      sorted_content = "#{formatted_imports.reject(&:empty?).join("\n")}\n#{others.join}".strip
 
-      # Write the sorted content back to the file
-      File.write(@file_path, sorted_content)
+      # Add a trailing newline only if imports exist
+      sorted_content = "#{sorted_content.rstrip}\n" if !formatted_imports.empty? && !sorted_content.empty?
+
+      # Write the sorted content back to the file only if imports exist
+      File.write(@file_path, sorted_content) unless formatted_imports.empty? && sorted_content.empty?
     end
 
     private
@@ -65,11 +67,37 @@ module Isort
       lines.select { |line| line =~ regex }
     end
 
-    def format_group(type, lines)
-      return [] if lines.empty?
+    def extract_lines_with_comments(lines, regex)
+      grouped_lines = []
+      buffer = []
+
+      lines.each do |line|
+        if line.strip.start_with?("#") || line.strip.empty?
+          # If the line is a comment or blank, add it to the buffer
+          buffer << line
+        elsif line =~ regex
+          # If it's an import line matching the regex, attach the buffer as comments
+          grouped_lines << (buffer + [line])
+          buffer = [] # Reset buffer
+        else
+          # If it's a non-matching line, reset the buffer
+          buffer = []
+        end
+      end
+
+      grouped_lines
+    end
+
+    def format_group(type, grouped_lines)
+      return [] if grouped_lines.empty?
 
-      # Remove duplicates and sort
-      lines.uniq.sort
+      # Flatten and sort each group by the import line
+      grouped_lines
+        .sort_by { |lines| lines.last.strip } # Sort by the actual import statement
+        .map { |lines| lines.join }          # Combine comments with the import
+        .map(&:strip)                        # Remove trailing newlines
+        .join("\n")                          # Join all imports in the group with newlines
+        .concat("\n")                        # Add a newline between groups
     end
 
   end

data/sample.rb

@@ -1,20 +1,4 @@
-require 'csv'
-require 'json'
-require_relative 'a_file'
-require_relative 'b_file'
-include SomeModule
-extend AnotherModule
-autoload :CSV, 'csv'
-using SomeRefinement
-class A
-
-end
-
-
-
-
-
-
-class B
-
-end
+require_relative "aa"
+require_relative "aaaa"
+require_relative "aaaaac"
+require_relative "abc"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isort
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - abhinvv1
@@ -67,7 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Isort automatically sorts and organizes your Ruby imports, including
-  require, require_relative, include, and extend statements
+  require, require_relative, include, using, and extend statements.Has the ability
+  to group different types of imports together. It can process single files or entire
+  directories directly throughcommand-line interface, and preserve the code comments
+  and inline documentation
 email:
 - abhinav.p@browserstack.com
 executables:
@@ -82,19 +85,18 @@ files:
 - README.md
 - Rakefile
 - exe/isort
-- isort-0.1.0.gem
 - lib/isort.rb
 - lib/isort/version.rb
 - sample.rb
 - sig/isort.rbs
 - sig/isort/file_sorter.rbs
-homepage: https://github.com/abhinvv1/sort
+homepage: https://github.com/abhinvv1/isort
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/abhinvv1/sort
-  source_code_uri: https://github.com/abhinvv1/sort
-  changelog_uri: https://github.com/abhinvv1/sort
+  homepage_uri: https://github.com/abhinvv1/isort
+  source_code_uri: https://github.com/abhinvv1/isort
+  changelog_uri: https://github.com/abhinvv1/isort
 post_install_message:
 rdoc_options: []
 require_paths: