specinfra 2.0.0.beta15 → 2.0.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52cbcd87131d03d42e7afa46dbdc4fcc4d249352
-  data.tar.gz: f77e622fc12d536070800b2ed9ffcb9073aa2c9d
+  metadata.gz: 2d14a86072b75b57a9623d3008288d7abcfc8a77
+  data.tar.gz: d19a4a7af63fe7137cf5e7a52ce35dae188cd6d3
 SHA512:
-  metadata.gz: 8cd425df44198ad44995b4b1b4fed47f36297bde6e208abedce59aed7f3b34a0889fc94b13514befc87e59edcb187400b3b29a28ce6c185f9c10f1f7eea42ecd
-  data.tar.gz: a2f79a8bdfe210b9050f9e3560156ee1d28bb6eff02e20714f6ae901a6912ac64699bb1d2beafbccf44d7d56a3e5e4fc28b453e7156a0f0d7851d62b8fc3d761
+  metadata.gz: 2e44a954ee10cc6be369ed721885c7a6016c096d0811e72a06464468b56b86381e25b228a0d04d5177cb54e4830d431ce0a34026f7516ddab9badd6876547191
+  data.tar.gz: 33143b70844ac8fea1f5bd343d61380151ca23af594824791a41218e5f442c3a21769a6db9183566b4cb11e273a5e4fc0b8e73447b232e9a9e69becdb5b1e071

data/lib/specinfra.rb

@@ -15,7 +15,7 @@ module Specinfra
     end
 
     def command
-      Specinfra::Command::Base.new
+      Specinfra::Command::Base
     end
 
     def backend

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

@@ -1,19 +1,21 @@
 class Specinfra::Command::Aix::Base::File < Specinfra::Command::Base::File
-  def check_is_accessible_by_user(file, user, access)
-    "su -s sh -c \"test -#{access} #{file}\" #{user}"
-  end
+  class << self
+    def check_is_accessible_by_user(file, user, access)
+      "su -s sh -c \"test -#{access} #{file}\" #{user}"
+    end
 
-  def check_has_mode(file, mode)
-    raise NotImplementedError.new('check_has_mode is not implemented in Specinfra::Command::AIX::Base::File')
-  end
+    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)
-    regexp = "^#{owner}$"
-    "ls -al #{escape(file)} | awk '{print $3}' | grep -- #{escape(regexp)}"
-  end
+    def check_is_owned_by(file, owner)
+      regexp = "^#{owner}$"
+      "ls -al #{escape(file)} | awk '{print $3}' | grep -- #{escape(regexp)}"
+    end
 
-  def check_is_grouped(file, group)
-    regexp = "^#{group}$"
-    "ls -al #{escape(file)} | awk '{print $4}' | grep -- #{escape(regexp)}"
+    def check_is_grouped(file, group)
+      regexp = "^#{group}$"
+      "ls -al #{escape(file)} | awk '{print $4}' | grep -- #{escape(regexp)}"
+    end
   end
 end

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

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

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Aix::Base::Package < Specinfra::Command::Base::Package
-  def check_is_installed(package, version=nil)
-    if version
-      "lslpp -L #{escape(package)} | awk '{print $2}' |  grep -w -- #{version}"
-    else
-      "lslpp -L #{escape(package)}"
+  class << self
+    def check_is_installed(package, version=nil)
+      if version
+        "lslpp -L #{escape(package)} | awk '{print $2}' |  grep -w -- #{version}"
+      else
+        "lslpp -L #{escape(package)}"
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 class Specinfra::Command::Aix::Base::Port < Specinfra::Command::Base::Port
-  def check_is_listening(port, options={})
-    regexp = "*.#{port} "
-    "netstat -an -f inet | awk '{print $4}' | grep  -- #{regexp}"
+  class << self
+    def check_is_listening(port, options={})
+      regexp = "*.#{port} "
+      "netstat -an -f inet | awk '{print $4}' | grep  -- #{regexp}"
+    end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Aix::Base::Service < Specinfra::Command::Base::Service
-  def check_is_enabled(service,level=nil)
-    "lssrc -s #{escape(service)} | grep active"
-  end
+  class << self
+    def check_is_enabled(service,level=nil)
+      "lssrc -s #{escape(service)} | grep active"
+    end
 
