agama-project · imobachgs · Jun 17, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022
diff --git a/cli/Gemfile.lock b/cli/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../service
   specs:
-    d-installer (0.2)
+    d-installer (0.3)
       cfa (~> 1.0.2)
       cfa_grub2 (~> 2.0.0)
       cheetah (~> 1.0.0)
@@ -14,8 +14,8 @@ PATH
 PATH
   remote: .
   specs:
-    d-installer-cli (0.2)
-      d-installer (= 0.2)
+    d-installer-cli (0.3)
+      d-installer (= 0.3)
       fast_gettext (~> 2.2.0)
       ruby-dbus (>= 0.18.0.beta5)
       thor (~> 1.2, >= 1.2.1)
@@ -56,7 +56,7 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     ruby-augeas (0.5.0)
-    ruby-dbus (0.18.0.beta6)
+    ruby-dbus (0.18.0.beta7)
       rexml
     simplecov (0.21.2)
       docile (~> 1.1)

diff --git a/cli/lib/dinstaller_cli/clients.rb b/cli/lib/dinstaller_cli/clients.rb
@@ -27,5 +27,4 @@ module Clients
 
 require "dinstaller_cli/clients/manager"
 require "dinstaller_cli/clients/language"
-require "dinstaller_cli/clients/software"
 require "dinstaller_cli/clients/storage"
diff --git a/cli/lib/dinstaller_cli/clients/software.rb b/cli/lib/dinstaller_cli/clients/software.rb
diff --git a/cli/lib/dinstaller_cli/commands/config.rb b/cli/lib/dinstaller_cli/commands/config.rb
@@ -23,8 +23,8 @@
 require "dinstaller_cli/install_config"
 require "dinstaller_cli/install_config_reader"
 require "dinstaller_cli/clients/language"
-require "dinstaller_cli/clients/software"
 require "dinstaller_cli/clients/storage"
+require "dinstaller/dbus/clients/software"
 require "dinstaller/dbus/clients/users"
 
 module DInstallerCli
@@ -135,7 +135,7 @@ def language_client
       end
 
       def software_client
-        @software_client ||= Clients::Software.new
+        @software_client ||= DInstaller::DBus::Clients::Software.new
       end
 
       def storage_client

diff --git a/cli/lib/dinstaller_cli/commands/software.rb b/cli/lib/dinstaller_cli/commands/software.rb
@@ -19,29 +19,8 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-# frozen_string_literal: true
-
-# Copyright (c) [2022] SUSE LLC
-#
-# All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, contact SUSE LLC.
-#
-# To contact SUSE LLC about this file by physical or electronic mail, you may
-# find current contact information at www.suse.com.
-
 require "thor"
-require "dinstaller_cli/clients/software"
+require "dinstaller/dbus/clients/software"
 
 module DInstallerCli
   module Commands
@@ -63,7 +42,7 @@ def selected_product(id = nil)
     private
 
       def client
-        @client ||= Clients::Software.new
+        @client ||= DInstaller::DBus::Clients::Software.new
       end
     end
   end

diff --git a/cli/test/dinstaller_cli/commands/config_test.rb b/cli/test/dinstaller_cli/commands/config_test.rb
@@ -24,19 +24,19 @@
 require "dinstaller_cli/install_config"
 require "dinstaller_cli/install_config_reader"
 require "dinstaller_cli/clients/language"
-require "dinstaller_cli/clients/software"
 require "dinstaller_cli/clients/storage"
 require "dinstaller/dbus/clients/users"
+require "dinstaller/dbus/clients/software"
 
 describe DInstallerCli::Commands::Config do
   before do
-    allow(DInstallerCli::Clients::Software).to receive(:new).and_return(software_client)
+    allow(DInstaller::DBus::Clients::Software).to receive(:new).and_return(software_client)
     allow(DInstallerCli::Clients::Language).to receive(:new).and_return(language_client)
     allow(DInstallerCli::Clients::Storage).to receive(:new).and_return(storage_client)
     allow(DInstaller::DBus::Clients::Users).to receive(:new).and_return(users_client)
   end
 
-  let(:software_client) { instance_double(DInstallerCli::Clients::Software) }
+  let(:software_client) { instance_double(DInstaller::DBus::Clients::Software) }
   let(:language_client) { instance_double(DInstallerCli::Clients::Language) }
   let(:storage_client) { instance_double(DInstallerCli::Clients::Storage) }
   let(:users_client) { instance_double(DInstaller::DBus::Clients::Users) }

diff --git a/cli/test/dinstaller_cli/commands/software_test.rb b/cli/test/dinstaller_cli/commands/software_test.rb
@@ -21,17 +21,17 @@
 
 require_relative "../../test_helper"
 require "dinstaller_cli/commands/software"
-require "dinstaller_cli/clients/software"
+require "dinstaller/dbus/clients/software"
 
 describe DInstallerCli::Commands::Software do
   subject { described_class.new }
 
   before do
     allow(subject).to receive(:say)
-    allow(DInstallerCli::Clients::Software).to receive(:new).and_return(client)
+    allow(DInstaller::DBus::Clients::Software).to receive(:new).and_return(client)
   end
 
-  let(:client) { instance_double(DInstallerCli::Clients::Software) }
+  let(:client) { instance_double(DInstaller::DBus::Clients::Software) }
 
   describe "#available_products" do
     before do

diff --git a/service/Gemfile.lock b/service/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    d-installer (0.2)
+    d-installer (0.3)
       cfa (~> 1.0.2)
       cfa_grub2 (~> 2.0.0)
       cheetah (~> 1.0.0)
@@ -51,7 +51,7 @@ GEM
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
     ruby-augeas (0.5.0)
-    ruby-dbus (0.18.0.beta6)
+    ruby-dbus (0.18.0.beta7)
       rexml
     simplecov (0.21.2)
       docile (~> 1.1)

diff --git a/service/bin/d-installer b/service/bin/d-installer
@@ -30,8 +30,42 @@ require "rubygems"
 require "bundler/setup"
 require "dinstaller/dbus/service_runner"
 
-service_name = $ARGV[0]&.to_sym || :manager
-service_runner = DInstaller::DBus::ServiceRunner.new(
-  service_name, logger: Logger.new($stdout)
-)
-service_runner.run
+# Runs the service with the given name
+#
+# @param name [Symbol] Service name
+# @see ORDERED_SERVICES
+def start_service(name)
+  logger = Logger.new($stdout, progname: name.to_s)
+  service_runner = DInstaller::DBus::ServiceRunner.new(
+    name, logger: logger
+  )
+  service_runner.run
+end
+
+ORDERED_SERVICES = [:software, :users, :manager].freeze
+
+# Starts all the services
+#
+# @return [Array<Integer>] PIDs
+# @see ORDERED_SERVICES
+def start_all_services
+  ORDERED_SERVICES.map do |name|
+    fork { exec("#{__FILE__} #{name}") }
+  end
+end
+
+if ARGV.empty?
+  pids = start_all_services
+  Signal.trap("SIGINT") do
+    puts "Stopping all services..."
+    exit
+  end
+  Process.wait
+else
+  name = ARGV[0]
+  Signal.trap("SIGINT") do
+    puts "Stopping #{name} service..."
+    exit
+  end
+  start_service(name.to_sym)
+end
diff --git a/service/lib/dinstaller/config.rb b/service/lib/dinstaller/config.rb
@@ -19,7 +19,6 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "yast"
 require "yaml"
 require "dinstaller/config_reader"
 
@@ -37,8 +36,8 @@ class << self
       attr_accessor :current, :base
 
       # Loads base and current config reading configuration from the system
-      def load
-        @base = ConfigReader.new.config
+      def load(logger = Logger.new($stdout))
+        @base = ConfigReader.new(logger: logger).config
         @current = @base&.copy
       end
 

diff --git a/service/lib/dinstaller/config_reader.rb b/service/lib/dinstaller/config_reader.rb
@@ -156,8 +156,6 @@ def file_paths_in(path)
       elsif File.directory?(path)
         Dir.glob("#{path}/*.{yml,yaml}")
       else
-        logger.debug("Ignoring not valid path: #{path}")
-
         []
       end
     end

diff --git a/service/lib/dinstaller/dbus/clients.rb b/service/lib/dinstaller/dbus/clients.rb
@@ -30,4 +30,5 @@ module Clients
 end
 
 require "dinstaller/dbus/clients/dinstaller"
+require "dinstaller/dbus/clients/software"
 require "dinstaller/dbus/clients/users"
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,8 +156,6 @@ def file_paths_in(path) @@
           elsif File.directory?(path)
             Dir.glob("#{path}/*.{yml,yaml}")
           else
-            logger.debug("Ignoring not valid path: #{path}")
             []
           end
         end
@@ Expand Down @@