specinfra 2.83.0 → 2.83.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/specinfra/command/freebsd/base/service.rb +2 -2
  3. data/lib/specinfra/version.rb +1 -1
  4. data/spec/command/freebsd/service_spec.rb +72 -43
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d74b760931c73cff0e9828d546a7e63f658ec60a
4
- data.tar.gz: f945ae61dd3f169436d89903db0ad45847684f63
3
+ metadata.gz: 7f98623e6d0a234bd7fe4efe0a86e0cdc270a415
4
+ data.tar.gz: 42c023dec145584e4bc648127adc088b88f2f727
5
5
  SHA512:
6
- metadata.gz: a5c308cdcf87bc332143697d3c6d8d5a47e221f1afef33e711ae0786958a71f3d20009d37d15591294465427e5a31b438ac7fb1494a868cc67895ceb50f1a3fe
7
- data.tar.gz: cfc67a5a753304dfa7f38573c77b0f6124c4012d63cc57c81d862671fed9bda823a597de02cffa61042c8d6cb1d1ef4b2d609eb3828937bdfa9458886a7e638a
6
+ metadata.gz: 05045bced49f00191b843da8fc16339f4209d543c04ae652a886feabe0ec346179da570168e4f16e0ddbe2c4a8e743203c49bc8665ce7bed3e64148f17917f53
7
+ data.tar.gz: fbb932813642ede8d94a754bd5a631ed8fe404b6489c2acc3c3539212638a0fe8c9cd53320d6996e105e5bec92fae48ca9e4387c35f7178451551fcf2c9b461d
data/lib/specinfra/command/freebsd/base/service.rb CHANGED
@@ -3,8 +3,8 @@ class Specinfra::Command::Freebsd::Base::Service < Specinfra::Command::Base::Ser
3
3
  def check_is_enabled(service, level=3)
4
4
  "service #{escape(service)} enabled"
5
5
  end
6
- def check_is_running_under_init(service)
7
- "service #{escape(service)} status | grep -E 'as (pid [0-9]+)'"
6
+ def check_is_running(service)
7
+ "service #{escape(service)} onestatus"
8
8
  end
9
9
  end
10
10
  end
data/lib/specinfra/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Specinfra
2
- VERSION = "2.83.0"
2
+ VERSION = "2.83.1"
3
3
  end
data/spec/command/freebsd/service_spec.rb CHANGED
@@ -5,67 +5,96 @@ describe 'command/freebsd/service works correctly' do
5
5
  property[:os] = nil
6
6
  end
7
7
 
8
- context 'freebsd-base' do
9
- before do
10
- set :os, :family => 'freebsd'
11
- end
12
- describe 'get_command(:check_service_is_enabled, "httpd")' do
13
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
8
+ describe 'check_service_is_enabled' do
9
+ context 'freebsd-base' do
10
+ before do
11
+ set :os, :family => 'freebsd'
12
+ end
13
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
14
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
15
+ end
14
16
  end
15
- end
16
17
 
17
- context 'freebsd-6' do
18
- before do
19
- set :os, :family => 'freebsd', :release => '6'
20
- end
21
- describe 'get_command(:check_service_is_enabled, "httpd")' do
22
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
18
+ context 'freebsd-6' do
19
+ before do
20
+ set :os, :family => 'freebsd', :release => '6'
21
+ end
22
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
23
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
24
+ end
23
25
  end
24
- end
25
26
 
26
- context 'freebsd-7' do
27
- before do
28
- set :os, :family => 'freebsd', :release => '7'
29
- end
30
- describe 'get_command(:check_service_is_enabled, "httpd")' do
31
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
27
+ context 'freebsd-7' do
28
+ before do
29
+ set :os, :family => 'freebsd', :release => '7'
30
+ end
31
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
32
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
33
+ end
32
34
  end
33
- end
34
35
 
35
- context 'freebsd-8' do
36
- before do
37
- set :os, :family => 'freebsd', :release => '8'
36
+ context 'freebsd-8' do
37
+ before do
38
+ set :os, :family => 'freebsd', :release => '8'
39
+ end
40
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
41
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
42
+ end
38
43
  end
39
- describe 'get_command(:check_service_is_enabled, "httpd")' do
40
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
44
+
45
+ context 'freebsd-9' do
46
+ before do
47
+ set :os, :family => 'freebsd', :release => '9'
48
+ end
49
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
50
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
51
+ end
41
52
  end
42
- end
43
53
 
44
- context 'freebsd-9' do
45
- before do
46
- set :os, :family => 'freebsd', :release => '9'
54
+ context 'freebsd-10' do
55
+ before do
56
+ set :os, :family => 'freebsd', :release => '10'
57
+ end
58
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
59
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
60
+ end
47
61
  end
48
- describe 'get_command(:check_service_is_enabled, "httpd")' do
49
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
62
+
63
+ context 'freebsd-11' do
64
+ before do
65
+ set :os, :family => 'freebsd', :release => '11'
66
+ end
67
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
68
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
69
+ end
50
70
  end
51
- end
52
71
 
53
- context 'freebsd-10' do
54
- before do
55
- set :os, :family => 'freebsd', :release => '10'
72
+ context 'freebsd-12' do
73
+ before do
74
+ set :os, :family => 'freebsd', :release => '12'
75
+ end
76
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
77
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
78
+ end
56
79
  end
57
- describe 'get_command(:check_service_is_enabled, "httpd")' do
58
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
80
+
81
+ context 'freebsd-13' do
82
+ before do
83
+ set :os, :family => 'freebsd', :release => '13'
84
+ end
85
+ describe 'get_command(:check_service_is_enabled, "httpd")' do
86
+ it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
87
+ end
59
88
  end
60
89
  end
61
90
 
62
- context 'freebsd-11' do
91
+ describe 'check_service_is_running' do
63
92
  before do
64
- set :os, :family => 'freebsd', :release => '11'
93
+ set :os, :family => 'freebsd'
65
94
  end
66
- describe 'get_command(:check_service_is_enabled, "httpd")' do
67
- it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
95
+
96
+ describe 'get_command(:check_service_is_running, "foobar")' do
97
+ it { expect(get_command(:check_service_is_running, 'foobar')).to eq 'service foobar onestatus' }
68
98
  end
69
99
  end
70
100
  end
71
-
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: specinfra
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.83.0
4
+ version: 2.83.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gosuke Miyashita
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-10-21 00:00:00.000000000 Z
11
+ date: 2021-10-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-scp