sos 0.2.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fecbea1e93ebdba1bc7b10cffcaa1cf3ed39a7
-  data.tar.gz: 30df4a9e22f27f3ba7968f91bce07f98eeaf0057
+  metadata.gz: 349b29c2085bb1ccd9feac783a9ecfec2d97f536
+  data.tar.gz: 0bfe909da1aced6c8aaaabe44dd0c6b25174c06f
 SHA512:
-  metadata.gz: 88ec0f2f820c4ffb0316bee320a63b14e25e6042aa458b047fd8a248d882ffbda0fe8b7d6229c3301eed0577158d1aafe804765a0bec9884536e73b7044c7546
-  data.tar.gz: ec3cae53b52b4a74b49ad8936f4c6c5638326c9b88622cc90ead8713248294ad7d5205935db4297777bc7f2638a4bb536d7f4017bb0739411657a4d6b561bbeb
+  metadata.gz: 5fc7f026f206af038dbd723bf9bf1bd877beed488374f552d2e4228f6fafe82aedc4507f4e512e7653284011cc66305d008bb8c00a52062cfe5663df30ad369a
+  data.tar.gz: 5503c0556fa1a0dc22a3a2e489212211c30161295a6b3f91d8a9770f26ff26e9d59a6cf002fc811fca8d5d67e9726346fae5e8786196b6eea11fd4a36cf90ab7

data/lib/sos.rb

@@ -21,18 +21,22 @@ SYNTAX =
   sos help
 
 Options:
-  -r, --runlevel <RUNLEVEL>  Change run-level. Default is level 3.
-  -h, --help     This help
+  -r, --runlevel <RUNLEVEL> 
+    Change run-level. Default is level 3.
+  -s, --selector <NAME>, ... ,<NAME>
+    Assign selector. Default is "openstack,neutron".
+  -h, --help
+    This help
 
 Commands:
   list      List available OpenStack services
   logs      Runs "tail -f"
-  restart   Runs "service restart"
-  start     Runs "service start"
-  status    Runs "service status"
-  stop      Runs "service stop"
+  restart   Runs "service restart" on enabled services
+  start     Runs "service start"   on enabled services
+  status    Runs "service status"  on enabled services
+  stop      Runs "service stop"    on enabled services
 
-<SERVICE>   Openstack service
+<SERVICE>   Service name
 }
 
 class Syntax
@@ -40,7 +44,7 @@ class Syntax
     @command   = nil
     @options   = {
       :runlevel => 3,
-      :selector   => '/neutron|openstack/',
+      :selector => 'openstack,neutron',
       :all      => false }
     @arguments = []
 
@@ -50,7 +54,7 @@ class Syntax
         @options[:all] = true
       when '-s', '--selector'
         line.shift
-        @options[:selector] = line[0]
+        @options[:selector] = line[0].gsub(/\s*/,'')
       when '-r', '--run_level'
         line.shift
         @options[:runlevel] = line[0].to_i
@@ -68,7 +72,9 @@ class Syntax
   end
 
   def run
-    services = Services.new(@options[:selector], @options[:runlevel], @arguments, OpenStack::LOGS)
+
+    services_list = Services.build_list(@options[:selector], @options[:runlevel], @arguments)
+    services = Services.new(services_list, OpenStack::LOGS)
 
     case @command
     when /status/i, /start/i, /stop/i, /restart/i
@@ -82,8 +88,8 @@ class Syntax
       }
       exec("tail -f #{logs}") if logs
     when /list/i
-      services.enabled.each { |service|
-        puts service.name
+      services.by_name.each { |service|
+        puts service
       }
     when 'test'
       p self

data/lib/sos/services.rb

@@ -2,9 +2,9 @@ class Service
   attr_reader :name, :state, :logs
 
   def initialize(name, state, logs)
-    @name      = name
-    @state = state =~ /on/i ? true : false
-    @logs = logs
+    @name  = name
+    @state = state =~ /on|enabled/i ? true : false
+    @logs  = logs
   end
 
   def has?(filter)
@@ -12,40 +12,55 @@ class Service
   end
 
   def to_s
-    @name + ':' + @state
+    state = @state ? 'enabled' : 'disabled'
+    @name + ':' + state
   end
 end
 
 class Services
-  def initialize(selector, run_level, filters, loglist)
-    @services = []
+  def self.build_list(selectors, run_level, filters)
+    # Returns each service on a line with
+    # name:state
+
+    selector = selectors.split(',').join('|')
 
-    list = %x{chkconfig --list | awk '#{selector} {print $1":"$#{run_level+2}}'}
+    list=''
+    redhat = %x{cat /etc/redhat-release}
+    case redhat
+    when /Red Hat Enterprise Linux/
+      if redhat =~ /release 6/
+        list = %x{ chkconfig --list | awk '/#{selector}/ {print $1":"$#{run_level+2}}'}
+        list.gsub!(/:\d:/,':')
+      end
+    when /Fedora/
+      list = %x{ systemctl list-unit-files | awk '/#{selector}/ {print}'}
+      list.gsub!(/\.service[\s]*/,':')
+    end
 
     if filters != []
       filtered = ''
-      list.each { |line|
+      list.each_line { |line|
         filters.each { |filter| filtered << line if line =~ /#{filter}/ }
       }
       list = filtered
     end
+    list
+  end
 
-    list.each  { |line|
-      line_tab = line.chop.split(':')
-      name = line_tab[0]
-      state = line_tab[2]
-      log = loglist[name] ? loglist[name] : ''
+  def initialize(service_list, services_logs)
+    @services = []
+    service_list.each_line  { |line|
+      name, state = line.chop.split(':')
+      log = services_logs[name] ? services_logs[name] : ''
       @services << Service.new(name, state, log)
     }
+    @services
   end
 
-  def get_by_name(filters)
-    return @services
+  def by_name
     list = []
-    filters.each { |filter|
-      @services.each { |service|
-        list << service if @service.has?(filter)
-      }
+    @services.each { |service|
+      list << service
     }
     list
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sos
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies: []
 description: Easy manipulation of OpenStack services and view corresponding log files
   for a specific host. Allows grouping part or all services at once.