pry-inline 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad0830574abaae8e85b28338c86853dfadf68ec
-  data.tar.gz: 038f400021c0b7085a7dd829f2c31ff19678fcc5
+  metadata.gz: ccf76045d92a7d2fc6007dd1c25e50ecd132cd32
+  data.tar.gz: 57745615589a32560e63968cb342257b9591967a
 SHA512:
-  metadata.gz: e63bb2968aca4882bf6489a9a81235a92aa0b8029d02f14ea81ef1314a286a346656999e8d5b90bd587c12434fe4d0afa15ee58f25b119f6771251bed2fd1300
-  data.tar.gz: 07d738a52bb58f932cb5b3ccaae3a63576c6625b8573522b0686935bd84b7a48b477ebb5b92b88ac3b4d4a29a5391d1858f582190a74ba80bfbe60f4a66d648a
+  metadata.gz: adf5e3164713671c75e60575e0cf4976230f069482d8491ede24e4b43bcc0d669bc140100b65d320d1b621ae2418d3676a49efb2392d0cef6a29fdb29a8b213b
+  data.tar.gz: 81e37a0a848be77bda06062269b3ee8e6256b51b461fde7628271af3a5b00f7a468a21143a0d042d7d2c4ba76320778c92db882b17ef0eef6412e14a431d3547

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Exclude:
     - examples/*.rb
+    - test/**/*.rb
 
 Metrics/LineLength:
   Max: 120
@@ -13,9 +14,3 @@ Style/Documentation:
 
 Style/FileName:
   Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Lint/UselessAssignment:
-  Enabled: false

data/README.md

@@ -40,7 +40,7 @@ push git commits and tags, and push the `.gem` file to [rubygems.org](https://ru
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pry-inline.
+Bug reports and pull requests are welcome on GitHub at https://github.com/seikichi/pry-inline.
 This project is intended to be a safe, welcoming space for collaboration,
 and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 

data/lib/pry-inline.rb

@@ -2,17 +2,19 @@ require 'pry'
 require 'ripper'
 require 'set'
 
-require 'pry-inline/when_started_hook'
-require 'pry-inline/before_session_hook'
+require 'pry-inline/inline_debuggable_code'
 
-Pry.config.hooks
-  .add_hook(:when_started, :pry_inline, PryInline::WhenStartedHook.new)
+Pry.config.hooks.add_hook(:when_started, :pry_inline) do
+  Pry::Code.send(:prepend, PryInline::InlineDebuggableCode)
+end
 
 before_session_hooks = Pry.config.hooks.get_hooks(:before_session)
 Pry.config.hooks.delete_hooks(:before_session)
 
 begin
-  Pry.config.hooks.add_hook(:before_session, :pry_inline, PryInline::BeforeSessionHook.new)
+  Pry.config.hooks.add_hook(:before_session, :pry_inline) do |_, target, _|
+    PryInline::InlineDebuggableCode.binding = target
+  end
 ensure
   before_session_hooks.each do |name, callable|
     Pry.config.hooks.add_hook(:before_session, name, callable)

data/lib/pry-inline/inline_debuggable_code.rb

@@ -1,23 +1,27 @@
 module PryInline
   # monkey patch for Pry::Code
   module InlineDebuggableCode
-    def initialize(lines, start_line, code_type)
-      super(lines, start_line, code_type)
-
-      @lineno_to_variables = Hash.new { |h, k| h[k] = Set.new }
-      traverse_sexp(Ripper.sexp(lines.is_a?(String) ? lines : lines.join("\n")))
-      @lineno_to_variables.each do |lineno, variables|
-        next if lineno == 0 || @lines.length <= lineno
-        @lines[lineno - 1].variables = variables
-      end
+    MAX_DEBUG_INFO_LENGTH = 80
+
+    @@binding = nil
+
+    def self.binding=(value)
+      @@binding = value
     end
 
-    def with_marker(lineno = 1)
-      super.tap do
-        @lines.each do |line|
-          line.variables = nil if line.lineno >= lineno
+    def print_to_output(output, color = false)
+      begin
+        @lineno_to_variables = Hash.new { |h, k| h[k] = Set.new }
+        traverse_sexp(Ripper.sexp(@lines.map(&:line).join("\n")))
+        @lineno_to_variables.each do |lineno, variables|
+          next if lineno == 0 || @lines.length <= lineno
+          next if @with_marker && lineno > (@marker_lineno - @lines[0].lineno)
+          add_debug_info(@lines[lineno - 1], variables)
         end
+      ensure
+        ret = super(output, color)
       end
+      ret
     end
 
     private
@@ -27,8 +31,9 @@ module PryInline
       event = sexp[0]
 
       return sexp.each { |s| traverse_sexp(s) } if event.is_a?(Array)
-      return traverse_sexp_in_assignment(sexp[1]) if %i(assign massign params).include?(event)
-      traverse_sexp(sexp[1..sexp.length]) unless event.to_s.start_with?('@')
+      return traverse_sexp_in_assignment(sexp[1]) if %i( assign massign ).include?(event)
+      return traverse_sexp_in_assignment(sexp[1..-1]) if event == :params
+      traverse_sexp(sexp[1..-1]) unless event.to_s.start_with?('@')
     end
 
     def traverse_sexp_in_assignment(sexp)
@@ -40,7 +45,27 @@ module PryInline
         return @lineno_to_variables[sexp[2][0]] << sexp[1]
       end
 
-      traverse_sexp_in_assignment(sexp[1..sexp.length])
+      traverse_sexp_in_assignment(sexp[1..-1])
+    end
+
+    def add_debug_info(loc, variables)
+      return if !variables || (variables & defined_variables).size <= 0
+      info = debug_info(variables)
+      loc.tuple[0] += " # #{info[0..MAX_DEBUG_INFO_LENGTH]}"
+      loc.tuple[0] += ' ...' if info.length > MAX_DEBUG_INFO_LENGTH
+    end
+
+    def defined_variables
+      return [] unless @@binding
+      @@binding.eval('local_variables').map(&:to_s) |
+        @@binding.eval('self.instance_variables').map(&:to_s) |
+        @@binding.eval('self.class.class_variables').map(&:to_s)
+    end
+
+    def debug_info(variables)
+      variables.select { |k| defined_variables.include?(k) }
+        .map { |k| "#{k}: #{@@binding.eval(k).inspect}" }
+        .join(', ')
     end
   end
 end

data/lib/pry-inline/version.rb

@@ -1,3 +1,3 @@
 module PryInline
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-inline
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Seiichi KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -74,7 +74,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -85,11 +84,8 @@ files:
 - bin/console
 - bin/setup
 - lib/pry-inline.rb
-- lib/pry-inline/before_session_hook.rb
 - lib/pry-inline/inline_debuggable_code.rb
-- lib/pry-inline/inline_debuggable_loc.rb
 - lib/pry-inline/version.rb
-- lib/pry-inline/when_started_hook.rb
 - pry-inline.gemspec
 - screenshot.png
 homepage: https://github.com/seikichi/pry-inline
@@ -117,3 +113,4 @@ signing_key:
 specification_version: 4
 summary: Inline debugging like RubyMine
 test_files: []
+has_rdoc: 

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/lib/pry-inline/before_session_hook.rb

@@ -1,9 +0,0 @@
-require 'pry-inline/inline_debuggable_loc'
-
-module PryInline
-  class BeforeSessionHook
-    def call(_, target, _)
-      PryInline::InlineDebuggableLOC.binding = target
-    end
-  end
-end

data/lib/pry-inline/inline_debuggable_loc.rb

@@ -1,45 +0,0 @@
-module PryInline
-  # monkey patch for Pry::Code::LOC
-  module InlineDebuggableLOC
-    MAX_DEBUG_INFO_LENGTH = 80
-
-    @@binding = nil
-
-    attr_accessor :variables
-
-    def dup
-      super.tap { |ret| ret.variables = variables }
-    end
-
-    def colorize(code_type)
-      if @variables && (@variables & defined_variables).size > 0
-        if debug_info.length <= MAX_DEBUG_INFO_LENGTH
-          tuple[0] += " # #{debug_info}"
-        else
-          tuple[0] += " # #{debug_info[0..MAX_DEBUG_INFO_LENGTH]} ...}"
-        end
-      end
-    ensure
-      super(code_type)
-    end
-
-    def self.binding=(value)
-      @@binding = value
-    end
-
-    private
-
-    def defined_variables
-      return [] unless @@binding
-      @@binding.eval('local_variables').map(&:to_s) |
-        @@binding.eval('self.instance_variables').map(&:to_s) |
-        @@binding.eval('self.class.class_variables').map(&:to_s)
-    end
-
-    def debug_info
-      @variables.select { |k| defined_variables.include?(k) }
-        .map { |k| "#{k}: #{@@binding.eval(k).inspect}" }
-        .join(', ')
-    end
-  end
-end

data/lib/pry-inline/when_started_hook.rb

@@ -1,11 +0,0 @@
-require 'pry-inline/inline_debuggable_code'
-require 'pry-inline/inline_debuggable_loc'
-
-module PryInline
-  class WhenStartedHook
-    def call(_, _, _)
-      Pry::Code.send(:prepend, PryInline::InlineDebuggableCode)
-      Pry::Code::LOC.send(:prepend, PryInline::InlineDebuggableLOC)
-    end
-  end
-end