mj 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff905fc5978244944098033bf6ecfb671f1130c336e2f77c19beefab3c927dfe
-  data.tar.gz: 0560a8a156cb45bc2e8c459b021e721118e304abf55e92d25039cd9c9277ee24
+  metadata.gz: 040511b6ef46ad0760a5958920e53ec8d00fa3f0697c9098004e649808c41f73
+  data.tar.gz: b9eaa497531aa4856674cf0f5d80825769e0b431ee8c304cf052680f8d22ee2c
 SHA512:
-  metadata.gz: b20134878fb83b50a0d9dda518dfc81500af893f522616605835e1ee2f6d78bbe824a9302d07131926d799bf308ee463efbfa9a0b4d37dce793fd2ab614c91d8
-  data.tar.gz: 30f12048aa54fa5070895859a99f0ffdd66bf35962d82e98952fc889b8a23afd9f4b650a89bea6645f28434210b173d90460196ab20a72f93fe68368cc50d87d
+  metadata.gz: 1e0c951f24b70e6d25746e51f3cf0a37c9fd781818763e26115f6199a157da4cc3f6590cba8819f56d5ecbdb7de8523e509b3f29dd5362340cebc7d1646c3028
+  data.tar.gz: 112bc4d98c34cd67f5ef1cae09646e06a920ab2b5ed27010130bbd926dc23d033bdf1a329d9fd0d4e56466dfb086747a40a3414200a5a441839f1a397dd90fdd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mj (0.4.1)
+    mj (0.5.1)
       thor (~> 1.2.1)
 
 GEM

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/candidates.rb

@@ -41,6 +41,10 @@ module Mj
         next_file(@items.reverse, reference_file)
       end
 
+      def sorted_by_path
+        new(@items.sort_by(&:path))
+      end
+
       private
 
       def new(*args)

data/lib/mj/alternative_file/commands/list_command.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Commands
+      class ListCommand
+        attr_reader :file
+
+        def initialize(file, options)
+          @file = CurrentFile.new(file.to_s)
+          @options = options
+        end
+
+        def exists?
+          @options[:exists]
+        end
+
+        def types
+          @options[:types].to_s.split(",")
+        end
+
+        def debug?
+          @options[:debug]
+        end
+      end
+    end
+  end
+end

data/lib/mj/alternative_file/commands/list_command_handler.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Mj
+  module AlternativeFile
+    module Commands
+      class ListCommandHandler
+        def initialize(resolvers:)
+          @resolvers = resolvers
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def handle(command)
+          candidates = @resolvers.resolve(command.file)
+
+          if command.types.any?
+            candidates = candidates.of_types(command.types)
+          end
+
+          if command.exists?
+            candidates = candidates.existing
+          end
+
+          unless command.debug?
+            candidates = candidates.unique
+          end
+
+          candidates.sorted_by_path
+        end
+        # rubocop:enable Metrics/MethodLength
+      end
+    end
+  end
+end

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

@@ -19,6 +19,8 @@ module Mj
 
             # lib files
             add_candidate("lib/#{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/thor_command.rb

@@ -10,6 +10,8 @@ require_relative "resolvers/ruby/rails_resolver"
 require_relative "resolvers/ruby/rails_controller_resolver"
 require_relative "resolvers/ruby/view_component_resolver"
 require_relative "resolvers/ruby/ruby_file"
+require_relative "commands/list_command_handler"
+require_relative "commands/list_command"
 
 module Mj
   module AlternativeFile
@@ -19,8 +21,10 @@ module Mj
       option :exists, type: :boolean, banner: "files that exist", aliases: :e
       option :debug, type: :boolean, banner: "print debug information", aliases: :d
       def list(reference_file)
-        file = CurrentFile.new(reference_file)
-        print_candidates(resolve(file))
+        handler = Commands::ListCommandHandler.new(resolvers: self.class.resolvers)
+        command = Commands::ListCommand.new(reference_file, options)
+        candidates = handler.handle(command)
+        print_candidates(candidates)
       end
 
       desc "next <reference-file>", "Next alternative file"
@@ -28,8 +32,10 @@ module Mj
       option :exists, type: :boolean, banner: "files that exist", aliases: :e
       option :debug, type: :boolean, banner: "print debug information", aliases: :d
       def next(reference_file)
-        file = CurrentFile.new(reference_file)
-        candidate = resolve(file).after(file)
+        handler = Commands::ListCommandHandler.new(resolvers: self.class.resolvers)
+        command = Commands::ListCommand.new(reference_file, options)
+        candidates = handler.handle(command)
+        candidate = candidates.after(command.file)
         print_candidates([candidate].compact)
       end
 
@@ -38,8 +44,10 @@ module Mj
       option :exists, type: :boolean, banner: "files that exist", aliases: :e
       option :debug, type: :boolean, banner: "print debug information", aliases: :d
       def prev(reference_file)
-        file = CurrentFile.new(reference_file)
-        candidate = resolve(file).before(file)
+        handler = Commands::ListCommandHandler.new(resolvers: self.class.resolvers)
+        command = Commands::ListCommand.new(reference_file, options)
+        candidates = handler.handle(command)
+        candidate = candidates.before(command.file)
         print_candidates([candidate].compact)
       end
 
@@ -54,28 +62,8 @@ module Mj
       private
 
       def print_candidates(candidates)
-        $stdout.puts candidates.map { |i| i.to_s(debug: options[:debug]) }.join(" ")
+        $stdout.puts candidates.map { |i| i.to_s(debug: options[:debug]) }.join("\n")
       end
-
-      # rubocop:disable Metrics/MethodLength
-      def resolve(file)
-        candidates = self.class.resolvers.resolve(file)
-
-        if options[:types]
-          candidates = candidates.of_types(options[:types].to_s.split(","))
-        end
-
-        if options[:exists]
-          candidates = candidates.existing
-        end
-
-        unless options[:debug]
-          candidates = candidates.unique
-        end
-
-        candidates
-      end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/mj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -47,6 +47,8 @@ files:
 - lib/mj.rb
 - lib/mj/alternative_file/candidate.rb
 - lib/mj/alternative_file/candidates.rb
+- lib/mj/alternative_file/commands/list_command.rb
+- lib/mj/alternative_file/commands/list_command_handler.rb
 - lib/mj/alternative_file/current_file.rb
 - lib/mj/alternative_file/resolver.rb
 - lib/mj/alternative_file/resolvers/base.rb