specinfra 2.0.0.beta15 → 2.0.0.beta16

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

@@ -1,19 +1,20 @@
 class Specinfra::Command::Solaris::Base::Service < Specinfra::Command::Base::Service
-  def check_is_enabled(service, level=nil)
-    "svcs -l #{escape(service)} 2> /dev/null | egrep '^enabled *true$'"
-  end
+  class << self
+    def check_is_enabled(service, level=nil)
+      "svcs -l #{escape(service)} 2> /dev/null | egrep '^enabled *true$'"
+    end
 
-  def check_running(service)
-    "svcs -l #{escape(service)} status 2> /dev/null | egrep '^state *online$'"
-  end
+    def check_running(service)
+      "svcs -l #{escape(service)} status 2> /dev/null | egrep '^state *online$'"
+    end
 
-  def check_has_property(svc, property)
-    commands = []
-    property.sort.each do |key, value|
-      regexp = "^#{value}$"
-      commands << "svcprop -p #{escape(key)} #{escape(svc)} | grep -- #{escape(regexp)}"
+    def check_has_property(svc, property)
+      commands = []
+      property.sort.each do |key, value|
+        regexp = "^#{value}$"
+        commands << "svcprop -p #{escape(key)} #{escape(svc)} | grep -- #{escape(regexp)}"
+      end
+      commands.join(' && ')
     end
-    commands.join(' && ')
   end
-
 end

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

@@ -1,13 +1,15 @@
 class Specinfra::Command::Solaris::Base::User < Specinfra::Command::Base::User
-  def check_belongs_to_group(user, group)
-    "id -Gn #{escape(user)} | grep -- #{escape(group)}"
-  end
+  class << self
+    def check_belongs_to_group(user, group)
+      "id -Gn #{escape(user)} | grep -- #{escape(group)}"
+    end
 
-  def check_has_home_directory(user, path_to_home)
-    "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep -w -- #{escape(path_to_home)}"
-  end
+    def check_has_home_directory(user, path_to_home)
+      "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep -w -- #{escape(path_to_home)}"
+    end
 
-  def check_has_login_shell(user, path_to_shell)
-    "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep -w -- #{escape(path_to_shell)}"
+    def check_has_login_shell(user, path_to_shell)
+      "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep -w -- #{escape(path_to_shell)}"
+    end
   end
 end

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Solaris::Base::Zfs < Specinfra::Command::Base::Zfs
-  include Specinfra::Command::Module::Zfs
+  class << self
+    include Specinfra::Command::Module::Zfs
+  end
 end
 
 

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

@@ -1,40 +1,42 @@
 class Specinfra::Command::Solaris::V10::File < Specinfra::Command::Solaris::Base::File
-  # reference: http://perldoc.perl.org/functions/stat.html
-  def check_has_mode(file, mode)
-    regexp = "^#{mode}$"
-    "perl -e 'printf \"%o\", (stat shift)[2]&07777' #{escape(file)}  | grep -- #{escape(regexp)}"
-  end
+  class << self
+    # reference: http://perldoc.perl.org/functions/stat.html
+    def check_has_mode(file, mode)
+      regexp = "^#{mode}$"
+      "perl -e 'printf \"%o\", (stat shift)[2]&07777' #{escape(file)}  | grep -- #{escape(regexp)}"
+    end
 
-  # reference: http://perldoc.perl.org/functions/stat.html
-  #            http://www.tutorialspoint.com/perl/perl_getpwuid.htm
-  def check_is_owned_by(file, owner)
-    regexp = "^#{owner}$"
-    "perl -e 'printf \"%s\", getpwuid((stat(\"#{escape(file)}\"))[4])' | grep -- #{escape(regexp)}"
-  end
+    # reference: http://perldoc.perl.org/functions/stat.html
+    #            http://www.tutorialspoint.com/perl/perl_getpwuid.htm
+    def check_is_owned_by(file, owner)
+      regexp = "^#{owner}$"
+      "perl -e 'printf \"%s\", getpwuid((stat(\"#{escape(file)}\"))[4])' | grep -- #{escape(regexp)}"
+    end
 
