specinfra 2.0.0.beta15 → 2.0.0.beta16

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

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

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Openbsd::Base::MailAlias < Specinfra::Command::Base::MailAlias
-  def check_is_aliased_to(recipient, target)
-    "egrep '^#{escape(recipient)}:.*#{escape(target)}' /etc/mail/aliases"
+  class << self
+    def check_is_aliased_to(recipient, target)
+      "egrep '^#{escape(recipient)}:.*#{escape(target)}' /etc/mail/aliases"
+    end
   end
 end

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

@@ -1,13 +1,15 @@
 class Specinfra::Command::Openbsd::Base::Package < Specinfra::Command::Base::Package
-  def check_is_installed(package, version=nil)
-    if version
-      "pkg_info -a | cut -d ' ' -f 1 | grep  #{escape(package)}-#{escape(version)}"
-    else
-      "pkg_info -a | cut -d ' ' -f 1 | grep  #{escape(package)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      if version
+        "pkg_info -a | cut -d ' ' -f 1 | grep  #{escape(package)}-#{escape(version)}"
+      else
+        "pkg_info -a | cut -d ' ' -f 1 | grep  #{escape(package)}"
+      end
     end
-  end
 
-  def install(package)
-    "pkg_add #{package}"
+    def install(package)
+      "pkg_add #{package}"
+    end
   end
 end

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Openbsd::Base::Port < Specinfra::Command::Base::Port
-  def check_is_listening(port, opts={})
-    "netstat -nat -f inet | egrep '((tcp|udp).*\.#{port}.*LISTEN$)'"
+  class << self
+    def check_is_listening(port, opts={})
+      "netstat -nat -f inet | egrep '((tcp|udp).*\.#{port}.*LISTEN$)'"
+    end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Openbsd::Base::Service < Specinfra::Command::Base::Service
-  def check_is_enabled(service, level=nil)
-    "egrep '(#{escape(service)}_flags=|^pkg_scripts=\"(.*)#{escape(service)}(.*)\")' /etc/rc.conf.local | grep -v \=NO"
-  end
+  class << self
+    def check_is_enabled(service, level=nil)
+      "egrep '(#{escape(service)}_flags=|^pkg_scripts=\"(.*)#{escape(service)}(.*)\")' /etc/rc.conf.local | grep -v \=NO"
+    end
 
-  def check_is_running(service)
-    "/etc/rc.d/#{escape(service)} status"
+    def check_is_running(service)
+      "/etc/rc.d/#{escape(service)} status"
+    end
   end
 end

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

@@ -1,10 +1,12 @@
 class Specinfra::Command::Openbsd::Base::User < Specinfra::Command::Base::User
-  def check_has_login_shell(user, path_to_shell)
-    "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep #{escape(path_to_shell)}"
-  end
-
-  def check_has_home_directory(user, path_to_home)
-    "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep #{escape(path_to_home)}"
+  class << self
+    def check_has_login_shell(user, path_to_shell)
+      "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep #{escape(path_to_shell)}"
+    end
+
+    def check_has_home_directory(user, path_to_home)
+      "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep #{escape(path_to_home)}"
+    end
   end
 end
 

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

@@ -1,3 +1,5 @@
 class Specinfra::Command::Opensuse::Base::Service < Specinfra::Command::Suse::Base::Service
-  include Specinfra::Command::Module::Systemd
+  class << self
+    include Specinfra::Command::Module::Systemd
+  end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Plamo::Base::Package < Specinfra::Command::Linux::Base::Package
-  def check_is_installed(package, version=nil)
-    cmd = "ls /var/log/packages/#{escape(package)}"
-    if version
-      cmd = "#{cmd} && grep -E \"PACKAGE NAME:.+#{escape(package)}-#{escape(version)}\" /var/log/packages/#{escape(package)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      cmd = "ls /var/log/packages/#{escape(package)}"
+      if version
+        cmd = "#{cmd} && grep -E \"PACKAGE NAME:.+#{escape(package)}-#{escape(version)}\" /var/log/packages/#{escape(package)}"
+      end
+      cmd
     end
-    cmd
   end
 end

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

@@ -1,8 +1,10 @@
 class Specinfra::Command::Plamo::Base::Service < Specinfra::Command::Linux::Base::Service
-  def check_is_enabled(service, level=3)
-    # This check is not necessarily detected whether service is enabled or not
-    # TODO: check rc.inet2 $SERV variable
-    "test -x /etc/rc.d/init.d/#{escape(service)}"
+  class << self
+    def check_is_enabled(service, level=3)
+      # This check is not necessarily detected whether service is enabled or not
+      # TODO: check rc.inet2 $SERV variable
+      "test -x /etc/rc.d/init.d/#{escape(service)}"
+    end
   end
 end
 

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

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

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

@@ -1,20 +1,22 @@
 class Specinfra::Command::Redhat::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 get_version(package, opts=nil)
-    "rpm -qi #{package} | grep Version | awk '{print $3}'"
-  end
+    def get_version(package, opts=nil)
+      "rpm -qi #{package} | grep Version | awk '{print $3}'"
+    end
 
-  def install(package)
-    cmd = "yum -y install #{package}"
+    def install(package)
+      cmd = "yum -y install #{package}"
+    end
   end
 end
 

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Redhat::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/redhat/base/yumrepo.rb

@@ -1,10 +1,12 @@
 class Specinfra::Command::Redhat::Base::Yumrepo < Specinfra::Command::Linux::Base::Yumrepo
-  def check_exists(repository)
-    "yum repolist all -C | grep ^#{escape(repository)}"
-  end
+  class << self
+    def check_exists(repository)
+      "yum repolist all -C | grep ^#{escape(repository)}"
+    end
 
-  def check_is_enabled(repository)
-    "yum repolist all -C | grep ^#{escape(repository)} | grep enabled"
+    def check_is_enabled(repository)
+      "yum repolist all -C | grep ^#{escape(repository)} | grep enabled"
+    end
   end
 end
 

data/lib/specinfra/command/redhat/v5/iptables.rb

@@ -1,8 +1,10 @@
 class Specinfra::Command::Redhat::V5::Iptables < Specinfra::Command::Redhat::Base::Iptables
-  def check_has_rule(rule, table=nil, chain=nil)
-    cmd =  "iptables-save"
-    cmd += " -t #{escape(table)}" if table
-    cmd += " | grep -- #{escape(rule)}"
-    cmd
+  class << self
+    def check_has_rule(rule, table=nil, chain=nil)
+      cmd =  "iptables-save"
+      cmd += " -t #{escape(table)}" if table
+      cmd += " | grep -- #{escape(rule)}"
+      cmd
+    end
   end
 end

data/lib/specinfra/command/redhat/v7/service.rb

@@ -1,3 +1,5 @@
 class Specinfra::Command::Redhat::V7::Service < Specinfra::Command::Redhat::Base::Service
-  include Specinfra::Command::Module::Systemd
+  class << self
+    include Specinfra::Command::Module::Systemd
+  end
 end

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

@@ -1,13 +1,15 @@
 class Specinfra::Command::Smartos::Base::Package < Specinfra::Command::Solaris::Base::Package
-  def check_is_installed(package, version=nil)
-    cmd = "/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^#{escape(package)}"
-    if version
-      cmd = "#{cmd}-#{escape(version)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      cmd = "/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^#{escape(package)}"
+      if version
+        cmd = "#{cmd}-#{escape(version)}"
+      end
+      cmd
     end
-    cmd
-  end
 
-  def get_version(package, opts=nil)
-    "pkgin list | cut -f 1 -d ' ' | grep -E '^#{escape(package)}-([^-])+$' | grep -Eo '(\\.|\\w)+$'"
+    def get_version(package, opts=nil)
+      "pkgin list | cut -f 1 -d ' ' | grep -E '^#{escape(package)}-([^-])+$' | grep -Eo '(\\.|\\w)+$'"
+    end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Smartos::Base::Service < Specinfra::Command::Solaris::Base::Service
-  def check_is_enabled(service, level=nil)
-    "svcs -l #{escape(service)} 2> /dev/null | grep -wx '^enabled.*true$'"
-  end
+  class << self
+    def check_is_enabled(service, level=nil)
+      "svcs -l #{escape(service)} 2> /dev/null | grep -wx '^enabled.*true$'"
+    end
 
-  def check_is_running(service)
-    "svcs -l #{escape(service)} status 2> /dev/null |grep -wx '^state.*online$'"
+    def check_is_running(service)
+      "svcs -l #{escape(service)} status 2> /dev/null |grep -wx '^state.*online$'"
+    end
   end
 end

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

@@ -1,10 +1,12 @@
 class Specinfra::Command::Solaris::Base::Cron < Specinfra::Command::Base::Cron
