roku_builder 4.25.4 → 4.26.0

data/test/roku_builder/plugins/test_inspector.rb

@@ -32,6 +32,7 @@ module RokuBuilder
       assert options[:screencapture]
     end
     def test_inspector_inspect
+
       logger = Minitest::Mock.new()
 
       logger.expect(:formatter=, nil, [Proc])
@@ -77,9 +78,19 @@ module RokuBuilder
       options = {inspect: true, in: File.join(test_files_path(InspectorTest), "test.pkg"), password: "password"}
       config, options = build_config_options_objects(InspectorTest, options, false)
       inspector = Inspector.new(config: config)
-      ::Logger.stub(:new, logger) do
-        inspector.inspect(options: options)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: false)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        ::Logger.stub(:new, logger) do
+          inspector.inspect(options: options)
+        end
       end
+      logger.verify
+      device_manager.verify
     end
     def test_inspector_inspect_old_interface
       logger = Minitest::Mock.new()
@@ -119,9 +130,20 @@ module RokuBuilder
       options = {inspect: true, in: File.join(test_files_path(InspectorTest), "test.pkg"), password: "password"}
       config, options = build_config_options_objects(InspectorTest, options, false)
       inspector = Inspector.new(config: config)
-      ::Logger.stub(:new, logger) do
-        inspector.inspect(options: options)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: false)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        ::Logger.stub(:new, logger) do
+          inspector.inspect(options: options)
+        end
       end
+
+      logger.verify
+      device_manager.verify
     end
 
     def test_screencapture
@@ -139,9 +161,19 @@ module RokuBuilder
       options = {screencapture: true }
       config, options = build_config_options_objects(InspectorTest, options, false)
       inspector = Inspector.new(config: config)
-      File.stub(:open, nil, io) do
-        inspector.screencapture(options: options)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: false)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        File.stub(:open, nil, io) do
+          inspector.screencapture(options: options)
+        end
       end
+      io.verify
+      device_manager.verify
     end
     def test_screencapture_png
       body = "<hr /><img src=\"pkgs/dev.png?time=1455629573\">"
@@ -158,8 +190,16 @@ module RokuBuilder
       options = {screencapture: true }
       config, options = build_config_options_objects(InspectorTest, options, false)
       inspector = Inspector.new(config: config)
-      File.stub(:open, nil, io) do
-        inspector.screencapture(options: options)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: false)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        File.stub(:open, nil, io) do
+          inspector.screencapture(options: options)
+        end
       end
     end
   end

data/test/roku_builder/plugins/test_linker.rb

@@ -9,10 +9,12 @@ module RokuBuilder
       RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Linker)
+      @device_manager = Minitest::Mock.new
       @requests = []
     end
     def teardown
       @requests.each {|req| remove_request_stub(req)}
+      @device_manager.verify
     end
     def test_linker_parse_options_long
       parser = OptionParser.new
