WIP: fixes on the previous split

openSUSE · Feb 18, 2022 · af52769 · af52769
1 parent 364ec4e
commit af52769
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/yastd/Gemfile.lock b/yastd/Gemfile.lock
@@ -8,7 +8,8 @@ PATH
       eventmachine (~> 1.2.7)
       fast_gettext (~> 2.2.0)
       nokogiri (~> 1.13.1)
-      ruby-dbus (~> 0.16.0)
+      rexml (~> 3.2.5)
+      ruby-dbus (~> 0.17.0)
 
 GEM
   remote: https://rubygems.org/
@@ -32,6 +33,7 @@ GEM
       rake
     racc (1.6.0)
     rake (13.0.6)
+    rexml (3.2.5)
     ruby-augeas (0.5.0)
     ruby-dbus (0.17.0)
       rexml

diff --git a/yastd/lib/yast2/dbus/installer.rb b/yastd/lib/yast2/dbus/installer.rb
@@ -27,6 +27,11 @@ module DBus
     #
     # @see https://rubygems.org/gems/ruby-dbus
     class Installer < ::DBus::Object
+      PATH = "/org/opensuse/YaST/Installer1".freeze
+      private_constant :PATH
+
+      YAST_INSTALLER_INTERFACE = "org.opensuse.YaST.Installer1"
+      private_constant :YAST_INSTALLER_INTERFACE
       attr_reader :installer, :logger
 
       # @param installer [Yast2::Installer] YaST installer instance
@@ -51,14 +56,6 @@ def initialize(installer, logger)
           0
         end
       end
-
-      private
-
-      PATH = "/org/opensuse/YaST/Installer1".freeze
-      private_constant :PATH
-
-      YAST_INSTALLER_INTERFACE = "org.opensuse.YaST.Installer1"
-      private_constant :YAST_INSTALLER_INTERFACE
     end
   end
 end
diff --git a/yastd/lib/yast2/dbus/language.rb b/yastd/lib/yast2/dbus/language.rb
@@ -25,6 +25,12 @@ module DBus
     #
     # @see https://rubygems.org/gems/ruby-dbus
     class Language < ::DBus::Object
+      PATH = "/org/opensuse/Yast/Language1".freeze
+      private_constant :PATH
+
+      YAST_LANGUAGE_INTERFACE = "org.opensuse.YaST.Language1".freeze
+      private_constant :YAST_LANGUAGE_INTERFACE
+
       # @param installer [Yast2::Installer] YaST installer instance
       def initialize(installer, logger)
         @installer = installer
@@ -50,12 +56,6 @@ def initialize(installer, logger)
 
       private
 
-      PATH = "/org/opensuse/Yast/Language1".freeze
-      private_constant :PATH
-
-      YAST_LANGUAGE_INTERFACE = "org.opensuse.YaST.Language1".freeze
-      private_constant :LANGUAGE_INTERFACE
-
       attr_reader :installer, :logger
 
       def available_languages

diff --git a/yastd/lib/yast2/dbus/service.rb b/yastd/lib/yast2/dbus/service.rb
@@ -37,11 +37,9 @@ module DBus
     # @see Yast2::DBus::Installer
     class Service
       # @return [String] service name
-      SERVICE_NAME = "org.opensuse.YaST"
+      SERVICE_NAME = "org.opensuse.YaST".freeze
 
       # @return [String] D-Bus object path
-      OBJECT_PATH = "/org/opensuse/YaST/Installer1"
-
       attr_reader :bus
 
       def initialize(logger = nil)
@@ -77,19 +75,19 @@ def installer_dbus
         @installer_dbus ||= Yast2::DBus::Installer.new(yast_installer, logger)
       end
 
-      def language_bus
+      def language_dbus
         @language_dbus ||= Yast2::DBus::Language.new(yast_installer, logger)
       end
 
-      def software_bus
+      def software_dbus
         @software_dbus ||= Yast2::DBus::Software.new(yast_installer, logger)
       end
 
-      def installer
+      def yast_installer
         @yast_installer ||= Yast2::Installer.new(logger: logger).tap do |installer|
           # FIXME: do not probe by default
           installer.probe
-          installer.dbus_objects = dbus_objects
+          #installer.dbus_objects = dbus_objects
         end
       end
     end

diff --git a/yastd/lib/yast2/dbus/software.rb b/yastd/lib/yast2/dbus/software.rb
@@ -27,6 +27,12 @@ module DBus
     #
     # @see https://rubygems.org/gems/ruby-dbus
     class Software < ::DBus::Object
+      PATH = "/org/opensuse/YaST/Software1".freeze
+      private_constant :PATH
+
+      YAST_SOFTWARE_INTERFACE = "org.opensuse.YaST.Software1"
+      private_constant :YAST_SOFTWARE_INTERFACE
+
       attr_reader :installer, :logger
 
       # @param installer [Yast2::Installer] YaST installer instance
@@ -38,7 +44,7 @@ def initialize(installer, logger)
         super(PATH)
       end
 
-      dbus_interface SOFTWARE_INTERFACE do
+      dbus_interface YAST_SOFTWARE_INTERFACE do
         dbus_reader :available_base_products, "a(ssa{sv})"
         attr_writer :available_base_products
         dbus_watcher :available_base_products
@@ -55,12 +61,6 @@ def initialize(installer, logger)
 
       private
 
-      PATH = "/org/opensuse/YaST/Software1".freeze
-      private_constant :PATH
-
-      YAST_SOFTWARE_INTERFACE = "org.opensuse.YaST.Software1"
-      private_constant :YAST_SOFTWARE_INTERFACE
-
       def available_base_products
         @available_base_products ||= installer.products
       end