specinfra 2.0.0.beta15 → 2.0.0.beta16

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

@@ -1,22 +1,24 @@
 class Specinfra::Command::Debian::Base::Package < Specinfra::Command::Linux::Base::Package
-  def check_is_installed(package, version=nil)
-    escaped_package = escape(package)
-    if version
-      cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^(install|hold) ok installed #{escape(version)}$'"
-    else
-      cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep -E '^(install|hold) ok installed$'"
+  class << self
+    def check_is_installed(package, version=nil)
+      escaped_package = escape(package)
+      if version
+        cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^(install|hold) ok installed #{escape(version)}$'"
+      else
+        cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep -E '^(install|hold) ok installed$'"
+      end
+      cmd
     end
-    cmd
-  end
 
-  alias :check_is_installed_by_apt :check_is_installed
+    alias :check_is_installed_by_apt :check_is_installed
 
-  def install(package)
-    "apt-get -y install #{package}"
-  end
+    def install(package)
+      "apt-get -y install #{package}"
+    end
 
-  def get_version(package, opts=nil)
-    "dpkg-query -f '${Status} ${Version}' -W #{package} | sed -n 's/^install ok installed //p'"
+    def get_version(package, opts=nil)
+      "dpkg-query -f '${Status} ${Version}' -W #{package} | sed -n 's/^install ok installed //p'"
+    end
   end
 end
 

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Debian::Base::Service < Specinfra::Command::Linux::Base::Service
-  def check_is_enabled(service, level=3)
-    # Until everything uses Upstart, this needs an OR.
-    "ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf"
+  class << self
+    def check_is_enabled(service, level=3)
+      # Until everything uses Upstart, this needs an OR.
+      "ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf"
+    end
   end
 end

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

@@ -1,10 +1,11 @@
 class Specinfra::Command::Fedora::Base::Service < Specinfra::Command::Redhat::Base::Service
-  def self.create
-    if os[:release].to_i < 15
-      self.new
-    else
-      Specinfra::Command::Fedora::V15::Service.new
+  class << self
+    def create
+      if os[:release].to_i < 15
+        self
+      else
+        Specinfra::Command::Fedora::V15::Service
+      end
     end
   end
 end
-

data/lib/specinfra/command/fedora/v15/service.rb

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

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

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

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

@@ -1,17 +1,19 @@
 class Specinfra::Command::Freebsd::Base::Package < Specinfra::Command::Base::Package
-  def check_is_installed(package, version=nil)
-    if version
-      "pkg_info -I #{escape(package)}-#{escape(version)}"
-    else
-      "pkg_info -Ix #{escape(package)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      if version
+        "pkg_info -I #{escape(package)}-#{escape(version)}"
+      else
+        "pkg_info -Ix #{escape(package)}"
+      end
     end
-  end
 
-  def install(package)
-    "pkg_add -r install #{package}"
-  end
+    def install(package)
+      "pkg_add -r install #{package}"
+    end
 
-  def get_version(package, opts=nil)
-    "pkg_info -Ix #{escape(package)} | cut -f 1 -w | sed -n 's/^#{escape(package)}-//p'"
+    def get_version(package, opts=nil)
+      "pkg_info -Ix #{escape(package)} | cut -f 1 -w | sed -n 's/^#{escape(package)}-//p'"
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Freebsd::Base::Port < Specinfra::Command::Base::Port
-  def check_is_listening(port, options={})
-    regexp = ":#{port} "
-    "sockstat -46l -p #{port} | grep -- #{escape(regexp)}"
+  class << self
+    def check_is_listening(port, options={})
+      regexp = ":#{port} "
+      "sockstat -46l -p #{port} | grep -- #{escape(regexp)}"
+    end
   end
 end

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Freebsd::Base::Service < Specinfra::Command::Base::Service
-  def check_is_enabled(service, level=3)
-    "service -e | grep -- #{escape(service)}"
+  class << self
+    def check_is_enabled(service, level=3)
+      "service -e | grep -- #{escape(service)}"
+    end
   end
 end

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

@@ -1,17 +1,19 @@
 class Specinfra::Command::Freebsd::V10::Package < Specinfra::Command::Freebsd::Base::Package
-  def check_is_installed(package, version=nil)
-    if version
-      "pkg query %v #{escape(package)} | grep -- #{escape(version)}"
-    else
-      "pkg info #{escape(package)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      if version
+        "pkg query %v #{escape(package)} | grep -- #{escape(version)}"
+      else
+        "pkg info #{escape(package)}"
+      end
     end
