yui_rest_client 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca27d870afe905331021d8f5e4f5404fddbde8cbd6f1c30f99014a9e67c65e26
-  data.tar.gz: 4b80b15184d9ab7073a23bdf126366790571aa976892c79183b559b053b2fe1a
+  metadata.gz: 054eac696bc03538afc5b08fa12c156e6706d478080139f2aae45a84b08848c8
+  data.tar.gz: e5ff3ffce8cd7f73f755e64da9805195d162870d73beb83bbacba3a019beb62d
 SHA512:
-  metadata.gz: f49a5754c51af9e4e97013872ed4b0b9db9b3b88cc436e54150e0247ef628dad4f22f5f2cde32a463d3e11427e11ba0ba209248b1e0adeefb516fde4d50d2a3e
-  data.tar.gz: 7f1aadb357cbce7897199832153388b5e421abf4ee651032ad75b18d21fc4042d2ed9eb960b6668b2a4a47e0cb7071f398c9b8be4b08a282043cb6bf9aaa37f4
+  metadata.gz: a850ce076c6250c3d68713bf9e9a629834598cc8ff7b9b1cb74949d9201ef6f75809f16cccd34232c7bfb3d5b7f3fee91e8dd91986d76edd0738a5feae7ca92b
+  data.tar.gz: 42cfa2bb2347ac72c952a6718de07f87b0e3f00481169aead945b464454a1eede7002eb1ee2806f9ba63650529b0ef1ec2c176d1e8878a4577ae7ae6a7edc78e

data/lib/yui_rest_client.rb

@@ -8,7 +8,6 @@ require 'timeout'
 require 'time'
 
 require 'yui_rest_client/version'
-require 'yui_rest_client/local_process'
 require 'yui_rest_client/widgets'
 require 'yui_rest_client/logger'
 require 'yui_rest_client/timer'

data/lib/yui_rest_client/app.rb

@@ -2,6 +2,8 @@
 
 module YuiRestClient
   class App
+    attr_reader :host, :port
+
     # Used to initialize main entry point of YuiRestClient and set host and port
     # for the application under control.
     # @param host [String] host address (e.g. 'localhost', '192.168.0.1')
@@ -13,6 +15,16 @@ module YuiRestClient
       @version_controller = Http::VersionController.new(host: host, port: port)
     end
 
+    # wait until the specified port is open or until the timeout is reached
+    # @raise YuiRestClient::Error::TimeoutError if the port is not opened in time
+    def connect
+      Wait.until(timeout: YuiRestClient.timeout, interval: YuiRestClient.interval) do
+        YuiRestClient.logger.debug("Waiting for #{@host}:#{@port}...")
+        port_open?
+      end
+      self
+    end
+
     # Initializes new instance of Bargraph with the filter provided.
     # Does not make request to libyui-rest-api.
     # @param filter [Hash] filter to find a widget
@@ -226,5 +238,20 @@ module YuiRestClient
       YuiRestClient.logger.info("Server API version: #{server_api_v}")
       server_api_v <= client_api_version
     end
+
+    private
+
+    # is the target port open?
+    # @return [Boolean] true if the port is open, false otherwise
+    def port_open?(seconds = 1)
+      Timeout.timeout(seconds) do
+        TCPSocket.new(@host, @port).close
+        true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        false
+      end
+    rescue Timeout::Error
+      false
+    end
   end
 end

data/lib/yui_rest_client/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module YuiRestClient
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
   API_VERSION = 'v1'
 end

data/lib/yui_rest_client/widgets.rb

@@ -20,7 +20,6 @@ module YuiRestClient
     require 'yui_rest_client/widgets/table'
     require 'yui_rest_client/widgets/textbox'
     require 'yui_rest_client/widgets/timefield'
-    require 'yui_rest_client/widgets/label'
     require 'yui_rest_client/widgets/richtext'
     require 'yui_rest_client/widgets/tree'
     # Class representing a Wizard UI. It can be YWizard

data/lib/yui_rest_client/widgets/tree.rb

@@ -128,7 +128,7 @@ module YuiRestClient
 
       def get_nodes(items, root = '')
         items.map do |x|
-          current = root.empty? ? x[:label] : root + '|' + x[:label]
+          current = root.empty? ? x[:label] : "#{root}|#{x[:label]}"
           x.key?(:children) ? [current, get_nodes(x[:children], current)] : current
         end.flatten
       end
@@ -136,7 +136,7 @@ module YuiRestClient
       def get_selected_node(items, root = '')
         selected = ''
         items.each do |x|
-          current = root.empty? ? x[:label] : root + '|' + x[:label]
+          current = root.empty? ? x[:label] : "#{root}|#{x[:label]}"
           return current if x[:selected]
 
           selected = get_selected_node(x[:children], current) if x.key?(:children)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yui_rest_client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Joaquin Rivera
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,6 @@ files:
 - lib/yui_rest_client/http/response.rb
 - lib/yui_rest_client/http/version_controller.rb
 - lib/yui_rest_client/http/widget_controller.rb
-- lib/yui_rest_client/local_process.rb
 - lib/yui_rest_client/logger.rb
 - lib/yui_rest_client/timer.rb
 - lib/yui_rest_client/version.rb

data/lib/yui_rest_client/local_process.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-# Client to interact with YAST UI rest api framework for integration testing
-module YuiRestClient
-  class LocalProcess
-    # default timeout for process
-    DEFAULT_TIMEOUT_PROCESS = 2
-
-    # start the application in background
-    # @param application [String] the command to start
-    def start_app(application)
-      @app_host = 'localhost'
-      @app_port = port
-
-      # another app already running?
-      raise "The port #{@app_host}:#{@app_port} is already open!" if port_open?(@app_host, @app_port)
-
-      YuiRestClient.logger.debug("Starting #{application}...")
-      # create a new process group so easily we will be able
-      # to kill all its sub-processes
-      @app_pid = spawn(application, pgroup: true)
-      wait_for_port(@app_host, @app_port)
-      YuiRestClient.logger.debug("App started: '#{application}'")
-    end
-
-    # kill the process if it is still running after finishing a scenario
-    def kill_app
-      return unless @app_pid
-
-      Process.waitpid(@app_pid, Process::WNOHANG)
-      YuiRestClient.logger.debug("Sending KILL signal for PID #{@app_pid}")
-      Process.kill('-KILL', @app_pid)
-    rescue Errno::ECHILD, Errno::ESRCH
-      # the process has already exited
-      @app_pid = nil
-    end
-
-    private
-
-    # set the application introspection port for communication
-    def port
-      ENV['YUI_HTTP_PORT'] ||= '9999'
-    end
-
-    # is the target port open?
-    # @param host [String] the host to connect to
-    # @param port [Integer] the port number
-    # @return [Boolean] true if the port is open, false otherwise
-    def port_open?(host, port)
-      TCPSocket.new(host, port).close
-      true
-    rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-      false
-    end
-
-    # wait until the specified port is open or until the timeout is reached
-    # @param host [String] the host to connect to
-    # @param port [Integer] the port number
-    # @raise YuiRestClient::Error::TimeoutError if the port is not opened in time
-    def wait_for_port(host, port)
-      Wait.until(timeout: YuiRestClient.timeout, interval: YuiRestClient.interval) do
-        YuiRestClient.logger.debug("Waiting for #{host}:#{port}...")
-        port_open?(host, port)
-      end
-    end
-
-    # optionally allow a short delay between the steps to watch the UI changes
-    def add_step_delay
-      delay = ENV['STEP_DELAY'].to_f
-      sleep(delay) if delay.positive?
-    end
-  end
-end