-  def check_is_running(service)
-    "ps -ef | grep -v grep | grep #{escape(service)}"
+    def check_is_running(service)
+      "ps -ef | grep -v grep | grep #{escape(service)}"
+    end
   end
 end

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

@@ -1,13 +1,15 @@
 class Specinfra::Command::Aix::Base::User < Specinfra::Command::Base::User
-  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
+  class << self
+    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
 
-  def check_has_login_shell(user, path_to_shell)
-    "lsuser -a shell #{escape(user)} |awk -F'=' '{print $2}' | grep -w -- #{escape(path_to_shell)}"
-  end
+    def check_has_login_shell(user, path_to_shell)
+      "lsuser -a shell #{escape(user)} |awk -F'=' '{print $2}' | grep -w -- #{escape(path_to_shell)}"
+    end
 
-  def check_has_home_directory(user, path_to_home)
-    "lsuser -a home #{escape(user)} | awk -F'=' '{print $2}' | grep -w -- #{escape(path_to_home)}"
+    def check_has_home_directory(user, path_to_home)
+      "lsuser -a home #{escape(user)} | awk -F'=' '{print $2}' | grep -w -- #{escape(path_to_home)}"
+    end
   end
 end

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

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

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

@@ -1,22 +1,24 @@
 class Specinfra::Command::Arch::Base::Package < Specinfra::Command::Linux::Base::Package
-  def check_is_installed(package,version=nil)
-    if version
-      "pacman -Q | grep #{escape(package)} #{escape(version)}"
-    else
-      "pacman -Q | grep #{escape(package)}"
+  class << self
+    def check_is_installed(package,version=nil)
+      if version
+        "pacman -Q | grep #{escape(package)} #{escape(version)}"
+      else
+        "pacman -Q | grep #{escape(package)}"
+      end
     end
-  end
 
-  def get_version(package, opts=nil)
-    "pacman -Qi #{package} | grep Version | awk '{print $3}'"
-  end
+    def get_version(package, opts=nil)
+      "pacman -Qi #{package} | grep Version | awk '{print $3}'"
+    end
 
-  def install(package)
-    "pacman -S --noconfirm #{package}"
-  end
+    def install(package)
+      "pacman -S --noconfirm #{package}"
+    end
 
-  # Should this method be here or not ?
-  def sync_repos
-    "pacman -Syy"
+    # Should this method be here or not ?
+    def sync_repos
+      "pacman -Syy"
+    end
   end
 end

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

@@ -1,3 +1,5 @@
 class Specinfra::Command::Arch::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/base.rb

@@ -1,92 +1,94 @@
 require 'shellwords'
 class Specinfra::Command::Base
-  attr_accessor :types
+  class << self
+    @@types = nil
 
-  class NotImplementedError < Exception; end
+    class NotImplementedError < Exception; end
 
-  def self.create
-    self.new
-  end
+    def create
+      self
+    end
 
-  def escape(target)
-    str = case target
-          when Regexp
-            target.source
-          else
-            target.to_s
-          end
+    def escape(target)
+      str = case target
+            when Regexp
+              target.source
+            else
+              target.to_s
+            end
 
-    Shellwords.shellescape(str)
-  end
-
-  def method_missing(meth, *args)
-    action, resource_type, subaction = breakdown(meth)
-    method =  action
-    method += "_#{subaction}" if subaction
-    command_object = command_class(resource_type).create
-    if command_object.respond_to?(method)
-      command_object.send(method, *args)
-    else
-      raise NotImplementedError.new("#{method} is not implemented in #{command_class(resource_type)}")
+      Shellwords.shellescape(str)
     end
-  end
 
-  def command_class(resource_type)
-    family  = os[:family]
-    version = os[:release] ? "V#{os[:release].to_i}" : nil
+    def method_missing(meth, *args)
+      action, resource_type, subaction = breakdown(meth)
+      method =  action
+      method += "_#{subaction}" if subaction
+      command_class = create_command_class(resource_type)
+      if command_class.respond_to?(method)
+        command_class.send(method, *args)
+      else
+        raise NotImplementedError.new("#{method} is not implemented in #{command_class}")
+      end
+    end
 
-    common_class = self.class.const_get('Specinfra').const_get('Command')
-    base_class   = common_class.const_get('Base')
-    os_class     = family.nil? ? base_class : common_class.const_get(family.capitalize)
+    def create_command_class(resource_type)
+      family  = os[:family]
+      version = os[:release] ? "V#{os[:release].to_i}" : nil
+
+      common_class = self.class.const_get('Specinfra').const_get('Command')
+      base_class   = common_class.const_get('Base')
+      os_class     = family.nil? ? base_class : common_class.const_get(family.capitalize)
+
+      if family && version
+        begin
+          version_class = os_class.const_get(version)
+        rescue
+          version_class = os_class.const_get('Base')
+        end
+      elsif family.nil?
+        version_class = os_class
+      elsif family != 'base' && version.nil?
+        version_class = os_class.const_get('Base')
+      end
 
-    if family && version
       begin
-        version_class = os_class.const_get(version)
+        command_class = version_class.const_get(resource_type.to_camel_case)
       rescue
-        version_class = os_class.const_get('Base')
       end
-    elsif family.nil?
-      version_class = os_class
-    elsif family != 'base' && version.nil?
-      version_class = os_class.const_get('Base')
-    end
 
-    begin
-      command_klass = version_class.const_get(resource_type.to_camel_case)
-    rescue
-    end
+      if command_class.nil? ||( (command_class < Specinfra::Command::Base).nil? && (command_class < Specinfra::Command::Windows::Base).nil? )
+        command_class = base_class.const_get(resource_type.to_camel_case)
+      end
 
-    if command_klass.nil? ||( (command_klass < Specinfra::Command::Base).nil? && (command_klass < Specinfra::Command::Windows::Base).nil? )
-      command_klass = base_class.const_get(resource_type.to_camel_case)
+      command_class.create
     end
 
-    command_klass
-  end
-
-  private
-  def breakdown(meth)
-    types = resource_types.map {|t| t.to_snake_case }.join('|')
-    md = meth.to_s.match(/^([^_]+)_(#{types})_?(.+)?$/)
-    if md.nil?
-      message =  "Could not break down `#{meth}' to appropriate type and method.\n"
-      message += "The method name shoud be in the form of `action_type_subaction'."
-      raise message
+    private
+    def breakdown(meth)
+      types = resource_types.map {|t| t.to_snake_case }.join('|')
+      md = meth.to_s.match(/^([^_]+)_(#{types})_?(.+)?$/)
+      if md.nil?
+        message =  "Could not break down `#{meth}' to appropriate type and method.\n"
+        message += "The method name shoud be in the form of `action_type_subaction'."
+        raise message
+      end
+      return md[1], md[2], md[3]
     end
-    return md[1], md[2], md[3]
-  end
 
-  def resource_types
-    if @types.nil?
-      @types = []
-      Specinfra::Command::Base.subclasses.each do |s|
-        @types << s.to_s.split(':')[-1]
-      end
-      Specinfra::Command::Windows::Base.subclasses.each do |s|
-        @types << s.to_s.split(':')[-1]
+    def resource_types
+      if @@types.nil?
+        @@types = []
+        Specinfra::Command::Base.subclasses.each do |s|
+          @@types << s.to_s.split(':')[-1]
+        end
+        Specinfra::Command::Windows::Base.subclasses.each do |s|
+          @@types << s.to_s.split(':')[-1]
+        end
+        @@types.uniq!
       end
-      @types.uniq!
+      @@types
     end
-    @types
   end
 end
 

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

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

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

@@ -1,95 +1,97 @@
 class Specinfra::Command::Base::File < Specinfra::Command::Base
-  def check_is_file(file)
-    "test -f #{escape(file)}"
-  end
-
-  def check_is_directory(directory)
-    "test -d #{escape(directory)}"
-  end
-
-  def check_is_socket(file)
-    "test -S #{escape(file)}"
-  end
-
-  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)
-    regexp = "^#{group}$"
-    "stat -c %G #{escape(file)} | grep -- #{escape(regexp)}"
-  end
-
-  def check_is_owned_by(file, owner)
-    regexp = "^#{owner}$"
-    "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
-  end
-
-  def check_has_mode(file, mode)
-    regexp = "^#{mode}$"
-    "stat -c %a #{escape(file)} | grep -- #{escape(regexp)}"
-  end
-
-  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("-", expected_pattern)
-    checker_with_fixed  = check_file_contains_with_fixed_strings("-", expected_pattern)
-    "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
-  end
-
-  def check_contains_lines(file, expected_lines, from=nil, to=nil)
-    require 'digest/md5'
-    from ||= '1'
-    to ||= '$'
-    sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-    head_line = expected_lines.first.chomp
-    lines_checksum = Digest::MD5.hexdigest(expected_lines.map(&:chomp).join("\n") + "\n")
-    afterwards_length = expected_lines.length - 1
-    "#{sed} | grep -A #{escape(afterwards_length)} -F -- #{escape(head_line)} | md5sum | grep -qiw -- #{escape(lines_checksum)}"
-  end
-
-  def check_contains_with_regexp(file, expected_pattern)
-    "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
-  end
-
-  def check_contains_with_fixed_strings(file, expected_pattern)
-    "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
-  end
-
-  def check_has_md5checksum(file, expected)
-    regexp = "^#{expected}"
-    "md5sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
-  end
-
-  def check_has_sha256checksum(file, expected)
-    regexp = "^#{expected}"
-    "sha256sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
-  end
-
-  def get_content(file)
-    "cat #{file} 2> /dev/null || echo -n"
-  end
-
-  def check_is_mounted(path)
-    regexp = "on #{path}"
-    "mount | grep -w -- #{escape(regexp)}"
-  end
-
-  def get_mode(file)
-    "stat -c %a #{escape(file)}"
-  end
-
-  def check_is_linked_to(link, target)
-    "stat -c %N #{escape(link)} | egrep -e \"-> .#{escape(target)}.\""
-  end
-
-  def get_mtime(file)
-    "stat -c %Y #{escape(file)}"
-  end
-
-  def get_size(file)
-    "stat -c %s #{escape(file)}"
+  class << self
+    def check_is_file(file)
+      "test -f #{escape(file)}"
+    end
+
+    def check_is_directory(directory)
+      "test -d #{escape(directory)}"
+    end
+
+    def check_is_socket(file)
+      "test -S #{escape(file)}"
+    end
+
+    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)
+      regexp = "^#{group}$"
+      "stat -c %G #{escape(file)} | grep -- #{escape(regexp)}"
+    end
+
+    def check_is_owned_by(file, owner)
+      regexp = "^#{owner}$"
+      "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
+    end
+
+    def check_has_mode(file, mode)
+      regexp = "^#{mode}$"
+      "stat -c %a #{escape(file)} | grep -- #{escape(regexp)}"
+    end
+
+    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("-", expected_pattern)
+      checker_with_fixed  = check_file_contains_with_fixed_strings("-", expected_pattern)
+      "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
+    end
+
+    def check_contains_lines(file, expected_lines, from=nil, to=nil)
+      require 'digest/md5'
+      from ||= '1'
+      to ||= '$'
+      sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
+      head_line = expected_lines.first.chomp
+      lines_checksum = Digest::MD5.hexdigest(expected_lines.map(&:chomp).join("\n") + "\n")
+      afterwards_length = expected_lines.length - 1
+      "#{sed} | grep -A #{escape(afterwards_length)} -F -- #{escape(head_line)} | md5sum | grep -qiw -- #{escape(lines_checksum)}"
+    end
+
+    def check_contains_with_regexp(file, expected_pattern)
+      "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
+    end
+
+    def check_contains_with_fixed_strings(file, expected_pattern)
+      "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
+    end
+
+    def check_has_md5checksum(file, expected)
+      regexp = "^#{expected}"
+      "md5sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
+    end
+
+    def check_has_sha256checksum(file, expected)
+      regexp = "^#{expected}"
+      "sha256sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
+    end
+
+    def get_content(file)
+      "cat #{file} 2> /dev/null || echo -n"
+    end
+
+    def check_is_mounted(path)
+      regexp = "on #{path}"
+      "mount | grep -w -- #{escape(regexp)}"
+    end
+
+    def get_mode(file)
+      "stat -c %a #{escape(file)}"
+    end
+
+    def check_is_linked_to(link, target)
+      "stat -c %N #{escape(link)} | egrep -e \"-> .#{escape(target)}.\""
+    end
+
+    def get_mtime(file)
+      "stat -c %Y #{escape(file)}"
+    end
+
+    def get_size(file)
+      "stat -c %s #{escape(file)}"
+    end
   end
 end