serverspec 0.2.9 → 0.2.10

data/lib/serverspec/backend/exec.rb

@@ -54,13 +54,14 @@ module Serverspec
       def check_readable(example, file, by_whom)
         mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        if by_whom.nil?
+        case by_whom
+        when nil
           mode_octal & 0444 != 0
-        elsif by_whom == 'owner'
+        when 'owner'
           mode_octal & 0400 != 0
-        elsif by_whom == 'group'
+        when 'group'
           mode_octal & 0040 != 0
-        elsif by_whom == 'others'
+        when 'others'
           mode_octal & 0004 != 0
         end
       end
@@ -68,13 +69,14 @@ module Serverspec
       def check_writable(example, file, by_whom)
         mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        if by_whom.nil?
+        case by_whom
+        when nil
           mode_octal & 0222 != 0
-        elsif by_whom == 'owner'
+        when 'owner'
           mode_octal & 0200 != 0
-        elsif by_whom == 'group'
+        when 'group'
           mode_octal & 0020 != 0
-        elsif by_whom == 'others'
+        when 'others'
           mode_octal & 0002 != 0
         end
       end
@@ -82,13 +84,14 @@ module Serverspec
       def check_executable(example, file, by_whom)
         mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        if by_whom.nil?
+        case by_whom
+        when nil
           mode_octal & 0111 != 0
-        elsif by_whom == 'owner'
+        when 'owner'
           mode_octal & 0100 != 0
-        elsif by_whom == 'group'
+        when 'group'
           mode_octal & 0010 != 0
-        elsif by_whom == 'others'
+        when 'others'
           mode_octal & 0001 != 0
         end
       end

data/lib/serverspec/commands/base.rb

@@ -80,7 +80,7 @@ module Serverspec
       end
 
       def check_belonging_group user, group
-        "id #{user} | awk '{print $2}' | grep #{group}"
+        "id #{user} | awk '{print $3}' | grep #{group}"
       end
 
       def check_iptables_rule rule, table=nil, chain=nil

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/debian/commands_spec.rb

@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
 end
 
 describe commands.check_belonging_group('root', 'wheel') do
-  it { should eq "id root | awk '{print $2}' | grep wheel" }
+  it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
 describe commands.check_iptables_rule('-P INPUT ACCEPT') do

data/spec/gentoo/commands_spec.rb

@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
 end
 
 describe commands.check_belonging_group('root', 'wheel') do
-  it { should eq "id root | awk '{print $2}' | grep wheel" }
+  it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
 describe commands.check_iptables_rule('-P INPUT ACCEPT') do

data/spec/redhat/commands_spec.rb

@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
 end
 
 describe commands.check_belonging_group('root', 'wheel') do
-  it { should eq "id root | awk '{print $2}' | grep wheel" }
+  it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
 describe commands.check_iptables_rule('-P INPUT ACCEPT') do

data/spec/solaris/commands_spec.rb

@@ -87,7 +87,7 @@ describe commands.check_installed_by_gem('jekyll') do
 end
 
 describe commands.check_belonging_group('root', 'wheel') do
-  it { should eq "id root | awk '{print $2}' | grep wheel" }
+  it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
 describe commands.check_zfs('rpool') do

metadata

@@ -1,90 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: serverspec
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 9
-  version: 0.2.9
+version: !ruby/object:Gem::Version
+  version: 0.2.10
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-15 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: RSpec tests for your servers provisioned by Puppet, Chef or anything else
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: RSpec tests for your servers provisioned by Puppet, Chef or anything
+  else
+email:
 - gosukenator@gmail.com
-executables: 
+executables:
 - serverspec-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -152,41 +151,32 @@ files:
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
-has_rdoc: true
 homepage: http://serverspec.org/
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
-test_files: 
+test_files:
 - spec/debian/commands_spec.rb
 - spec/debian/matchers_spec.rb
 - spec/gentoo/commands_spec.rb