specinfra 2.21.1 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e796a0b83f9bde7cfa6fc07448f33a4515af371
-  data.tar.gz: 8851a409215866f9ea12b1be34432ad7a055871d
+  metadata.gz: 0bfa588a9ff12b8acac2ca45a3d330e9cb458bfa
+  data.tar.gz: 011fd091e8a33237f34ba487a6c1cc59526219fa
 SHA512:
-  metadata.gz: 6e4b443bb4083979729929b28093e5f8a50d7acf7879ba025b34851935dd2ae1097a0448b80f5a47cb7e209e76ae238737e2032f8b8e6176d057f922190f5634
-  data.tar.gz: 48ac0a3b80d41cb7d658d68e44d500c81abd55735b28413b30602a538b9c3fe143abec40858b6e678c94ed8ddac198d086039bb3d1b6bf5d7da27af19e803f83
+  metadata.gz: 13debcb36c02720cad205eafec9d4290e4bd48b36aedf581f4b011e754699640f31a235f33d8e7423916740dfc13f1a2941eec8c04b4a1ec1e3ad86d0d1be4e5
+  data.tar.gz: 2c35a3d831a4d4993aab5fc305d8a756801c839933a4ae75b3945e55766e27057b4f39dade5d3298443939613970853c6663d4710557407981370e4c2f49654e

data/examples/multiple_backends.rb

@@ -0,0 +1,46 @@
+require 'specinfra'
+require 'pp'
+
+a = Specinfra::Backend::Exec.new
+
+ssh_options = Net::SSH::Config.for(ENV['SSH_HOST'], [ENV['SSH_CONFIG']])
+b = Specinfra::Backend::Ssh.new(
+  :host => ssh_options[:host_name],
+  :ssh_options => ssh_options,
+)
+
+threads = [a, b].map do |backend|
+  Thread.start(backend) do |backend|
+    result = []
+    result << backend.run_command("uname -a")
+    result << backend.command
+    result << backend.command.get(:install_package, 'dstat')
+    result
+  end
+end
+
+threads.each(&:join)
+threads.each do |t|
+  pp t.value
+end
+
+# example:
+# [#<Specinfra::CommandResult:0x007fb3b1352e30
+#   @exit_signal=nil,
+#   @exit_status=0,
+#   @stderr="",
+#   @stdout=
+#    "Darwin p411 14.1.0 Darwin Kernel Version 14.1.0: Thu Feb 26 19:26:47 PST 2015; root:xnu-2782.10.73~1/RELEASE_X86_64 x86_64\n">,
+#  #<Specinfra::CommandFactory:0x007fb3b1153508
+#   @os_info={:family=>"darwin", :release=>nil, :arch=>"x86_64"}>,
+#  "/usr/local/bin/brew install  'dstat'"]
+# [#<Specinfra::CommandResult:0x007fb3b0b9c2e0
+#   @exit_signal=nil,
+#   @exit_status=0,
+#   @stderr="",
+#   @stdout=
+#    "Linux itamae-trusty 3.13.0-39-generic #66-Ubuntu SMP Tue Oct 28 13:30:27 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux\n">,
+#  #<Specinfra::CommandFactory:0x007fb3b0d4d4b8
+#   @os_info={:family=>"ubuntu", :release=>"14.04", :arch=>"x86_64"}>,
+#  "DEBIAN_FRONTEND='noninteractive' apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'  install dstat"]
+

data/lib/specinfra.rb

@@ -17,7 +17,7 @@ module Specinfra
     end
 
     def command
-      Specinfra::CommandFactory
+      Specinfra::CommandFactory.instance
     end
 
     def backend

data/lib/specinfra/backend/base.rb

@@ -3,7 +3,36 @@ require 'specinfra/command_result'
 
 module Specinfra::Backend
   class Base
-    include Singleton
+    def self.instance
+      @instance ||= self.new
+    end
+
+    def initialize(config = {})
+      @config = config
+    end
+
+    def get_config(key)
+      @config[key] || Specinfra.configuration.send(key)
+    end
+
+    def set_config(key, value)
+      @config[key] = value
+    end
+
+    def os_info
+      return @os_info if @os_info
+
+      Specinfra::Helper::DetectOs.subclasses.each do |klass|
+        if @os_info = klass.new(self).detect
+          @os_info[:arch] ||= self.run_command('uname -m').stdout.strip
+          return @os_info
+        end
+      end
+    end
+
+    def command
+      CommandFactory.new(os_info)
+    end
 
     def set_example(e)
       @example = e

