dev_scripts 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d228641ef9316118dc6db77ce51b8e427dce277873ba1698ef02462ba5c9b18d
-  data.tar.gz: 97d738e8c9632d42a66944a2c7fcc9cefaa3f4cea46da91e497b8df18d30f1c6
+SHA1:
+  metadata.gz: bb8b845e411220940dea6320c29b837dc3fe4be0
+  data.tar.gz: f2bb862cda6a06d556077c16ca95737706d8656d
 SHA512:
-  metadata.gz: 47d81e8075cb5d3637d754e3d377fbb6bfb37499644390eb5acaee3eef424f4c68cb1bbf29582647543e19d7c610c08df59637a5cc34ae61a7c24064b8cad44f
-  data.tar.gz: 2cb25859255da05f5f1f25d176c57c6a9cb8686a596ad30ffde2243537e0985b4aefe6f0193eeb33fed7dfd6df236f12a32877c0604b71d582c7d8c06cd2f2c2
+  metadata.gz: 2d30b227df38ceb469e5a68a2bab68b55274be68265b2d63f92ae6ca767a3beb4c1a01e88d1eb7e27b4664531c67549c7012f5ea67e6d7afcd79f50a44b57603
+  data.tar.gz: c142dcbf20b61b2e02207180dda4f535ec0181a30be1cadf927dfb2ec442a83a98c2640433d48198972c43728260c419f924d9adcf92b7b7e265b313626bef68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dev_scripts (0.1.5)
+    dev_scripts (0.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -12,6 +12,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
+    ast (2.4.0)
     byebug (11.0.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -44,6 +45,8 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    parser (2.6.5.0)
+      ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -83,6 +86,7 @@ DEPENDENCIES
   dev_scripts!
   guard
   guard-rspec
+  parser
   pry
   pry-byebug
   rake (~> 10.0)

data/dev_scripts.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "activesupport"
+  spec.add_development_dependency "parser"
 end

data/lib/dev_scripts/scripts/expand_block.rb

@@ -1,5 +1,5 @@
 require 'dev_scripts/script'
-require 'dev_scripts/support/block_expander'
+require 'dev_scripts/support/expanded_block'
 
 DevScripts::Script.define_script :expand_block do
   args :file_path, :line_number
@@ -9,7 +9,7 @@ DevScripts::Script.define_script :expand_block do
 
     File.foreach(file_path).with_index do |file_line, index|
       if index + 1 == line_number.to_i
-        lines << DevScripts::Support::BlockExpander.new(line: file_line).run
+        lines << DevScripts::Support::ExpandedBlock.new(line: file_line)
       else
         lines << file_line
       end

data/lib/dev_scripts/support/block.rb

@@ -0,0 +1,54 @@
+module DevScripts
+  module Support
+    class Block < String
+      def initialize(args_node, block_node)
+        @block_node = block_node
+
+        self << 'do'
+
+        if args_node.children.size > 0
+          self << args_node.children.each_with_object(' |').with_index do |(arg, string), index|
+            string << arg.children.first.to_s
+
+            string << ', ' if index < args_node.children.size - 1
+            string << '|' if index == args_node.children.size - 1
+          end
+        end
+
+        self << "\n"
+        self << '  ' + body
+        self << "\n"
+        self << 'end'
+      end
+
+      private
+
+      attr_reader :block_node
+
+      def args(node)
+        node.children.each_with_object(' |').with_index do |(arg, string), index|
+          string << arg.children.first.to_s
+
+          string << ', ' if index < node.children.size - 1
+          string << "|" if index == node.children.size - 1
+        end
+      end
+
+      def block_node_method_call?
+        block_node.type == :send
+      end
+
+      def body
+        if block_node_method_call?
+          MethodCall.new(block_node)
+        else
+          if Symbol === block_node.children.first
+            ":#{block_node.children.first}"
+          else
+            block_node.children.first.to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dev_scripts/support/expanded_block.rb

@@ -0,0 +1,26 @@
+require 'parser/current'
+require 'dev_scripts/support/block'
+require 'dev_scripts/support/method_call'
+
+module DevScripts
+  module Support
+    class ExpandedBlock < String
+      def initialize(line:)
+        parsed = Parser::CurrentRuby.parse(line).children
+        spacing = line.match(/\A\s*/)[0]
+        end_spacing = line.match(/\s*\z/)[0]
+        block_string = DevScripts::Support::Block.new(parsed[1], parsed[2])
+        block_lines = block_string.split("\n")
+
+        self << spacing + DevScripts::Support::MethodCall.new(parsed[0])
+        self << ' '
+        self << block_lines[0]
+        self << "\n"
+        self << spacing + block_lines[1]
+        self << "\n"
+        self << spacing + block_lines[2]
+        self << end_spacing
+      end
+    end
+  end
+end

data/lib/dev_scripts/support/method_call.rb

@@ -0,0 +1,58 @@
+module DevScripts
+  module Support
+    class MethodCall < String
+      attr_reader :receiver, :invocation, :args
+
+      def initialize(ast_node)
+        current_receiver, @invocation, *@args = ast_node.children
+
+        invocation_stack = [invocation_with_args]
+
+        while Parser::AST::Node === current_receiver
+          invocation_stack.unshift MethodCall.new(current_receiver).invocation_with_args
+
+          current_receiver, invocation, *args = current_receiver&.children || []
+        end
+
+        invocation_stack.each_with_index do |invocation_string, index|
+          self << '.' if index > 0
+          self << invocation_string.to_s
+        end
+      end
+
+      def invocation_with_args
+        if args && args.size > 0
+          args.each_with_object("#{invocation}(").with_index do |(arg, string), index|
+            string << arg_string(arg)
+
+            string << ', ' if index < args.size - 1
+            string << ')' if index == args.size - 1
+          end
+        else
+          invocation
+        end
+      end
+
+      def arg_string(arg)
+        case arg.type
+        when :sym
+          ":#{arg.children[0]}"
+        when :str
+          "#{arg.children[0]}"
+        when :int
+          "#{arg.children[0].to_i}"
+        when :lvar
+          "#{arg.children[0]}"
+        when :send
+          "#{arg.children[1]}"
+        when :hash
+          arg_string(arg.children[0])
+        when :pair
+          key, value = arg.children
+
+          "#{key.children.first}: #{value.children.last}"
+        end
+      end
+    end
+  end
+end

data/lib/dev_scripts/version.rb

@@ -1,3 +1,3 @@
 module DevScripts
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_scripts
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Carlos Quinones
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Register and run scripts for ruby and rails development, with some defaults.
 email:
 - cquinones100@gmail.com
@@ -148,7 +162,9 @@ files:
 - lib/dev_scripts/scripts/expand_block.rb
 - lib/dev_scripts/scripts/open_spec_file.rb
 - lib/dev_scripts/scripts/rubocop_metrics_method_length.rb
-- lib/dev_scripts/support/block_expander.rb
+- lib/dev_scripts/support/block.rb
+- lib/dev_scripts/support/expanded_block.rb
+- lib/dev_scripts/support/method_call.rb
 - lib/dev_scripts/version.rb
 homepage: 
 licenses: []
@@ -168,7 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Register and run scripts for ruby and rails development

data/lib/dev_scripts/support/block_expander.rb

@@ -1,51 +0,0 @@
-module DevScripts
-  module Support
-    class BlockExpander
-
-      def initialize(line:)
-        @line = line
-        @body = line.match(/\{.*}\s*\n*\z/)&.send(:[], 0)
-        @spacing = line.match(/\A\s*/)&.send(:[], 0)
-        @argument = line.match(/\|\w+(,\w+)*\|/)&.send(:[], 0)
-      end
-
-      def run
-        line_one + line_two + line_three  
-      end
-
-      private 
-
-      attr_reader :method_call, :body, :spacing, :argument, :line
-
-      def method_call
-        line.split('').each_with_object('') do |character, new_line|
-          return new_line if character == '{'
-
-          new_line << character
-        end
-      end
-
-      def new_body
-        body
-          .gsub('{', 'do')
-          .gsub(/\|\w+(,\w+)*\|/) { |match| "#{match}\n#{spacing}" }
-          .gsub('}', )
-      end
-
-      def line_one
-        method_call.gsub(/\s*\z/, '') + " do#{argument ? ' ' + argument : ''}\n"
-      end
-
-      def line_two
-        spacing +
-        '  ' +
-        body.gsub(/\A{\s*(\|\w+(,\w+)*\|)*\s*/, '').gsub(/\s*}\s*\z/, '') +
-        "\n"
-      end
-
-      def line_three
-        spacing + body.match(/}\s*/)[0].gsub('}', 'end')
-      end
-    end
-  end
-end