serverspec 2.0.0.beta12 → 2.0.0.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb680a827d43bb8fb406134a26494c1e3efbc65f
-  data.tar.gz: da77751a48806ae531b1932f7ce6057e816baa3d
+  metadata.gz: dfe900aaf63d9ca678daab329a9f1a8bf938e158
+  data.tar.gz: 979acbe1e6086adbf4dfaedce62ea1467c9b04ad
 SHA512:
-  metadata.gz: c8a4a6b768c9fc9b08334d0d655d29950a73e3c1192cb241093ac694f81c095d85ff52d971e7d90409372630dfee6290b1f3b9de4434bc4054d7da073df31cc5
-  data.tar.gz: 62ab1044d043f9f7b955a321b61a99b3a8dfbfbc9e0aa0cd5ad8f319bd6acbe26cfb6b1478f3462962136f3a7eba333d995e676175a962c7436739f5d08d9412
+  metadata.gz: 0ac4886d3067ee1491102ea4e2072d7083e0fd0f41eab7342fce6a797fa7974243a8fc24a0a5ef71bd940e23362f65e4bcdf9a5a3d46bd93079b18717baa4c30
+  data.tar.gz: 4ec79e587099951c3f1c721d747491f76636f06940f5ce34f02b3ea00ccb96b894825b159a361b95eafcccd806c0c5d84889692ffa5dda1a676ec8f7536b9539

data/lib/serverspec/type/file.rb

@@ -19,18 +19,18 @@ module Serverspec
 
       def contain(pattern, from, to)
         if pattern.is_a?(Array)
-          @runner.check_file_contain_lines(@name, pattern, from, to)
+          @runner.check_file_contains_lines(@name, pattern, from, to)
         else
           if (from || to).nil?
-            @runner.check_file_contain(@name, pattern)
+            @runner.check_file_contains(@name, pattern)
           else
-            @runner.check_file_contain_within(@name, pattern, from, to)
+            @runner.check_file_contains_within(@name, pattern, from, to)
           end
         end
       end
 
       def mode?(mode)
-        @runner.check_file_mode(@name, mode)
+        @runner.check_file_has_mode(@name, mode)
       end
 
       def owned_by?(owner)
@@ -47,7 +47,7 @@ module Serverspec
 
       def readable?(by_whom, by_user)
         if by_user != nil
-          @runner.check_file_access_by_user(@name, by_user, 'r')
+          @runner.check_file_is_accessible_by_user(@name, by_user, 'r')
         else
           @runner.check_file_is_readable(@name, by_whom)
         end
@@ -55,7 +55,7 @@ module Serverspec
 
       def writable?(by_whom, by_user)
         if by_user != nil
-          @runner.check_file_access_by_user(@name, by_user, 'w')
+          @runner.check_file_is_accessible_by_user(@name, by_user, 'w')
         else
           @runner.check_file_is_writable(@name, by_whom)
         end
@@ -63,7 +63,7 @@ module Serverspec
 
       def executable?(by_whom, by_user)
         if by_user != nil
-          @runner.check_file_access_by_user(@name, by_user, 'x')
+          @runner.check_file_is_accessible_by_user(@name, by_user, 'x')
         else
           @runner.check_file_is_executable(@name, by_whom)
         end
@@ -97,7 +97,7 @@ module Serverspec
       end
 
       def version?(version)
-        @runner.check_file_version(@name, version)
+        @runner.check_file_has_version(@name, version)
       end
 
       def mtime

data/lib/serverspec/type/interface.rb

@@ -9,7 +9,7 @@ module Serverspec
       end
 
       def has_ipv4_address?(ip_address)
-        @runner.check_interface_ipv4_address(@name, ip_address)
+        @runner.check_interface_has_ipv4_address(@name, ip_address)
       end
     end
   end

data/lib/serverspec/type/selinux.rb

@@ -2,15 +2,15 @@ module Serverspec
   module Type
     class Selinux < Base
       def disabled?
-        @runner.check_selinux_mode('disabled')
+        @runner.check_selinux_has_mode('disabled')
       end
 
       def enforcing?
-        @runner.check_selinux_mode('enforcing')
+        @runner.check_selinux_has_mode('enforcing')
       end
 
       def permissive?
-        @runner.check_selinux_mode('permissive')
+        @runner.check_selinux_has_mode('permissive')
       end
 
       def to_s
@@ -19,3 +19,5 @@ module Serverspec
     end
   end
 end
+
+

data/lib/serverspec/type/user.rb

@@ -6,11 +6,11 @@ module Serverspec
       end
 
       def belongs_to_group?(group)
-        @runner.check_user_is_belonging_to_group(@name, group)
+        @runner.check_user_belongs_to_group(@name, group)
       end
 
       def belongs_to_primary_group?(group)
-        backend.check_belonging_primary_group(@name, group)
+        backend.check_user_belongs_to_primary_group(@name, group)
       end
 
       def has_uid?(uid)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta12"
+  VERSION = "2.0.0.beta13"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta11"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta12"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/type/base/user_spec.rb

@@ -18,6 +18,10 @@ describe user('root') do
   it { should belong_to_group 'root' }
 end
 
+describe user('root') do
+  it { should belong_to_primary_group 'root' }
+end
+
 describe user('root') do
   it { should_not belong_to_group 'invalid-group' }
 end

data/wercker.yml

@@ -1,4 +1,4 @@
-box: mizzy/serverspec-base
+box: mizzy/serverspec-base@0.0.3
 build:
   steps:
     - script:
@@ -61,16 +61,8 @@ build:
 
   after-steps:
     - script:
-        name: Run vagrant destroy centos65
-        code: vagrant destroy centos65 --force
-        cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant destroy centos70
-        code: vagrant destroy centos70 --force
-        cwd: $WORKING_DIR
-    - script:
-        name: Run vagrant destroy ubuntu1404
-        code: vagrant destroy ubuntu1404 --force
+        name: Run vagrant destroy
+        code: vagrant destroy --force
         cwd: $WORKING_DIR
     - 1syo/idobata-notify@0.1.1:
         token: $IDOBATA_TOKEN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta12
+  version: 2.0.0.beta13
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta11
+        version: 2.0.0.beta12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta11
+        version: 2.0.0.beta12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement