serverspec 0.2.9 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. data/lib/serverspec/backend/exec.rb +15 -12
  2. data/lib/serverspec/commands/base.rb +1 -1
  3. data/lib/serverspec/version.rb +1 -1
  4. data/spec/debian/commands_spec.rb +1 -1
  5. data/spec/gentoo/commands_spec.rb +1 -1
  6. data/spec/redhat/commands_spec.rb +1 -1
  7. data/spec/solaris/commands_spec.rb +1 -1
  8. metadata +77 -87
data/lib/serverspec/backend/exec.rb CHANGED
@@ -54,13 +54,14 @@ module Serverspec
54
54
  def check_readable(example, file, by_whom)
55
55
  mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
56
56
  mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
57
- if by_whom.nil?
57
+ case by_whom
58
+ when nil
58
59
  mode_octal & 0444 != 0
59
- elsif by_whom == 'owner'
60
+ when 'owner'
60
61
  mode_octal & 0400 != 0
61
- elsif by_whom == 'group'
62
+ when 'group'
62
63
  mode_octal & 0040 != 0
63
- elsif by_whom == 'others'
64
+ when 'others'
64
65
  mode_octal & 0004 != 0
65
66
  end
66
67
  end
@@ -68,13 +69,14 @@ module Serverspec
68
69
  def check_writable(example, file, by_whom)
69
70
  mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
70
71
  mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
71
- if by_whom.nil?
72
+ case by_whom
73
+ when nil
72
74
  mode_octal & 0222 != 0
73
- elsif by_whom == 'owner'
75
+ when 'owner'
74
76
  mode_octal & 0200 != 0
75
- elsif by_whom == 'group'
77
+ when 'group'
76
78
  mode_octal & 0020 != 0
77
- elsif by_whom == 'others'
79
+ when 'others'
78
80
  mode_octal & 0002 != 0
79
81
  end
80
82
  end
@@ -82,13 +84,14 @@ module Serverspec
82
84
  def check_executable(example, file, by_whom)
83
85
  mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
84
86
  mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
85
- if by_whom.nil?
87
+ case by_whom
88
+ when nil
86
89
  mode_octal & 0111 != 0
87
- elsif by_whom == 'owner'
90
+ when 'owner'
88
91
  mode_octal & 0100 != 0
89
- elsif by_whom == 'group'
92
+ when 'group'
90
93
  mode_octal & 0010 != 0
91
- elsif by_whom == 'others'
94
+ when 'others'
92
95
  mode_octal & 0001 != 0
93
96
  end
94
97
  end
data/lib/serverspec/commands/base.rb CHANGED
@@ -80,7 +80,7 @@ module Serverspec
80
80
  end
81
81
 
82
82
  def check_belonging_group user, group
83
- "id #{user} | awk '{print $2}' | grep #{group}"
83
+ "id #{user} | awk '{print $3}' | grep #{group}"
84
84
  end
85
85
 
86
86
  def check_iptables_rule rule, table=nil, chain=nil
data/lib/serverspec/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Serverspec
2
- VERSION = "0.2.9"
2
+ VERSION = "0.2.10"
3
3
  end
data/spec/debian/commands_spec.rb CHANGED
@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
87
87
  end
88
88
 
89
89
  describe commands.check_belonging_group('root', 'wheel') do
90
- it { should eq "id root | awk '{print $2}' | grep wheel" }
90
+ it { should eq "id root | awk '{print $3}' | grep wheel" }
91
91
  end
92
92
 
93
93
  describe commands.check_iptables_rule('-P INPUT ACCEPT') do
data/spec/gentoo/commands_spec.rb CHANGED
@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
87
87
  end
88
88
 
89
89
  describe commands.check_belonging_group('root', 'wheel') do
90
- it { should eq "id root | awk '{print $2}' | grep wheel" }
90
+ it { should eq "id root | awk '{print $3}' | grep wheel" }
91
91
  end
92
92
 
93
93
  describe commands.check_iptables_rule('-P INPUT ACCEPT') do
data/spec/redhat/commands_spec.rb CHANGED
@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
87
87
  end
88
88
 
89
89
  describe commands.check_belonging_group('root', 'wheel') do
90
- it { should eq "id root | awk '{print $2}' | grep wheel" }
90
+ it { should eq "id root | awk '{print $3}' | grep wheel" }
91
91
  end
92
92
 
93
93
  describe commands.check_iptables_rule('-P INPUT ACCEPT') do
data/spec/solaris/commands_spec.rb CHANGED
@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
87
87
  end
