mj 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a69d697244fdee8394820682a99fdc199ec5b1b912c2d573f4b181c541100dc3
-  data.tar.gz: 7ac9b8f07c95ce5af439ddbfb18cb8d0385a1e1a3815188a5016757cfac978d6
+  metadata.gz: 683483a53bb0ecac42edc0a0f5f51e8cb14a2cd47af192caddfaf5b8317cdfd8
+  data.tar.gz: eff84fc6a46cb4a000340ba32cadd1ab9edf84bdbb3c8b2d0745fe935ed8c025
 SHA512:
-  metadata.gz: 19af4785f9f6441ca64ac8b721ef45db5e4b4ddff476f077b1f8430711ecad83070e643a102dd867e0d66bd7c6b9d1eb6510d37f5b58e1dbb92531b33e4025f8
-  data.tar.gz: fade8044f50496e2e2cf1a6d804e39fe69ae94b518faf733d489a3e17e2a48ba4af99dba3011ec647d0c3ea4d86498810f787d9d07ab5d47082636ab9c858d56
+  metadata.gz: c4e1b4dd41ebec30aabbc7ed605a9b0b0407a2803305e41f52c07a3e326b4111b186d07de57aba6d15843aa211f6a4c630fd591dd015c1a1e8d2577aee0a7540
+  data.tar.gz: 93afecccc6e7ab89277acb49a444936bf37ffa2c54409556beeb107ac67f9d35c1e149ec6a0d026dbb4e844ce4278c69d21cb948ab565436118fae4b7305a4fd

data/Gemfile.lock

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

data/README.md

@@ -25,9 +25,76 @@ Or install it yourself as:
 ## Usage
 
 ```bash
-mj --help
+mj help
 ```
 
+### Alternative file
+
+Examples:
+
+```
+$ mj alternative_file list app/components/attribute_component.rb
+app/components/attribute_component.html.erb
+app/components/attribute_component.rb
+lib/components/attribute_component.rb
+spec/components/attribute_component_spec.rb
+test/components/attribute_component_test.rb
+
+$ mj alternative_file list app/components/attribute_component.rb  --exists
+app/components/attribute_component.html.erb
+app/components/attribute_component.rb
+spec/components/attribute_component_spec.rb
+
+$ mj alternative_file list app/components/attribute_component.rb  --types=spec
+spec/components/attribute_component_spec.rb
+
+$ mj alternative_file next app/components/attribute_component.rb
+lib/components/attribute_component.rb
+
+$ mj alternative_file prev app/components/attribute_component.rb
+app/components/attribute_component.html.erb
+```
+
+Why? Because you can integrate that command with your IDE/Text Editor. For instance, here's my [neovim integration](https://github.com/mjacobus/dotfiles/blob/d8ceda659dc9b587ab22b05fc15eac2fa5b477d7/neovim/.config/nvim/init.lua#L31-L63):
+
+```lua
+vimp.nnoremap('<leader>ak', function()
+  open_mj_alternative_file('next', '--exists')
+end)
+
+vimp.nnoremap('<leader>aj', function()
+  open_mj_alternative_file('prev', '--exists')
+end)
+
+function open_mj_alternative_file(subcommand, options)
+  file_path = vim.fn.expand('%')
+  files = mj_alternative_file(file_path, subcommand, options)
+  files = vim.split(files, ' ')
+  file = files[1]
+
+
+  if file ~= '' then
+    vim.api.nvim_command('e ' .. file)
+  end
+end
+
+function mj_alternative_file(file, subcommand, options)
+  local cmd = 'mj alternative_file ' .. subcommand .. ' ' .. file .. ' ' .. options
+  return execute_command(cmd)
+end
+
+function execute_command(cmd)
+  print("cmd: " .. cmd)
+  local f = io.popen(cmd)
+  local s = f:read('*a')
+  f:close()
+  return s
+end
+```
+
+This way I can use `<leader>a{direction}`, where `k` is `next`, and `j` is `previous` alternative file.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

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,9 @@ 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
         end
       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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,7 +85,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