specinfra 2.36.8 → 2.36.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d2b1c6944e896557724f62fceb228fdf1f001e
-  data.tar.gz: 24b52752bf4605b74469bb66db47dea78c1a844e
+  metadata.gz: 4cf93ab042236297cb6f78d012341b8b7870b77b
+  data.tar.gz: a81e8e5dbe0c3dfa2bf40d8ddedb32e70bee665e
 SHA512:
-  metadata.gz: 8984fd17a57b32c91f3e1d9886d170ceaaf066f14af3d7d9f864def1f242dd07812cc32245bcb64208b23cffd8875d8d1d8ca87f03530c59ff691c7e745a6238
-  data.tar.gz: 6be1856438bf9043a667eabba1800c36845a60432f2ac07872ab0e7a1e2d7520d3770525f6d5f36c3e502c5415a72ae76de2444796607cccafca9458cf396687
+  metadata.gz: 0e01bc129cfeddfc571083a30458bc450795d942f035ad6da3832be25f5952cd15b3d5329c883e577f6f4ddf731e738b80aa5b0bb73374346f598d6542bde135
+  data.tar.gz: 552564670bf16631c158af9b03459a2db6659aab024db502b1f62b32eef7681f4e93df0cbe5eddc6b4e7c62c0feca5e078bf790a3472709ddd5a1ae16896d20b

data/lib/specinfra/command/module/service/systemd.rb

@@ -3,15 +3,8 @@ module Specinfra
     module Module
       module Service
         module Systemd
-          def check_is_enabled_under_systemd(service, level="multi-user.target")
-            if level.to_s =~ /^\d+$/
-              level = "runlevel#{level}.target"
-            end
-            unless service.match(/\.(service|mount|device|socket)$/)
-              service += '.service'
-            end
-
-            "systemctl --plain list-dependencies #{level} | grep '\\(^\\| \\)#{escape(service)}$'"
+          def check_is_enabled_under_systemd(service, level=nil)
+            "systemctl --quiet is-enabled #{escape(service)}"
           end
 
           def check_is_running_under_systemd(service)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.36.8"
+  VERSION = "2.36.9"
 end

data/spec/command/module/service/systemd_spec.rb

@@ -5,7 +5,7 @@ describe Specinfra::Command::Module::Service::Systemd do
     extend Specinfra::Command::Module::Service::Systemd
   end
   let(:klass) { Specinfra::Command::Module::Service::Systemd::Test }
-  it { expect(klass.check_is_enabled_under_systemd('httpd')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)httpd.service$'" }
+  it { expect(klass.check_is_enabled_under_systemd('httpd')).to eq "systemctl --quiet is-enabled httpd" }
   it { expect(klass.check_is_running_under_systemd('httpd')).to eq 'systemctl is-active httpd' }
   it { expect(klass.enable_under_systemd('httpd')).to  eq 'systemctl enable httpd' }
   it { expect(klass.disable_under_systemd('httpd')).to eq 'systemctl disable httpd' }

data/spec/command/module/systemd_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Specinfra::Command::Redhat::V7::Service do
   let(:klass) { Specinfra::Command::Redhat::V7::Service }
-  it { expect(klass.check_is_enabled('httpd')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)httpd.service$'" }
-  it { expect(klass.check_is_enabled('httpd', 'multi-user.target')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)httpd.service$'" }
-  it { expect(klass.check_is_enabled('httpd', 3)).to eq "systemctl --plain list-dependencies runlevel3.target | grep '\\(^\\| \\)httpd.service$'" }
-  it { expect(klass.check_is_enabled('httpd', '3')).to eq "systemctl --plain list-dependencies runlevel3.target | grep '\\(^\\| \\)httpd.service$'" }
-  it { expect(klass.check_is_enabled('sshd.socket')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)sshd.socket$'" }
+  it { expect(klass.check_is_enabled('httpd')).to eq "systemctl --quiet is-enabled httpd" }
+  it { expect(klass.check_is_enabled('httpd', 'multi-user.target')).to eq "systemctl --quiet is-enabled httpd" }
+  it { expect(klass.check_is_enabled('httpd.service')).to eq "systemctl --quiet is-enabled httpd.service" }
+  it { expect(klass.check_is_enabled('sshd.socket')).to eq "systemctl --quiet is-enabled sshd.socket" }
+  it { expect(klass.check_is_enabled('logrotate.timer')).to eq "systemctl --quiet is-enabled logrotate.timer" }
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.36.8
+  version: 2.36.9
 platform: ruby
 authors:
 - Gosuke Miyashita