data/lib/specinfra/backend/cmd.rb

@@ -6,7 +6,7 @@ module Specinfra
       include PowerShell::ScriptHelper
 
       def run_command(cmd, opts={})
-        Specinfra.configuration.os = { :family => 'windows' }
+        set_config(:os, { :family => 'windows' })
         script = create_script(cmd)
         result = execute_script %Q{#{powershell} -encodedCommand #{encode_script(script)}}
 
@@ -39,7 +39,7 @@ module Specinfra
       private
 
       def powershell
-        architecture = @example.metadata[:architecture] || Specinfra.configuration.architecture
+        architecture = @example.metadata[:architecture] || get_config(:architecture)
 
         case architecture
         when :i386 then x86_powershell

data/lib/specinfra/backend/docker.rb

@@ -7,15 +7,15 @@ module Specinfra::Backend
         fail "Docker client library is not available. Try installing `docker-api' gem."
       end
 
-      ::Docker.url = Specinfra.configuration.docker_url
+      ::Docker.url = get_config(:docker_url)
 
-      if image = Specinfra.configuration.docker_image
+      if image = get_config(:docker_image)
         @images = []
         @base_image = get_or_pull_image(image)
 
         create_and_start_container
         ObjectSpace.define_finalizer(self, proc { cleanup_container })
-      elsif container = Specinfra.configuration.docker_container
+      elsif container = get_config(:docker_container)
         @container = ::Docker::Container.get(container)
       else
         fail 'Please specify docker_image or docker_container.'
@@ -61,14 +61,14 @@ module Specinfra::Backend
 
       opts.merge!({'OpenStdin' => true})
 
-      if path = Specinfra.configuration.path
+      if path = get_config(:path)
         (opts['Env'] ||= []) << "PATH=#{path}"
       end
 
-      env = Specinfra.configuration.env.to_a.map { |v| v.join('=') }
+      env = get_config(:env).to_a.map { |v| v.join('=') }
       opts['Env'] = opts['Env'].to_a.concat(env)
 
-      opts.merge!(Specinfra.configuration.docker_container_create_options || {})
+      opts.merge!(get_config(:docker_container_create_options) || {})
 
       @container = ::Docker::Container.create(opts)
       @container.start

data/lib/specinfra/backend/dockerfile.rb

@@ -4,10 +4,10 @@ module Specinfra::Backend
     def initialize
       @lines = []
       ObjectSpace.define_finalizer(self) {
-        if Specinfra.configuration.dockerfile_finalizer.nil?
+        if get_config(:dockerfile_finalizer).nil?
           puts @lines
         else
-          Specinfra.configuration.dockerfile_finalizer.call(@lines)
+          get_config(:dockerfile_finalizer).call(@lines)
         end
       }
     end

data/lib/specinfra/backend/exec.rb

@@ -30,11 +30,11 @@ module Specinfra::Backend
     end
 
     def build_command(cmd)
-      shell = Specinfra.configuration.shell || '/bin/sh'
+      shell = get_config(:shell) || '/bin/sh'
       cmd = cmd.shelljoin if cmd.is_a?(Array)
       cmd = "#{shell.shellescape} -c #{cmd.to_s.shellescape}"
 
-      path = Specinfra.configuration.path
+      path = get_config(:path)
       if path
         cmd = %Q{env PATH="#{path}" #{cmd}}
       end
@@ -49,7 +49,7 @@ module Specinfra::Backend
 
       keys.each { |key| ENV["_SPECINFRA_#{key}"] = ENV[key] ; ENV.delete(key) }
 
-      env = Specinfra.configuration.env || {}
+      env = get_config(:env) || {}
       env[:LANG] ||= 'C'
 
       env.each do |key, value|
@@ -68,8 +68,8 @@ module Specinfra::Backend
     end
 
     def add_pre_command(cmd)
-      if Specinfra.configuration.pre_command
-        pre_cmd = build_command(Specinfra.configuration.pre_command)
+      if get_config(:pre_command)
+        pre_cmd = build_command(get_config(:pre_command))
         "#{pre_cmd} && #{cmd}"
       else
         cmd

data/lib/specinfra/backend/lxc.rb

@@ -35,7 +35,7 @@ module Specinfra::Backend
     end
 
     def ct
-      @ct ||= ::LXC::Container.new(Specinfra.configuration.lxc)
+      @ct ||= ::LXC::Container.new(get_config(:lxc))
     end
   end
 end

data/lib/specinfra/backend/powershell/script_helper.rb

@@ -5,7 +5,7 @@ module Specinfra
     module PowerShell
       module ScriptHelper
         def build_command(cmd)
-          path = Specinfra.configuration.path
+          path = get_config(:path)
           if path
             cmd.strip!
             cmd = 
@@ -18,12 +18,12 @@ EOF
         end
 
         def add_pre_command(cmd)
-          path = Specinfra.configuration.path
-          if Specinfra.configuration.pre_command
+          path = get_config(:path)
+          if get_config(:pre_command)
             cmd.strip!
             cmd = 
 <<-EOF
-if (#{Specinfra.configuration.pre_command})
+if (#{get_config(:pre_command)})
 {
 #{cmd}
 }

data/lib/specinfra/backend/ssh.rb

@@ -45,10 +45,10 @@ module Specinfra::Backend
     end
 
     def with_env
-      env = Specinfra.configuration.env || {}
+      env = get_config(:env) || {}
       env[:LANG] ||= 'C'
 
-      ssh_options = Specinfra.configuration.ssh_options || {}
+      ssh_options = get_config(:ssh_options) || {}
       ssh_options[:send_env] ||= []
 
       env.each do |key, value|
@@ -68,14 +68,14 @@ module Specinfra::Backend
 
     def create_ssh
       Net::SSH.start(
-        Specinfra.configuration.host,
-        Specinfra.configuration.ssh_options[:user],
-        Specinfra.configuration.ssh_options
+        get_config(:host),
+        get_config(:ssh_options)[:user],
+        get_config(:ssh_options)
       )
     end
 
     def create_scp
-      ssh = Specinfra.configuration.ssh
+      ssh = get_config(:ssh)
       if ssh.nil?
         ssh = create_ssh
       end
@@ -83,12 +83,12 @@ module Specinfra::Backend
     end
 
     def scp_upload!(from, to, opt={})
-      if Specinfra.configuration.scp.nil?
-        Specinfra.configuration.scp = create_scp
+      if get_config(:scp).nil?
+        set_config(:scp, create_scp)
       end
 
       tmp = File.join('/tmp', File.basename(to))
-      scp = Specinfra.configuration.scp
+      scp = get_config(:scp)
       scp.upload!(from, tmp, opt)
       run_command(Specinfra.command.get(:move_file, tmp, to))
     end
@@ -100,13 +100,13 @@ module Specinfra::Backend
       exit_signal = nil
       retry_prompt = /^Sorry, try again/
 
-      if Specinfra.configuration.ssh.nil?
-        Specinfra.configuration.ssh = create_ssh
+      if get_config(:ssh).nil?
+        set_config(:ssh, create_ssh)
       end
 
-      ssh = Specinfra.configuration.ssh
+      ssh = get_config(:ssh)
       ssh.open_channel do |channel|
-        if Specinfra.configuration.sudo_password or Specinfra.configuration.request_pty
+        if get_config(:sudo_password) or get_config(:request_pty)
           channel.request_pty do |ch, success|
             abort "Could not obtain pty " if !success
           end
@@ -117,7 +117,7 @@ module Specinfra::Backend
             if data.match retry_prompt
               abort 'Wrong sudo password! Please confirm your password.'
             elsif data.match /^#{prompt}/
-              channel.send_data "#{Specinfra.configuration.sudo_password}\n"
+              channel.send_data "#{get_config(:sudo_password)}\n"
             else
               stdout_data += data
             end
@@ -149,13 +149,13 @@ module Specinfra::Backend
     end
 
     def sudo
-      if sudo_path = Specinfra.configuration.sudo_path
+      if sudo_path = get_config(:sudo_path)
         sudo_path += '/sudo'
       else
         sudo_path = 'sudo'
       end
 
-      sudo_options = Specinfra.configuration.sudo_options
+      sudo_options = get_config(:sudo_options)
       if sudo_options
         sudo_options = sudo_options.shelljoin if sudo_options.is_a?(Array)
         sudo_options = ' ' + sudo_options
@@ -165,8 +165,8 @@ module Specinfra::Backend
     end
 
     def sudo?
-      user = Specinfra.configuration.ssh_options[:user]
-      disable_sudo = Specinfra.configuration.disable_sudo
+      user = get_config(:ssh_options)[:user]
+      disable_sudo = get_config(:disable_sudo)
       user != 'root' && !disable_sudo
     end
   end

data/lib/specinfra/backend/telnet.rb

@@ -29,7 +29,7 @@ module Specinfra::Backend
     end
 
     def with_env
-      env = Specinfra.configuration.env || {}
+      env = get_config(:env) || {}
       env[:LANG] ||= 'C'
 
       env.each do |key, value|
@@ -47,8 +47,8 @@ module Specinfra::Backend
     end
 
     def add_pre_command(cmd)
-      if Specinfra.configuration.pre_command
-        pre_cmd = build_command(Specinfra.configuration.pre_command)
+      if get_config(:pre_command)
+        pre_cmd = build_command(get_config(:pre_command))
         "#{pre_cmd} && #{cmd}"
       else
         cmd
@@ -61,10 +61,10 @@ module Specinfra::Backend
       exit_status = nil
       exit_signal = nil
       retry_prompt = /^Login: /
-      if Specinfra.configuration.telnet.nil?
-        Specinfra.configuration.telnet = create_telnet
+      if get_config(:telnet).nil?
+        set_config(:telnet, create_telnet)
       end
-      telnet = Specinfra.configuration.telnet
+      telnet = get_config(:telnet)
       re = [] 
       unless telnet.nil?
         re = telnet.cmd( "#{command}; echo $?" ).split("\n")[0..-2]
@@ -75,10 +75,10 @@ module Specinfra::Backend
     end
  
     def create_telnet
-      tel = Net::Telnet.new( "Host" => Specinfra.configuration.host )
+      tel = Net::Telnet.new( "Host" => get_config(:host) )
       tel.login( 
-        "Name" => Specinfra.configuration.telnet_options[:user], 
-        "Password" => Specinfra.configuration.telnet_options[:pass]
+        "Name" => get_config(:telnet_options)[:user], 
+        "Password" => get_config(:telnet_options)[:pass]
       )
       tel
     rescue
@@ -86,13 +86,13 @@ module Specinfra::Backend
     end
 
     def sudo
-      if sudo_path = Specinfra.configuration.sudo_path
+      if sudo_path = get_config(:sudo_path)
         sudo_path += '/sudo'
       else
         sudo_path = 'sudo'
       end
 
-      sudo_options = Specinfra.configuration.sudo_options
+      sudo_options = get_config(:sudo_options)
       if sudo_options
         sudo_options = sudo_options.shelljoin if sudo_options.is_a?(Array)
         sudo_options = ' ' + sudo_options

data/lib/specinfra/backend/winrm.rb

@@ -3,9 +3,9 @@ module Specinfra::Backend
     include PowerShell::ScriptHelper
 
     def run_command(cmd, opts={})
-      Specinfra.configuration.os = { :family => 'windows' }
+      set_config(:os, {:family => 'windows'})
       script = create_script(cmd)
-      winrm = Specinfra.configuration.winrm
+      winrm = get_config(:winrm)
 
       result = winrm.powershell(script)
       stdout, stderr = [:stdout, :stderr].map do |s|

data/lib/specinfra/command_factory.rb

@@ -1,77 +1,83 @@
 class Specinfra::CommandFactory
-  class << self
-    @@types = nil
+  @@types = nil
 
-    def get(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
+  def self.instance
+    self.new(os)
+  end
 
-    private
-    def create_command_class(resource_type)
-      family  = os[:family]
-      version = os[:release] ? "V#{os[:release].to_i}" : nil
+  def initialize(os_info)
+    @os_info = os_info
+  end
 
-      common_class = Specinfra::Command
-      base_class   = common_class.const_get('Base')
-      os_class     = family.nil? ? base_class : common_class.const_get(family.capitalize)
+  def get(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
 
-      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
+  private
+  def create_command_class(resource_type)
+    family  = @os_info[:family]
+    version = @os_info[:release] ? "V#{@os_info[:release].to_i}" : nil
+
+    common_class = Specinfra::Command
+    base_class   = common_class.const_get('Base')
+    os_class     = family.nil? ? base_class : common_class.const_get(family.capitalize)
 
+    if family && version
       begin
-        command_class = version_class.const_get(resource_type.to_camel_case)
+        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 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
+    begin
+      command_class = version_class.const_get(resource_type.to_camel_case)
+    rescue
+    end
 
-      command_class.create
+    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
 
-    def breakdown(meth)
-      # Somtimes `selinux_module' type matches `selinux' and error occurs.
-      # Reverse sorting is needed to avoid this problem.
-      types = resource_types.map {|t| t.to_snake_case }.sort.reverse.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]
+    command_class.create
+  end
+
+  def breakdown(meth)
+    # Somtimes `selinux_module' type matches `selinux' and error occurs.
+    # Reverse sorting is needed to avoid this problem.
+    types = resource_types.map {|t| t.to_snake_case }.sort.reverse.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
 
-    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!
+  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
+      @@types.uniq!
     end
+    @@types
   end
 end

data/lib/specinfra/helper/detect_os.rb

@@ -1,7 +1,19 @@
 module Specinfra::Helper
   class DetectOs
-    def self.run_command(cmd)
-      Specinfra.backend.run_command(cmd)
+    def self.detect
+      self.new(Specinfra.backend).detect
+    end
+
+    def initialize(backend)
+      @backend = backend
+    end
+
+    def run_command(cmd)
+      @backend.run_command(cmd)
+    end
+
+    def detect
+      raise NotImplementedError
     end
   end
 end

data/lib/specinfra/helper/detect_os/aix.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Aix < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('uname -s').stdout =~ /AIX/i
       { :family => 'aix', :release => nil }
     end

data/lib/specinfra/helper/detect_os/alpine.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Alpine < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /etc/alpine-release').success?
       release = run_command('cat /etc/alpine-release').stdout
       { :family => 'alpine', :release => release }

data/lib/specinfra/helper/detect_os/arch.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Arch < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /etc/arch-release').success?
       { :family => 'arch', :release => nil }
     end

data/lib/specinfra/helper/detect_os/coreos.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Coreos < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /etc/coreos/update.conf').success?
       distro  = nil
       release = nil

data/lib/specinfra/helper/detect_os/darwin.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Darwin < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('uname -s').stdout =~ /Darwin/i
       { :family => 'darwin', :release => nil }
     end

data/lib/specinfra/helper/detect_os/debian.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /etc/debian_version').success?
       distro  = nil
       release = nil

data/lib/specinfra/helper/detect_os/esxi.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Esxi < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('vmware -v').success?
       line = run_command('vmware -v').stdout
       if line =~ /VMware ESXi (.*)/

data/lib/specinfra/helper/detect_os/freebsd.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Freebsd < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
       if uname =~ /10./
         { :family => 'freebsd', :release => 10 }

data/lib/specinfra/helper/detect_os/gentoo.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Gentoo < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /etc/gentoo-release').success?
       { :family => 'gentoo', :release => nil }
     end

data/lib/specinfra/helper/detect_os/nixos.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Nixos < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /var/run/current-system/sw').success?
       { :family => 'nixos', :release => nil }
     end

data/lib/specinfra/helper/detect_os/openbsd.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Openbsd < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('uname -s').stdout =~ /OpenBSD/i
       { :family => 'openbsd', :release => nil }
     end

data/lib/specinfra/helper/detect_os/plamo.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Plamo < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /usr/lib/setup/Plamo-*').success?
       { :family => 'plamo', :release => nil }
     end

data/lib/specinfra/helper/detect_os/redhat.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Redhat < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     # 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?

data/lib/specinfra/helper/detect_os/solaris.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Solaris < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i
       if uname =~ /5.10/
         { :family => 'solaris', :release => 10 }

data/lib/specinfra/helper/detect_os/suse.rb

@@ -1,5 +1,5 @@
 class Specinfra::Helper::DetectOs::Suse < Specinfra::Helper::DetectOs
-  def self.detect
+  def detect
     if run_command('ls /etc/SuSE-release').success?
       line = run_command('cat /etc/SuSE-release').stdout
       if line =~ /SUSE Linux Enterprise Server (\d+)/

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.21.1"
+  VERSION = "2.22.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.21.1
+  version: 2.22.0
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -109,6 +109,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/multiple_backends.rb
 - lib/specinfra.rb
 - lib/specinfra/backend.rb
 - lib/specinfra/backend/base.rb