spielbash 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dda7f053211da0e400d7d97ae8c5b525c86ac39
-  data.tar.gz: 949124904f77ce130434565a98274a918c2af07f
+  metadata.gz: '09da61edc3e1a9325354e616ad9d9dd031828469'
+  data.tar.gz: 106b73657f6a99e63b584981f0bc9a77f73c5447
 SHA512:
-  metadata.gz: e0f9f2d705c2f6fbe9bae098802ecf094104310b9d85a06d920f6c4ade2cda9450caa1429c3ef53f10631e7ab6bd0b88ff857965ae2e311b0bb76d855d29e172
-  data.tar.gz: 994acbeabd2adbd3bfcd5d586ba45af64fe8f424966584bf1eff6a0a29aa7329b2128aedaa2a9e47a8fe1532df72184c2b9a8e64a81fa861971944f975da89c3
+  metadata.gz: 959d24a54faaebe57e0f9ddd75c81baf61e07eed707a075d48f6f3ca532e754fe73e7dbd195c067771c7afd9347b14e9aa9e3d7777f26680572374f125b873d5
+  data.tar.gz: f9baca5a0481b7f322aca9490497916d63aa929531ea5d87039804eea777b880c16a9a680f80d15a88d1fe69221bfb39a78d4e354395cb73c3f99a901aa5398f

data/lib/spielbash/interactor/record_interactor.rb

@@ -12,8 +12,9 @@ module Spielbash
       wait = opts['wait']
       width = opts['width']
       height = opts['height']
+      wait_check_cmd = opts['wait_check_cmd']
 
-      context = Spielbash::Context.new(typing_delay_s, reading_delay_s, wait, width, height)
+      context = Spielbash::Context.new(typing_delay_s, reading_delay_s, wait, width, height, wait_check_cmd)
 
       actions = create_actions(context, script['scenes'])
       pre_run_actions = create_actions(context, script['pre-run'])
@@ -24,6 +25,7 @@ module Spielbash
     end
 
     private
+
     def create_actions(context, scenes)
       actions = []
       for scene in scenes do
@@ -36,27 +38,34 @@ module Spielbash
                                                       action_opts['height'])
 
         action = case
-                   when scene.has_key?('message') then
-                     value = scene['message']
-                     message_context = Spielbash::MessageContext.new(context,
-                                                                     action_opts['typing_delay_s'],
-                                                                     action_opts['reading_delay_s'],
-                                                                     action_opts['wait'],
-                                                                     action_opts['width'],
-                                                                     action_opts['height'],
-                                                                     action_opts['delete'].nil? ? true : action_opts['delete'])
-                     Spielbash::MessageAction.new(value, message_context)
-                   when scene.has_key?('command') then
-                     value = scene['command']
-                     Spielbash::CommandAction.new(value, action_context)
-                   when scene.has_key?('pause') then
-                     value = scene['pause']
-                     Spielbash::PauseAction.new(value, action_context)
-                   when scene.has_key?('key') then
-                     value = scene['key']
-                     Spielbash::PressKeyAction.new(value, action_context)
-                   else
-                     not_implemented
+                 when scene.has_key?('message') then
+                   value = scene['message']
+                   message_context = Spielbash::MessageContext.new(context,
+                                                                   action_opts['typing_delay_s'],
+                                                                   action_opts['reading_delay_s'],
+                                                                   action_opts['wait'],
+                                                                   action_opts['width'],
+                                                                   action_opts['height'],
+                                                                   action_opts['delete'].nil? ? true : action_opts['delete'])
+                   Spielbash::MessageAction.new(value, message_context)
+                 when scene.has_key?('command') then
+                   value = scene['command']
+                   Spielbash::CommandAction.new(value, action_context)
+                 when scene.has_key?('pause') then
+                   value = scene['pause']
+                   Spielbash::PauseAction.new(value, action_context)
+                 when scene.has_key?('key') then
+                   value = scene['key']
+                   Spielbash::PressKeyAction.new(value, action_context)
+                 when scene.has_key?('new_env') then
+                   cmd = scene['new_env']
+                   wait_cmd = scene['wait_check_cmd']
+                   Spielbash::NewEnvironmentAction.new(cmd, wait_cmd, context)
+                 when scene.has_key?('delete_env') then
+                   cmd = scene['delete_env']
+                   Spielbash::DeleteEnvironmentAction.new(cmd, context)
+                 else
+                   not_implemented
                  end
 
         actions << action

data/lib/spielbash/model/action/delete_environment_action.rb

@@ -0,0 +1,22 @@
+module Spielbash
+  class DeleteEnvironmentAction < Spielbash::BaseAction
+    attr_accessor :command
+
+    def initialize(command, root_context)
+      super(root_context)
+      @command = command
+    end
+
+    def execute(session)
+      command.each_char do |c|
+        session.send_key(c)
+        sleep(action_context.typing_delay_s)
+      end
+      session.send_key('C-m')
+
+      sleep(action_context.reading_delay_s)
+
+      action_context.wait_check_cmd = nil
+    end
+  end
+end

data/lib/spielbash/model/action/new_environment_action.rb

@@ -0,0 +1,23 @@
+module Spielbash
+  class NewEnvironmentAction < Spielbash::BaseAction
+    attr_accessor :command, :wait_check_cmd
+
+    def initialize(command, wait_check_cmd, root_context)
+      super(root_context)
+      @command = command
+      @wait_check_cmd = wait_check_cmd
+    end
+
+    def execute(session)
+      command.each_char do |c|
+        session.send_key(c)
+        sleep(action_context.typing_delay_s)
+      end
+      session.send_key('C-m')
+
+      sleep(action_context.reading_delay_s)
+
+      action_context.wait_check_cmd = wait_check_cmd
+    end
+  end
+end

data/lib/spielbash/model/context.rb

@@ -1,13 +1,14 @@
 module Spielbash
   class Context
-    attr_accessor :typing_delay_s, :reading_delay_s, :wait, :width, :height
+    attr_accessor :typing_delay_s, :reading_delay_s, :wait, :width, :height, :wait_check_cmd
 
-    def initialize(typinig_delay_s, reading_delay_s, wait, width, height)
+    def initialize(typinig_delay_s, reading_delay_s, wait, width, height, wait_check_cmd = nil)
       @typing_delay_s = typinig_delay_s
       @reading_delay_s = reading_delay_s
       @wait = wait
       @width = width
       @height = height
+      @wait_check_cmd = wait_check_cmd
     end
   end
 end

data/lib/spielbash/model/session.rb

@@ -39,7 +39,7 @@ module Spielbash
       return if pid.empty?
 
       loop do
-        execute_with('pgrep', "-P #{pid}", true)
+        exec_wait_check_cmd(pid)
         children = last_stdout
         break if children.empty?
       end
@@ -59,6 +59,15 @@ module Spielbash
 
     private
 
+    def exec_wait_check_cmd(pid)
+      if context.wait_check_cmd.nil?
+        execute_with('pgrep', "-P #{pid}", true)
+      else
+        cmd = context.wait_check_cmd.split
+        execute_with_exactly(cmd.first, true, false, true, *cmd.drop(1))
+      end
+    end
+
     def execute_tmux_with(arguments, wait = false)
       execute_with('tmux', arguments, wait)
     end

data/lib/spielbash/spielbash.rb

@@ -9,3 +9,5 @@ require 'spielbash/model/action/command_action'
 require 'spielbash/model/action/pause_action'
 require 'spielbash/model/action/action_context'
 require 'spielbash/model/action/message_context'
+require 'spielbash/model/action/new_environment_action'
+require 'spielbash/model/action/delete_environment_action'

data/lib/spielbash/version.rb

@@ -1,3 +1,3 @@
 module Spielbash
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spielbash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Anton Malinskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -148,8 +148,10 @@ files:
 - lib/spielbash/model/action/action_context.rb
 - lib/spielbash/model/action/base_action.rb
 - lib/spielbash/model/action/command_action.rb
+- lib/spielbash/model/action/delete_environment_action.rb
 - lib/spielbash/model/action/message_action.rb
 - lib/spielbash/model/action/message_context.rb
+- lib/spielbash/model/action/new_environment_action.rb
 - lib/spielbash/model/action/pause_action.rb
 - lib/spielbash/model/action/press_key_action.rb
 - lib/spielbash/model/context.rb