-  # reference: http://perldoc.perl.org/functions/stat.html
-  #            http://www.tutorialspoint.com/perl/perl_getgrgid.htm
-  def check_is_grouped(file, group)
-    regexp = "^#{group}$"
-    "perl -e 'printf \"%s\", getgrgid((stat(\"#{escape(file)}\"))[5])'  | grep -- #{escape(regexp)}"
-  end
+    # reference: http://perldoc.perl.org/functions/stat.html
+    #            http://www.tutorialspoint.com/perl/perl_getgrgid.htm
+    def check_is_grouped(file, group)
+      regexp = "^#{group}$"
+      "perl -e 'printf \"%s\", getgrgid((stat(\"#{escape(file)}\"))[5])'  | grep -- #{escape(regexp)}"
+    end
 
-  # reference: http://www.tutorialspoint.com/perl/perl_readlink.htm
-  def check_is_linked_to(link, target)
-    regexp = "^#{target}$"
-    "perl -e 'printf \"%s\", readlink(\"#{escape(link)}\")' | grep -- #{escape(regexp)}"
-  end
+    # reference: http://www.tutorialspoint.com/perl/perl_readlink.htm
+    def check_is_linked_to(link, target)
+      regexp = "^#{target}$"
+      "perl -e 'printf \"%s\", readlink(\"#{escape(link)}\")' | grep -- #{escape(regexp)}"
+    end
 
-  def check_contain(file, expected_pattern)
-    "grep -- #{escape(expected_pattern)} #{escape(file)}"
-  end
+    def check_contain(file, expected_pattern)
+      "grep -- #{escape(expected_pattern)} #{escape(file)}"
+    end
 
-  def check_has_md5checksum(file, expected)
-    "digest -a md5 -v #{escape(file)} | grep -iw -- #{escape(expected)}"
-  end
+    def check_has_md5checksum(file, expected)
+      "digest -a md5 -v #{escape(file)} | grep -iw -- #{escape(expected)}"
+    end
 
-  # reference: http://perldoc.perl.org/functions/stat.html
-  def get_mode(file)
-    "perl -e 'printf \"%o\", (stat shift)[2]&07777' #{escape(file)}"
+    # reference: http://perldoc.perl.org/functions/stat.html
+    def get_mode(file)
+      "perl -e 'printf \"%o\", (stat shift)[2]&07777' #{escape(file)}"
+    end
   end
 end

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Solaris::V10::Group < Specinfra::Command::Solaris::Base::Group
-  def check_exists(group)
-    "getent group | grep -w -- #{escape(group)}"
+  class << self
+    def check_exists(group)
+      "getent group | grep -w -- #{escape(group)}"
+    end
   end
 end

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

@@ -1,11 +1,13 @@
 class Specinfra::Command::Solaris::V10::Host < Specinfra::Command::Solaris::Base::Host
-  def check_is_reachable(host, port, proto, timeout)
-    if port.nil?
-      "ping -n #{escape(host)} #{escape(timeout)}"
-    elsif proto == 'tcp'
-      "echo 'quit' | mconnect -p #{escape(port)} #{escape(host)} > /dev/null 2>&1"
-    else
-      raise NotImplementedError.new
+  class << self
+    def check_is_reachable(host, port, proto, timeout)
+      if port.nil?
+        "ping -n #{escape(host)} #{escape(timeout)}"
+      elsif proto == 'tcp'
+        "echo 'quit' | mconnect -p #{escape(port)} #{escape(host)} > /dev/null 2>&1"
+      else
+        raise NotImplementedError.new
+      end
     end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Solaris::V10::Package < Specinfra::Command::Solaris::Base::Package
-  def check_is_installed(package, version=nil)
-    cmd = "pkginfo -q  #{escape(package)}"
-    if version
-      cmd = "#{cmd} | grep -- #{escape(version)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      cmd = "pkginfo -q  #{escape(package)}"
+      if version
+        cmd = "#{cmd} | grep -- #{escape(version)}"
+      end
+      cmd
     end
-    cmd
   end
 end

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

@@ -1,11 +1,13 @@
 class Specinfra::Command::Solaris::V10::User < Specinfra::Command::Solaris::Base::User
-  def check_belongs_to_group(user, group)
-    "id -ap #{escape(user)} | grep -- #{escape(group)}"
-  end
+  class << self
+    def check_belongs_to_group(user, group)
+      "id -ap #{escape(user)} | grep -- #{escape(group)}"
+    end
 
-  def check_has_authorized_key(user, key)
-    key.sub!(/\s+\S*$/, '') if key.match(/^\S+\s+\S+\s+\S*$/)
-    "grep -- #{escape(key)} ~#{escape(user)}/.ssh/authorized_keys"
+    def check_has_authorized_key(user, key)
+      key.sub!(/\s+\S*$/, '') if key.match(/^\S+\s+\S+\s+\S*$/)
+      "grep -- #{escape(key)} ~#{escape(user)}/.ssh/authorized_keys"
+    end
   end
 end
 

data/lib/specinfra/command/suse/base/package.rb

@@ -1,19 +1,21 @@
 class Specinfra::Command::Suse::Base::Package < Specinfra::Command::Linux::Base::Package
-  def check_is_installed(package,version=nil)
-    cmd = "rpm -q #{escape(package)}"
-    if version
-      cmd = "#{cmd} | grep -w -- #{escape(version)}"
+  class << self
+    def check_is_installed(package,version=nil)
+      cmd = "rpm -q #{escape(package)}"
+      if version
+        cmd = "#{cmd} | grep -w -- #{escape(version)}"
+      end
+      cmd
     end
-    cmd
-  end
 
-  alias :check_is_installed_by_rpm :check_is_installed
+    alias :check_is_installed_by_rpm :check_is_installed
 
-  def install(package)
-    cmd = "zypper -n install #{package}"
-  end
+    def install(package)
+      cmd = "zypper -n install #{package}"
+    end
 
-  def get_version(package, opts=nil)
-    "rpm -qi #{package} | grep Version | awk '{print $3}'"
+    def get_version(package, opts=nil)
+      "rpm -qi #{package} | grep Version | awk '{print $3}'"
+    end
   end
 end

data/lib/specinfra/command/suse/base/service.rb

@@ -1,6 +1,8 @@
 class Specinfra::Command::Suse::Base::Service < Specinfra::Command::Linux::Base::Service
-  def check_is_enabled(service, level=3)
-    "chkconfig --list #{escape(service)} | grep #{level}:on"
+  class << self
+    def check_is_enabled(service, level=3)
+      "chkconfig --list #{escape(service)} | grep #{level}:on"
+    end
   end
 end
 

data/lib/specinfra/command/ubuntu/base/ppa.rb

@@ -1,15 +1,17 @@
 class Specinfra::Command::Ubuntu::Base::Ppa < Specinfra::Command::Debian::Base::Ppa
-  def check_exists(package)
-    %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
-  end
+  class << self
+    def check_exists(package)
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+    end
 
-  def check_is_enabled(package)
-    %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
-  end
+    def check_is_enabled(package)
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+    end
 
-  private
+    private
 
-  def to_apt_line_uri(repo)
-    escape(repo.gsub(/^ppa:/,''))
+    def to_apt_line_uri(repo)
+      escape(repo.gsub(/^ppa:/,''))
+    end
   end
 end

data/lib/specinfra/command/ubuntu/base/service.rb

@@ -1,5 +1,7 @@
 class Specinfra::Command::Ubuntu::Base::Service < Specinfra::Command::Debian::Base::Service
-  def check_is_running(service)
-    "service #{escape(service)} status && service #{escape(service)} status | grep 'running'"
+  class << self
+    def check_is_running(service)
+      "service #{escape(service)} status && service #{escape(service)} status | grep 'running'"
+    end
   end
 end

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

@@ -1,14 +1,15 @@
 class Specinfra::Command::Windows::Base
-  def self.create
-    self.new
-  end
+  class << self
+    def create
+      self
+    end
 
-  private
-  def windows_account account
-    match = /((.+)\\)?(.+)/.match account
-    domain = match[2]
-    name = match[3]
-    [name, domain]
+    private
+    def windows_account account
+      match = /((.+)\\)?(.+)/.match account
+      domain = match[2]
+      name = match[3]
+      [name, domain]
+    end
   end
-
 end

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

@@ -1,14 +1,16 @@
 class Specinfra::Command::Windows::Base::Feature < Specinfra::Command::Windows::Base
-  def check_is_enabled(name,provider)
-    if provider.nil?
-      cmd =  "@(ListWindowsFeatures -feature #{name}).count -gt 0"
-    else
-      cmd =  "@(ListWindowsFeatures -feature #{name} -provider #{provider}).count -gt 0"
-    end
+  class << self
+    def check_is_enabled(name,provider)
+      if provider.nil?
+        cmd =  "@(ListWindowsFeatures -feature #{name}).count -gt 0"
+      else
+        cmd =  "@(ListWindowsFeatures -feature #{name} -provider #{provider}).count -gt 0"
+      end
 
-    Backend::PowerShell::Command.new do
-      using 'list_windows_features.ps1'
-      exec cmd
+      Backend::PowerShell::Command.new do
+        using 'list_windows_features.ps1'
+        exec cmd
+      end
     end
   end
 end

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

@@ -1,98 +1,99 @@
 class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Base
-  def check_is_file(file)
-    cmd = item_has_attribute file, 'Archive'
-    Backend::PowerShell::Command.new do
-      exec cmd
+  class << self
+    def check_is_file(file)
+      cmd = item_has_attribute file, 'Archive'
+      Backend::PowerShell::Command.new do
+        exec cmd
+      end
     end
-  end
 
-  def check_is_directory(dir)
-    cmd = item_has_attribute dir, 'Directory'
-    Backend::PowerShell::Command.new do
-      exec cmd
+    def check_is_directory(dir)
+      cmd = item_has_attribute dir, 'Directory'
+      Backend::PowerShell::Command.new do
+        exec cmd
+      end
     end
-  end
 
-  def check_is_hidden(file)
-    cmd = item_has_attribute file, 'Hidden'
-    Backend::PowerShell::Command.new do
-      exec cmd
+    def check_is_hidden(file)
+      cmd = item_has_attribute file, 'Hidden'
+      Backend::PowerShell::Command.new do
+        exec cmd
+      end
     end
-  end
 
-  def check_is_readonly(file)
-    cmd = item_has_attribute file, 'ReadOnly'
-    Backend::PowerShell::Command.new do
-      exec cmd
+    def check_is_readonly(file)
+      cmd = item_has_attribute file, 'ReadOnly'
+      Backend::PowerShell::Command.new do
+        exec cmd
+      end
     end
-  end
 
-  def check_is_system(file)
-    cmd = item_has_attribute file, 'System'
-    Backend::PowerShell::Command.new do
-      exec cmd
+    def check_is_system(file)
+      cmd = item_has_attribute file, 'System'
+      Backend::PowerShell::Command.new do
+        exec cmd
+      end
     end
-  end
   
-  def get_content(file)
-    "[Io.File]::ReadAllText('#{file}')"
-  end
+    def get_content(file)
+      "[Io.File]::ReadAllText('#{file}')"
+    end
   
-  def check_is_accessible_by_user(file, user, access)
-    case access
-    when 'r'
-      check_is_readable(file, user)
-    when 'w'
-      check_is_writable(file, user)
-    when 'x'
-      check_is_executable(file, user)
+    def check_is_accessible_by_user(file, user, access)
+      case access
+      when 'r'
+        check_is_readable(file, user)
+      when 'w'
+        check_is_writable(file, user)
+      when 'x'
+        check_is_executable(file, user)
+      end
     end
