rundoc 4.1.3 → 5.0.0

data/test/rundoc/code_commands/append_file_test.rb

@@ -7,8 +7,13 @@ class AppendFileTest < Minitest::Test
         file = "foo.rb"
         `echo 'foo' >> #{file}`
 
-        cc = Rundoc::CodeCommand::FileCommand::Append.new(file)
-        cc << "bar"
+        cc = Rundoc::CodeCommand::FileCommand::AppendRunner.new(
+          render_command: false,
+          render_result: false,
+          io: StringIO.new,
+          user_args: Rundoc::CodeCommand::FileCommand::AppendArgs.new(file),
+          contents: "bar"
+        )
         cc.call
 
         result = File.read(file)
@@ -16,8 +21,13 @@ class AppendFileTest < Minitest::Test
         assert_match(/foo/, result)
         assert_match(/bar/, result)
 
-        cc = Rundoc::CodeCommand::FileCommand::Append.new(file)
-        cc << "baz"
+        cc = Rundoc::CodeCommand::FileCommand::AppendRunner.new(
+          render_command: false,
+          render_result: false,
+          io: StringIO.new,
+          user_args: Rundoc::CodeCommand::FileCommand::AppendArgs.new(file),
+          contents: "baz"
+        )
         cc.call
 
         actual = File.read(file)
@@ -39,8 +49,13 @@ class AppendFileTest < Minitest::Test
         line = 2
         `echo '#{contents}' >> #{file}`
 
-        cc = Rundoc::CodeCommand::FileCommand::Append.new("#{file}##{line}")
-        cc << "gem 'pg'"
+        cc = Rundoc::CodeCommand::FileCommand::AppendRunner.new(
+          render_command: false,
+          render_result: false,
+          io: StringIO.new,
+          user_args: Rundoc::CodeCommand::FileCommand::AppendArgs.new("#{file}##{line}"),
+          contents: "gem 'pg'"
+        )
         cc.call
 
         expected = "source https://rubygems.org\ngem 'pg'\ngem rails, 4.0.0\n\n"
@@ -54,8 +69,13 @@ class AppendFileTest < Minitest::Test
       Dir.chdir(dir) do
         filename = "file-#{Time.now.utc.strftime("%Y%m%d%H%M%S")}.txt"
         FileUtils.touch(filename)
-        cc = Rundoc::CodeCommand::FileCommand::Append.new("file-*.txt")
-        cc << "some text"
+        cc = Rundoc::CodeCommand::FileCommand::AppendRunner.new(
+          render_command: false,
+          render_result: false,
+          io: StringIO.new,
+          user_args: Rundoc::CodeCommand::FileCommand::AppendArgs.new("file-*.txt"),
+          contents: "some text"
+        )
         cc.call
 
         assert_equal "\nsome text\n", File.read(filename)
@@ -69,8 +89,13 @@ class AppendFileTest < Minitest::Test
         FileUtils.touch("file-1234.txt")
         FileUtils.touch("file-5678.txt")
         assert_raises do
-          cc = Rundoc::CodeCommand::FileCommand::Append.new("file-*.txt")
-          cc << "some text"
+          cc = Rundoc::CodeCommand::FileCommand::AppendRunner.new(
+            render_command: false,
+            render_result: false,
+            io: StringIO.new,
+            user_args: Rundoc::CodeCommand::FileCommand::AppendArgs.new("file-*.txt"),
+            contents: "some text"
+          )
           cc.call
         end
       end

data/test/rundoc/code_commands/background_test.rb

@@ -6,33 +6,35 @@ class BackgroundTest < Minitest::Test
       Dir.chdir(dir) do
         # Intentionally out of order, should not raise an error as long as "cat"
         # command exists at execution time
-        stdin_write = Rundoc::CodeCommand::Background::StdinWrite.new(
+        stdin_write = Rundoc::CodeCommand::Background::StdinWriteRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StdinWriteArgs.new(
           "hello there",
           name: "cat",
           wait: "hello"
-        )
+        ))
 
-        background_start = Rundoc::CodeCommand::Background::Start.new("cat",
-          name: "cat")
+        background_start = Rundoc::CodeCommand::Background::StartRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StartArgs.new("cat",
+          name: "cat"))
 
         background_start.call
         output = stdin_write.call
         assert_equal("hello there" + $/, output)
 
-        Rundoc::CodeCommand::Background::Wait.new(
-          name: "cat",
-          wait: "hello"
-        ).call
+        Rundoc::CodeCommand::Background::WaitRunner.new(render_command: false, render_result: false, io: StringIO.new,
+          user_args: Rundoc::CodeCommand::Background::WaitArgs.new(
+            name: "cat",
+            wait: "hello"
+          )).call
 
-        Rundoc::CodeCommand::Background::Log::Clear.new(
-          name: "cat"
-        ).call
+        Rundoc::CodeCommand::Background::Log::ClearRunner.new(render_command: false, render_result: false, io: StringIO.new,
+          user_args: Rundoc::CodeCommand::Background::Log::ClearArgs.new(
+            name: "cat"
+          )).call
 
-        output = Rundoc::CodeCommand::Background::StdinWrite.new(
+        output = Rundoc::CodeCommand::Background::StdinWriteRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StdinWriteArgs.new(
           "general kenobi",
           name: "cat",
           wait: "general"
-        ).call
+        )).call
         assert_equal("general kenobi" + $/, output)
       end
     end
@@ -44,9 +46,9 @@ class BackgroundTest < Minitest::Test
         file = "foo.txt"
         run!("echo 'foo' >> #{file}")
 
-        background_start = Rundoc::CodeCommand::Background::Start.new("tail -f #{file}",
+        background_start = Rundoc::CodeCommand::Background::StartRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StartArgs.new("tail -f #{file}",
           name: "tail2",
-          wait: "f")
+          wait: "f"))
 
         GC.start
 
@@ -55,7 +57,7 @@ class BackgroundTest < Minitest::Test
         assert_match("foo", output)
         assert_equal(true, background_start.alive?)
 
-        background_stop = Rundoc::CodeCommand::Background::Stop.new(name: "tail2")
+        background_stop = Rundoc::CodeCommand::Background::StopRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StopArgs.new(name: "tail2"))
         background_stop.call
 
         assert_equal(false, background_start.alive?)
@@ -69,31 +71,33 @@ class BackgroundTest < Minitest::Test
         file = "foo.txt"
         run!("echo 'foo' >> #{file}")
 
-        background_start = Rundoc::CodeCommand::Background::Start.new("tail -f #{file}",
+        background_start = Rundoc::CodeCommand::Background::StartRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StartArgs.new("tail -f #{file}",
           name: "tail",
-          wait: "f")
+          wait: "f"))
         output = background_start.call
 
         assert_match("foo", output)
         assert_equal(true, background_start.alive?)
 
-        log_read = Rundoc::CodeCommand::Background::Log::Read.new(name: "tail")
+        log_read = Rundoc::CodeCommand::Background::Log::ReadRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::Log::ReadArgs.new(name: "tail"))
         output = log_read.call
 
         assert_equal("foo", output.chomp)
 
-        log_clear = Rundoc::CodeCommand::Background::Log::Clear.new(name: "tail")
+        log_clear = Rundoc::CodeCommand::Background::Log::ClearRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::Log::ClearArgs.new(name: "tail"))
         output = log_clear.call
         assert_equal("", output)
 
         run!("echo 'bar' >> #{file}")
 
-        log_read = Rundoc::CodeCommand::Background::Log::Read.new(name: "tail")
+        background_start.background.wait("bar")
+
+        log_read = Rundoc::CodeCommand::Background::Log::ReadRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::Log::ReadArgs.new(name: "tail"))
         output = log_read.call
 
         assert_equal("bar", output.chomp)
 
-        background_stop = Rundoc::CodeCommand::Background::Stop.new(name: "tail")
+        background_stop = Rundoc::CodeCommand::Background::StopRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::Background::StopArgs.new(name: "tail"))
         background_stop.call
 
         assert_equal(false, background_start.alive?)

data/test/rundoc/code_commands/bash_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class BashTest < Minitest::Test
   def test_bash_returns_cd
     original_dir = `pwd`
-    Rundoc::CodeCommand::Bash.new("cd ..").call
+    Rundoc::CodeCommand::BashRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::BashArgs.new("cd ..")).call
     now_dir = `pwd`
     refute_equal original_dir, now_dir
   ensure
@@ -12,14 +12,14 @@ class BashTest < Minitest::Test
 
   def test_bash_stderr_with_or_is_capture
     command = "1>&2 echo 'msg to STDERR 1' || 1>&2 echo 'msg to STDERR 2'"
-    bash = Rundoc::CodeCommand::Bash.new(command)
+    bash = Rundoc::CodeCommand::BashRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::BashArgs.new(command))
     assert_equal "$ #{command}", bash.to_md
     assert_equal "msg to STDERR 1\n", bash.call
   end
 
   def test_bash_shells_and_shows_correctly
     ["pwd", "ls"].each do |command|
-      bash = Rundoc::CodeCommand::Bash.new(command)
+      bash = Rundoc::CodeCommand::BashRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::BashArgs.new(command))
       assert_equal "$ #{command}", bash.to_md
       assert_equal `#{command}`, bash.call
     end
@@ -27,8 +27,13 @@ class BashTest < Minitest::Test
 
   def test_stdin
     command = "tail -n 2"
-    bash = Rundoc::CodeCommand::Bash.new(command)
-    bash << "foo\nbar\nbaz\n"
+    bash = Rundoc::CodeCommand::BashRunner.new(
+      render_command: false,
+      render_result: false,
+      io: StringIO.new,
+      user_args: Rundoc::CodeCommand::BashArgs.new(command),
+      contents: "foo\nbar\nbaz\n"
+    )
     assert_equal "bar\nbaz\n", bash.call
   end
 end

data/test/rundoc/code_commands/comment_test.rb

@@ -0,0 +1,116 @@
+require "test_helper"
+
+class CommentTest < Minitest::Test
+  def test_comment_runner_call_returns_empty_string
+    io = StringIO.new
+    runner = Rundoc::CodeCommand::CommentRunner.new(
+      render_command: false,
+      render_result: false,
+      io: io,
+      user_args: Rundoc::CodeCommand::CommentArgs.new("$ cat hello")
+    )
+    assert_equal "", runner.call
+    assert_equal "", runner.to_md
+    assert_equal "Skipping command (commented out): # $ cat hello\n", io.string
+  end
+
+  def test_comment_with_contents
+    io = StringIO.new
+    runner = Rundoc::CodeCommand::CommentRunner.new(
+      render_command: false,
+      render_result: false,
+      io: io,
+      user_args: Rundoc::CodeCommand::CommentArgs.new("$ tail -n 2"),
+      contents: "foo\nbar\nbaz\n"
+    )
+    assert_equal "", runner.call
+    expected = <<~EOF
+      Skipping command (commented out): # $ tail -n 2
+      foo
+      bar
+      baz
+    EOF
+    assert_equal expected.strip, io.string.strip
+  end
+
+  def test_comment_is_noop_in_document
+    contents = <<~EOF
+      before
+
+      ```
+      :::>> # $ cat hello
+      ```
+
+      after
+    EOF
+
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        parsed = parse_contents(contents)
+        actual = strip_autogen_warning(parsed.to_md)
+        assert_equal "before\n\n\nafter\n", actual
+      end
+    end
+  end
+
+  def test_smudged_comment
+    contents = <<~EOF
+      before
+
+      ```
+      :::>> #$ cat hello
+      ```
+
+      after
+    EOF
+
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        parsed = parse_contents(contents)
+        actual = strip_autogen_warning(parsed.to_md)
+        assert_equal "before\n\n\nafter\n", actual
+      end
+    end
+  end
+
+  def test_bare_comment_is_noop
+    contents = <<~EOF
+      before
+
+      ```
+      :::>> #
+      ```
+
+      after
+    EOF
+
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        parsed = parse_contents(contents)
+        actual = strip_autogen_warning(parsed.to_md)
+        assert_equal "before\n\n\nafter\n", actual
+      end
+    end
+  end
+
+  def test_comment_does_not_affect_other_commands
+    contents = <<~EOF
+      before
+
+      ```
+      :::>> # this is commented out
+      :::>> $ echo "hello"
+      ```
+
+      after
+    EOF
+
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        parsed = parse_contents(contents)
+        actual = strip_autogen_warning(parsed.to_md)
+        assert_equal "before\n\n```\n$ echo \"hello\"\nhello\n```\n\nafter\n", actual
+      end
+    end
+  end
+end

data/test/rundoc/code_commands/pipe_test.rb

@@ -5,7 +5,7 @@ class PipeTest < Minitest::Test
     pipe_cmd = "tail -n 2"
     cmd = "ls"
     out = `#{cmd}`
-    pipe = Rundoc::CodeCommand::Pipe.new(pipe_cmd)
+    pipe = Rundoc::CodeCommand::PipeRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::PipeArgs.new(pipe_cmd))
     actual = pipe.call(commands: [{command: cmd, output: out}])
 
     expected = `#{cmd} | #{pipe_cmd}`
@@ -16,7 +16,7 @@ class PipeTest < Minitest::Test
     pipe_cmd = "tail -n 2"
     cmd = "ls"
     out = `#{cmd}`
-    pipe = Rundoc::CodeCommand::Pipe.new("$ #{pipe_cmd}")
+    pipe = Rundoc::CodeCommand::PipeRunner.new(render_command: false, render_result: false, io: StringIO.new, user_args: Rundoc::CodeCommand::PipeArgs.new("$ #{pipe_cmd}"))
     actual = pipe.call(commands: [{command: cmd, output: out}])
 
     expected = `#{cmd} | #{pipe_cmd}`

data/test/rundoc/code_commands/print_test.rb

@@ -6,9 +6,7 @@ class PrintTest < Minitest::Test
     env[:before] = []
 
     input = %($ rails new myapp # Not a command since it's missing the ":::>>")
-    cmd = Rundoc::CodeCommand::PrintText.new(input)
-    cmd.render_command = false
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintTextRunner.new(user_args: Rundoc::CodeCommand::PrintTextArgs.new(input), io: StringIO.new, render_command: false, render_result: true)
 
     assert_equal "", cmd.to_md(env)
     assert_equal "", cmd.call
@@ -20,9 +18,7 @@ class PrintTest < Minitest::Test
     env[:before] = []
 
     input = %($ rails new myapp # Not a command since it's missing the ":::>>")
-    cmd = Rundoc::CodeCommand::PrintText.new(input)
-    cmd.render_command = true
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintTextRunner.new(user_args: Rundoc::CodeCommand::PrintTextArgs.new(input), io: StringIO.new, render_command: true, render_result: true)
 
     assert_equal "", cmd.to_md(env)
     assert_equal input, cmd.call
@@ -35,9 +31,7 @@ class PrintTest < Minitest::Test
     env[:before] = []
 
     input = %($ rails new <%= 'myapp' %> # Not a command since it's missing the ":::>>")
-    cmd = Rundoc::CodeCommand::PrintERB.new(input)
-    cmd.render_command = false
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintERBRunner.new(user_args: Rundoc::CodeCommand::PrintERBArgs.new(input), io: StringIO.new, render_command: false, render_result: true)
 
     assert_equal "", cmd.to_md(env)
     assert_equal "", cmd.call
@@ -49,10 +43,7 @@ class PrintTest < Minitest::Test
     env = {}
     env[:before] = []
 
-    cmd = Rundoc::CodeCommand::PrintERB.new
-    cmd.contents = %(<%= "foo" %>)
-    cmd.render_command = true
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintERBRunner.new(user_args: Rundoc::CodeCommand::PrintERBArgs.new, io: StringIO.new, render_command: true, render_result: true, contents: %(<%= "foo" %>))
 
     assert_equal "", cmd.to_md(env)
     assert_equal "foo", cmd.call
@@ -62,10 +53,13 @@ class PrintTest < Minitest::Test
   def test_binding_is_preserved
     env = {}
     env[:before] = []
-    cmd = Rundoc::CodeCommand::PrintERB.new
-    cmd.contents = %{<%= @foo = SecureRandom.hex(16) %>}
-    cmd.render_command = true
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintERBRunner.new(
+      user_args: Rundoc::CodeCommand::PrintERBArgs.new,
+      io: StringIO.new,
+      contents: %{<%= @foo = SecureRandom.hex(16) %>},
+      render_command: true,
+      render_result: true
+    )
 
     assert_equal "", cmd.to_md(env)
     assert_equal [], env[:before]
@@ -73,19 +67,13 @@ class PrintTest < Minitest::Test
 
     assert !expected.empty?
 
-    cmd = Rundoc::CodeCommand::PrintERB.new
-    cmd.contents = %(<%= @foo %>)
-    cmd.render_command = true
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintERBRunner.new(user_args: Rundoc::CodeCommand::PrintERBArgs.new, io: StringIO.new, render_command: true, render_result: true, contents: %(<%= @foo %>))
 
     assert_equal "", cmd.to_md(env)
     assert_equal expected, cmd.call
     assert_equal [], env[:before]
 
-    cmd = Rundoc::CodeCommand::PrintERB.new(binding: "different")
-    cmd.contents = %(<%= @foo %>)
-    cmd.render_command = true
-    cmd.render_result = true
+    cmd = Rundoc::CodeCommand::PrintERBRunner.new(user_args: Rundoc::CodeCommand::PrintERBArgs.new(binding: "different"), io: StringIO.new, render_command: true, render_result: true, contents: %(<%= @foo %>))
 
     assert_equal "", cmd.to_md(env)
     assert_equal "", cmd.call

data/test/rundoc/code_commands/remove_contents_test.rb

@@ -21,8 +21,13 @@ class RemoveContentsTest < Minitest::Test
 
         assert_match(/sqlite3/, File.read(@file))
 
-        cc = Rundoc::CodeCommand::FileCommand::Remove.new(@file)
-        cc << "gem 'sqlite3'"
+        cc = Rundoc::CodeCommand::FileCommand::RemoveRunner.new(
+          render_command: false,
+          render_result: false,
+          user_args: Rundoc::CodeCommand::FileCommand::RemoveArgs.new(@file),
+          contents: "gem 'sqlite3'",
+          io: StringIO.new
+        )
         cc.call
 
         refute_match(/sqlite3/, File.read(@file))
@@ -33,7 +38,7 @@ class RemoveContentsTest < Minitest::Test
         env[:fence_start] = "```ruby"
         cc.to_md(env)
 
-        assert_equal ["In file `foo.rb` remove:", Rundoc::CodeCommand::NEWLINE], env[:before]
+        assert_equal ["In file `foo.rb` remove:", Rundoc::CodeCommand::FileCommand::RemoveRunner::NEWLINE], env[:before]
       end
     end
   end

data/test/rundoc/code_section_test.rb

@@ -19,7 +19,8 @@ class CodeSectionTest < Minitest::Test
           fence: match[:fence],
           lang: match[:lang],
           code: match[:contents],
-          context: default_context
+          context: default_context,
+          io: StringIO.new
         ).render
         assert_equal "", result
       end
@@ -39,7 +40,8 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     ).render
     assert_equal contents, result.gsub(Rundoc::FencedCodeBlock::AUTOGEN_WARNING, "\n")
   end
@@ -56,13 +58,14 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     )
     code_section.render
 
     code_command = code_section.executed_commands.first
-    assert_equal true, code_command.render_command
-    assert_equal false, code_command.render_result
+    assert_equal true, code_command.render_command?
+    assert_equal false, code_command.render_result?
 
     contents = <<~RUBY
       ```
@@ -75,13 +78,14 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     )
     code_section.render
 
     code_command = code_section.executed_commands.first
-    assert_equal true, code_command.render_command
-    assert_equal false, code_command.render_result
+    assert_equal true, code_command.render_command?
+    assert_equal false, code_command.render_result?
   end
 
   def test_show_command_show_render
@@ -96,14 +100,14 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     )
     code_section.render
 
-    puts code_section.executed_commands.inspect
     code_command = code_section.executed_commands.first
-    assert_equal true, code_command.render_command
-    assert_equal true, code_command.render_result
+    assert_equal true, code_command.render_command?
+    assert_equal true, code_command.render_result?
   end
 
   def test_hide_command_hide_render
@@ -118,13 +122,14 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     )
     code_section.render
 
     code_command = code_section.executed_commands.first
-    assert_equal false, code_command.render_command
-    assert_equal false, code_command.render_result
+    assert_equal false, code_command.render_command?
+    assert_equal false, code_command.render_result?
 
     contents = <<~RUBY
       ```
@@ -137,13 +142,14 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     )
     code_section.render
 
     code_command = code_section.executed_commands.first
-    assert_equal false, code_command.render_command
-    assert_equal false, code_command.render_result
+    assert_equal false, code_command.render_command?
+    assert_equal false, code_command.render_result?
   end
 
   def test_hide_command_show_render
@@ -158,12 +164,13 @@ class CodeSectionTest < Minitest::Test
       fence: match[:fence],
       lang: match[:lang],
       code: match[:contents],
-      context: default_context
+      context: default_context,
+      io: StringIO.new
     )
     code_section.render
 
     code_command = code_section.executed_commands.first
-    assert_equal false, code_command.render_command
-    assert_equal true, code_command.render_result
+    assert_equal false, code_command.render_command?
+    assert_equal true, code_command.render_result?
   end
 end

data/test/rundoc/peg_parser_test.rb

@@ -249,7 +249,8 @@ class PegParserTest < Minitest::Test
 
     actual = @transformer.apply(tree)
     assert_equal :rundoc, actual.keyword
-    assert_equal("email = ENV['HEROKU_EMAIL'] || `heroku auth:whoami`", actual.original_args)
+    assert_nil actual.original_args
+    assert_equal("email = ENV['HEROKU_EMAIL'] || `heroku auth:whoami`\n", actual.contents)
   end
 
   def test_rundoc_sub_commands_no_quotes
@@ -351,4 +352,19 @@ class PegParserTest < Minitest::Test
     assert_equal :"background.start", actual.keyword
     assert_equal ["rails server", {name: "server"}], actual.original_args
   end
+
+  def test_no_args_preserves_newlines_in_stdin
+    input = <<~EOF.strip
+      :::>> rundoc
+      first = 1 # comment
+      second = 2
+    EOF
+
+    parser = Rundoc::PegParser.new.command_with_stdin
+    tree = parser.parse_with_debug(input)
+
+    actual = @transformer.apply(tree)
+    assert_equal :rundoc, actual.keyword
+    assert_equal "first = 1 # comment\nsecond = 2".strip, actual.contents.strip
+  end
 end