serverspec 0.3.1 → 0.3.2

data/lib/serverspec/commands/darwin.rb

@@ -9,6 +9,25 @@ module Serverspec
         "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
       end
 
+      def check_mode file, mode
+        regexp = "^#{mode}$"
+        "stat -f %A #{escape(file)} | grep -- #{escape(regexp)}"
+      end
+
+      def check_owner file, owner
+        regexp = "^#{owner}$"
+        "stat -f %Su #{escape(file)} | grep -- #{escape(regexp)}"
+      end
+
+      def check_grouped file, group
+        regexp = "^#{group}$"
+        "stat -f %Sg #{escape(file)} | grep -- #{escape(regexp)}"
+      end
+
+      def get_mode(file)
+        "stat -f %A #{escape(file)}"
+      end
+
       def check_access_by_user file, user, access
         "sudo -u #{user} -s /bin/test -#{access} #{file}"
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/darwin/commands_spec.rb

@@ -110,22 +110,21 @@ end
 describe 'check_file_md5checksum', :os => :darwin do
   subject { commands.check_file_md5checksum('/usr/bin/rsync', '03ba2dcdd50ec3a7a45d3900902a83ce') }
   it { should eq "openssl md5 /usr/bin/rsync | cut -d'=' -f2 | cut -c 2- | grep -E ^03ba2dcdd50ec3a7a45d3900902a83ce$" }
-  it { should_not eq "openssl md5 /usr/bin/rsync | cut -d'=' -f2 | cut -c 2- | grep -E ^03ba2dcdd50ec3a7a45d3900902a83c" }
 end
 
 describe 'check_mode', :os => :darwin do
   subject { commands.check_mode('/etc/sudoers', 440) }
-  it { should eq 'stat -c %a /etc/sudoers | grep -- \\^440\\$' }
+  it { should eq 'stat -f %A /etc/sudoers | grep -- \\^440\\$' }
 end
 
 describe 'check_owner', :os => :darwin do
   subject { commands.check_owner('/etc/passwd', 'root') }
-  it { should eq 'stat -c %U /etc/passwd | grep -- \\^root\\$' }
+  it { should eq 'stat -f %Su /etc/passwd | grep -- \\^root\\$' }
 end
 
 describe 'check_grouped', :os => :darwin do
   subject { commands.check_grouped('/etc/passwd', 'wheel') }
-  it { should eq 'stat -c %G /etc/passwd | grep -- \\^wheel\\$' }
+  it { should eq 'stat -f %Sg /etc/passwd | grep -- \\^wheel\\$' }
 end
 
 describe 'check_cron_entry', :os => :darwin do
@@ -188,7 +187,7 @@ end
 
 describe 'get_mode', :os => :darwin do
   subject { commands.get_mode('/dev') }
-  it { should eq 'stat -c %a /dev' }
+  it { should eq 'stat -f %A /dev' }
 end
 
 describe 'check_access_by_user', :os => :darwin do

metadata

@@ -1,104 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: serverspec
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-14 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-14 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
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   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: highline
+  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: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-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
@@ -193,41 +194,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/darwin/commands_spec.rb
 - spec/darwin/matchers_spec.rb
 - spec/debian/commands_spec.rb