-  end
 
-  def install(package)
-    "pkg install -y #{package}"
-  end
+    def install(package)
+      "pkg install -y #{package}"
+    end
 
-  def get_version(package, opts=nil)
-    "pkg query %v #{escape(package)}"
+    def get_version(package, opts=nil)
+      "pkg query %v #{escape(package)}"
+    end
   end
 end

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Gentoo::Base::Package < Specinfra::Command::Linux::Base::Package
-  def check_is_installed(package, version=nil)
-    "eix #{escape(package)} --installed"
+  class << self
+    def check_is_installed(package, version=nil)
+      "eix #{escape(package)} --installed"
+    end
   end
 end

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

@@ -1,11 +1,13 @@
 class Specinfra::Command::Gentoo::Base::Service < Specinfra::Command::Linux::Base::Service
-  def check_is_enabled(service, level=3)
-    regexp = "^\\s*#{service}\\s*|\\s*\\(boot\\|default\\)"
-    "rc-update show | grep -- #{escape(regexp)}"
-  end
-
-  def check_is_running(service)
-    "/etc/init.d/#{escape(service)} status"
+  class << self
+    def check_is_enabled(service, level=3)
+      regexp = "^\\s*#{service}\\s*|\\s*\\(boot\\|default\\)"
+      "rc-update show | grep -- #{escape(regexp)}"
+    end
+
+    def check_is_running(service)
+      "/etc/init.d/#{escape(service)} status"
+    end
   end
 end
 

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

@@ -1,13 +1,15 @@
 class Specinfra::Command::Linux::Base::File < Specinfra::Command::Base::File
-  def check_is_accessible_by_user(file, user, access)
-    "su -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
-  end
+  class << self
+    def check_is_accessible_by_user(file, user, access)
+      "su -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
+    end
 
-  def check_is_immutable(file)
-    check_attribute(file, 'i')
-  end
+    def check_is_immutable(file)
+      check_attribute(file, 'i')
+    end
 
-  def check_attribute(file, attribute)
-    "lsattr -d #{escape(file)} 2>&1 | awk '$1~/^-*#{escape(attribute)}-*$/ {exit 0} {exit 1}'"
+    def check_attribute(file, attribute)
+      "lsattr -d #{escape(file)} 2>&1 | awk '$1~/^-*#{escape(attribute)}-*$/ {exit 0} {exit 1}'"
+    end
   end
 end

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

@@ -1,17 +1,19 @@
 class Specinfra::Command::Linux::Base::Interface < Specinfra::Command::Base::Interface
-  def get_speed_of(name)
-    "ethtool #{name} | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\\/s/,\"\\\\1\",\"\")}'"
-  end
+  class << self
+    def get_speed_of(name)
+      "ethtool #{name} | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\\/s/,\"\\\\1\",\"\")}'"
+    end
 
-  def check_has_ipv4_address(interface, ip_address)
-    ip_address = ip_address.dup
-    if ip_address =~ /\/\d+$/
-      ip_address << " "
-    else
-      ip_address << "/"
+    def check_has_ipv4_address(interface, ip_address)
+      ip_address = ip_address.dup
+      if ip_address =~ /\/\d+$/
+        ip_address << " "
+      else
+        ip_address << "/"
+      end
+      ip_address.gsub!(".", "\\.")
+      "ip addr show #{interface} | grep 'inet #{ip_address}'"
     end
-    ip_address.gsub!(".", "\\.")
-    "ip addr show #{interface} | grep 'inet #{ip_address}'"
   end
 end
 

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

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

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

@@ -1,5 +1,7 @@
 class Specinfra::Command::Linux::Base::KernelModule < Specinfra::Command::Base::KernelModule
-  def check_is_loaded(name)
-    "lsmod | grep ^#{name}"
+  class << self
+    def check_is_loaded(name)
+      "lsmod | grep ^#{name}"
+    end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Linux::Base::LxcContainer < Specinfra::Command::Base::LxcContainer
-  def check_exists(container)
-    "lxc-ls -1 | grep -w #{escape(container)}"
-  end
+  class << self
+    def check_exists(container)
+      "lxc-ls -1 | grep -w #{escape(container)}"
+    end
 
-  def check_is_running(container)
-    "lxc-info -n #{escape(container)} -s | grep -w RUNNING"
+    def check_is_running(container)
+      "lxc-info -n #{escape(container)} -s | grep -w RUNNING"
+    end
   end
 end

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

