mj 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040511b6ef46ad0760a5958920e53ec8d00fa3f0697c9098004e649808c41f73
-  data.tar.gz: b9eaa497531aa4856674cf0f5d80825769e0b431ee8c304cf052680f8d22ee2c
+  metadata.gz: 1c41690187e0bdc1673d0e3719ab6a01b7059459ec25a957228ac64435b72f6a
+  data.tar.gz: 59b806a25685ef0661da12675bc098863c28e6b2b0d5c3ba6ae3bdf524de24b3
 SHA512:
-  metadata.gz: 1e0c951f24b70e6d25746e51f3cf0a37c9fd781818763e26115f6199a157da4cc3f6590cba8819f56d5ecbdb7de8523e509b3f29dd5362340cebc7d1646c3028
-  data.tar.gz: 112bc4d98c34cd67f5ef1cae09646e06a920ab2b5ed27010130bbd926dc23d033bdf1a329d9fd0d4e56466dfb086747a40a3414200a5a441839f1a397dd90fdd
+  metadata.gz: 81c3559bc183377f40f99af130be362d1d39d3d68451ecbabff3cb084496bfe51d4cff9111771a9fe3449d2a890ea060ed4ba3847d1cad9d9cb52f3189a4fa79
+  data.tar.gz: 9a15946c97689290f26b32a89e06b0405384df0282d97b50766581ace012430c05ddddcf082892997658e100851bddbdb767dd0de58003e8176387aefac655ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (0.5.1)
+    mj (0.5.4)
       thor (~> 1.2.1)
 
 GEM
@@ -78,4 +78,4 @@ DEPENDENCIES
   simplecov-lcov
 
 BUNDLED WITH
-   2.3.6
+   2.3.16

data/lib/mj/alternative_file/candidate.rb

@@ -24,6 +24,10 @@ module Mj
         other.path == path && other.type == type
       end
 
+      def inspect
+        "#{path}|#{type}"
+      end
+
       def to_s(debug: false)
         parts = [path]
 

data/lib/mj/alternative_file/resolvers/ruby/packwerk_resolver.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Resolvers
+      module Ruby
+        class PackwerkResolver < Resolvers::Base
+          def initialize
+            @rails = RailsResolver.new
+          end
+
+          private
+
+          def apply_to?(file)
+            file.extension == "rb" && file.start_with?(
+              "packages",
+              "spec",
+              "test"
+            )
+          end
+
+          def add_candidates(file, candidates) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+            parts = file.split("/")
+            prefix = []
+            prefix.push(parts.shift)
+            prefix.push(parts.shift)
+
+            file = parts.join("/")
+            file = CurrentFile.new(file)
+
+            @rails.resolve(file).each do |resolved|
+              file = [prefix, resolved].flatten.join("/")
+              file = file.sub("/spec/public/", "/spec/")
+              file = file.sub("/test/public/", "/test/")
+              add_candidate(file, resolved.type, to: candidates)
+            end
+
+            add_public(candidates)
+          end
+
+          def add_public(candidates)
+            public_candidates = candidates.reject do |file|
+              file.type == :spec || file.type == :minitest
+            end
+
+            public_candidates.each do |candidate|
+              parts = candidate.path.split("/app/")
+              public_candidate = [parts[0], "/app/public/", parts[1]].compact.join
+              add_candidate(public_candidate, candidate.type, to: candidates)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mj/alternative_file/resolvers/ruby/rails_controller_resolver.rb

@@ -4,6 +4,7 @@ module Mj
   module AlternativeFile
     module Resolvers
       module Ruby
+        # rubocop:disable Metrics/MethodLength
         class RailsControllerResolver < Resolvers::Base
           private
 
@@ -13,7 +14,11 @@ module Mj
               "spec/integration",
               "test/integration",
               "test/controllers",
-              "spec/controllers"
+              "spec/controllers",
+              "spec/requests",
+              "test/requests",
+              "spec/system",
+              "test/system"
             )
           end
 
@@ -23,27 +28,53 @@ module Mj
               add_controller_test(file, candidates, "test")
               add_integration_test(file, candidates, "spec")
               add_integration_test(file, candidates, "test")
+              add_request_test(file, candidates, "spec")
+              add_request_test(file, candidates, "test")
+              add_system_test(file, candidates, "spec")
+              add_system_test(file, candidates, "test")
               return
             end
 
             resolve_controller(file, candidates)
           end
