demotape 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2d9c7696e6ae9e4a0013f5e431e2ce1140ea7a536ce3027b7d1fe055835be7
-  data.tar.gz: 96318b40137c65f80b9a25d1d7aef2a9d2b5abda54137b3155fad72d22c65df4
+  metadata.gz: 9703d45771aaa186b951e020ed1f30f6eb0ef4c12aa9de87a55cc6b229dacb07
+  data.tar.gz: 3f16d0099cffbc04e345c062e04c176dcec891063177bcdb2850056b2f24d29f
 SHA512:
-  metadata.gz: 3ae5db1753a91ef17835e0a77ec046ef05a8b67245a8fc86634eb51216fee0216a5d2596402ccddbb12074982dae06b1d7ef3e315b266ac61f8c318cb5db0e5f
-  data.tar.gz: f53681e7e489a9390905ce79fc47c8417f9fb2df65cc13496a7c58737e8f6cd9cbc4d209a925043f78a526bde42504fd4b025557d370fa0cb94c61c0157e97de
+  metadata.gz: e71e511638f3bb46d93bc332f79df365c9a80e5a6daef615500685a1f9e5a7760e37bbb7e0f2faf333a5a439685439defe0140baab13fdbcf2119d8ac718871f
+  data.tar.gz: d563b7107de203799897fcf840f045f8d73b009a7e9a60c54f16f55f61b0570accfbe656756603abb32a845aaed304fc7151a911103bdd273197ad42efa82099

data/CHANGELOG.md

@@ -11,6 +11,18 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## v0.0.7
+
+- [Fixed] Fix key combos that had numbers in them not being recognized.
+
+## v0.0.6
+
+- [Added] Add `demotape run --working-dir` to specify the working directory for
+  commands. Notice that this changes all path references to be relative to the
+  working directory, including `--output-path` (if it's a relative path).
+- [Fixed] Fix issue where `Set typing_speed` wasn't recognized.
+- [Fixed] Fix issue where `Set shell` wasn't recognized.
+
 ## v0.0.5
 
 - [Changed] Add newline to multiline strings if they don't end with one.

data/README.md

@@ -109,6 +109,11 @@ $ echo "Type 'echo \"it works with stdin too\"'\nEnter\nSleep 5" | \
         info  Finished in 11.92s
 ```
 
+> [!TIP]
+>
+> Notice that when using `--working-dir`, all path references will be relative
+> to the working directory, including `--output-path`.
+
 ### Output formats
 
 - When exporting videos, you can choose between `.mp4`, `.webm` or `.avi`.

data/editors/sublime-text/DemoTape.sublime-syntax

@@ -85,7 +85,7 @@ contexts:
       push: possible_key_count
 
     # Modifiers
-    - match: '\b(Ctrl|Control|Alt|Option|Shift|Meta|Command)\b'
+    - match: '\b(Ctrl|Control|Alt|Option|Shift|Meta|Command|Cmd)\b'
       scope: keyword.control.demotape
       push: key_combo
 

data/editors/vim/syntax/demotape.vim

@@ -32,7 +32,7 @@ syn match demotapeKey "\<Numpad[0-9]\>"
 syn match demotapeKey "\<F\([1-9]\|1[0-2]\)\>"
 
 " Modifiers
-syn keyword demotapeModifier Ctrl Control Alt Option Shift Meta Command
+syn keyword demotapeModifier Ctrl Control Alt Option Shift Meta Command Cmd
 
 " Key combination operator
 syn match demotapeOperator "+"

data/editors/vscode/demotape.tmLanguage.json

@@ -95,7 +95,7 @@
         },
         {
           "comment": "Modifiers",
-          "match": "\\b(Ctrl|Control|Alt|Option|Shift|Meta|Command)\\b",
+          "match": "\\b(Ctrl|Control|Alt|Option|Shift|Meta|Command|Cmd)\\b",
           "name": "keyword.control.demotape"
         },
         {

data/editors/zed/tree-sitter/grammar.js

@@ -187,7 +187,7 @@ module.exports = grammar({
     ),
 
     modifier_key: $ => choice(
-      'Ctrl', 'Control', 'Alt', 'Option', 'Shift', 'Meta', 'Command'
+      'Ctrl', 'Control', 'Alt', 'Option', 'Shift', 'Meta', 'Command', 'Cmd'
     ),
 
     letter_key: $ => /[A-Za-z0-9]/,

data/lib/demo_tape/cli.rb

@@ -13,6 +13,10 @@ module DemoTape
     end
 
     desc "run PATH", "Runs a demo tape"
+    option :working_dir,
+           type: :string,
+           desc: "Working directory to run the commands in",
+           default: Dir.pwd
     option :typing_speed,
            type: :string,
            default: "50ms",
@@ -158,7 +162,9 @@ module DemoTape
         content = File.read(file_path)
       end
 
-      Runner.new(file_path:, content:, thor: shell, options:).run
+      Dir.chdir(options.working_dir) do
+        Runner.new(file_path:, content:, thor: shell, options:).run
+      end
     end
 
     desc "themes", "Lists available built-in themes"

data/lib/demo_tape/parser/rules.rb

@@ -42,12 +42,26 @@ module DemoTape
           results.any?
         end
 
+        def |(other)
+          Any.new(self, other)
+        end
+
         def +(other)
           expectations << other
           self
         end
       end
 
+      class Any
+        def initialize(*types)
+          @types = types
+        end
+
+        def valid?(*)
+          @types.any? { it.valid?(*) }
+        end
+      end
+
       class Duration
         include Helpers
 
@@ -232,50 +246,38 @@ module DemoTape
       # Group invocations
       rules.push identifier(/^[a-z0-9_]+$/)
 
+      key = identifier(*Command::VALID_KEYS) | number
+
       # KEY+KEY
+      rules.push identifier(*Command::KEY_MAPPING.keys) + operator("+") + key
       rules.push identifier(*Command::KEY_MAPPING.keys) +
                  operator("+") +
-                 identifier(*Command::VALID_KEYS)
+                 key +
+                 number
 
       # KEY+KEY+KEY
       rules.push identifier(*Command::KEY_MAPPING.keys) +
                  operator("+") +
-                 identifier(*Command::VALID_KEYS) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS)
-
-      # KEY+KEY+KEY+KEY
-      rules.push identifier(*Command::KEY_MAPPING.keys) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS) +
+                 key +
                  operator("+") +
-                 identifier(*Command::VALID_KEYS)
-
-      # KEY+KEY COUNT
-      rules.push identifier(*Command::KEY_MAPPING.keys) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS) +
-                 number
-
-      # KEY+KEY+KEY COUNT
+                 key
       rules.push identifier(*Command::KEY_MAPPING.keys) +
                  operator("+") +
-                 identifier(*Command::VALID_KEYS) +
+                 key +
                  operator("+") +
-                 identifier(*Command::VALID_KEYS) +
+                 key +
                  number
 
-      # KEY+KEY+KEY+KEY COUNT
-      rules.push identifier(*Command::KEY_MAPPING.keys) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS) +
-                 operator("+") +
-                 identifier(*Command::VALID_KEYS) +
-                 number
+      # KEY+KEY+KEY+KEY
+      key_combo = identifier(*Command::KEY_MAPPING.keys) +
+                  operator("+") +
+                  key +
+                  operator("+") +
+                  key +
+                  operator("+") +
+                  key
+      rules.push key_combo
+      rules.push key_combo.dup + number
 
       # COMMAND
       rules.push identifier(
@@ -335,7 +337,8 @@ module DemoTape
 
       # Set attribute DURATION
       rules.push identifier("Set") +
-                 identifier("loop_delay", "run_sleep", "run_enter_delay") +
+                 identifier("loop_delay", "run_sleep", "run_enter_delay",
+                            "typing_speed") +
                  duration
 
       # Set attribute BOOLEAN
@@ -347,12 +350,12 @@ module DemoTape
       rules.push identifier("Set") +
                  identifier("width", "height", "cursor_width", "font_size",
                             "padding", "margin", "loop_delay", "line_height",
-                            "border_radius") +
+                            "border_radius", "typing_speed") +
                  number
 
       # Set attribute STRING
       rules.push identifier("Set") +
-                 identifier("theme", "font_family", "margin_fill") +
+                 identifier("theme", "font_family", "margin_fill", "shell") +
                  string
 
       # Set cursor_style STRING

data/lib/demo_tape/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demotape
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Nando Vieira
@@ -691,10 +691,10 @@ metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/fnando/demotape
   bug_tracker_uri: https://github.com/fnando/demotape/issues
-  source_code_uri: https://github.com/fnando/demotape/tree/v0.0.5
-  changelog_uri: https://github.com/fnando/demotape/tree/v0.0.5/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/demotape/tree/v0.0.5/README.md
-  license_uri: https://github.com/fnando/demotape/tree/v0.0.5/LICENSE.md
+  source_code_uri: https://github.com/fnando/demotape/tree/v0.0.7
+  changelog_uri: https://github.com/fnando/demotape/tree/v0.0.7/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/demotape/tree/v0.0.7/README.md
+  license_uri: https://github.com/fnando/demotape/tree/v0.0.7/LICENSE.md
 rdoc_options: []
 require_paths:
 - lib