grep-interactors 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13371cc60413f745df6dd14ec5c45539f3ee7dccaedb70f5401ccf4f8f59fe7c
-  data.tar.gz: 7e4a2b69cd84b721af0079e86429e37af818f07215ebe66a04b47f2a967b9116
+  metadata.gz: bf0c9dfcc8e8f5a79ae2b2dbf6e97bb00e0b359c5041c839c33c2d37d351c834
+  data.tar.gz: 321c39615a25918bdf9192679740bdc5e994d530a41d4107fdf7bb866e0c59bc
 SHA512:
-  metadata.gz: 8d51cbd7df7831c63eadff494bb6c2d2024a23afe55fa1d05691afb8b47c3ad801dad6cdb45fba8b281e2761f0ef7fcf9223481c836455482d569319e4c032f3
-  data.tar.gz: 5a484354429f6bd957540788d93ce26060ef6c75aaf931cd098a5dd63091628cb7c814745c713c69cbc0a37568b21ba711764abe58b0d2ad45622255f9663ddf
+  metadata.gz: c025db885a8ce9e45ec5250c4abc4d8b23c9ede52faba40c42cfa1b8b50a9ff105ce5a170db8e53c473c451b1c1d3e34e2ff66cccf5fb3bf6da7d566fbb244a9
+  data.tar.gz: 3f78a9ea5cdcf822f0855e91d072a763ca27ec3811632fae994e933a0bf822c17bc73cce0d92779175f5cdf04cc8fbb06c90c50b6a02bcb451e7e8df7947f4ab

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/Gemfile

@@ -4,9 +4,7 @@ ruby "2.7.0"
 
 gemspec
 
-gem "interactor"
 gem "rake"
 gem "rspec"
 gem "activesupport"
-gem "byebug"
-gem "parser"
+gem "dry-auto_inject"

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    grep-interactors (0.1.1)
+    grep-interactors (0.1.5)
+      activesupport
+      dry-auto_inject
 
 GEM
   remote: https://rubygems.org/
