yasysdui 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a3e992efcb04c043a58eefeff250bba4a86d861a17c01b2a59a5599f64bc0d
-  data.tar.gz: 0fe081d9e999d7f11cb2915c42c0d7356183c74bcc3777657e33179cffc6a3be
+  metadata.gz: 2a1c4c3713301c8b7a944530ae8bc4407bd86e6a8d1f27525c29d69cf3339d5e
+  data.tar.gz: 629daedf793179249c3b95f4c90f3c4c39cb004d5505ad7678f9b7998896a5dd
 SHA512:
-  metadata.gz: 0fd3eb0e22f1db6596b8f5110dbdbe013527c6644b6781419edb19bae2a8e7fd2d4bed0c492519b6ab8cf58d31437e94044f66a83b9a4f0cb7f90c248c181462
-  data.tar.gz: a31feffb6f17d65d2bd7709fe632fbcc89af2055d4e3d1a0167736970e84c62a35b2d11bb389df0f594ef1e5280d529f8ce06e52b3f5f519f9e0baaaef0f853d
+  metadata.gz: ae8dad92c6b92339ade702a2400bf3a7731f24a6500a477c592802ae919ebf24c5c93de5896e0dcc6880d43f94ae0cf3edf94e2960690119e960fc45e071c365
+  data.tar.gz: 0cda143e377c4ca59300cfcbc16f607d16834c45631de502f37125659c454479e467edce10db78adb415b5ad176009a8e4ed142986b918726195df03364e8bfe

data/bin/yasysdui

@@ -7,23 +7,12 @@
 require 'gtk3'
 require 'yasysdui'
 
-# Obsolete 
-#$MANAGED_SERVICES = Array.new
-# Personalisation of managed services:
-# 
-# syntax: 
-# $MANAGED_SERVICES << "service_name" 
-#$MANAGED_SERVICES << "vpnagentd"
-#$MANAGED_SERVICES << "naclient"
 
 #*********** List of services************************
 def load_service_list
 
   lsto = ServiceListStore.new_all_service
 
-# lsto = ServiceListStore.new
-# $MANAGED_SERVICES.each{|s| lsto.append_managed_service(s) }
-
   lsto.sort_by_unit
   
   $list=FilteredServiceListStore.new(lsto)

data/lib/yasysdui.rb

@@ -1,3 +1,4 @@
 require 'pp'
 require_relative 'yasysdui/service_controler'
-require_relative 'yasysdui/service_list'
+require_relative 'yasysdui/service_list'
+require_relative 'yasysdui/config'

data/lib/yasysdui/config.rb

@@ -0,0 +1,21 @@
+require 'parseconfig'
+require 'singleton'
+
+
+
+class YSConfig
+	include Singleton
+	attr_reader :managed_services
+	def load
+	
+		begin
+			config = ParseConfig.new( File.join(Dir.home,".config","yasysdui.conf") )
+		rescue
+		end
+
+		if config
+			@managed_services = config.params["managed_services"].split(%r{\s+}) if config.params["managed_services"]
+		end
+	end
+end
+# end of configuration

data/lib/yasysdui/service_catalog.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 require_relative 'system_service'
-
+require_relative 'config'
 
 class ServiceCatalog < Hash
     include Singleton
@@ -8,12 +8,14 @@ class ServiceCatalog < Hash
     def initialize
         super
         @idx = SimpleIndex.new
-        self.get_all_service
+        @config = YSConfig.instance
+        @config.load 
+        self.get_requested_services
         self.build_index
     end
     def rebuild
       clear
-      self.get_all_service
+      self.get_requested_services
       self.build_index
     end
     def build_index
@@ -106,13 +108,32 @@ class ServiceCatalog < Hash
             end
         }
     end
-# get all available units/scripts    
-    def get_all_service
-        pp :getting_all_services
-        get_all_known_units; pp :got_all_known_units
-        add_units_from_file_list; pp :got_all_units_from_file
-        add_init_d_scripts; pp :got_all_init_scripts
-        puts "Built service catalog with #{self.size} item(s)" 
+# get all maanged services as sepcified in config file  
+    def get_managed_services
+        @config.managed_services.each{|f| 
+# only try to add an init script if it does not exist already in the catlog
+            unless self.has_key?(f)
+                srv = SystemService.new( f )
+                srv.read_status_info 
+                srv.read_state
+     			self[srv] = srv if srv
+            end
+        }
+    end
+# get either
+#    all available units/scripts    OR
+#     the  anaged services only (as specified in the config file)
+    def get_requested_services
+		if @config.managed_services
+			pp :getting_managed_services
+			get_managed_services
+		else
+			pp :getting_all_services
+			get_all_known_units; pp :got_all_known_units
+			add_units_from_file_list; pp :got_all_units_from_file
+			add_init_d_scripts; pp :got_all_init_scripts
+			puts "Built service catalog with #{self.size} item(s)" 
+		end
 		self
 	end   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yasysdui
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Denis Mertz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
 description: A quick and dirty ruby-gtk3 ui wrapper around systemd/systemctl
 email: dev@familie-mertz.eu
 executables:
@@ -34,6 +54,7 @@ files:
 - bin/yasysdui
 - lib/yasysdui.rb
 - lib/yasysdui/command_button.rb
+- lib/yasysdui/config.rb
 - lib/yasysdui/index.rb
 - lib/yasysdui/service_catalog.rb
 - lib/yasysdui/service_controler.rb