@@ -1,11 +1,13 @@
 class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selinux
-  def check_has_mode(mode)
-    cmd =  ""
-    cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
-    cmd += "getenforce | grep -i -- #{escape(mode)} "
-    cmd += "&& grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
-    cmd += ")" if mode == "disabled"
-    cmd
+  class << self
+    def check_has_mode(mode)
+      cmd =  ""
+      cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
+      cmd += "getenforce | grep -i -- #{escape(mode)} "
+      cmd += "&& grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
+      cmd += ")" if mode == "disabled"
+      cmd
+    end
   end
 end
 

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

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

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

@@ -1,15 +1,17 @@
 class Specinfra::Command::Nixos::Base::Package < Specinfra::Command::Linux::Base::Package
-  def check_is_installed(package, version=nil)
-    if version
-      "nix-store -q --references /var/run/current-system/sw | grep #{escape(package)}-#{escape(version)}"
-    else
-      "nix-store -q --references /var/run/current-system/sw | grep #{escape(package)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      if version
+        "nix-store -q --references /var/run/current-system/sw | grep #{escape(package)}-#{escape(version)}"
+      else
+        "nix-store -q --references /var/run/current-system/sw | grep #{escape(package)}"
+      end
     end
-  end
 
-  alias :check_is_installed_by_nix :check_is_installed
+    alias :check_is_installed_by_nix :check_is_installed
 
-  def install(package)
-    "nix-env -i #{package}"
-  end
+    def install(package)
+      "nix-env -i #{package}"
+    end
+end
 end

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

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

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

@@ -1,39 +1,41 @@
 class Specinfra::Command::Openbsd::Base::File < Specinfra::Command::Base::File
-  def check_has_md5checksum(file, expected)
-    regexp = "^#{expected}"
-    "cksum -qa md5 #{escape(file)} | grep -w #{escape(regexp)}"
-  end
+  class << self
+    def check_has_md5checksum(file, expected)
+      regexp = "^#{expected}"
+      "cksum -qa md5 #{escape(file)} | grep -w #{escape(regexp)}"
+    end
 
-  def check_has_sha256checksum(file, expected)
-    regexp = "^#{expected}"
-    "cksum -qa sha256 #{escape(file)} | grep -w #{escape(regexp)}"
-  end
+    def check_has_sha256checksum(file, expected)
+      regexp = "^#{expected}"
+      "cksum -qa sha256 #{escape(file)} | grep -w #{escape(regexp)}"
+    end
 
-  def check_is_linked_to(link, target)
-    "stat -f %Y #{escape(link)} | grep -- #{escape(target)}"
-  end
+    def check_is_linked_to(link, target)
+      "stat -f %Y #{escape(link)} | grep -- #{escape(target)}"
+    end
 
-  def check_has_mode(file, mode)
-    regexp = "^#{mode}$"
-    "stat -f%Lp #{escape(file)} | grep #{escape(regexp)}"
-  end
+    def check_has_mode(file, mode)
+      regexp = "^#{mode}$"
+      "stat -f%Lp #{escape(file)} | grep #{escape(regexp)}"
+    end
 
-  def check_is_owned_by(file, owner)
-    regexp = "^#{owner}$"
-    "stat -f %Su #{escape(file)} | grep -- #{escape(regexp)}"
-  end
+    def check_is_owned_by(file, owner)
+      regexp = "^#{owner}$"
+      "stat -f %Su #{escape(file)} | grep -- #{escape(regexp)}"
+    end
 
-  def check_is_grouped(file, group)
-    regexp = "^#{group}$"
-    "stat -f %Sg #{escape(file)} | grep -- #{escape(regexp)}"
-  end
+    def check_is_grouped(file, group)
+      regexp = "^#{group}$"
+      "stat -f %Sg #{escape(file)} | grep -- #{escape(regexp)}"
+    end
 
-  def check_is_mounted(path)
-    regexp = "on #{path} "
-    "mount | grep #{escape(regexp)}"
-  end
+    def check_is_mounted(path)
+      regexp = "on #{path} "
+      "mount | grep #{escape(regexp)}"
+    end
 
-  def get_mode(file)
-    "stat -f%Lp #{escape(file)}"
+    def get_mode(file)
+      "stat -f%Lp #{escape(file)}"
+    end
   end
 end