@@ -12,16 +14,23 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
-    byebug (11.1.3)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
+    dry-auto_inject (0.7.0)
+      dry-container (>= 0.3.4)
+    dry-configurable (0.11.6)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    interactor (3.1.2)
     minitest (5.14.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -46,10 +55,8 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  byebug
+  dry-auto_inject
   grep-interactors!
-  interactor
-  parser
   rake
   rspec
 

data/README.md

@@ -2,7 +2,7 @@
 
 # Grep::Interactors
 
-Gem, which helps realize grep through organized Interactors.
+Gem, which helps grep through organized Interactors.
 For example, if sent interactor as ARG contains calling of other interactors, it will try to find entries in them.
 More in spec/
 
@@ -26,11 +26,23 @@ Or install it yourself as:
 
 ## How to run
 ```bash
-$ grep-interactors terminal_app interactors_path file_path keyword
+$ grep-interactors interactors_path file_path keyword
 ```
 eg
 ```bash
-$ grep-interactors terminal_app.rb /home/stanislav_lemm/Projects/solaris/app/interactors/ /home/stanislav_lemm/Projects/solaris/app/interactors/agreements/create.rb agreement
+$ grep-interactors /home/stanislav_lemm/Projects/solaris/app/interactors/ /home/stanislav_lemm/Projects/solaris/app/interactors/agreements/create.rb user
+
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/update_attributes.rb:6
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/update_attributes.rb:9
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/update_attributes.rb:12
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/update_attributes.rb:18
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/update_attributes.rb:30
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/update_attributes.rb:34
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/mind/refresh_value.rb:8
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/mind/refresh_value.rb:9
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/mind/refresh_value.rb:13
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/mind/refresh_value.rb:35
+/home/stanislav_lemm/Projects/solaris/app/interactors/user/mind/refresh_value.rb:39
 ```
 _Works only with absolute path for now_
 
@@ -40,6 +52,11 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Roadmap
+* Add docs
+* intellij idea plugin
+* Sublime Text 3 package
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ZamanovArslan/grep-interactors.

data/bin/grep-interactors

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "grep_interactors"
+
+GrepInteractors::Cli.call(ARGV)

data/exe/grep-interactors

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "grep_interactors"
+
+GrepInteractors::Cli.call(ARGV)

data/grep-interactors.gemspec

@@ -1,12 +1,17 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "grep_interactors/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "grep-interactors"
-  spec.version       = "0.1.1"
+  spec.version       = GrepInteractors::VERSION
   spec.authors       = ["ArslanZamanov"]
   spec.email         = ["arslan.zamanov@flatstack.com"]
-  spec.executables << 'grep'
 
   spec.summary       = "Recursive Grep keyword in called interactors inside requested interactor"
-  spec.description   = "WIP"
+  spec.description   = "Gem, which helps realize grep through organized Interactors. For example, if sent interactor as
+ ARG contains calling of other interactors, it will try to find entries in them. More in specs"
   spec.homepage      = "https://github.com/ZamanovArslan/grep-interactors"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
@@ -16,12 +21,14 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/ZamanovArslan/grep-interactors"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.add_runtime_dependency 'dry-auto_inject'
+  spec.add_runtime_dependency 'activesupport'
+
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+
   spec.require_paths = ["lib"]
 end

data/lib/containers/base.rb

@@ -0,0 +1,5 @@
+module Containers
+  class Base
+    extend Dry::Container::Mixin
+  end
+end

data/lib/grep_interactors.rb

@@ -1,10 +1,24 @@
-require_relative "grep_in_paths"
-require_relative "parser"
+require "active_support"
+require "dry/auto_inject"
+require "containers/base"
 
-class GrepInteractors
+module GrepInteractors
   def self.call(interactors_path, file_path, query)
     file_paths = Parser.new(interactors_path, file_path).file_paths
 
-    GrepInPaths.call(query, file_paths)
+    GrepInPaths.new.call(query, file_paths)
   end
-end
+
+  def self.container
+    @@container ||= Containers::Base
+  end
+
+  Import = Dry::AutoInject(container)
+end
+
+require "grep_interactors/parser"
+require "grep_interactors/cli"
+require "grep_interactors/grep_in_paths"
+require "grep_interactors/version"
+require "string_matcher/default"
+require "string_matcher/regex"

data/lib/grep_interactors/cli.rb

@@ -0,0 +1,39 @@
+require "optparse"
+require "grep_interactors"
+
+module GrepInteractors
+  class Cli
+    def self.call(args, out = STDOUT)
+      OptionParser.new do |opts|
+        opts.on("-r", "--regexp", "Use regexp to search entries") do
+          GrepInteractors.container.register("string_matcher", ::StringMatcher::Regex)
+        end
+
+        opts.on_tail("-v", "--version", "Print version number") do
+          out << "Grep Interactors #{GrepInteractors::VERSION}\n"
+          exit
+        end
+
+        opts.on_tail("-h", "--help", "Print this help") do
+          out << "Search entries in interactors chain calls \n\n"
+          out << opts
+          out << "\nCreated and maintained by Arslan Zamanov, available under the MIT License.\n"
+          out << "Report bugs and contribute at https://github.com/ZamanovArslan/grep-interactors\n"
+          exit
+        end
+      end.parse!(args)
+
+      GrepInteractors.container.register("string_matcher", ::StringMatcher::Default) unless GrepInteractors.container.key?("string_matcher")
+
+      if args[0..3].empty?
+        out << "Args should be defined\n"
+        return false
+      end
+
+      out << GrepInteractors.call(args[0], args[1], args[2]).join("\n")
+      out << "\n"
+
+      exit 0
+    end
+  end
+end

data/lib/grep_interactors/grep_in_paths.rb

@@ -0,0 +1,15 @@
+module GrepInteractors
+  class GrepInPaths
+    include Import["string_matcher"]
+
+    def call(query, file_paths)
+      file_paths.reduce([]) do |accum, file_path|
+        lines = File.open(file_path).readlines
+
+        accum + lines.each_with_index.map do |line, index|
+          ("#{file_path}:#{index + 1}") if string_matcher.match?(line, query)
+        end.compact
+      end.flatten
+    end
+  end
+end

data/lib/grep_interactors/parser.rb

@@ -0,0 +1,53 @@
+require "pathname"
+
+module GrepInteractors
+  class Parser
+    attr_reader :interactors_path, :file_path
+
+    def initialize(interactors_path, file_path)
+      @interactors_path = interactors_path
+      @file_path = file_path
+    end
+
+    def file_paths
+      recursive_parse_file_paths([file_path])
+    end
+
+    def recursive_parse_file_paths(file_paths)
+      return [] if file_paths.empty?
+
+      new_file_paths = parse_files_paths parse_interactors file_paths[0]
+      new_file_paths + recursive_parse_file_paths(file_paths[1..-1]) + recursive_parse_file_paths(new_file_paths)
+    end
+
+    def parse_files_paths(class_names)
+      class_names.map { |class_name| get_file_path_by_class(class_name) }
+    end
+
+    def parse_interactors(file_path)
+      interactors = File.read(file_path).scan(/[A-Z][a-z]*[::[A-Z][a-z]*]*/).map do |constant|
+        get_full_class_name(constant, file_path)
+      end.compact
+      current_class = get_class_name_by_path(file_path)
+
+      interactors - [current_class]
+    end
+
+    def get_full_class_name(constant, file_path)
+      return constant if Pathname.new(get_file_path_by_class(constant)).exist?
+
+      current_module = get_class_name_by_path(file_path).split("::")[0..-2].join("::")
+      full_class_name = "#{current_module}::#{constant}"
+
+      full_class_name if Pathname.new(get_file_path_by_class(full_class_name)).exist?
+    end
+
+    def get_class_name_by_path(path)
+      ActiveSupport::Inflector.camelize(path.gsub(interactors_path, "").gsub(".rb", ""))
+    end
+
+    def get_file_path_by_class(class_name)
+      "#{interactors_path}#{ActiveSupport::Inflector.underscore(class_name)}.rb"
+    end
+  end
+end

data/lib/grep_interactors/version.rb

@@ -0,0 +1,3 @@
+module GrepInteractors
+  VERSION = "0.1.6"
+end

data/lib/string_matcher/default.rb

@@ -0,0 +1,7 @@
+module StringMatcher
+  class Default
+    def self.match?(string, regexp)
+      string.include? regexp
+    end
+  end
+end

data/lib/string_matcher/regex.rb

@@ -0,0 +1,7 @@
+module StringMatcher
+  class Regex
+    def self.match?(string, regexp)
+      string.match? Regexp.new regexp
+    end
+  end
+end

metadata

@@ -1,25 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: grep-interactors
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - ArslanZamanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
-dependencies: []
-description: WIP
+date: 2020-09-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-auto_inject
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |-
+  Gem, which helps realize grep through organized Interactors. For example, if sent interactor as
+   ARG contains calling of other interactors, it will try to find entries in them. More in specs
 email:
 - arslan.zamanov@flatstack.com
 executables:
-- grep
+- grep-interactors
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -27,14 +58,18 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/grep
+- bin/grep-interactors
 - bin/setup
-- exe/grep
+- exe/grep-interactors
 - grep-interactors.gemspec
-- lib/grep_in_paths.rb
+- lib/containers/base.rb
 - lib/grep_interactors.rb
-- lib/parser.rb
-- lib/terminal_app.rb
+- lib/grep_interactors/cli.rb
+- lib/grep_interactors/grep_in_paths.rb
+- lib/grep_interactors/parser.rb
+- lib/grep_interactors/version.rb
+- lib/string_matcher/default.rb
+- lib/string_matcher/regex.rb
 homepage: https://github.com/ZamanovArslan/grep-interactors
 licenses:
 - MIT

data/bin/grep

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'grep_interactors'
-
-puts GrepInteractors.call(ARGV[0], ARGV[1], ARGV[2])

data/exe/grep

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'grep_interactors'
-
-puts GrepInteractors.call(ARGV[0], ARGV[1], ARGV[2])

data/lib/grep_in_paths.rb

@@ -1,11 +0,0 @@
-class GrepInPaths
-  def self.call(query, file_paths)
-    file_paths.reduce([]) do |accum, file_path|
-      lines = File.open(file_path).readlines
-
-      accum + lines.each_with_index.filter_map do |line, index|
-        ("#{file_path}:#{index + 1}") if line.include?(query)
-      end
-    end.flatten
-  end
-end

data/lib/parser.rb

@@ -1,52 +0,0 @@
-require "active_support"
-require "pathname"
-
-class Parser
-  attr_reader :interactors_path, :file_path
-
-  def initialize(interactors_path, file_path)
-    @interactors_path = interactors_path
-    @file_path = file_path
-  end
-
-  def file_paths
-    recursive_parse_file_paths([file_path])
-  end
-
-  def recursive_parse_file_paths(file_paths)
-    return [] if file_paths.empty?
-
-    new_file_paths = parse_files_paths parse_interactors file_paths[0]
-    new_file_paths + recursive_parse_file_paths(file_paths[1..-1]) + recursive_parse_file_paths(new_file_paths)
-  end
-
-  def parse_files_paths(class_names)
-    class_names.map {|class_name| get_file_path_by_class(class_name) }
-  end
-
-  def parse_interactors(file_path)
-    interactors = File.read(file_path).scan(/[A-Z][a-z]*[::[A-Z][a-z]*]*/).filter_map do |constant|
-      get_full_class_name(constant, file_path)
-    end
-    current_class = get_class_name_by_path(file_path)
-
-    interactors - [current_class]
-  end
-
-  def get_full_class_name(constant, file_path)
-    return constant if Pathname.new(get_file_path_by_class(constant)).exist?
-
-    current_module = get_class_name_by_path(file_path).split("::")[0..-2].join("::")
-    full_class_name = "#{current_module}::#{constant}"
-
-    full_class_name if Pathname.new(get_file_path_by_class(full_class_name)).exist?
-  end
-
-  def get_class_name_by_path(path)
-    ActiveSupport::Inflector.camelize(path.gsub(interactors_path, "").gsub(".rb", ""))
-  end
-
-  def get_file_path_by_class(class_name)
-    "#{interactors_path}#{ActiveSupport::Inflector.underscore(class_name)}.rb"
-  end
-end

data/lib/terminal_app.rb

@@ -1,3 +0,0 @@
-require_relative "grep_interactors"
-
-puts GrepInteractors.call(ARGV[0], ARGV[1], ARGV[2])