specinfra 1.27.5 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf132b8746de3ef1580b6c39ef553ee7b2459832
-  data.tar.gz: 03a3abbe7eadea2f0436b9363cc59737ab7bfc2a
+  metadata.gz: 0ebda9e1a8980f9cd098f5831d06e0a7cdce6d62
+  data.tar.gz: 9bf241f31f25c1f8e5ab0260f2a3461c8e45dd0a
 SHA512:
-  metadata.gz: ca0ab54768ea1818a89c2b3e96fc9dae37495a14e0aa1921b28c102b71178e83d978edd9721315ed67cf43dbfde54365e61a048c823ccf2ab3ded603469b6d58
-  data.tar.gz: a0e32824d098305ddac11e1c2bf19fc69c9848cb77bf77e1edf6b66786ee9bbb028a9e6c7f99035770671d24f931cc3e147c2d3b4ca94a3b1de9c9f2f38ab4fe
+  metadata.gz: 63aa54e8bd0578ed770798036e1f97b12868d37aefea6b163c28ee235435113d01b40d225eb03cac389d002ea4982d8e43531b292e7f1e34740a4c1574362d65
+  data.tar.gz: 7763ef61cc1fe078e44b0c4e879e2f0831ec8a67a16ab77e79ade0f57fef9fd7a4b2020811aca30260a247f2fdd4b65956256736acce0e7a267172c40384e35c

data/Rakefile

@@ -1,36 +1,30 @@
 require "bundler/gem_tasks"
-begin
-  require "rspec/core/rake_task"
-  require "octorelease"
-rescue LoadError
-end
+require "rspec/core/rake_task"
+require "octorelease"
 
-if defined?(RSpec)
-  task :spec => 'spec:all'
+task :spec => 'spec:all'
 
-  namespace :spec do
-    task :all => [ :helper, :backend, :configuration ]
+namespace :spec do
+  task :all => [ :helper, :backend, :configuration ]
 
-    RSpec::Core::RakeTask.new(:helper) do |t|
-      t.pattern = "spec/helper/*_spec.rb"
-    end
+  RSpec::Core::RakeTask.new(:helper) do |t|
+    t.pattern = "spec/helper/*_spec.rb"
+  end
 
-    task :backend => 'backend:all'
-    namespace :backend do
-      backends = %w[exec ssh]
+  task :backend => 'backend:all'
+  namespace :backend do
+    backends = %w[exec ssh]
 
-      task :all => backends
+    task :all => backends
 
-      backends.each do |backend|
-        RSpec::Core::RakeTask.new(backend) do |t|
-          t.pattern = "spec/backend/#{backend}/*_spec.rb"
-        end
+    backends.each do |backend|
+      RSpec::Core::RakeTask.new(backend) do |t|
+        t.pattern = "spec/backend/#{backend}/*_spec.rb"
       end
     end
+  end
 
-    RSpec::Core::RakeTask.new(:configuration) do |t|
-      t.pattern = "spec/configuration_spec.rb"
-    end
+  RSpec::Core::RakeTask.new(:configuration) do |t|
+    t.pattern = "spec/configuration_spec.rb"
   end
 end
-

data/lib/specinfra/backend/exec.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require 'fileutils'
+require 'shellwords'
 
 module SpecInfra
   module Backend
@@ -33,22 +34,25 @@ module SpecInfra
       end
 
       def build_command(cmd)
+        shell = SpecInfra.configuration.shell || '/bin/sh'
+        cmd = cmd.shelljoin if cmd.is_a?(Array)
+        cmd = "#{shell.shellescape} -c #{cmd.shellescape}"
+
         path = SpecInfra.configuration.path
         if path
-          cmd = "env PATH=#{path}:$PATH #{cmd}"
-          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
-          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
+          cmd = "env PATH=#{path.shellescape}:\"$PATH\" #{cmd}"
         end
+
         cmd
       end
 
       def add_pre_command(cmd)
-        path = SpecInfra.configuration.path
         if SpecInfra.configuration.pre_command
-          cmd = "#{SpecInfra.configuration.pre_command} && #{cmd}"
-          cmd = "env PATH=#{path}:$PATH #{cmd}" if path
+          pre_cmd = build_command(SpecInfra.configuration.pre_command)
+          "#{pre_cmd} && #{cmd}"
+        else
+          cmd
         end
-        cmd
       end
 
       def check_running(process)
@@ -181,38 +185,20 @@ module SpecInfra
 
       def check_os
         return SpecInfra.configuration.os if SpecInfra.configuration.os
-        arch = run_command('uname -m').stdout.strip
-        # Fedora also has an /etc/redhat-release so the Fedora check must
-        # come before the RedHat check
-        if run_command('ls /etc/fedora-release').success?
-          line = run_command('cat /etc/redhat-release').stdout
-          if line =~ /release (\d[\d]*)/
-            release = $1
-          end
-          { :family => 'Fedora', :release => release }
-        elsif run_command('ls /etc/redhat-release').success?
+        if run_command('ls /etc/redhat-release').success?
           line = run_command('cat /etc/redhat-release').stdout
           if line =~ /release (\d[\d.]*)/
             release = $1
           end
-
-          if release =~ /7./
-            { :family => 'RedHat7', :release => release, :arch => arch }
-          else
-            { :family => 'RedHat', :release => release, :arch => arch }
-          end
+          { :family => 'RedHat', :release => release }
         elsif run_command('ls /etc/system-release').success?
-          { :family => 'RedHat', :release => nil, :arch => arch } # Amazon Linux
+          { :family => 'RedHat', :release => nil } # Amazon Linux
         elsif run_command('ls /etc/SuSE-release').success?
           line = run_command('cat /etc/SuSE-release').stdout
           if line =~ /SUSE Linux Enterprise Server (\d+)/
             release = $1
-            family = 'SuSE'
-          elsif line =~ /openSUSE (\d+\.\d+|\d+)/
-            release = $1
-            family = 'OpenSUSE'
           end
-          { :family => family, :release => release, :arch => arch }
+          { :family => 'SuSE', :release => release }
         elsif run_command('ls /etc/debian_version').success?
           lsb_release = run_command("lsb_release -ir")
           if lsb_release.success?
@@ -231,39 +217,37 @@ module SpecInfra
           end
           distro ||= 'Debian'
           release ||= nil
-          { :family => distro.strip, :release => release, :arch => arch }
+          { :family => distro.strip, :release => release }
         elsif run_command('ls /etc/gentoo-release').success?
-          { :family => 'Gentoo', :release => nil, :arch => arch }
+          { :family => 'Gentoo', :release => nil }
         elsif run_command('ls /usr/lib/setup/Plamo-*').success?
-          { :family => 'Plamo', :release => nil, :arch => arch }
-        elsif run_command('ls /var/run/current-system/sw').success?
-          { :family => 'NixOS', :release => nil, :arch => arch }
+          { :family => 'Plamo', :release => nil }
         elsif run_command('uname -s').stdout =~ /AIX/i
-          { :family => 'AIX', :release => nil, :arch => arch }
-        elsif ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i
-          if uname =~ /5.10/
-            { :family => 'Solaris10', :release => nil, :arch => arch }
+          { :family => 'AIX', :release => nil }
+        elsif (os = run_command('uname -sr').stdout) && os =~ /SunOS/i
+          if os =~ /5.10/
+            { :family => 'Solaris10', :release => nil }
           elsif run_command('grep -q "Oracle Solaris 11" /etc/release').success?
-            { :family => 'Solaris11', :release => nil, :arch => arch }
+            { :family => 'Solaris11', :release => nil }
           elsif run_command('grep -q SmartOS /etc/release').success?
-            { :family => 'SmartOS', :release => nil, :arch => arch }
+            { :family => 'SmartOS', :release => nil }
           else
-            { :family => 'Solaris', :release => nil, :arch => arch }
+            { :family => 'Solaris', :release => nil }
           end
         elsif run_command('uname -s').stdout =~ /Darwin/i
           { :family => 'Darwin', :release => nil }
-        elsif ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
-          if uname =~ /10./
-            { :family => 'FreeBSD10', :release => nil, :arch => arch }
+        elsif (os = run_command('uname -sr').stdout) && os =~ /FreeBSD/i
+          if os =~ /10./
+            { :family => 'FreeBSD10', :release => nil }
           else