88
88
 
89
89
  describe commands.check_belonging_group('root', 'wheel') do
90
- it { should eq "id root | awk '{print $2}' | grep wheel" }
90
+ it { should eq "id root | awk '{print $3}' | grep wheel" }
91
91
  end
92
92
 
93
93
  describe commands.check_zfs('rpool') do
metadata CHANGED
@@ -1,90 +1,89 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: serverspec
3
- version: !ruby/object:Gem::Version
4
- hash: 5
5
- prerelease: false
6
- segments:
7
- - 0
8
- - 2
9
- - 9
10
- version: 0.2.9
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.2.10
5
+ prerelease:
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Gosuke Miyashita
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2013-04-15 00:00:00 +09:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2013-04-20 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: net-ssh
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
25
17
  none: false
26
- requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- hash: 3
30
- segments:
31
- - 0
32
- version: "0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
33
22
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: rspec
37
23
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
39
25
  none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 3
44
- segments:
45
- - 0
46
- version: "0"
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: rspec
32
+ requirement: !ruby/object:Gem::Requirement
33
+ none: false
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
37
+ version: '0'
47
38
  type: :runtime
48
- version_requirements: *id002
49
- - !ruby/object:Gem::Dependency
50
- name: bundler
51
39
  prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
46
+ - !ruby/object:Gem::Dependency
47
+ name: bundler
48
+ requirement: !ruby/object:Gem::Requirement
53
49
  none: false
54
- requirements:
50
+ requirements:
55
51
  - - ~>
56
- - !ruby/object:Gem::Version
57
- hash: 9
58
- segments:
59
- - 1
60
- - 3
61
- version: "1.3"
52
+ - !ruby/object:Gem::Version
53
+ version: '1.3'
62
54
  type: :development
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: rake
66
55
  prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
68
57
  none: false
69
- requirements:
70
- - - ">="
71
- - !ruby/object:Gem::Version
72
- hash: 3
73
- segments:
74
- - 0
75
- version: "0"
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '1.3'
62
+ - !ruby/object:Gem::Dependency
63
+ name: rake
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
76
70
  type: :development
77
- version_requirements: *id004
78
- description: RSpec tests for your servers provisioned by Puppet, Chef or anything else
79
- email:
71
+ prerelease: false
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ description: RSpec tests for your servers provisioned by Puppet, Chef or anything
79
+ else
80
+ email:
80
81
  - gosukenator@gmail.com
81
- executables:
82
+ executables:
82
83
  - serverspec-init
83
84
  extensions: []
84
-
85
85
  extra_rdoc_files: []
86
-
87
- files:
86
+ files:
88
87
  - .gitignore
89
88
  - .travis.yml
90
89
  - Gemfile
@@ -152,41 +151,32 @@ files:
152
151
  - spec/solaris/matchers_spec.rb
153
152
  - spec/spec_helper.rb
154
153
  - spec/support/shared_matcher_examples.rb
155
- has_rdoc: true
156
154
  homepage: http://serverspec.org/
157
- licenses:
155
+ licenses:
158
156
  - MIT
159
157
  post_install_message:
160
158
  rdoc_options: []
161
-
162
- require_paths:
159
+ require_paths:
163
160
  - lib
164
- required_ruby_version: !ruby/object:Gem::Requirement
161
+ required_ruby_version: !ruby/object:Gem::Requirement
165
162
  none: false
166
- requirements:
167
- - - ">="
168
- - !ruby/object:Gem::Version
169
- hash: 3
170
- segments:
171
- - 0
172
- version: "0"
173
- required_rubygems_version: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ! '>='
165
+ - !ruby/object:Gem::Version
166
+ version: '0'
167
+ required_rubygems_version: !ruby/object:Gem::Requirement
174
168
  none: false
175
- requirements:
176
- - - ">="
177
- - !ruby/object:Gem::Version
178
- hash: 3
179
- segments:
180
- - 0
181
- version: "0"
169
+ requirements:
170
+ - - ! '>='
171
+ - !ruby/object:Gem::Version
172
+ version: '0'
182
173
  requirements: []
183
-
184
174
  rubyforge_project:
185
- rubygems_version: 1.3.7
175
+ rubygems_version: 1.8.25
186
176
  signing_key:
187
177
  specification_version: 3
188
178
  summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
189
- test_files:
179
+ test_files:
190
180
  - spec/debian/commands_spec.rb
191
181
  - spec/debian/matchers_spec.rb
192
182
  - spec/gentoo/commands_spec.rb