specinfra 2.0.0.beta11 → 2.0.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e7da43f292ae565ce7e036cf0e01f84f3948074
-  data.tar.gz: 43299654571faa8d17c225e5f50e19b74a66bf09
+  metadata.gz: 7e83660b824856312827345a04517188e064c1e6
+  data.tar.gz: ecf35e4263f0b93b3a9db776bab43c0ebc207081
 SHA512:
-  metadata.gz: 6e73ccb0b53cce1b47f21757701fd1546c4533bca4add49bf81db69a56034e1149ff83751f4e9a89d51c9d6ffd2f0735d84db502592a582234e4ddae3c8bc514
-  data.tar.gz: be93932a402895870109593780bfd613ffd0f724a23e5ee75fb71cb550fac601be0e6ffc6168552229643ff5dcb2c665c319269fc9df86e6bdd5928f2156df3b
+  metadata.gz: eb2b8b616fa33bb47882acd858c0a0ac46db3f2b50209863ad639c3b0dc679d7ad8d885056d9b3791677646544774e2a10451af06b0fcaee2a9c16d4cfa5388e
+  data.tar.gz: 60d9cb2c010eae33245ee8737267e012554bf538c6cf352ba5b5262701b017cf90681033d2b4a1071b0680804851b0722393227b9bd100612cf238222960a67a

data/lib/specinfra/command/aix/base/file.rb

@@ -1,10 +1,10 @@
 class Specinfra::Command::Aix::Base::File < Specinfra::Command::Base::File
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     "su -s sh -c \"test -#{access} #{file}\" #{user}"
   end
 
-  def check_mode(file, mode)
-    raise NotImplementedError.new('check_mode is not implemented in Specinfra::Command::AIX::Base::File')
+  def check_has_mode(file, mode)
+    raise NotImplementedError.new('check_has_mode is not implemented in Specinfra::Command::AIX::Base::File')
   end
 
   def check_is_owned_by(file, owner)

data/lib/specinfra/command/aix/base/user.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Aix::Base::User < Specinfra::Command::Base::User
-  def check_is_belonging_to_group(user, group)
+  def check_belongs_to_group(user, group)
     "lsuser -a groups #{escape(user)} | awk -F'=' '{print $2}'| sed -e 's/,/ /g' |grep -w  -- #{escape(group)}"
   end
 

data/lib/specinfra/command/arch/base/file.rb

@@ -1,5 +1,12 @@
 class Specinfra::Command::Arch::Base::File < Specinfra::Command::Linux::Base::File
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     "runuser -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
   end
 end
+
+
+
+
+
+
+

data/lib/specinfra/command/base/file.rb

@@ -11,8 +11,8 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
     "test -S #{escape(file)}"
   end
 
-  def check_contain(file, expected_pattern)
-    "#{check_file_contain_with_regexp(file, expected_pattern)} || #{check_file_contain_with_fixed_strings(file, expected_pattern)}"
+  def check_contains(file, expected_pattern)
+    "#{check_file_contains_with_regexp(file, expected_pattern)} || #{check_file_contains_with_fixed_strings(file, expected_pattern)}"
   end
 
   def check_is_grouped(file, group)
@@ -25,21 +25,21 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
     "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
   end
 
-  def check_mode(file, mode)
+  def check_has_mode(file, mode)
     regexp = "^#{mode}$"
     "stat -c %a #{escape(file)} | grep -- #{escape(regexp)}"
   end
 
-  def check_contain_within(file, expected_pattern, from=nil, to=nil)
+  def check_contains_within(file, expected_pattern, from=nil, to=nil)
     from ||= '1'
     to ||= '$'
     sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-    checker_with_regexp = check_file_contain_with_regexp("-", expected_pattern)
-    checker_with_fixed  = check_file_contain_with_fixed_strings("-", expected_pattern)
+    checker_with_regexp = check_file_contains_with_regexp("-", expected_pattern)
+    checker_with_fixed  = check_file_contains_with_fixed_strings("-", expected_pattern)
     "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
   end
 
-  def check_contain_lines(file, expected_lines, from=nil, to=nil)
+  def check_contains_lines(file, expected_lines, from=nil, to=nil)
     require 'digest/md5'
     from ||= '1'
     to ||= '$'
@@ -50,11 +50,11 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
     "#{sed} | grep -A #{escape(afterwards_length)} -F -- #{escape(head_line)} | md5sum | grep -qiw -- #{escape(lines_checksum)}"
   end
 
-  def check_contain_with_regexp(file, expected_pattern)
+  def check_contains_with_regexp(file, expected_pattern)
     "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
   end
 
-  def check_contain_with_fixed_strings(file, expected_pattern)
+  def check_contains_with_fixed_strings(file, expected_pattern)
     "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
   end
 

data/lib/specinfra/command/base/user.rb

@@ -3,11 +3,11 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
     "id #{escape(user)}"
   end
 
-  def check_is_belonging_to_group(user, group)
+  def check_belongs_to_group(user, group)
     "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
   end
 
-  def check_is_belonging_to_primary_group(user, group)
+  def check_belongs_to_primary_group(user, group)
     "id -gn #{escape(user)}| grep ^#{escape(group)}$"
   end
 

data/lib/specinfra/command/darwin/base/file.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Darwin::Base::File < Specinfra::Command::Base::File
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     "sudo -u #{user} -s /bin/test -#{access} #{file}"
   end
 
@@ -15,7 +15,7 @@ class Specinfra::Command::Darwin::Base::File < Specinfra::Command::Base::File
     "stat -f %Y #{escape(link)} | grep -- #{escape(target)}"
   end
 
-  def check_mode(file, mode)
+  def check_has_mode(file, mode)
     regexp = "^#{mode}$"
     "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
   end

data/lib/specinfra/command/freebsd/base/file.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Freebsd::Base::File < Specinfra::Command::Base::File
-  def check_mode(file, mode)
+  def check_has_mode(file, mode)
     regexp = "^#{mode}$"
     "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
   end

data/lib/specinfra/command/linux/base/file.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Linux::Base::File < Specinfra::Command::Base::File
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     "su -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
   end
 

data/lib/specinfra/command/linux/base/interface.rb

@@ -3,7 +3,7 @@ class Specinfra::Command::Linux::Base::Interface < Specinfra::Command::Base::Int
     "ethtool #{name} | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\\/s/,\"\\\\1\",\"\")}'"
   end
 
-  def check_ipv4_address(interface, ip_address)
+  def check_has_ipv4_address(interface, ip_address)
     ip_address = ip_address.dup
     if ip_address =~ /\/\d+$/
       ip_address << " "

data/lib/specinfra/command/linux/base/selinux.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selinux
-  def check_mode(mode)
+  def check_has_mode(mode)
     cmd =  ""
     cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
     cmd += "getenforce | grep -i -- #{escape(mode)} "
@@ -8,3 +8,5 @@ class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selin
     cmd
   end
 end
+
+

data/lib/specinfra/command/openbsd/base/file.rb

@@ -13,7 +13,7 @@ class Specinfra::Command::Openbsd::Base::File < Specinfra::Command::Base::File
     "stat -f %Y #{escape(link)} | grep -- #{escape(target)}"
   end
 
-  def check_mode(file, mode)
+  def check_has_mode(file, mode)
     regexp = "^#{mode}$"
     "stat -f%Lp #{escape(file)} | grep #{escape(regexp)}"
   end

data/lib/specinfra/command/openbsd/base/interface.rb

@@ -3,7 +3,14 @@ class Specinfra::Command::Openbsd::Base::Interface < Specinfra::Command::Base::I
     "ifconfig #{name} | grep 'media\:' | perl -pe 's|.*media\:.*\\((.*?)\\)|\\1|'"
   end
 
-  def check_ipv4_address(interface, ip_address)
+  def check_has_ipv4_address(interface, ip_address)
     "ifconfig #{interface} | grep -w inet | cut -d ' ' -f 2"
   end
 end
+
+
+
+
+
+
+

data/lib/specinfra/command/redhat/base/file.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Redhat::Base::File < Specinfra::Command::Linux::Base::File
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     # Redhat-specific
     "runuser -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
   end

data/lib/specinfra/command/solaris/base/file.rb

@@ -1,14 +1,14 @@
 class Specinfra::Command::Solaris::Base::File < Specinfra::Command::Base::File
-  def check_contain_within(file, expected_pattern, from=nil, to=nil)
+  def check_contains_within(file, expected_pattern, from=nil, to=nil)
     from ||= '1'
     to ||= '$'
     sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-    checker_with_regexp = check_file_contain_with_regexp("/dev/stdin", expected_pattern)
-    checker_with_fixed  = check_file_contain_with_fixed_strings("/dev/stdin", expected_pattern)
+    checker_with_regexp = check_file_contains_with_regexp("/dev/stdin", expected_pattern)
+    checker_with_fixed  = check_file_contains_with_fixed_strings("/dev/stdin", expected_pattern)
     "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
   end
 
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     # http://docs.oracle.com/cd/E23823_01/html/816-5166/su-1m.html
     ## No need for login shell as it seems that behavior as superuser is favorable for us, but needs
     ## to be better tested under real solaris env

data/lib/specinfra/command/solaris/base/user.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Solaris::Base::User < Specinfra::Command::Base::User
-  def check_is_belonging_to_group(user, group)
+  def check_belongs_to_group(user, group)
     "id -Gn #{escape(user)} | grep -- #{escape(group)}"
   end
 

data/lib/specinfra/command/solaris/v10/file.rb

@@ -1,6 +1,6 @@
 class Specinfra::Command::Solaris::V10::File < Specinfra::Command::Solaris::Base::File
   # reference: http://perldoc.perl.org/functions/stat.html
-  def check_mode(file, mode)
+  def check_has_mode(file, mode)
     regexp = "^#{mode}$"
     "perl -e 'printf \"%o\", (stat shift)[2]&07777' #{escape(file)}  | grep -- #{escape(regexp)}"
   end

data/lib/specinfra/command/solaris/v10/user.rb

@@ -1,5 +1,5 @@
 class Specinfra::Command::Solaris::V10::User < Specinfra::Command::Solaris::Base::User
-  def check_is_belonging_to_group(user, group)
+  def check_belongs_to_group(user, group)
     "id -ap #{escape(user)} | grep -- #{escape(group)}"
   end
 

data/lib/specinfra/command/windows/base/file.rb

@@ -38,7 +38,7 @@ class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Bas
     "[Io.File]::ReadAllText('#{file}')"
   end
   
-  def check_access_by_user(file, user, access)
+  def check_is_accessible_by_user(file, user, access)
     case access
     when 'r'
       check_is_readable(file, user)
@@ -70,13 +70,13 @@ class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Bas
     end
   end
 
-  def check_contain(file, pattern)
+  def check_contains(file, pattern)
     Backend::PowerShell::Command.new do
       exec "[Io.File]::ReadAllText('#{file}') -match '#{convert_regexp(pattern)}'"
     end
   end
 
-  def check_contain_within file, pattern, from=nil, to=nil
+  def check_contains_within file, pattern, from=nil, to=nil
     from ||= '^'
     to ||= '$'
     Backend::PowerShell::Command.new do
@@ -85,7 +85,7 @@ class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Bas
     end
   end
 
-  def check_version(name,version)
+  def check_has_version(name,version)
     cmd = "((Get-Command '#{name}').FileVersionInfo.ProductVersion -eq '#{version}') -or ((Get-Command '#{name}').FileVersionInfo.FileVersion -eq '#{version}')"
     Backend::PowerShell::Command.new { exec cmd }
   end
@@ -96,8 +96,3 @@ class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Bas
   end
 
 end
-
-
-
-
-

data/lib/specinfra/command/windows/base/user.rb

@@ -7,7 +7,7 @@ class Specinfra::Command::Windows::Base::User < Specinfra::Command::Windows::Bas
     end
   end
 
-  def check_is_belonging_to_group(user, group)
+  def check_belongs_to_group(user, group)
     user_id, user_domain = windows_account user
     group_id, group_domain = windows_account group
     Backend::PowerShell::Command.new do

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta11"
+  VERSION = "2.0.0.beta12"
 end

data/wercker.yml

@@ -1,4 +1,4 @@
-box: mizzy/serverspec-base
+box: mizzy/serverspec-base@0.0.3
 build:
   steps:
     - script:
@@ -34,6 +34,18 @@ build:
         name: Run rake spec:centos65
         code: rake spec:centos65
         cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant up centos70
+        code: vagrant up centos70 --provider=digital_ocean
+        cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant reload centos70
+        code: vagrant reload centos70
+        cwd: $WORKING_DIR
+    - script:
+        name: Run rake spec:centos70
+        code: rake spec:centos70
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant up ubuntu1404
         code: vagrant up ubuntu1404 --provider=digital_ocean
@@ -49,12 +61,8 @@ build:
 
   after-steps:
     - script:
-        name: Run vagrant destroy centos65
-        code: vagrant destroy centos65 --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: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta11
+  version: 2.0.0.beta12
 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: net-ssh