pry-timetravel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d28f753687e1f5f96c87e7ce51949dc68d8fab6
-  data.tar.gz: be676c5cc7e8ff236314b31e6161aef76ce017a4
+  metadata.gz: 036cd80689a69996c2e965251b5eea0d8ad65958
+  data.tar.gz: 4469ac880bb66bcea64873f4cc423f06c2603a76
 SHA512:
-  metadata.gz: c42224c2d9c89770cf5f22c861b37fa254a71713d11c46696fbc6d912027f21454a0ea98688f13f690a69e7fc7a5e12b8a1c63e2b2d61603c7c192bbebfb0c01
-  data.tar.gz: 27bfcc69e86ff9838820f350c5fb617e24d6d1c456e702b670c8c25d7156b9afdb5be0c728b9416f8645696759c4482930e3f0f9e309344635fc9638b2636fed
+  metadata.gz: 948b4b85a37039e6829ff9a511ce3cf9c40f3c28d10b0f62e3d9726089c7e2280a9350553f903e15cbce77a36efc5334a1cd917a6c0cb23c0e35fd835204c727
+  data.tar.gz: c045d71745d255a7e3c37978cc212a666cde0e40adb625deded075b8323283fc12c070b7377e7b8dcbb3267ba50c05cc97e43f24740d8e6c1c95d62b92e62a75

data/README.md

@@ -26,6 +26,27 @@ There are a few more details, but that is the important bit.
 
 WARNING: Time travel may cause zombies.
 
+## KNOWN ISSUES
+
+### Redis fork detection
+
+Redis checks to see if you forked and yells at you about needing to reconnect.
+Reasonably so, as it is a crazy idea to use the same connection in forked
+children! But we are doing crazy things. In 3.1.0 the gem will auto-reconnect,
+or you can pass inherit_socket to the connection to stop that. Or you can do
+this to bypass safety measures:
+
+    class Redis
+      class Client
+        def ensure_connected
+          yield
+        end
+      end
+    end
+
+Maybe this will be a default hack that gets activated on your first snapshot at
+some point in the near future.
+
 ## Meta
 
 Released under the MIT license, see LICENSE.MIT for details. License is

data/lib/pry-timetravel.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'pry'
+require 'json'
 
-require File.expand_path('../pry-timetravel/commands', __FILE__)
+require_relative 'pry-timetravel/commands'
 
 class PryTimetravel
   class << self
@@ -23,92 +24,142 @@ class PryTimetravel
     end
 
     def enter_suspended_animation
+      dlog("Installing SIGCONT trap")
       old_sigcont_handler = Signal.trap('CONT') do
         dlog("Got a SIGCONT")
       end
 
+      dlog("Installing SIGEXIT trap")
       old_sigexit_handler = Signal.trap('EXIT') do
         dlog("got EXIT")
-        Kernel.exit!
+        Kernel.exit! true
       end
 
       dlog("Stopping myself")
       Process.kill 'SIGSTOP', $$
       dlog("Back from SIGSTOP!")
 
+      @snap_tree = JSON.parse(File.read("/tmp/timetravel_#{$root_parent}.json"))
+
       dlog("Returning to old SIGCONT")
-      Signal.trap('CONT', old_sigcont_handler)
+      Signal.trap('CONT', old_sigcont_handler || "DEFAULT")
+
       dlog("Returning to old SIGEXIT")
-      Signal.trap('EXIT', old_sigexit_handler)
+      Signal.trap('EXIT', old_sigexit_handler || "DEFAULT")
     end
 
-    def snapshot
+    def start_root_parent
+      $root_parent = $$
+      child_pid = fork
+      if child_pid
+        Signal.trap('INT') do
+          dlog("root-parent got INT, ignoring")
+        end
+        Signal.trap('USR1') do
+          dlog("root-parent got USR1, exiting")
+          FileUtils.rm("/tmp/timetravel_#{$root_parent}.json")
+          Kernel.exit! true
+        end
+        dlog "Root parent waiting on #{child_pid}"
+        #  sleep
+        #  Process.waitall
+        Process.waitpid child_pid
+        #  Process.waitpid 0
+        dlog "Root parent exiting after wait"
+        FileUtils.rm("/tmp/timetravel_#{$root_parent}.json")
+        Kernel.exit! true
+      end
+    end
+
+    def snapshot(target, parent = -> {}, child = -> {})
 
       # We need a root-parent to keep the shell happy
       if ! $root_parent
-        $root_parent = $$
-        child_pid = fork
-        if child_pid
-          Signal.trap('INT') do
-            dlog("root-parent got INT")
-          end
-          Signal.trap('USR1') do
-            dlog("root-parent got USR1")
-            Kernel.exit!
-          end
-          dlog "Root parent waiting on #{child_pid}"
-          Process.waitpid child_pid
-          dlog "Root parent exiting!"
-          Kernel.exit!
-        end
+        start_root_parent
       end
 
-      $timetravel_root ||= $$
+      @timetravel_root ||= $$
+      @snap_tree ||= {
+        $$.to_s => {
+          "file" => target.eval('__FILE__'),
+          "line" => target.eval('__LINE__'),
+        }
+      }
 
       parent_pid = $$
       child_pid = fork
+
       if child_pid
-        dlog("I am parent #{parent_pid}: I have a child pid #{child_pid}")
 
-        # Method 3: Child suspends themselves, parent adds them to list
-        @previous_pid ||= []
-        @previous_pid.push child_pid
+        dlog("I am parent #{parent_pid}: I have a child pid #{child_pid}")
+        enter_suspended_animation
 
-        # Perform operation
-        yield
+        # Perform child operation
+        child.()
 
       else
+
         child_pid = $$
         dlog("I am child #{child_pid}: I have a parent pid #{parent_pid}")
-        enter_suspended_animation
+
+        @snap_tree[child_pid.to_s] = {
+          "previous" => parent_pid,
+          "file" => target.eval('__FILE__'),
+          "line" => target.eval('__LINE__'),
+        }
+
+        # Perform parent operation
+        parent.()
+
       end
     end
 
-    def snapshot_list
-      @previous_pid && @previous_pid.join(" ")
+    def snapshot_list(target, indent = "", node = @timetravel_root.to_s)
+      # @snap_tree && @snap_tree.keys.join(" ")
+      return unless node && node != ""
+
+      # This shouldn't be here
+      @snap_tree[$$.to_s]["file"] = target.eval('__FILE__')
+      @snap_tree[$$.to_s]["line"] = target.eval('__LINE__')
+
+      out = "#{indent}#{node} #{@snap_tree[node]["file"]} #{@snap_tree[node]["line"]} #{ node == $$.to_s ? '***' : ''}\n"
+      @snap_tree.keys.select { |n|
+        @snap_tree[n]["previous"] == node.to_i
+      }.each do |n|
+        out += snapshot_list(target, indent + "  ", n)
+      end
+      out
     end
 
-    def restore_snapshot(target_pid = nil, count = nil)
-      dlog("Thinking about time travel...");
+    def restore_snapshot(target, target_pid = nil, count = 1)
+      dlog("Thinking about time travel... $$");
 
-      if target_pid.nil? && @previous_pid && ! @previous_pid.empty?
-        count = 1 if count == 0
-        target_pid = @previous_pid[-count]
+      if target_pid.nil? && @snap_tree && ! @snap_tree[$$.to_s].nil?
+        count = 1 if count < 1
+        target_pid = @snap_tree[$$.to_s]["previous"]
+        @snap_tree[$$.to_s]["file"] = target.eval('__FILE__')
+        @snap_tree[$$.to_s]["line"] = target.eval('__LINE__')
       else
         target_pid = target_pid
       end
 
       if target_pid
         dlog("ME #{$$}: I found a target pid #{target_pid}! TIME TRAVEL TIME")
+
+        File.open("/tmp/timetravel_#{$root_parent}.json", 'w') do |f|
+          f.puts @snap_tree.to_json
+        end
+
         Process.kill 'SIGCONT', target_pid
         enter_suspended_animation
       else
         dlog("I was unable to time travel. Maybe it is a myth.");
+        puts "No previous snapshot found."
       end
     end
 
     def restore_root_snapshot
-      restore_snapshot($timetravel_root) if $timetravel_root
+      restore_snapshot(@timetravel_root) if @timetravel_root
     end
 
   end

data/lib/pry-timetravel/commands.rb

@@ -20,11 +20,14 @@ Pry::Commands.create_command "snap", "Create a snapshot that you can later retur
   end
   def process
     if opts.l?
-      output.puts PryTimetravel.snapshot_list
+      output.puts PryTimetravel.snapshot_list(target)
     else
-      PryTimetravel.snapshot do
-        run(args.join(" ")) unless args.empty?
-      end
+      PryTimetravel.snapshot(
+        target,
+        -> { run(args.join(" ")) unless args.empty? },
+        -> { run('whereami') }
+      )
+      #  run('whereami')
     end
   end
 end
@@ -47,10 +50,10 @@ Pry::Commands.create_command "back", "Go back to the most recent snapshot" do
   end
   def process
     if opts.h?
-      PryTimetravel.restore_root_snapshot
+      PryTimetravel.restore_root_snapshot(target)
     else
-      count = args.first.to_i
-      PryTimetravel.restore_snapshot(opts[:p], count)
+      target_pid = args.first ? args.first.to_i : opts[:p]
+      PryTimetravel.restore_snapshot(target, target_pid)
     end
   end
 end

data/pry-timetravel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'pry-timetravel'
-  s.version       = '0.0.2'
+  s.version       = '0.0.3'
   s.summary       = 'Timetravel'
   s.description   = 'Allows you to timetravel!'
   s.homepage      = 'https://github.com/awwaiid/pry-timetravel'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-timetravel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brock Wilcox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry