runcmd-cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14952b53e3c7e1af1acdac479415b9366e4bc639974a505a00dc89d0ca81ef91
-  data.tar.gz: cceecc3dab11f8fe696e0ab62e30cdf62d70c0e1e9f369b33d2244df804c52cc
+  metadata.gz: 4009812a50103f2672c2ffe3f5f652645bae990952bac1ea51c29c11c02a098d
+  data.tar.gz: 8e62aa9134f735f331088211d7785c572698b1e8ef55f5780ae7251da09df80d
 SHA512:
-  metadata.gz: 8a0fce19e9c38708465147c977f7cf008c0db1a6d828099c87388dee0a8eecede4043fa29da0ef6aab06282351a80453ca16c4f11060d4ed2a3f2c9229e85775
-  data.tar.gz: 359a6dab0af6bcdf69e693dc6bc2bbe1045811322db9a87f52b5859f05623a725aa374bca5c3ab073ccd0f33e78617f47d550fcf032f3b6ec694663a883f5797
+  metadata.gz: 41f017464bfdf3f96bfe8f8a229211fdc998ec478a457eec736ca9ae65e6b2aac64a2914509bd2878c1b0fce20782b9ad951148a72f76cce77e2fd483e7aa729
+  data.tar.gz: a829859d3e1bf169598a393e0979495c47e211cace2a4403c2db8570e825895ce4ad1aac09d06770e204ffaafa78232c58194edfb9e0a429d5875fd704ba56ea

data/Gemfile.lock

@@ -6,7 +6,7 @@ PATH
 PATH
   remote: .
   specs:
-    runcmd-cli (0.1.2)
+    runcmd-cli (0.2.0)
       clamp
       runcmd
 

data/lib/runcmd/cli.rb

@@ -9,7 +9,7 @@ end
 require_relative "cli/version"
 
 require_relative "cli/version_command"
-require_relative "cli/run_command"
+require_relative "cli/record_command"
 require_relative "cli/play_command"
 
 require_relative "cli/root_command"

data/lib/runcmd/cli/play_command.rb

@@ -1,19 +1,70 @@
 # frozen_string_literal: true
+require "pty"
+require 'io/console'
+
+# Signal.trap("INT") {
+#   puts "CTRL+C detected, press second time to exit"
+#   exit if $ctrl_c
+#   $ctrl_c = true
+# }
 
 module Runcmd
   module Cli
     class PlayCommand < Clamp::Command
       parameter "RECORDING", "recording"
-      option ["--speed", "-s"], "speed", "speed", default: 0 do |s|
+      option ["--speed", "-"], "SPEED", "speed", default: 0.1 do |s|
         Float(s)
       end
 
       def execute
-        log = File.open(recording, "r")
-        log.each_char do |c|
-          print c
-          sleep speed
+        recording_input = File.new recording, "r"
+        cmd = recording_input.readline
+        args = recording_input.readline.split(" ")
+
+        stderr_reader, stderr_writer = IO.pipe
+
+        env = {
+          "LINES" => IO.console.winsize.first.to_s,
+          "COLUMNS" => IO.console.winsize.last.to_s
+        }
+
+        stdout,stdin,pid = PTY.spawn(env, cmd, *args, err: stderr_writer.fileno)
+        stderr_writer.close
+
+        stdin_thr = Thread.new do
+          while c = recording_input.getc
+            case c
+            when "\u0003"
+              # control+c
+              stdin.print c
+            else
+              stdin.print c
+            end
+            sleep speed
+          end
+
+          stdin.close
         end
+
+        stdout_thr = Thread.new do
+          while c = stdout.getc
+            print c
+          end
+        end
+
+        stderr_thr = Thread.new do
+          while c = stderr_reader.getc
+            print c
+          end
+        end
+
+        stdout_thr.join
+        stdin_thr.kill
+
+        stdin_thr.join
+        stderr_thr.join
+
+        recording_input.close
       end
     end
   end

data/lib/runcmd/cli/{run_command.rb → record_command.rb}

@@ -10,10 +10,11 @@ Signal.trap("INT") {
 
 module Runcmd
   module Cli
-    class RunCommand < Clamp::Command
+    class RecordCommand < Clamp::Command
+      parameter "RECORDING", "recording"
       parameter "COMMAND ...", "command"
-      option ["--record","-r"], "RECORD", "record"
 
+      option ["--video", "-v"], "VIDEO", "video"
       def execute
         cmd = command_list.shift
         args = command_list
@@ -25,20 +26,23 @@ module Runcmd
           "COLUMNS" => IO.console.winsize.last.to_s
         }
 
-        log = File.new record, "w" if record
+        recording_video = File.new "#{recording}.video", "w" if video
+        recording_input = File.new "#{recording}.runcmd", "w"
+        recording_input.puts cmd
+        recording_input.puts args.join(" ")
 
         stdout,stdin,pid = PTY.spawn(env, cmd, *args, err: stderr_writer.fileno)
         stderr_writer.close
 
         stdin_thr = Thread.new do
           while c = $stdin.getch
+            recording_input.print c
             case c
             when "\u0003"
               # control+c
               stdin.print c
             else
               stdin.print c
-              log.print c if record
             end
           end
 
@@ -48,14 +52,14 @@ module Runcmd
         stdout_thr = Thread.new do
           while c = stdout.getc
             print c
-            log.print c if record
+            recording_video.print c if video
           end
         end
 
         stderr_thr = Thread.new do
           while c = stderr_reader.getc
             print c
-            log.print c if record
+            recording_video.print c if video
           end
         end
 
@@ -65,7 +69,9 @@ module Runcmd
         stdin_thr.join
         stderr_thr.join
 
-        log.close if record
+        recording_video.close if video
+        recording_input.close
+
       end
     end
   end

data/lib/runcmd/cli/root_command.rb

@@ -11,7 +11,7 @@ module Runcmd
       end
 
       subcommand ["version"], "Show version information", VersionCommand
-      subcommand ["run"], "run", RunCommand
+      subcommand ["record"], "record", RecordCommand
       subcommand ["play"], "play", PlayCommand
 
       def self.run

data/lib/runcmd/cli/version.rb

@@ -1,5 +1,5 @@
 module Runcmd
   module Cli
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runcmd-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Matti Paksula
@@ -103,8 +103,8 @@ files:
 - exe/runcmd
 - lib/runcmd/cli.rb
 - lib/runcmd/cli/play_command.rb
+- lib/runcmd/cli/record_command.rb
 - lib/runcmd/cli/root_command.rb
-- lib/runcmd/cli/run_command.rb
 - lib/runcmd/cli/version.rb
 - lib/runcmd/cli/version_command.rb
 - runcmd-cli.gemspec