@@ -41,8 +43,14 @@ module RokuBuilder
       options = {deeplink: 'a:A, b:B:C, d:a\b'}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.deeplink(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.deeplink(options: options)
+      end
     end
     def test_linker_link_sideload
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/launch/dev?a=A&b=B:C&d=a%5Cb").
@@ -55,8 +63,14 @@ module RokuBuilder
       options = {deeplink: 'a:A, b:B:C, d:a\b',  working: true}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.deeplink(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.deeplink(options: options)
+      end
     end
     def test_linker_link_sideload_current
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/launch/dev?a=A&b=B:C&d=a%5Cb").
@@ -72,8 +86,14 @@ module RokuBuilder
         config, options = build_config_options_objects(LinkerTest, options, false)
       end
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.deeplink(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.deeplink(options: options)
+      end
     end
     def test_linker_link_app
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/launch/1234?a=A&b=B:C&d=a%5Cb").
@@ -82,8 +102,14 @@ module RokuBuilder
       options = {deeplink: 'a:A, b:B:C, d:a\b', app_id: "1234"}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.deeplink(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.deeplink(options: options)
+      end
     end
     def test_linker_link_nothing
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/launch/dev").
@@ -92,8 +118,14 @@ module RokuBuilder
       options = {deeplink: ''}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.deeplink(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.deeplink(options: options)
+      end
     end
     def test_linker_link_sideload_input
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/input?a=A&b=B:C&d=a%5Cb").
@@ -106,8 +138,14 @@ module RokuBuilder
       options = {input: 'a:A, b:B:C, d:a\b',  working: true}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.input(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.input(options: options)
+      end
     end
     def test_linker_link_app_input
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/input?a=A&b=B:C&d=a%5Cb").
@@ -116,8 +154,14 @@ module RokuBuilder
       options = {input: 'a:A, b:B:C, d:a\b', app_id: "1234"}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.input(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.input(options: options)
+      end
     end
     def test_linker_link_nothing_input
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/input").
@@ -126,8 +170,14 @@ module RokuBuilder
       options = {input: ''}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
-      linker.input(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.input(options: options)
+      end
     end
 
     def test_linker_list
@@ -143,13 +193,19 @@ module RokuBuilder
       options = {applist: true}
       config, options = build_config_options_objects(LinkerTest, options, false)
 
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      @device_manager.expect(:reserve_device, device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [device])
+
       linker = Linker.new(config: config)
 
       print_count = 0
       did_print = Proc.new { |msg| print_count+=1 }
 
-      linker.stub(:printf, did_print) do
-        linker.applist(options: options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        linker.stub(:printf, did_print) do
+          linker.applist(options: options)
+        end
       end
 
       assert_equal 6, print_count

data/test/roku_builder/plugins/test_loader.rb

@@ -10,14 +10,19 @@ module RokuBuilder
       RokuBuilder.setup_plugins
       register_plugins(Loader)
       @config, @options = build_config_options_objects(LoaderTest, {sideload: true, working: true}, false)
+      RokuBuilder.class_variable_set(:@@config, @config)
+      RokuBuilder.class_variable_set(:@@options, @options)
       @root_dir = @config.root_dir
-      @device_config = @config.device_config
+      @device_config = @config.devices.first.last
       FileUtils.cp(File.join(@root_dir, "manifest_template"), File.join(@root_dir, "manifest"))
       @request_stubs = []
+      @device_manager = Minitest::Mock.new
+      @device = RokuBuilder::Device.new("roku", @config.raw[:devices][:roku])
     end
     def teardown
       FileUtils.rm(File.join(@root_dir, "manifest"))
       @request_stubs.each {|req| remove_request_stub(req)}
+      @device_manager.verify
     end
     def test_loader_parse_options_long
       parser = OptionParser.new
@@ -47,9 +52,13 @@ module RokuBuilder
         to_return(status: 200, body: "", headers: {}))
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
         to_return(status: 200, body: "Install Success", headers: {}))
+      @device_manager.expect(:reserve_device, @device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      loader = Loader.new(config: @config)
-      loader.sideload(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        loader = Loader.new(config: @config)
+        loader.sideload(options: @options)
+      end
     end
     def test_loader_sideload_infile
       infile = File.join(@root_dir, "test.zip")
@@ -62,9 +71,13 @@ module RokuBuilder
         to_return(status: 200, body: "", headers: {}))
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
         to_return(status: 200, body: "Install Success", headers: {}))
+      @device_manager.expect(:reserve_device, @device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      loader = Loader.new(config: @config)
-      loader.sideload(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        loader = Loader.new(config: @config)
+        loader.sideload(options: @options)
+      end
     end
     def test_loader_build_defining_folder_and_files
       loader = Loader.new(config: @config)
@@ -100,33 +113,49 @@ module RokuBuilder
     def test_loader_unload
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
         to_return(status: 200, body: "Delete Succeeded", headers: {}))
+      @device_manager.expect(:reserve_device, @device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      loader = Loader.new(config: @config)
-      loader.delete(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        loader = Loader.new(config: @config)
+        loader.delete(options: @options)
+      end
     end
     def test_loader_unload_fail
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
         to_return(status: 200, body: "Delete Failed", headers: {}))
+      @device_manager.expect(:reserve_device, @device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      loader = Loader.new(config: @config)
-      assert_raises ExecutionError do
-        loader.delete(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        loader = Loader.new(config: @config)
+        assert_raises ExecutionError do
+          loader.delete(options: @options)
+        end
       end
     end
     def test_loader_squash
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
         to_return(status: 200, body: "Conversion succeeded", headers: {}))
+      @device_manager.expect(:reserve_device, @device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      loader = Loader.new(config: @config)
-      loader.squash(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        loader = Loader.new(config: @config)
+        loader.squash(options: @options)
+      end
     end
     def test_loader_squash_fail
       @request_stubs.push(stub_request(:post, "http://#{@device_config[:ip]}/plugin_install").
         to_return(status: 200, body: "Conversion failed", headers: {}))
+      @device_manager.expect(:reserve_device, @device, no_lock: false)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      loader = Loader.new(config: @config)
-      assert_raises ExecutionError do
-        loader.squash(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        loader = Loader.new(config: @config)
+        assert_raises ExecutionError do
+          loader.squash(options: @options)
+        end
       end
     end
     def test_copy_files

data/test/roku_builder/plugins/test_monitor.rb

@@ -21,8 +21,12 @@ module RokuBuilder
         user: "user",
         password: "password"
       }
-      @config.instance_variable_set(:@parsed, {device_config: device_config, init_params: {}})
       @monitor = Monitor.new(config: @config)
+      @device_manager = Minitest::Mock.new
+      @device = RokuBuilder::Device.new("roku", device_config)
+    end
+    def teardown
+      @device_manager.verify
     end
     def test_scripter_parse_options_long
       parser = OptionParser.new
@@ -51,11 +55,15 @@ module RokuBuilder
         sleep(0.1)
         "q"
       }
+      @device_manager.expect(:reserve_device, @device, no_lock: true)
+      @device_manager.expect(:release_device, nil, [@device])
 
-      Readline.stub(:readline, readline) do
-        Net::Telnet.stub(:new, @connection) do
-          @connection.stub(:waitfor, waitfor, "txt") do
-            @monitor.monitor(options: @options)
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        Readline.stub(:readline, readline) do
+          Net::Telnet.stub(:new, @connection) do
+            @connection.stub(:waitfor, waitfor, "txt") do
+              @monitor.monitor(options: @options)
+            end
           end
         end
       end
@@ -73,11 +81,16 @@ module RokuBuilder
         sleep(0.1)
         "q"
       }
-      Readline.stub(:readline, readline) do
-        Net::Telnet.stub(:new, @connection) do
-          @connection.stub(:waitfor, waitfor, "txt") do
-            @monitor.stub(:manage_text, "") do
-              @monitor.monitor(options: @options)
+      @device_manager.expect(:reserve_device, @device, no_lock: true)
+      @device_manager.expect(:release_device, nil, [@device])
+
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        Readline.stub(:readline, readline) do
+          Net::Telnet.stub(:new, @connection) do
+            @connection.stub(:waitfor, waitfor, "txt") do
+              @monitor.stub(:manage_text, "") do
+                @monitor.monitor(options: @options)
+              end
             end
           end
         end
@@ -110,12 +123,16 @@ module RokuBuilder
           "q"
         end
       }
-
-      Readline.stub(:readline, readline) do
-        Net::Telnet.stub(:new, @connection) do
-          @connection.stub(:waitfor, waitfor, "txt") do
-            @connection.stub(:puts, puts) do
-              @monitor.monitor(options: @options)
+      @device_manager.expect(:reserve_device, @device, no_lock: true)
+      @device_manager.expect(:release_device, nil, [@device])
+
+      RokuBuilder.stub(:device_manager, @device_manager) do
+        Readline.stub(:readline, readline) do
+          Net::Telnet.stub(:new, @connection) do
+            @connection.stub(:waitfor, waitfor, "txt") do
+              @connection.stub(:puts, puts) do
+                @monitor.monitor(options: @options)
+              end
             end
           end
         end

data/test/roku_builder/plugins/test_navigator.rb

@@ -82,14 +82,23 @@ module RokuBuilder
       options = {}
       options[type] = input.to_s
       config, options = build_config_options_objects(NavigatorTest, options, false)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: true)
+      device_manager.expect(:release_device, nil, [device])
+
       navigator = Navigator.new(config: config)
-      if success
-        navigator.send(type, options: options)
-      else
-        assert_raises ExecutionError do
+      RokuBuilder.stub(:device_manager, device_manager) do
+        if success
           navigator.send(type, options: options)
+        else
+          assert_raises ExecutionError do
+            navigator.send(type, options: options)
+          end
         end
       end
+      device_manager.verify
     end
 
     def test_navigator_screen_secret
@@ -116,8 +125,16 @@ module RokuBuilder
         logger.expect(:debug, nil, ["Send Command: /keypress/Rev"])
       end
 
-      navigator.screen(options: options)
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: true)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        navigator.screen(options: options)
+      end
 
+      device_manager.verify
       logger.verify
       Logger.set_testing
     end
@@ -231,9 +248,18 @@ module RokuBuilder
       options = {navigate: true}
       config, options = build_config_options_objects(NavigatorTest, options, false)
       navigator = Navigator.new(config: config)
-      navigator.stub(:read_char, "\u0003") do
-        navigator.navigate(options: options)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: true)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        navigator.stub(:read_char, "\u0003") do
+          navigator.navigate(options: options)
+        end
       end
+      device_manager.verify
     end
 
     def test_navigator_interactive_nav
@@ -249,7 +275,7 @@ module RokuBuilder
         @i += 1
         char
       }
-      thread_new = lambda { |char|
+      thread_new = lambda { |char,device|
         assert_equal "<", char
       }
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/keypress/Rev").
@@ -257,19 +283,31 @@ module RokuBuilder
       options = {navigate: true}
       config, options = build_config_options_objects(NavigatorTest, options, false)
       navigator = Navigator.new(config: config)
-      navigator.stub(:read_char, read_char) do
-        Thread.stub(:new, thread_new, "<") do
-          navigator.navigate(options: options)
+
+      device_manager = Minitest::Mock.new
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+      device_manager.expect(:reserve_device, device, no_lock: true)
+      device_manager.expect(:release_device, nil, [device])
+
+      RokuBuilder.stub(:device_manager, device_manager) do
+        navigator.stub(:read_char, read_char) do
+          Thread.stub(:new, thread_new, "<") do
+            navigator.navigate(options: options)
+          end
         end
       end
+      device_manager.verify
     end
-    def test_navigator_hendle_interactive_text
+    def test_navigator_handle_interactive_text
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/keypress/LIT_b").
         to_return(status: 200, body: "", headers: {}))
       options = {navigate: true}
       config, options = build_config_options_objects(NavigatorTest, options, false)
       navigator = Navigator.new(config: config)
-      navigator.send(:handle_navigate_input, "b")
+
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+
+      navigator.send(:handle_navigate_input, "b", device)
     end
     def test_navigator_hendle_interactive_command
       @requests.push(stub_request(:post, "http://192.168.0.100:8060/keypress/Play").
@@ -277,7 +315,10 @@ module RokuBuilder
       options = {navigate: true}
       config, options = build_config_options_objects(NavigatorTest, options, false)
       navigator = Navigator.new(config: config)
-      navigator.send(:handle_navigate_input, "=")
+
+      device = RokuBuilder::Device.new("roku", config.raw[:devices][:roku])
+
+      navigator.send(:handle_navigate_input, "=", device)
     end
     def test_navigator_generate_mappings
       options = {navigate: true}