specinfra 2.0.0.beta15 → 2.0.0.beta16

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

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

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

@@ -1,23 +1,25 @@
 class Specinfra::Command::Base::Host < Specinfra::Command::Base
-  def check_is_resolvable(name, type)
-    if type == "dns"
-      "nslookup -timeout=1 #{escape(name)}"
-    elsif type == "hosts"
-      "grep -w -- #{escape(name)} /etc/hosts"
-    else
-      "getent hosts #{escape(name)}"
+  class << self
+    def check_is_resolvable(name, type)
+      if type == "dns"
+        "nslookup -timeout=1 #{escape(name)}"
+      elsif type == "hosts"
+        "grep -w -- #{escape(name)} /etc/hosts"
+      else
+        "getent hosts #{escape(name)}"
+      end
     end
-  end
 
-  def check_is_reachable(host, port, proto, timeout)
-    if port.nil?
-      "ping -w #{escape(timeout)} -c 2 -n #{escape(host)}"
-    else
-      "nc -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} -w #{escape(timeout)}"
+    def check_is_reachable(host, port, proto, timeout)
+      if port.nil?
+        "ping -w #{escape(timeout)} -c 2 -n #{escape(host)}"
+      else
+        "nc -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} -w #{escape(timeout)}"
+      end
     end
-  end
 
-  def get_ipaddress(name)
-    "getent hosts #{escape(name)} | awk '{print $1}'"
+    def get_ipaddress(name)
+      "getent hosts #{escape(name)} | awk '{print $1}'"
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Base::MailAlias < Specinfra::Command::Base
-  def check_is_aliased_to(recipient, target)
-    target = "[[:space:]]#{target}"
-    "getent aliases #{escape(recipient)} | grep -- #{escape(target)}$"
+  class << self
+    def check_is_aliased_to(recipient, target)
+      target = "[[:space:]]#{target}"
+      "getent aliases #{escape(recipient)} | grep -- #{escape(target)}$"
+    end
   end
 end

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

@@ -1,42 +1,44 @@
 class Specinfra::Command::Base::Package < Specinfra::Command::Base
-  def check_is_installed_by_gem(name, version=nil)
-    regexp = "^#{name}"
-    cmd = "gem list --local | grep -w -- #{escape(regexp)}"
-    cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-    cmd
-  end
+  class << self
+    def check_is_installed_by_gem(name, version=nil)
+      regexp = "^#{name}"
+      cmd = "gem list --local | grep -w -- #{escape(regexp)}"
+      cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
+      cmd
+    end
 
-  def check_is_installed_by_npm(name, version=nil)
-    cmd = "npm ls #{escape(name)} -g"
-    cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-    cmd
-  end
+    def check_is_installed_by_npm(name, version=nil)
+      cmd = "npm ls #{escape(name)} -g"
+      cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
+      cmd
+    end
 
-  def check_is_installed_by_pecl(name, version=nil)
-    regexp = "^#{name}"
-    cmd = "pecl list | grep -w -- #{escape(regexp)}"
-    cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-    cmd
-  end
+    def check_is_installed_by_pecl(name, version=nil)
+      regexp = "^#{name}"
+      cmd = "pecl list | grep -w -- #{escape(regexp)}"
+      cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
+      cmd
+    end
 
-  def check_is_installed_by_pear(name, version=nil)
-    regexp = "^#{name}"
-    cmd = "pear list | grep -w -- #{escape(regexp)}"
-    cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-    cmd
-  end
+    def check_is_installed_by_pear(name, version=nil)
+      regexp = "^#{name}"
+      cmd = "pear list | grep -w -- #{escape(regexp)}"
+      cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
+      cmd
+    end
 
-  def check_is_installed_by_pip(name, version=nil)
-    regexp = "^#{name}"
-    cmd = "pip list | grep -w -- #{escape(regexp)}"
-    cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-    cmd
-  end
+    def check_is_installed_by_pip(name, version=nil)
+      regexp = "^#{name}"
+      cmd = "pip list | grep -w -- #{escape(regexp)}"
+      cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
+      cmd
+    end
 
-  def check_is_installed_by_cpan(name, version=nil)
-    regexp = "^#{name}"
-    cmd = "cpan -l | grep -w -- #{escape(regexp)}"
-    cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-    cmd
+    def check_is_installed_by_cpan(name, version=nil)
+      regexp = "^#{name}"
+      cmd = "cpan -l | grep -w -- #{escape(regexp)}"
+      cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
+      cmd
+    end
   end
 end

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

@@ -1,8 +1,10 @@
 class Specinfra::Command::Base::Port < Specinfra::Command::Base
-  def check_is_listening(port, options={})
-    pattern = ":#{port}"
-    pattern = " #{options[:local_address]}#{pattern}" if options[:local_address]
-    pattern = "^#{options[:protocol]} .*#{pattern}" if options[:protocol]
-    "netstat -tunl | grep -- #{escape(pattern)}"
+  class << self
+    def check_is_listening(port, options={})
+      pattern = ":#{port}"
+      pattern = " #{options[:local_address]}#{pattern}" if options[:local_address]
+      pattern = "^#{options[:protocol]} .*#{pattern}" if options[:protocol]
+      "netstat -tunl | grep -- #{escape(pattern)}"
+    end
   end
 end

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

@@ -1,14 +1,15 @@
 class Specinfra::Command::Base::Process < Specinfra::Command::Base
-  def get(process, opts)
-    "ps -C #{escape(process)} -o #{opts[:format]} | head -1"
-  end
+  class << self
+    def get(process, opts)
+      "ps -C #{escape(process)} -o #{opts[:format]} | head -1"
+    end
 
-  def check_is_running(process)
-    "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
-  end
+    def check_is_running(process)
+      "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
+    end
 
-  def check_count(process,count)
-    "test $(ps aux | grep -w -- #{escape(process)} | grep -v grep | wc -l) -eq #{escape(count)}"
+    def check_count(process,count)
+      "test $(ps aux | grep -w -- #{escape(process)} | grep -v grep | wc -l) -eq #{escape(count)}"
+    end
   end
-
 end

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

@@ -1,7 +1,9 @@
 class Specinfra::Command::Base::RoutingTable < Specinfra::Command::Base
-  def check_has_entry(destination)
-    "ip route | grep -E '^#{destination} |^default '"
-  end
+  class << self
+    def check_has_entry(destination)
+      "ip route | grep -E '^#{destination} |^default '"
+    end
 
-  alias :get_entry :check_has_entry
+    alias :get_entry :check_has_entry
+  end
 end

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

@@ -1,25 +1,27 @@
 class Specinfra::Command::Base::Service < Specinfra::Command::Base
-  def check_is_running(service)
-    "service #{escape(service)} status"
-  end
+  class << self
+    def check_is_running(service)
+      "service #{escape(service)} status"
+    end
 
-  def check_is_installed(service, level=3)
-    raise NotImplementedError.new
-  end
+    def check_is_installed(service, level=3)
+      raise NotImplementedError.new
+    end
 
-  def check_is_running_under_supervisor(service)
-    "supervisorctl status #{escape(service)} | grep RUNNING"
-  end
+    def check_is_running_under_supervisor(service)
+      "supervisorctl status #{escape(service)} | grep RUNNING"
+    end
 
-  def check_is_running_under_upstart(service)
-    "initctl status #{escape(service)} | grep running"
-  end
+    def check_is_running_under_upstart(service)
+      "initctl status #{escape(service)} | grep running"
+    end
 
-  def check_is_monitored_by_monit(service)
-    "monit status"
-  end
+    def check_is_monitored_by_monit(service)
+      "monit status"
+    end
 
-  def check_is_monitored_by_god(service)
-    "god status #{escape(service)}"
+    def check_is_monitored_by_god(service)
+      "god status #{escape(service)}"
+    end
   end
 end

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

@@ -1,31 +1,33 @@
 class Specinfra::Command::Base::User < Specinfra::Command::Base
-  def check_exists(user)
-    "id #{escape(user)}"
-  end
+  class << self
+    def check_exists(user)
+      "id #{escape(user)}"
+    end
 
-  def check_belongs_to_group(user, group)
-    "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
-  end
+    def check_belongs_to_group(user, group)
+      "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
+    end
 