-  end
 
-  def check_is_readable(file, by_whom)
-    Backend::PowerShell::Command.new do
-      using 'check_file_access_rules.ps1'
-      exec "CheckFileAccessRules -path '#{file}' -identity '#{get_identity by_whom}' -rules @('FullControl', 'Modify', 'ReadAndExecute', 'Read', 'ListDirectory')"
+    def check_is_readable(file, by_whom)
+      Backend::PowerShell::Command.new do
+        using 'check_file_access_rules.ps1'
+        exec "CheckFileAccessRules -path '#{file}' -identity '#{get_identity by_whom}' -rules @('FullControl', 'Modify', 'ReadAndExecute', 'Read', 'ListDirectory')"
+      end
     end
-  end
 
-  def check_is_writable(file, by_whom)
-    Backend::PowerShell::Command.new do
-      using 'check_file_access_rules.ps1'
-      exec "CheckFileAccessRules -path '#{file}' -identity '#{get_identity by_whom}' -rules @('FullControl', 'Modify', 'Write')"
+    def check_is_writable(file, by_whom)
+      Backend::PowerShell::Command.new do
+        using 'check_file_access_rules.ps1'
+        exec "CheckFileAccessRules -path '#{file}' -identity '#{get_identity by_whom}' -rules @('FullControl', 'Modify', 'Write')"
+      end
     end
-  end
 
-  def check_is_executable(file, by_whom)
-    Backend::PowerShell::Command.new do
-      using 'check_file_access_rules.ps1'
-      exec "CheckFileAccessRules -path '#{file}' -identity '#{get_identity by_whom}' -rules @('FullControl', 'Modify', 'ReadAndExecute', 'ExecuteFile')"
+    def check_is_executable(file, by_whom)
+      Backend::PowerShell::Command.new do
+        using 'check_file_access_rules.ps1'
+        exec "CheckFileAccessRules -path '#{file}' -identity '#{get_identity by_whom}' -rules @('FullControl', 'Modify', 'ReadAndExecute', 'ExecuteFile')"
+      end
     end
-  end
 
-  def check_contains(file, pattern)
-    Backend::PowerShell::Command.new do
-      exec "[Io.File]::ReadAllText('#{file}') -match '#{convert_regexp(pattern)}'"
+    def check_contains(file, pattern)
+      Backend::PowerShell::Command.new do
+        exec "[Io.File]::ReadAllText('#{file}') -match '#{convert_regexp(pattern)}'"
+      end
     end
-  end
 
-  def check_contains_within file, pattern, from=nil, to=nil
-    from ||= '^'
-    to ||= '$'
-    Backend::PowerShell::Command.new do
-      using 'crop_text.ps1'
-      exec %Q[(CropText -text ([Io.File]::ReadAllText('#{file}')) -fromPattern '#{convert_regexp(from)}' -toPattern '#{convert_regexp(to)}') -match '#{pattern}']
+    def check_contains_within file, pattern, from=nil, to=nil
+      from ||= '^'
+      to ||= '$'
+      Backend::PowerShell::Command.new do
+        using 'crop_text.ps1'
+        exec %Q[(CropText -text ([Io.File]::ReadAllText('#{file}')) -fromPattern '#{convert_regexp(from)}' -toPattern '#{convert_regexp(to)}') -match '#{pattern}']
+      end
     end
-  end
 
-  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
+    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
 
-  private
-  def item_has_attribute item, attribute
-    "((Get-Item -Path '#{item}' -Force).attributes.ToString() -Split ', ') -contains '#{attribute}'"
+    private
+    def item_has_attribute item, attribute
+      "((Get-Item -Path '#{item}' -Force).attributes.ToString() -Split ', ') -contains '#{attribute}'"
+    end
   end
-
 end