demotape 0.0.2 → 0.0.3

data/lib/demo_tape/runner.rb

@@ -30,8 +30,11 @@ module DemoTape
       @ttyd ||= TTYD.new(port: options.port, shell: options.shell)
     end
 
-    def fail_with(message)
-      thor.say_error "\nERROR: #{message}", :red
+    def fail_with(error)
+      error = error.message if error.respond_to?(:message)
+
+      thor.say_error "\nERROR: #{error}", :red
+      puts error.backtrace if error.respond_to?(:backtrace)
       exit 1
     end
 
@@ -65,7 +68,9 @@ module DemoTape
     def commands
       @commands ||= begin
         debug "Parsing tape"
-        Parser.new.parse(content, file: file_path)
+        parser = Parser.new
+        tree = parser.parse(content, file: file_path)
+        parser.to_commands(tree)
       end
     end
 
@@ -73,10 +78,33 @@ module DemoTape
       commands.select(&:meta?)
     end
 
+    def groups
+      @groups ||=
+        commands
+        .select(&:group?)
+        .each_with_object({}) do |command, buffer|
+          buffer[command.args] = command
+        end
+    end
+
     def executable_commands
       commands.reject(&:meta?)
     end
 
+    def resolve_group_expansions
+      @commands = commands.flat_map do |command|
+        next command unless command.group_invocation?
+
+        group = groups[command.type]
+
+        unless group
+          command.raise_error("Undefined group: #{command.type.inspect}")
+        end
+
+        group.children
+      end
+    end
+
     def resolve_includes
       nested_level = 0
 
@@ -87,7 +115,9 @@ module DemoTape
           if command.type == "Include"
             nested_level += 1
             thor.say_status :command, command.to_formatted(thor)
-            Parser.new.parse(File.read(command.args), file: command.args)
+            parser = Parser.new
+            tree = parser.parse(File.read(command.args), file: command.args)
+            parser.to_commands(tree)
           else
             command
           end
@@ -152,6 +182,7 @@ module DemoTape
       end
 
       resolve_screenshot_count
+      resolve_group_expansions
       run_meta_commands
       resolve_output_paths
       setup_tmp_dir
@@ -170,7 +201,7 @@ module DemoTape
     rescue StandardError => error
       write_state(:keep_recording, false)
       write_state(:paused, true)
-      fail_with error.message
+      fail_with error
     ensure
       FileUtils.rm_rf(tmp_dir)
       ttyd.stop
@@ -321,6 +352,10 @@ module DemoTape
       frame_count = read_state(:current_frame)
       exporter = Exporter.new(tmp_dir:, frame_count:, options:, theme:)
 
+      if frame_count < 5
+        fail_with "Not enough frames captured to generate output video."
+      end
+
       output_paths.each do |path|
         if path.exist? && !options.overwrite
           fail_with "Output file already exists: #{path}"
@@ -397,7 +432,7 @@ module DemoTape
         end
 
         run_wait_until(
-          Command.new("WaitUntil", "", pattern: /^::demotape:ready::$/)
+          Command.new("WaitUntil", {pattern: /^::demotape:ready::$/})
         )
         run_clear(nil)
         sleep 1
@@ -495,13 +530,6 @@ module DemoTape
     end
 
     def run_wait_until(command)
-      timeout = Duration.parse(command.options.fetch(:timeout, 15))
-      tick = 0.02
-
-      curr_line = read_state(:term_current_line)
-      offset = curr_line[:number].to_i
-      lines = []
-
       spinner = Spinner.new(phrases: [
         "Searching high and low…",
         "Looking under every byte…",
@@ -510,6 +538,16 @@ module DemoTape
         "Seeking the needle in the haystack…"
       ])
 
+      timeout = Duration.parse(command.options.fetch(:duration, 15))
+      pattern = command.args.fetch(:pattern)
+      tick = 0.02
+
+      curr_line = read_state(:term_current_line)
+
+      # @todo think what to do with offset and how to use it
+      _offset = curr_line[:number].to_i
+      lines = []
+
       while timeout.positive?
         session_mutex.synchronize do
           script = <<~SCRIPT
@@ -517,7 +555,7 @@ module DemoTape
               let linesCount = term.buffer.active.length;
               let lines = [];
 
-              for (let lineNumber = #{offset}; lineNumber < linesCount; lineNumber += 1) {
+              for (let lineNumber = 0; lineNumber < linesCount; lineNumber += 1) {
                 lines.push(term.buffer.active.getLine(lineNumber).translateToString().trimEnd());
               }
 
@@ -528,7 +566,7 @@ module DemoTape
           lines = session.evaluate_script(script)
         end
 
-        matches = lines.grep(command.options[:pattern])
+        matches = lines.grep(pattern)
 
         if matches.any?
           spinner.stop
@@ -540,12 +578,16 @@ module DemoTape
       end
 
       spinner.stop
-      command.raise_error("Timeout")
+      screen = lines.reject(&:empty?)
+      screen = thor.set_color(screen.join("\n"), :red)
+      command.raise_error(
+        "Timeout waiting for pattern #{pattern.inspect}\n\n#{screen}"
+      )
     end
 
     def run_type(command)
       speed = Duration.parse(
-        command.options.fetch(:speed, options.typing_speed)
+        command.options.fetch(:duration, options.typing_speed)
       )
 
       text_size = command.args.chars.count
@@ -581,7 +623,7 @@ module DemoTape
         "Just a quick wait…"
       ])
 
-      sleep(Duration.parse(command.args))
+      sleep(Duration.parse(command.options.fetch(:duration, 1)))
 
       spinner.stop
     end
@@ -595,7 +637,7 @@ module DemoTape
 
     def run_type_key(command)
       speed = Duration.parse(
-        command.options.fetch(:speed, options.typing_speed)
+        command.options.fetch(:duration, options.typing_speed)
       )
 
       command.options.fetch(:count, 1).times do
@@ -639,13 +681,13 @@ module DemoTape
         value = Spacing.new(*(Array(value) * 4).take(4).map(&:to_i))
       end
 
-      if name == :theme
-        if command.options[:sub_option]
-          theme[command.options[:sub_option].to_sym] = value
-          return
-        else
-          @theme = nil
-        end
+      # Theme is cached, so we just need to clear the
+      # cached value to force reload.
+      @theme = nil if name == :theme
+
+      if command.options[:option].start_with?("theme.")
+        attr_name = command.options[:option].sub("theme.", "").to_sym
+        theme[attr_name] = value
       end
 
       options[name] = value
@@ -661,7 +703,16 @@ module DemoTape
       end
 
       send_keys(:control, "l")
-      sleep 0.5
+      run_wait(Command.new("Wait", "", duration: 0.5))
+      write_state(:term_current_line, term_current_line)
+    end
+
+    def run_run(command)
+      run_type(Command.new("Type", command.args))
+      run_wait(Command.new("Wait", "", duration: options.run_enter_delay))
+      send_keys(:enter)
+      wait_duration = command.options.fetch(:duration, options.run_sleep)
+      run_wait(Command.new("Wait", "", duration: wait_duration))
     end
 
     def run_type_file(command)
@@ -674,6 +725,10 @@ module DemoTape
       run_type(Command.new("Type", content, *command.options))
     end
 
+    def run_group(*)
+      # do nothing
+    end
+
     def run_screenshot(command)
       exporter = Exporter.new(
         tmp_dir:,

data/lib/demo_tape/token.rb

@@ -11,14 +11,100 @@ module DemoTape
         @line = line
         @column = column
       end
+
+      def meta?
+        identifier?("Include") ||
+          identifier?("Output") ||
+          identifier?("Require") ||
+          identifier?("Set")
+      end
+
+      def group?
+        identifier?("Group")
+      end
+
+      def supports_block?
+        group?
+      end
+
+      def regex?
+        is_a?(Token::Regex)
+      end
+
+      def keyword?(wanted = nil)
+        is_a?(Token::Keyword) && (wanted.nil? || value == wanted)
+      end
+
+      def string?
+        is_a?(Token::String)
+      end
+
+      def multiline_string?
+        is_a?(Token::MultilineString)
+      end
+
+      def number?
+        is_a?(Token::Number)
+      end
+
+      def duration?
+        is_a?(Token::Duration)
+      end
+
+      def operator?(wanted = nil)
+        is_a?(Token::Operator) && (wanted.nil? || value == wanted)
+      end
+
+      def comma_operator?
+        operator?(",")
+      end
+
+      def at_operator?
+        operator?("@")
+      end
+
+      def plus_operator?
+        operator?("+")
+      end
+
+      def around_space?
+        is_a?(Token::TrailingSpace) || is_a?(Token::LeadingSpace)
+      end
+
+      def space?
+        is_a?(Token::Space)
+      end
+
+      def any_space?
+        around_space? || space?
+      end
+
+      def comment?
+        is_a?(Token::Comment)
+      end
+
+      def newline?
+        is_a?(Token::Newline)
+      end
+
+      def identifier?(wanted = nil)
+        is_a?(Token::Identifier) && (wanted.nil? || value == wanted)
+      end
     end
 
     class Identifier < Base; end
     class String < Base; end
+    class MultilineString < Base; end
     class Number < Base; end
     class Duration < Base; end
     class Regex < Base; end
     class TimeUnit < Base; end
     class Operator < Base; end
+    class Space < Base; end
+    class LeadingSpace < Base; end
+    class TrailingSpace < Base; end
+    class Keyword < Base; end
+    class Comment < Base; end
+    class Newline < Base; end
   end
 end

data/lib/demo_tape/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DemoTape
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/demo_tape.rb

@@ -13,18 +13,21 @@ module DemoTape
   require "tty-spinner"
 
   require_relative "demo_tape/version"
+  require_relative "demo_tape/command"
   require_relative "demo_tape/spacing"
   require_relative "demo_tape/bounds"
   require_relative "demo_tape/token"
-  require_relative "demo_tape/command"
-  require_relative "demo_tape/lexer"
+  require_relative "demo_tape/parser/helpers"
+  require_relative "demo_tape/parser/rules"
   require_relative "demo_tape/parser"
+  require_relative "demo_tape/lexer"
   require_relative "demo_tape/runner"
   require_relative "demo_tape/exporter"
   require_relative "demo_tape/duration"
   require_relative "demo_tape/theme"
   require_relative "demo_tape/ttyd"
   require_relative "demo_tape/spinner"
+  require_relative "demo_tape/formatter"
 
   ParseError = Class.new(StandardError)
 end