-            { :family => 'FreeBSD', :release => nil, :arch => arch }
+            { :family => 'FreeBSD', :release => nil }
           end
         elsif run_command('uname -sr').stdout =~ /Arch/i
-          { :family => 'Arch', :release => nil, :arch => arch }
+          { :family => 'Arch', :release => nil }
         elsif run_command('uname -s').stdout =~ /OpenBSD/i
-          { :family => 'OpenBSD', :release => nil, :arch => arch }
+          { :family => 'OpenBSD', :release => nil }
         else
-          { :family => 'Base', :release => nil, :arch => arch }
+          { :family => 'Base', :release => nil }
         end
       end
 

data/lib/specinfra/backend/powershell/support/find_iis_component.ps1

@@ -1,89 +1,13 @@
 function FindIISWebsite 
 {
     param($name)
-    
-    Import-Module WebAdministration 
-    
-    Try {
-        Get-Item "IIS:\Sites\$name" -Erroraction silentlycontinue
-    }
-    Catch [System.IO.FileNotFoundException] {
-        Get-Item "IIS:\Sites\$name" -Erroraction silentlycontinue
-    }
+    import-module WebAdministration
+    Get-Website | Where { $_.name -match $name }
 }
 
 function FindIISAppPool
 {
     param($name)
-    
-    Import-Module WebAdministration
-    Try {
-        Get-Item "IIS:\AppPools\$name" -Erroraction silentlycontinue
-    }
-    Catch [System.IO.FileNotFoundException] {
-        Get-Item "IIS:\AppPools\$name" -Erroraction silentlycontinue
-
-    }
-}
-
-function FindSiteBindings
-{
-    param($name, $protocol, $hostHeader, $port, $ipAddress)
-    
-    Import-Module WebAdministration
-    Try {
-        Get-WebBinding -Name $name -Protocol $protocol -HostHeader $hostHeader -Port $port -IPAddress $ipAddress
-    }
-    Catch [System.IO.FileNotFoundException] {
-        Get-WebBinding -Name $name -Protocol $protocol -HostHeader $hostHeader -Port $port -IPAddress $ipAddress
-    }
-}
-
-function FindSiteVirtualDir
-{
-    param($name, $vdir, $path)
-    
-    Import-Module WebAdministration
-    
-    $webVirtDirPath = [string]::Format('IIS:\Sites\{0}\{1}',$name, $vdir);
-    if (Test-Path $webVirtDirPath) 
-    {
-        if ([string]::IsNullOrEmpty($path))
-        {
-            $true
-        }
-        else
-        {
-            (Get-Item $webVirtDirPath).physicalPath -eq $path
-        }
-    }
-    else 
-    {
-        $false
-    }
-}
-
-function FindSiteApplication
-{
-    param($name, $app, $pool, $physicalPath)
-    
-    Import-Module WebAdministration
-    
-    $path = "IIS:\Sites\${name}\${app}"
-    $result = $false
-    if (Test-Path $path) 
-    {
-        $result = $true    
-        if ([string]::IsNullOrEmpty($pool) -eq $false)
-        {
-            $result = $result -and (Get-Item $path).applicationPool -eq $pool
-        }
-
-        if ([string]::IsNullOrEmpty($physicalPath) -eq $false)
-        {
-            $result = $result -and (Get-Item $path).physicalPath -eq $physicalPath
-        }
-    }
-    
-    $result
-}
+    import-module WebAdministration
+    Get-Item "IIS:\AppPools\$name" -Erroraction silentlycontinue
+}

data/lib/specinfra/backend/ssh.rb

@@ -24,19 +24,6 @@ module SpecInfra
         disable_sudo = SpecInfra.configuration.disable_sudo
         if user != 'root' && !disable_sudo
           cmd = "#{sudo} #{cmd}"
-          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1#{sudo} ")
-          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1#{sudo} ")
-        end
-        cmd
-      end
-
-      def add_pre_command(cmd)
-        cmd = super(cmd)
-        user = SpecInfra.configuration.ssh.options[:user]
-        pre_command = SpecInfra.configuration.pre_command
-        disable_sudo = SpecInfra.configuration.disable_sudo
-        if pre_command && user != 'root' && !disable_sudo
-          cmd = "#{sudo} #{cmd}"
         end
         cmd
       end
@@ -58,7 +45,6 @@ module SpecInfra
         exit_status = nil
         exit_signal = nil
         pass_prompt = SpecInfra.configuration.pass_prompt || /^\[sudo\] password for/
-        retry_prompt = /^Sorry, try again/
 
         ssh = SpecInfra.configuration.ssh
         ssh.open_channel do |channel|
@@ -70,9 +56,7 @@ module SpecInfra
           channel.exec("#{command}") do |ch, success|
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
-              if data.match retry_prompt
-                abort 'Wrong sudo password! Please confirm your password.'
-              elsif data.match pass_prompt
+              if data.match pass_prompt
                 channel.send_data "#{SpecInfra.configuration.sudo_password}\n"
               else
                 stdout_data += data
@@ -81,7 +65,7 @@ module SpecInfra
 
             channel.on_extended_data do |ch, type, data|
               if data.match /you must have a tty to run sudo/
-                abort 'Please set "SpecInfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropriate file.'
+                abort 'Please set "SpecInfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropreate file.'
               end
 
               if data.match /^sudo: no tty present and no askpass program specified/
@@ -105,16 +89,19 @@ module SpecInfra
       end
 
       def sudo
-        sudo_path = SpecInfra.configuration.sudo_path
-        sudo_path += '/' if sudo_path
+        if sudo_path = SpecInfra.configuration.sudo_path
+          sudo_path += '/sudo'
+        else
+          sudo_path = 'sudo'
+        end
 
         sudo_options = SpecInfra.configuration.sudo_options
         if sudo_options
-          sudo_options = sudo_options.join(' ') if sudo_options.is_a?(Array)
+          sudo_options = sudo_options.shelljoin if sudo_options.is_a?(Array)
           sudo_options = ' ' + sudo_options
         end
 
-        "#{sudo_path}sudo#{sudo_options}"
+        "#{sudo_path.shellescape}#{sudo_options}"
       end
     end
   end

data/lib/specinfra/command/arch.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module SpecInfra
   module Command
     class Arch < Linux
@@ -8,7 +7,7 @@ module SpecInfra
 
       def check_enabled(service, level)
         level = "multi-user.target" if level == 3
-        "systemctl --plain list-dependencies #{level} | grep '^● #{escape(service)}.service$'"
+        "systemctl --plain list-dependencies #{level} | grep '^#{escape(service)}.service$'"
       end
 
       def check_running(service)
@@ -17,12 +16,12 @@ module SpecInfra
 
       def check_installed(package,version=nil)
         if version
-          grep = version.include?('-') ? "^#{escape(version)}$" : "^#{escape(version)}-"
-          "pacman -Q #{escape(package)} | awk '{print $2}' | grep '#{grep}'"
+          "pacman -Q | grep #{escape(package)} #{espace(version)}"
         else
-          "pacman -Q #{escape(package)}"
+          "pacman -Q | grep #{escape(package)}"
         end
       end
+
       def sync_repos
         "pacman -Syy"
       end

data/lib/specinfra/command/base.rb

@@ -29,8 +29,8 @@ module SpecInfra
       end
 
       def check_mounted(path)
-        regexp = "on #{path} "
-        "mount | grep -- '#{escape(regexp)}'"
+        regexp = "on #{path}"
+        "mount | grep -w -- #{escape(regexp)}"
       end
 
       def check_routing_table(destination)
@@ -59,14 +59,6 @@ module SpecInfra
         "test -f #{escape(file)}"
       end
 
-      def get_file_mtime(file)
-        "stat -c %Y #{escape(file)}"
-      end
-
-      def get_file_size(file)
-        "stat -c %s #{escape(file)}"
-      end
-
       def check_socket(file)
         "test -S #{escape(file)}"
       end
@@ -80,7 +72,7 @@ module SpecInfra
       end
 
       def check_group(group)
-        "getent group #{escape(group)}"
+        "getent group | grep -wq -- #{escape(group)}"
       end
 
       def check_installed(package, version=nil)
@@ -129,10 +121,6 @@ module SpecInfra
         "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
       end
 
-      def check_process_count(process, count)
-        "test $(ps aux | grep -w -- #{escape(process)} | grep -v grep | wc -l) -eq #{escape(count)}"
-      end
-
       def get_process(process, opts)
         "ps -C #{escape(process)} -o #{opts[:format]} | head -1"
       end
@@ -142,11 +130,11 @@ module SpecInfra
       end
 
       def check_file_contain_with_regexp(file, expected_pattern)
-        "grep -qs -- #{escape(expected_pattern)} #{escape(file)}"
+        "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
       end
 
       def check_file_contain_with_fixed_strings(file, expected_pattern)
-        "grep -qFs -- #{escape(expected_pattern)} #{escape(file)}"
+        "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
       end
 
       def check_file_checksum(file, expected)
@@ -168,7 +156,6 @@ module SpecInfra
         from ||= '1'
         to ||= '$'
         sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-        sed += " | sed -n 1,#{escape(to)}p" if from != '1' and to != '$'
         checker_with_regexp = check_file_contain_with_regexp("-", expected_pattern)
         checker_with_fixed  = check_file_contain_with_fixed_strings("-", expected_pattern)
         "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
@@ -201,7 +188,7 @@ module SpecInfra
       end
 
       def check_cron_entry(user, entry)
-        entry_escaped = entry.gsub(/\*/, '\\*').gsub(/\[/, '\\[').gsub(/\]/, '\\]')
+        entry_escaped = entry.gsub(/\*/, '\\*')
         if user.nil?
           "crontab -l | grep -v \"#\" -- | grep -- #{escape(entry_escaped)}"
         else
@@ -258,10 +245,6 @@ module SpecInfra
         "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
       end
 
-      def check_primary_group(group)
-        raise NotImplementedError.new
-      end
-
       def check_gid(group, gid)
         regexp = "^#{group}"
         "getent group | grep -w -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
@@ -289,10 +272,6 @@ module SpecInfra
         raise NotImplementedError.new
       end
 
-      def check_ip6tables_rule(rule, table=nil, chain=nil)
-        raise NotImplementedError.new
-      end
-
       def check_zfs(zfs, property=nil, value=nil)
         raise NotImplementedError.new
       end
@@ -332,10 +311,6 @@ module SpecInfra
       def check_ipv4_address(interface, ip_address)
         raise NotImplementedError.new
       end
-      
-      def check_ipv6_address(interface, ip_address)
-        raise NotImplementedError.new
-      end
 
       def check_mail_alias(recipient, target)
         target = "[[:space:]]#{target}"
@@ -354,10 +329,6 @@ module SpecInfra
         raise NotImplementedError.new
       end
 
-      def check_immutable(file)
-        raise NotImplementedError.new
-      end
-
       def get_package_version(package, opts=nil)
         raise NotImplementedError.new
       end

data/lib/specinfra/command/darwin.rb

@@ -1,19 +1,6 @@
 module SpecInfra
   module Command
     class Darwin < Base
-      def check_enabled(service, level=nil)
-        "launchctl list | grep #{escape(service)}"
-      end
-
-      def check_running(service)
-        "launchctl list | grep #{escape(service)} | grep -E '^[0-9]+'"
-      end
-
-      def check_listening(port)
-        regexp = ":#{port} "
-        "lsof -nP -iTCP -sTCP:LISTEN | grep -- #{escape(regexp)}"
-      end
-
       def check_file_md5checksum(file, expected)
         "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
       end
@@ -58,12 +45,6 @@ module SpecInfra
         end
         cmd
       end
-      alias :check_installed_by_homebrew :check_installed
-
-      def check_installed_by_pkgutil(package, version=nil)
-        cmd = "pkgutil --pkg-info #{package}"
-        cmd = "#{cmd} | grep '^version: #{escape(version)}'" if version
-      end
 
       def install(package)
         cmd = "brew install '#{package}'"

data/lib/specinfra/command/debian.rb

@@ -2,12 +2,8 @@ module SpecInfra
   module Command
     class Debian < Linux
       def check_enabled(service, level=3)
-        # Debian jessie default init system (on Linux) is systemd,
-        # but upstart and sysvinit is also available.
-        cmd  = "if [ -d /run/systemd/system ]; then systemctl --plain list-dependencies runlevel#{level}.target | grep '^#{escape(service)}.service$'; "
-        cmd += "else ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf; "
-        cmd += "fi"
-        "sh -c \"#{cmd}\""
+        # 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
 
       def check_installed(package, version=nil)

data/lib/specinfra/command/freebsd.rb

@@ -23,20 +23,6 @@ module SpecInfra
         "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
-      def check_owner(file, owner)
-        regexp = "^#{owner}$"
-        "stat -f%Su #{escape(file)} | grep -- #{escape(regexp)}"
-      end
-
-      def check_grouped(file, group)
-        regexp = "^#{group}$"
-        "stat -f%Sg #{escape(file)} | grep -- #{escape(regexp)}"
-      end
-
-      def check_link(link, target)
-        "stat -f%Y #{escape(link)} | grep -- #{escape(target)}"
-      end
-
       def get_mode(file)
         "stat -f%Lp #{escape(file)}"
       end

data/lib/specinfra/command/linux.rb

@@ -17,18 +17,6 @@ module SpecInfra
         cmd
       end
 
-      def check_ip6tables_rule(rule, table=nil, chain=nil)
-        cmd = "ip6tables"
-        cmd += " -t #{escape(table)}" if table
-        cmd += " -S"
-        cmd += " #{escape(chain)}" if chain
-        cmd += " | grep -- #{escape(rule)}"
-        cmd += " || ip6tables-save"
-        cmd += " -t #{escape(table)}" if table
-        cmd += " | grep -- #{escape(rule)}"
-        cmd
-      end
-
       def check_selinux(mode)
         cmd =  ""
         cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
@@ -56,17 +44,6 @@ module SpecInfra
         ip_address.gsub!(".", "\\.")
         "ip addr show #{interface} | grep 'inet #{ip_address}'"
       end
-      
-      def check_ipv6_address(interface, ip_address)
-        ip_address = ip_address.dup
-        if ip_address =~ /\/\d+$/
-          ip_address << " "
-        else
-          ip_address << "/"
-        end
-        ip_address.downcase!
-        "ip addr show #{interface} | grep 'inet6 #{ip_address}'"
-      end
 
       def check_zfs(zfs, property=nil)
         if property.nil?
@@ -86,15 +63,7 @@ module SpecInfra
       end
 
       def check_container_running(container)
-        "lxc-info -n #{escape(container)} -s | grep -w RUNNING"
-      end
-
-      def check_attribute(file, attribute)
-        "lsattr -d #{escape(file)} 2>&1 | awk '$1~/^-*#{escape(attribute)}-*$/ {exit 0} {exit 1}'"
-      end
-
-      def check_immutable(file)
-        check_attribute(file, 'i')
+        "lxc-info -n #{escape(container)} -t RUNNING"
       end
 
     end

data/lib/specinfra/command/openbsd.rb

@@ -2,7 +2,7 @@ module SpecInfra
   module Command
     class OpenBSD < Base
       def check_enabled(service, level=3)
-        "rcctl status #{escape(service)}"
+        "egrep '(#{escape(service)}_flags=|^pkg_scripts=\"(.*)#{escape(service)}(.*)\")' /etc/rc.conf.local | grep -v \=NO"
       end
 
       def check_file_md5checksum(file, expected)
@@ -76,7 +76,7 @@ module SpecInfra
 #      end
 
       def check_running(service)
-        "rcctl check #{escape(service)}"
+        "/etc/rc.d/#{escape(service)} status"
       end
 
       def get_mode(file)

data/lib/specinfra/command/redhat.rb

@@ -6,10 +6,6 @@ module SpecInfra
         "runuser -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
       end
 
-      def check_belonging_primary_group(user, group)
-        "id -gn #{escape(user)}| grep ^#{escape(group)}$"
-      end
-
       def check_enabled(service, level=3)
         "chkconfig --list #{escape(service)} | grep #{level}:on"
       end