-  def check_cron_entry(user, entry)
-    entry_escaped = entry.gsub(/\*/, '\\*').gsub(/\[/, '\\[').gsub(/\]/, '\\]')
-    if user.nil?
-      "crontab -l | grep -- #{escape(entry_escaped)}"
-    else
-      "crontab -l #{escape(user)} | grep -- #{escape(entry_escaped)}"
+  class << self
+    def check_cron_entry(user, entry)
+      entry_escaped = entry.gsub(/\*/, '\\*').gsub(/\[/, '\\[').gsub(/\]/, '\\]')
+      if user.nil?
+        "crontab -l | grep -- #{escape(entry_escaped)}"
+      else
+        "crontab -l #{escape(user)} | grep -- #{escape(entry_escaped)}"
+      end
     end
   end
 end

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

@@ -1,17 +1,19 @@
 class Specinfra::Command::Solaris::Base::File < Specinfra::Command::Base::File
-  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_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
+  class << self
+    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_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_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
-    "su #{user} -c \"test -#{access} #{file}\""
+    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
+      "su #{user} -c \"test -#{access} #{file}\""
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Solaris::Base::Group < Specinfra::Command::Base::Group
-  def check_has_gid(group, gid)
-    regexp = "^#{group}:"
-    "getent group | grep -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
+  class << self
+    def check_has_gid(group, gid)
+      regexp = "^#{group}:"
+      "getent group | grep -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
+    end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Solaris::Base::Host < Specinfra::Command::Base::Host
-  def check_is_reachable(host, port, proto, timeout)
-    if port.nil?
-      "ping -n #{escape(host)} #{escape(timeout)}"
-    else
-      "nc -vvvvz#{escape(proto[0].chr)} -w #{escape(timeout)} #{escape(host)} #{escape(port)}"
+  class << self
+    def check_is_reachable(host, port, proto, timeout)
+      if port.nil?
+        "ping -n #{escape(host)} #{escape(timeout)}"
+      else
+        "nc -vvvvz#{escape(proto[0].chr)} -w #{escape(timeout)} #{escape(host)} #{escape(port)}"
+      end
     end
   end
 end

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Solaris::Base::Ipfilter < Specinfra::Command::Base::Ipfilter
-  def check_has_rule(rule)
-    "ipfstat -io 2> /dev/null | grep -- #{escape(rule)}"
+  class << self
+    def check_has_rule(rule)
+      "ipfstat -io 2> /dev/null | grep -- #{escape(rule)}"
+    end
   end
 end

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

@@ -1,7 +1,9 @@
 class Specinfra::Command::Solaris::Base::Ipnat < Specinfra::Command::Base::Ipnat
-  def check_has_rule(rule)
-    regexp = "^#{rule}$"
-    "ipnat -l 2> /dev/null | grep -- #{escape(regexp)}"
+  class << self
+    def check_has_rule(rule)
+      regexp = "^#{rule}$"
+      "ipnat -l 2> /dev/null | grep -- #{escape(regexp)}"
+    end
   end
 end
 

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

@@ -1,10 +1,12 @@
 class Specinfra::Command::Solaris::Base::Package < Specinfra::Command::Base::Package
-  def check_is_installed(package, version=nil)
-    cmd = "pkg list -H #{escape(package)} 2> /dev/null"
-    if version
-      cmd = "#{cmd} | grep -qw -- #{escape(version)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      cmd = "pkg list -H #{escape(package)} 2> /dev/null"
+      if version
+        cmd = "#{cmd} | grep -qw -- #{escape(version)}"
+      end
+      cmd
     end
-    cmd
   end
 end
 

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

@@ -1,11 +1,13 @@
 class Specinfra::Command::Solaris::Base::Port < Specinfra::Command::Base::Port
-  def check_is_listening(port, opts=nil)
-    regexp = "\\.#{port} "
-    "netstat -an 2> /dev/null | grep -- LISTEN | grep -- #{escape(regexp)}"
-  end
+  class << self
+    def check_is_listening(port, opts=nil)
+      regexp = "\\.#{port} "
+      "netstat -an 2> /dev/null | grep -- LISTEN | grep -- #{escape(regexp)}"
+    end
 
-  def check_is_listening_with_protocol(port, protocol)
-    regexp = ".*\\.#{port} "
-    "netstat -an -P #{escape(protocol)} 2> /dev/null | grep -- LISTEN | grep -- #{escape(regexp)}"
+    def check_is_listening_with_protocol(port, protocol)
+      regexp = ".*\\.#{port} "
+      "netstat -an -P #{escape(protocol)} 2> /dev/null | grep -- LISTEN | grep -- #{escape(regexp)}"
+    end
   end
 end