-  def check_belongs_to_primary_group(user, group)
-    "id -gn #{escape(user)}| grep ^#{escape(group)}$"
-  end
+    def check_belongs_to_primary_group(user, group)
+      "id -gn #{escape(user)}| grep ^#{escape(group)}$"
+    end
 
-  def check_has_uid(user, uid)
-    regexp = "^uid=#{uid}("
-    "id #{escape(user)} | grep -- #{escape(regexp)}"
-  end
+    def check_has_uid(user, uid)
+      regexp = "^uid=#{uid}("
+      "id #{escape(user)} | grep -- #{escape(regexp)}"
+    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)}"
-  end
+    def check_has_login_shell(user, path_to_shell)
+      "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep -w -- #{escape(path_to_shell)}"
+    end
 
-  def check_has_authorized_key(user, key)
-    key.sub!(/\s+\S*$/, '') if key.match(/^\S+\s+\S+\s+\S*$/)
-    "grep -w -- #{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 -w -- #{escape(key)} ~#{escape(user)}/.ssh/authorized_keys"
+    end
   end
 end

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

@@ -1,37 +1,39 @@
 class Specinfra::Command::Darwin::Base::File < Specinfra::Command::Base::File
-  def check_is_accessible_by_user(file, user, access)
-    "sudo -u #{user} -s /bin/test -#{access} #{file}"
-  end
-
-  def check_has_md5checksum(file, expected)
-    "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
-  end
-
-  def check_has_sha256checksum(file, expected)
-    "openssl sha256 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
-  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_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 get_mode(file)
-    "stat -f%Lp #{escape(file)}"
+  class << self
+    def check_is_accessible_by_user(file, user, access)
+      "sudo -u #{user} -s /bin/test -#{access} #{file}"
+    end
+
+    def check_has_md5checksum(file, expected)
+      "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
+    end
+
+    def check_has_sha256checksum(file, expected)
+      "openssl sha256 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
+    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_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 get_mode(file)
+      "stat -f%Lp #{escape(file)}"
+    end
   end
 end
 

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

@@ -1,15 +1,17 @@
 class Specinfra::Command::Darwin::Base::Package < Specinfra::Command::Base::Package
-  def check_is_installed(package, version=nil)
-    escaped_package = escape(package)
-    if version
-      cmd = "/usr/local/bin/brew info #{escaped_package} | grep -E '^\/usr\/local\/Cellar\/#{escaped_package}\/#{escape(version)}'"
-    else
-      cmd = "/usr/local/bin/brew list -1 | grep -E '^#{escaped_package}$'"
+  class << self
+    def check_is_installed(package, version=nil)
+      escaped_package = escape(package)
+      if version
+        cmd = "/usr/local/bin/brew info #{escaped_package} | grep -E '^\/usr\/local\/Cellar\/#{escaped_package}\/#{escape(version)}'"
+      else
+        cmd = "/usr/local/bin/brew list -1 | grep -E '^#{escaped_package}$'"
+      end
+      cmd
     end
-    cmd
-  end
 
-  def install(package)
-    cmd = "brew install '#{package}'"
+    def install(package)
+      cmd = "brew install '#{package}'"
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Darwin::Base::Port < Specinfra::Command::Base::Port
-  def check_is_listening(port, options={})
-    regexp = ":#{port} "
-    "lsof -nP -iTCP -sTCP:LISTEN | grep -- #{escape(regexp)}"
+  class << self
+    def check_is_listening(port, options={})
+      regexp = ":#{port} "
+      "lsof -nP -iTCP -sTCP:LISTEN | grep -- #{escape(regexp)}"
+    end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Darwin::Base::Service < Specinfra::Command::Base::Service
-  def check_is_enabled(service, level=nil)
-    "launchctl list | grep #{escape(service)}"
-  end
+  class << self
+    def check_is_enabled(service, level=nil)
+      "launchctl list | grep #{escape(service)}"
+    end
 
-  def check_is_running(service)
-    "launchctl list | grep #{escape(service)} | grep -E '^[0-9]+'"
+    def check_is_running(service)
+      "launchctl list | grep #{escape(service)} | grep -E '^[0-9]+'"
+    end
   end
 end