rshade 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732ff0b4c056d8b8128994ad4093db4146eb1728958f095a910017ba0bf7650c
-  data.tar.gz: 267e18db3d5a50cd2019990d216523b560baae47daf5e5dda36d300e593b49c8
+  metadata.gz: bf8737edb621544556bb58751c0513b17fe1d9f47a6d36fc77c57cac7cb00ef4
+  data.tar.gz: 13beabd1a6b22e62efc8c4bec6d0a7931ddd2960b8a4ec9cf0eeac6c0c2b8b95
 SHA512:
-  metadata.gz: 7184d8bc3982149ddf6871a0ca47a0f883bb8c00fb85949ef16efbc910bf3c74cfa0037a55ee3a3dc441dc638f497db887c25990145e1847a90d73fbf3fd91ee
-  data.tar.gz: af113a6e204ace9480bb42c2382b60d527c81fe18a4303dc538ce715acfe82932f601bdc20bb91f07a5072f5c5b5f65d00221ab221d8d9e8b2664d666225aa68
+  metadata.gz: d2e84b206dc81d4dad3af68cee691f22ec65749de2971ba5ec4c6001187333a17ea2e36c42cdb8341605cfbbbbc459add8355af29fc097e2108b96eb5c9e233c
+  data.tar.gz: cd41a6538fad5193dfcf4888da29ba1bfc0e216a5d2023e47291425546d8633660af24cffbd196960d6896e4b2b077ff549f4a57392164b8b625a54b90947f66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rshade (0.1.1)
+    rshade (0.1.2)
       colorize
 
 GEM

data/README.md

@@ -11,6 +11,12 @@ trace = RShade::Trace.new
 trace.reveal do  
   #your code here
 end
+trace.show
+#rspec
+ rshade_reveal do
+   #code here
+ end 
+
 ```
 
 ## Installation  

data/lib/rshade.rb

@@ -1,10 +1,12 @@
 require 'colorize'
-require "rshade/helper"
-require "rshade/source_node"
-require "rshade/filter"
-require "rshade/trace"
-require "rshade/rspec"
-require "rshade/version"
+require 'rshade/source'
+require 'rshade/tree'
+require 'rshade/source_node'
+require 'rshade/trace'
+require 'rshade/rspec'
+require 'rshade/version'
 
 module RShade
+  APP_TRACE = :app_trace
+  FULL_TRACE = :full_trace
 end

data/lib/rshade/rspec.rb

@@ -2,7 +2,7 @@ module RShade
   REPORTS = []
 
   module RSpecHelper
-    def rshade_reveal(&block)
+    def rshade_reveal(type = ::RShade::APP_TRACE)
       raise 'No block given' unless block_given?
 
       trace = Trace.new
@@ -10,7 +10,7 @@ module RShade
         yield
       end
 
-      REPORTS.push trace.show
+      REPORTS.push trace.show(type)
     end
   end
 end

data/lib/rshade/source.rb

@@ -0,0 +1,53 @@
+module RShade
+  # nodoc
+  class Source
+    RUBY_VERSION_PATTERN = /ruby-[0-9.]*/
+
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def klass
+      @hash[:klass]
+    end
+
+    def lib_code?
+      !app_code?
+    end
+
+    def app_code?
+      @app_code ||= exclude_path.none? { |item| path.include? item }
+    end
+
+    def path
+      @hash[:path]
+    end
+
+    def lineno
+      @hash[:lineno]
+    end
+
+    def method_name
+      @hash[:method_name]
+    end
+
+    def exclude_path
+      @path_arr ||= begin
+        [ENV['GEM_PATH'].split(':'), parse_ruby_version].flatten.compact
+      end
+    end
+
+    def parse_ruby_version
+      val = RUBY_VERSION_PATTERN.match(ENV['GEM_PATH'])
+      return nil unless val
+
+      val[0]
+    end
+
+    def pretty
+      class_method = "#{klass}##{method_name}".colorize(:green)
+      full_path = "#{path}:#{lineno}".colorize(:blue)
+      "#{class_method} -> #{full_path}"
+    end
+  end
+end

data/lib/rshade/source_node.rb

@@ -1,69 +1,23 @@
 module RShade
-  class SourceNode
-    attr_accessor :nodes, :value, :parent
-
-    def initialize(parent, value = nil)
-      @nodes = []
-      @value = value || { valid: true, level: 0 }
-      @value[:valid] = true unless @value.has_key?(:valid)
-      @parent = parent
-    end
-
-    def add(node)
-      @nodes << node
-    end
-
-    def valid?
-      @value[:valid]
-    end
-
-    def toggle_valid(state)
-      @value[:valid] = state
-    end
-
-    def level
-      @value[:level] || 0
-    end
-
-    def klass
-      @value[:klass]
-    end
-
-    def method_name
-      @value[:method_name]
-    end
-
-    def path
-      @value[:path]
-    end
-
-    def lineno
-      @value[:lineno]
-    end
-
-    def pretty
-      class_method = "#{klass}##{method_name}".colorize(:green)
-      full_path = "#{path}:#{lineno}".colorize(:blue)
-      "#{class_method} -> #{full_path}"
-    end
-
-    def filter(node = self, &block)
-      return unless block_given?
-
-      node.nodes.each do |item|
-        filter(item, &block)
+  # nodoc
+  class SourceNode < Tree
+    def initialize(value = nil)
+      super(value)
+    end
+
+    def clone_by(new_tree = SourceNode.new(nil), &block)
+      if yield(self)
+        new_tree.value = value
+        node = SourceNode.new(nil)
+        node.parent = new_tree
+        new_tree << node
+        new_tree = node
       end
 
-      unless yield(node)
-        node.toggle_valid false
+      nodes.each do |item|
+        item.clone_by(new_tree, &block)
       end
-    end
-
-    def traverse(node = self, &block)
-      return unless block_given?
-
-      yield(node)
-      node.nodes.each { |leaf| traverse(leaf, &block) }
+      new_tree
     end
   end
 end

data/lib/rshade/trace.rb

@@ -1,13 +1,11 @@
 module RShade
   class Trace
-    include RShade::Helper
     attr_accessor :source_tree, :open, :close, :set
     EVENTS = %i[call return].freeze
 
     def initialize
       @source_tree = SourceNode.new(nil)
       @tp = TracePoint.new(*EVENTS, &method(:process_trace))
-      @filter = RShade::Filter.new
       @stack = [@source_tree]
     end
 
@@ -20,21 +18,42 @@ module RShade
       @tp.disable
     end
 
-    def show
-      @source_tree.filter do |node|
-        next true unless node.parent
+    def show(type = ::RShade::APP_TRACE)
+      return show_app_trace if type == ::RShade::APP_TRACE
 
-        @filter.call(node.path)
+      show_full_trace
+    end
+
+    def show_full_trace(tree = nil)
+      buffer = StringIO.new
+      tree ||= source_tree
+      tree.pre_order_traverse do |node, depth|
+        if node.root?
+          buffer << "---\n"
+          next
+        end
+
+        buffer << "#{'  ' * depth} #{node.value.pretty}\n" if node.value
+      end
+      puts buffer.string
+    end
+
+    def show_app_trace
+      clone = source_tree.clone_by do |node|
+        next true if node.root?
+
+        node.value.app_code?
       end
-      pretty_print @source_tree
+      show_full_trace(clone)
     end
 
     def process_trace(tp)
       if tp.event == :call
         parent = @stack.last
         hash = { level: @stack.size, path: tp.path, lineno: tp.lineno, klass: tp.defined_class, method_name: tp.method_id }
-        node = SourceNode.new(parent, hash)
-        parent.add node
+        node = SourceNode.new(Source.new(hash))
+        node.parent = parent
+        parent << node
         @stack.push node
       end
 

data/lib/rshade/tree.rb

@@ -0,0 +1,30 @@
+module RShade
+  # nodoc
+  class Tree
+    attr_accessor :parent, :value
+    attr_reader :nodes
+
+    def initialize(value = nil)
+      @value = value
+      @nodes = []
+      @parent = nil
+    end
+
+    def root?
+      !parent
+    end
+
+    def <<(node)
+      @nodes << node
+    end
+
+    def pre_order_traverse(depth = 0, &block)
+      return unless block_given?
+
+      yield(self, depth)
+      nodes.each do |item|
+        item.pre_order_traverse(depth + 1, &block)
+      end
+    end
+  end
+end

data/lib/rshade/version.rb

@@ -1,3 +1,3 @@
 module RShade
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rshade
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ivan Lopatin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -84,11 +84,11 @@ files:
 - bin/console
 - bin/setup
 - lib/rshade.rb
-- lib/rshade/filter.rb
-- lib/rshade/helper.rb
 - lib/rshade/rspec.rb
+- lib/rshade/source.rb
 - lib/rshade/source_node.rb
 - lib/rshade/trace.rb
+- lib/rshade/tree.rb
 - lib/rshade/version.rb
 - rshade.gemspec
 - shade.jpg

data/lib/rshade/filter.rb

@@ -1,23 +0,0 @@
-module RShade
-  class Filter
-    RUBY_VERSION_PATTERN = /ruby-[0-9.]*/
-    def call(path)
-      return false unless path
-
-      exclude_path.none? { |item| path.include? item }
-    end
-
-    def exclude_path
-      @path_arr ||= begin
-        [ENV['GEM_PATH'].split(':'), parse_ruby_version].flatten.compact
-      end
-    end
-
-    def parse_ruby_version
-      val = RUBY_VERSION_PATTERN.match(ENV['GEM_PATH'])
-      return nil unless val
-
-      val[0]
-    end
-  end
-end

data/lib/rshade/helper.rb

@@ -1,14 +0,0 @@
-module RShade
-  module Helper
-    def pretty_print(root)
-      str = StringIO.new
-      str.write "\n\n"
-      str.write "---\n".colorize(:yellow)
-      root.traverse do |node|
-        str.write"#{' ' * node.level}#{node.pretty}\n" if node.valid?
-      end
-      str.write '---'.colorize(:yellow)
-      str.string
-    end
-  end
-end