+          # rubocop:enable Metrics/MethodLength
 
           def add_integration_test(file, candidates, type)
             path = file.without_prefix("app/controllers").without_suffix(".rb").trim_slashes
             add_candidate("#{type}/integration/#{path}_#{type}.rb", "integration_#{type}", to: candidates)
           end
 
+          def add_request_test(file, candidates, type)
+            path = file.without_prefix("app/controllers").sub("_controller", "").without_suffix(".rb").trim_slashes
+            add_candidate("#{type}/requests/#{path}_#{type}.rb", "request_#{type}", to: candidates)
+          end
+
+          def add_system_test(file, candidates, type)
+            path = file.without_prefix("app/controllers").sub("_controller", "").without_suffix(".rb").trim_slashes
+            add_candidate("#{type}/system/#{path}_#{type}.rb", "system_#{type}", to: candidates)
+          end
+
           def add_controller_test(file, candidates, type)
             path = file.without_prefix("app/controllers").without_suffix(".rb").trim_slashes
             add_candidate("#{type}/controllers/#{path}_#{type}.rb", "controller_#{type}", to: candidates)
           end
 
+          # rubocop:disable Metrics/MethodLength
           def resolve_controller(file, candidates)
+            # requests|system tests don't usually have "request_{type}.rb" suffix
+            if file.start_with?(%r{(test|spec)/(system|request)})
+              file = file.sub("_spec.rb", "_controller_spec.rb")
+                .sub("_test.rb", "_controller_test.rb")
+            end
+
             controller_path = file.sub("test/integration", "app/controllers")
               .sub("spec/integration", "app/controllers")
               .sub("spec/controllers", "app/controllers")
               .sub("test/controllers", "app/controllers")
+              .sub("test/requests", "app/controllers")
+              .sub("test/system", "app/controllers")
+              .sub("spec/requests", "app/controllers")
+              .sub("spec/system", "app/controllers")
               .sub("_spec.rb", ".rb")
               .sub("_test.rb", ".rb")
               .to_s
@@ -51,6 +82,7 @@ module Mj
             add_candidate(controller_path, "controller", to: candidates)
           end
         end
+        # rubocop:enable Metrics/MethodLength
       end
     end
   end

data/lib/mj/alternative_file/resolvers/ruby/rails_resolver.rb

@@ -19,6 +19,7 @@ module Mj
 
             # lib files
             add_candidate("lib/#{ruby_file.class_path}.rb", "lib", to: candidates)
+            add_candidate("#{ruby_file.class_path}.rb", "lib", to: candidates)
             add_candidate("spec/lib/#{ruby_file.class_path}_spec.rb", :spec, to: candidates)
             add_candidate("test/lib/#{ruby_file.class_path}_test.rb", :minitest, to: candidates)
           end

data/lib/mj/alternative_file/resolvers/ruby/ruby_file.rb

@@ -7,9 +7,10 @@ module Mj
         class RubyFile < AlternativeFile::CurrentFile
           def class_path
             path_without_extension
+              .without_prefix("spec")
+              .without_prefix("test")
               .without_prefix("app")
               .without_prefix("lib")
-              .without_prefix("spec")
               .without_suffix("_spec")
               .without_suffix("_test")
               .trim_slashes

data/lib/mj/alternative_file/thor_command.rb

@@ -9,6 +9,7 @@ require_relative "resolvers/base"
 require_relative "resolvers/ruby/rails_resolver"
 require_relative "resolvers/ruby/rails_controller_resolver"
 require_relative "resolvers/ruby/view_component_resolver"
+require_relative "resolvers/ruby/packwerk_resolver"
 require_relative "resolvers/ruby/ruby_file"
 require_relative "commands/list_command_handler"
 require_relative "commands/list_command"
@@ -56,6 +57,7 @@ module Mj
           resolvers.add(Resolvers::Ruby::RailsResolver.new)
           resolvers.add(Resolvers::Ruby::RailsControllerResolver.new)
           resolvers.add(Resolvers::Ruby::ViewComponentResolver.new)
+          resolvers.add(Resolvers::Ruby::PackwerkResolver.new)
         end
       end
 

data/lib/mj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mj
-  VERSION = "0.5.1"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,7 @@ files:
 - lib/mj/alternative_file/current_file.rb
 - lib/mj/alternative_file/resolver.rb
 - lib/mj/alternative_file/resolvers/base.rb
+- lib/mj/alternative_file/resolvers/ruby/packwerk_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/rails_controller_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/rails_resolver.rb
 - lib/mj/alternative_file/resolvers/ruby/ruby_file.rb
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: My personal CLI