mj 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1315dc125dadf7c6af6dfdaba6b81c52afd1aea322676a050d01ff6b3af6cd12
-  data.tar.gz: 975b749f8c67d2e9380c6b4df17b457e9e88f04ebbb3e74539b27b9816cb17c2
+  metadata.gz: 45d956a04733940240dd116cbd23f2bce4f7489d98954b6eebf4bef7ad650265
+  data.tar.gz: bfd4982a65d4794f54c662fb62aed6952f35af192708984462aa286522a273df
 SHA512:
-  metadata.gz: 7dc77ebcfe8f3b8b02972b027cba9a820f3efade191fd925ed53d25ad3500eba4ce17054028fe828575a23b12696205cb8933dd2a26bb2d81648d2dd7355302c
-  data.tar.gz: 63b69114fa66a7ccfdbe81f3d4e10a3d8bf873adef015a76e7f7e460e2df1ab630f949f14b6d5e7ff0bd031f43192f2e813fa06878cc547e12f8b44705554af6
+  metadata.gz: 3f7d3cbda48c13aa55f08da78e2d072c7c70322c2d53fd6048e68885acda47b969bf36634c4e41d8fcd98f809821fcd0ab6c3f8a0e8b5d2be35d1bbca4c3e141
+  data.tar.gz: 3e51c76e04d0dafed9c49ec6a548dbc6647727cde8fe930e74cff81eca818a67d8bf9b657717be1b55f9979eb29f814dfdd533c8b919492ffe188d9fcc9cd036

data/Gemfile.lock

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

data/lib/mj/alternative_file/candidate.rb

@@ -6,9 +6,10 @@ module Mj
       attr_reader :path
       attr_reader :type
 
-      def initialize(path:, type:)
+      def initialize(path:, type:, metadata: {})
         @path = path
         @type = type
+        @metadata = metadata || {}
       end
 
       def exist?
@@ -22,6 +23,31 @@ module Mj
 
         other.path == path && other.type == type
       end
+
+      def to_s(debug: false)
+        parts = [path]
+
+        if debug
+          parts.push("(#{metadata})")
+        end
+
+        parts.join
+      end
+
+      private
+
+      def metadata
+        data = {
+          type: type,
+          exists: exist?
+        }
+
+        @metadata.keys.sort.each do |key|
+          data[key] = @metadata[key]
+        end
+
+        data.map { |k, v| "#{k}:#{v}" }.join(",")
+      end
     end
   end
 end

data/lib/mj/alternative_file/resolvers/base.rb

@@ -15,7 +15,9 @@ module Mj
         private
 
         def create_candidate(path, type)
-          AlternativeFile::Candidate.new(path: path, type: type)
+          AlternativeFile::Candidate.new(path: path, type: type, metadata: {
+                                           resolved_by: self.class.name
+                                         })
         end
 
         def apply_to?(_file)

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

@@ -16,6 +16,9 @@ module Mj
             alternatives.push(create_candidate("app/#{ruby_file.class_path}.rb", "model"))
             alternatives.push(create_candidate("spec/#{ruby_file.class_path}_spec.rb", "spec"))
             alternatives.push(create_candidate("test/#{ruby_file.class_path}_test.rb", "minitest"))
+
+            # lib files
+            alternatives.push(create_candidate("lib/#{ruby_file.class_path}.rb", "lib"))
           end
         end
       end

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

@@ -8,6 +8,7 @@ module Mj
           def class_path
             path_without_extension
               .without_prefix("app")
+              .without_prefix("lib")
               .without_prefix("spec")
               .without_suffix("_spec")
               .without_suffix("_test")

data/lib/mj/alternative_file/thor_command.rb

@@ -16,6 +16,7 @@ module Mj
       desc "list <reference-file>", "List all alternative files"
       option :types, type: :string, banner: "<comma-separated-types>", aliases: :t
       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))
@@ -24,6 +25,7 @@ module Mj
       desc "next <reference-file>", "Next alternative file"
       option :types, type: :string, banner: "<comma-separated-types>", aliases: :t
       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)
@@ -33,6 +35,7 @@ module Mj
       desc "prev <reference-file>", "Previous alternative file"
       option :types, type: :string, banner: "<comma-separated-types>", aliases: :t
       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)
@@ -49,9 +52,10 @@ module Mj
       private
 
       def print_candidates(candidates)
-        $stdout.puts candidates.map(&:path).join(" ")
+        $stdout.puts candidates.map { |i| i.to_s(debug: options[:debug]) }.join(" ")
       end
 
+      # rubocop:disable Metrics/MethodLength
       def resolve(file)
         candidates = self.class.resolvers.resolve(file)
 
@@ -63,8 +67,13 @@ module Mj
           candidates = candidates.existing
         end
 
-        candidates.unique
+        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.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mj
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor