rundoc 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 175e8af5e0beeb7acca8d32740f3379d68771ba207d723a1f51495848645249c
-  data.tar.gz: ac404b2c8337948628d7f18b90b20c57668f8a059d6e10c9c64354d21e04ac58
+  metadata.gz: b65a04eca7d7099223b2a626c47eb78e14a8e102266cf880cddc747a0d9fc4a5
+  data.tar.gz: 840585e8f0c6b3cddbb1d15354f4fdf862d2440b20054cd1b5344c026adb23d9
 SHA512:
-  metadata.gz: 758367c980b07a1d57f63fd0272e16f4ac4a93c42e747b9da200891438e661cede3edde72bb23f25ceb3e8c35074c53a59cb0a7e141edcb78684569163134deb
-  data.tar.gz: 6250e519af65a9800d4bb41926adb1713ef8e12d22e4503bb8eb8369514ce82db1036e289b80d0bd0fa8fb5cdb5d2f92fc2dc6e9ce029f5fb4a873f872e8f310
+  metadata.gz: 99661d14543918c21a988bd1c4cffc1d5c9d73a852a95c16b0905b5ddde312dc986d970b4082921752cd2eac4d786a0ae37f42f3577fdea2df54c6de50376810
+  data.tar.gz: 6819d3babc4cb2a7ad1f76386e3d7e7f28886a989e6a31ef052ea87b3b226a6979cc1c2092653fa7aadadd34d3f8af9b268464c2a14c70f385b559ee8a13ca9a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## HEAD
 
+## 4.1.3
+
+- Fix: Internal error in `background.wait` introduced in 4.1.2 (https://github.com/zombocom/rundoc/pull/97)
+- Fix: Website commands such as `:::>> website.visit(...)` now use lazy lookup (like Background tasks since 4.1.2). This allows `pre.erb` to be used with these commands (https://github.com/zombocom/rundoc/pull/98)
+
 ## 4.1.2
 
 - Fix: Background task name lookup is now lazy, this fixes a bug when using `:::>- pre.erb background.start(...)` (https://github.com/zombocom/rundoc/pull/95)

data/lib/rundoc/code_command/background/wait.rb

@@ -8,7 +8,7 @@ class Rundoc::CodeCommand::Background
     end
 
     def background
-      @background ||= Rundoc::CodeCommand::Background::ProcessSpawn.find(name)
+      @background ||= Rundoc::CodeCommand::Background::ProcessSpawn.find(@name)
     end
 
     def to_md(env = {})

data/lib/rundoc/code_command/website/navigate.rb

@@ -2,7 +2,11 @@ class Rundoc::CodeCommand::Website
   class Navigate < Rundoc::CodeCommand
     def initialize(name:)
       @name = name
-      @driver = Rundoc::CodeCommand::Website::Driver.find(name)
+      @driver = nil
+    end
+
+    def driver
+      @driver ||= Rundoc::CodeCommand::Website::Driver.find(@name)
     end
 
     def to_md(env = {})
@@ -11,7 +15,7 @@ class Rundoc::CodeCommand::Website
 
     def call(env = {})
       puts "website.navigate [#{@name}]: #{contents}"
-      @driver.safe_eval(contents, env)
+      driver.safe_eval(contents, env)
       ""
     end
 

data/lib/rundoc/code_command/website/screenshot.rb

@@ -1,8 +1,13 @@
 class Rundoc::CodeCommand::Website
   class Screenshot < Rundoc::CodeCommand
     def initialize(name:, upload: false)
-      @driver = Rundoc::CodeCommand::Website::Driver.find(name)
+      @name = name
       @upload = upload
+      @driver = nil
+    end
+
+    def driver
+      @driver ||= Rundoc::CodeCommand::Website::Driver.find(@name)
     end
 
     def to_md(env = {})
@@ -10,14 +15,14 @@ class Rundoc::CodeCommand::Website
     end
 
     def call(env = {})
-      puts "Taking screenshot: #{@driver.current_url}"
-      filename = @driver.screenshot(
+      puts "Taking screenshot: #{driver.current_url}"
+      filename = driver.screenshot(
         upload: @upload,
         screenshots_dir: env[:context].screenshots_dir
       )
 
       relative_filename = filename.relative_path_from(env[:context].output_dir)
-      env[:before] << "![Screenshot of #{@driver.current_url}](#{relative_filename})"
+      env[:before] << "![Screenshot of #{driver.current_url}](#{relative_filename})"
       ""
     end
 

data/lib/rundoc/code_command/website/visit.rb

@@ -6,14 +6,21 @@ class Rundoc::CodeCommand::Website
       @name = name
       @url = url
       @scroll = scroll
-      @driver = Driver.new(
-        name: name,
-        url: url,
-        height: height,
-        width: width,
-        visible: visible
-      )
-      Driver.add(@name, @driver)
+      @height = height
+      @width = width
+      @visible = visible
+    end
+
+    def driver
+      @driver ||= Driver.new(
+        name: @name,
+        url: @url,
+        height: @height,
+        width: @width,
+        visible: @visible
+      ).tap do |driver|
+        Driver.add(@name, driver)
+      end
     end
 
     def to_md(env = {})
@@ -26,11 +33,11 @@ class Rundoc::CodeCommand::Website
 
       puts message
 
-      @driver.visit(@url) if @url
-      @driver.scroll(@scroll) if @scroll
+      driver.visit(@url) if @url
+      driver.scroll(@scroll) if @scroll
 
       return "" if contents.nil? || contents.empty?
-      @driver.safe_eval(contents, env)
+      driver.safe_eval(contents, env)
 
       ""
     end

data/lib/rundoc/version.rb

@@ -1,3 +1,3 @@
 module Rundoc
-  VERSION = "4.1.2"
+  VERSION = "4.1.3"
 end

data/test/integration/website_test.rb

@@ -6,6 +6,8 @@ class IntegrationWebsiteTest < Minitest::Test
       ```
       :::>> website.visit(name: "example", url: "http://example.com")
       :::>> website.screenshot(name: "example")
+      :::>> website.navigate(name: "example")
+      session.execute_script "window.scrollBy(0,10)"
       ```
     RUBY
 

data/test/rundoc/code_commands/background_test.rb

@@ -19,6 +19,11 @@ class BackgroundTest < Minitest::Test
         output = stdin_write.call
         assert_equal("hello there" + $/, output)
 
+        Rundoc::CodeCommand::Background::Wait.new(
+          name: "cat",
+          wait: "hello"
+        ).call
+
         Rundoc::CodeCommand::Background::Log::Clear.new(
           name: "cat"
         ).call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rundoc
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Richard Schneeman