specinfra 2.0.0.beta32 → 2.0.0.beta33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bdf29071ca5229cf86e2c3652d9e5aff5a95adf
-  data.tar.gz: 3316f09764ff4c1bdf3e77ca77d1e1b50473fbbe
+  metadata.gz: 0db001bb80acc21063e836cfcc9f38085f321b5c
+  data.tar.gz: c8798ab23084ea41e8b9f24dd682658c9f11dff5
 SHA512:
-  metadata.gz: d47a9c0b81348438f99b5d9f8074c6442b0d7e35ce86e802b24c7a5350ef93c1994dba0b4d66d71b99c7fd52febdc580de8b9dddc2c0daa23421ec17b67de137
-  data.tar.gz: cf65c9ea30eb98dd69890127ecdfc1ce1649eaa02787db878a95ac6156ca61b9fee07c422602f0cfa2382e735b72f4b2fc628357d42acc90ee010b6d35c2e8e2
+  metadata.gz: 5470153f45e9c0ea4cd866b6d2f3dfb8a1e0d99372bf6a8082b51539dbb397c67d3db0bda2401a52aed9a14a3cf0e37da6deab27d1a77d8f62beb80ebacd559e
+  data.tar.gz: f60a57128d79bef16301c1c97b3f700e7e4391d59369046b575255dd189585f7b115d3c247108180a73524a4fdc2dd31d045a07274de3285061440081959bbe4

data/lib/specinfra/backend/cmd.rb

@@ -6,6 +6,7 @@ module Specinfra
       include PowerShell::ScriptHelper
 
       def run_command(cmd, opts={})
+        set :os, :family => 'windows'
         script = create_script(cmd)
         result = execute_script %Q{#{powershell} -encodedCommand #{encode_script(script)}}
 

data/lib/specinfra/backend/exec.rb

@@ -4,7 +4,6 @@ require 'shellwords'
 
 module Specinfra::Backend
   class Exec < Base
-
     def run_command(cmd, opts={})
       cmd = build_command(cmd)
       cmd = add_pre_command(cmd)
@@ -22,6 +21,11 @@ module Specinfra::Backend
       CommandResult.new :stdout => stdout, :exit_status => $?.exitstatus
     end
 
+    def copy_file(from, to)
+      FileUtils.cp(from, to)
+    end
+
+    private
     def with_env
       keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE
           RUBYOPT GEM_HOME GEM_PATH GEM_CACHE]
@@ -67,9 +71,5 @@ module Specinfra::Backend
         cmd
       end
     end
-
-    def copy_file(from, to)
-      FileUtils.cp(from, to)
-    end
   end
 end

data/lib/specinfra/backend/ssh.rb

@@ -1,13 +1,10 @@
+# -*- coding: utf-8 -*-
 require 'specinfra/backend/exec'
 require 'net/ssh'
 require 'net/scp'
 
 module Specinfra::Backend
   class Ssh < Exec
-    def prompt
-      'Password: '
-    end
-
     def run_command(cmd, opt={})
       cmd = build_command(cmd)
       cmd = add_pre_command(cmd)
@@ -25,6 +22,30 @@ module Specinfra::Backend
       CommandResult.new ret
     end
 
+    def copy_file(from, to)
+      if Specinfra.configuration.scp.nil?
+        Specinfra.configuration.scp = create_scp
+      end
+
+      scp = Specinfra.configuration.scp
+      scp.upload!(from, to)
+    end
+
+    private
+    def prompt
+      'Password: '
+    end
+
+    def build_command(cmd)
+      cmd = super(cmd)
+      user = Specinfra.configuration.ssh_options[:user]
+      disable_sudo = Specinfra.configuration.disable_sudo
+      if user != 'root' && !disable_sudo
+        cmd = "#{sudo} -p '#{prompt}' #{cmd}"
+      end
+      cmd
+    end
+
     def with_env
       env = Specinfra.configuration.env || {}
       env[:LANG] ||= 'C'
@@ -47,26 +68,6 @@ module Specinfra::Backend
       end
     end
 
-    def build_command(cmd)
-      cmd = super(cmd)
-      user = Specinfra.configuration.ssh_options[:user]
-      disable_sudo = Specinfra.configuration.disable_sudo
-      if user != 'root' && !disable_sudo
-        cmd = "#{sudo} -p '#{prompt}' #{cmd}"
-      end
-      cmd
-    end
-
-    def copy_file(from, to)
-      if Specinfra.configuration.scp.nil?
-        Specinfra.configuration.scp = create_scp
-      end
-
-      scp = Specinfra.configuration.scp
-      scp.upload!(from, to)
-    end
-
-    private
     def create_ssh
       Net::SSH.start(
         Specinfra.configuration.host,
@@ -116,7 +117,7 @@ module Specinfra::Backend
             end
 
             if data.match /^sudo: no tty present and no askpass program specified/
-              abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable"
+              abort 'Please set sudo password to Specinfra.configuration.sudo_password.'
             else
               stderr_data += data
             end

data/lib/specinfra/backend/winrm.rb

@@ -1,8 +1,9 @@
 module Specinfra::Backend
-  class WinRM < Base
+  class Winrm < Base
     include PowerShell::ScriptHelper
 
     def run_command(cmd, opts={})
+      set :os, :family => 'windows'
       script = create_script(cmd)
       winrm = Specinfra.configuration.winrm
 

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

@@ -35,9 +35,10 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
       from ||= '1'
       to ||= '$'
       sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
+      sed_end = "sed -n 1,#{escape(to)}p"
       checker_with_regexp = check_contains_with_regexp("-", expected_pattern)
       checker_with_fixed  = check_contains_with_fixed_strings("-", expected_pattern)
-      "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
+      "#{sed} | #{sed_end} | #{checker_with_regexp} || #{sed} | #{sed_end} | #{checker_with_fixed}"
     end
 
     def check_contains_lines(file, expected_lines, from=nil, to=nil)
@@ -52,11 +53,11 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
     end
 
     def check_contains_with_regexp(file, expected_pattern)
-      "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
+      "grep -qs -- #{escape(expected_pattern)} #{escape(file)}"
     end
 
     def check_contains_with_fixed_strings(file, expected_pattern)
-      "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
+      "grep -qFs -- #{escape(expected_pattern)} #{escape(file)}"
     end
 
     def get_md5sum(file)

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

@@ -4,10 +4,6 @@ class Specinfra::Command::Base::Service < Specinfra::Command::Base
       "service #{escape(service)} status"
     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

data/lib/specinfra/command/base.rb

@@ -1,8 +1,6 @@
 require 'shellwords'
 class Specinfra::Command::Base
   class << self
-    @@types = nil
-
     class NotImplementedError < Exception; end
 
     def create
@@ -19,78 +17,5 @@ class Specinfra::Command::Base
 
       Shellwords.shellescape(str)
     end
-
-    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 create_command_class(resource_type)
-      family  = os[:family]
-      version = os[:release] ? "V#{os[: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
-          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
-
-      begin
-        command_class = 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
-
-      command_class.create
-    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
-      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!
-      end
-      @@types
-    end
   end
 end
-
-
-

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

@@ -10,5 +10,3 @@ class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selin
     end
   end
 end
-
-

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

@@ -9,10 +9,3 @@ class Specinfra::Command::Openbsd::Base::User < Specinfra::Command::Base::User
     end
   end
 end
-
-
-
-
-
-
-

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

@@ -4,9 +4,10 @@ class Specinfra::Command::Solaris::Base::File < Specinfra::Command::Base::File
       from ||= '1'
       to ||= '$'
       sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
+      sed_end = "sed -n 1,#{escape(to)}p"
       checker_with_regexp = check_contains_with_regexp("/dev/stdin", expected_pattern)
       checker_with_fixed  = check_contains_with_fixed_strings("/dev/stdin", expected_pattern)
-      "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
+      "#{sed} | #{sed_end} | #{checker_with_regexp}|| #{sed} | #{sed_end} | #{checker_with_fixed}"
     end
 
     def check_is_accessible_by_user(file, user, access)

data/lib/specinfra/command/windows/base/feature.rb

@@ -1,10 +1,10 @@
 class Specinfra::Command::Windows::Base::Feature < Specinfra::Command::Windows::Base
   class << self
-    def check_is_enabled(name,provider)
+    def check_is_enabled(name, provider)
       if provider.nil?
         cmd =  "@(ListWindowsFeatures -feature #{name}).count -gt 0"
       else
-        cmd =  "@(ListWindowsFeatures -feature #{name} -provider #{provider}).count -gt 0"
+        cmd =  "@(ListWindowsFeatures -feature #{name} -provider #{provider.to_s}).count -gt 0"
       end
 
       Backend::PowerShell::Command.new do

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

@@ -93,7 +93,7 @@ class Specinfra::Command::Windows::Base::File < Specinfra::Command::Windows::Bas
 
     private
     def item_has_attribute item, attribute
-      "((Get-Item -Path '#{item}' -Force).attributes.ToString() -Split ', ') -contains '#{attribute}'"
+      %Q!((Get-Item -Path "#{item}" -Force).attributes.ToString() -Split ', ') -contains '#{attribute}'!
     end
   end
 end

data/lib/specinfra/command/windows/base/iis_app_pool.rb

@@ -64,6 +64,3 @@ class Specinfra::Command::Windows::Base::IisAppPool < Specinfra::Command::Window
     end
   end
 end
-
-
-

data/lib/specinfra/command_factory.rb

@@ -0,0 +1,75 @@
+class Specinfra::CommandFactory
+  class << self
+    @@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
+
+    private
+    def create_command_class(resource_type)
+      family  = os[:family]
+      version = os[:release] ? "V#{os[: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
+          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
+
+      begin
+        command_class = 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
+
+      command_class.create
+    end
+
+    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
+
+    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
+    end
+  end
+end

data/lib/specinfra/processor.rb

@@ -35,8 +35,8 @@ module Specinfra
       mode = sprintf('%04s',Specinfra.backend.run_command(cmd).stdout.strip)
       mode = mode.split('')
       mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-      case by_whom
-      when nil
+      case by_whom.to_s
+      when ''
         mode_octal & 0444 != 0
       when 'owner'
         mode_octal & 0400 != 0
@@ -52,8 +52,8 @@ module Specinfra
       mode = sprintf('%04s',Specinfra.backend.run_command(cmd).stdout.strip)
       mode = mode.split('')
       mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-      case by_whom
-      when nil
+      case by_whom.to_s
+      when ''
         mode_octal & 0222 != 0
       when 'owner'
         mode_octal & 0200 != 0
@@ -69,8 +69,8 @@ module Specinfra
       mode = sprintf('%04s',Specinfra.backend.run_command(cmd).stdout.strip)
       mode = mode.split('')
       mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-      case by_whom
-      when nil
+      case by_whom.to_s
+      when ''
         mode_octal & 0111 != 0
       when 'owner'
         mode_octal & 0100 != 0

data/lib/specinfra/runner.rb

@@ -1,11 +1,16 @@
 module Specinfra
   class Runner
     def self.method_missing(meth, *args)
+      backend   = Specinfra.backend
+      processor = Specinfra::Processor
+      
       if os.include?(:family) && os[:family] == 'windows'
-        run(meth, *args)
+        if backend.respond_to?(meth)
+          backend.send(meth, *args)
+        else
+          run(meth, *args)
+        end
       else
-        processor = Specinfra::Processor
-        backend   = Specinfra.backend
         if processor.respond_to?(meth)
           processor.send(meth, *args)
         elsif backend.respond_to?(meth)
@@ -16,19 +21,15 @@ module Specinfra
       end
     end
 
-    def self.run_command(cmd)
-      Specinfra.backend.run_command(cmd)
-    end
-
     private
     def self.run(meth, *args)
       cmd = Specinfra.command.get(meth, *args)
+      ret = Specinfra.backend.run_command(cmd)
       if meth.to_s =~ /^check/
-        Specinfra.backend.run_command(cmd).success?
+        ret.success?
       else
-        Specinfra.backend.run_command(cmd)
+        ret
       end
     end
-
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta32"
+  VERSION = "2.0.0.beta33"
 end

data/lib/specinfra.rb

@@ -2,6 +2,7 @@ require 'specinfra/version'
 require 'specinfra/helper'
 require 'specinfra/backend'
 require 'specinfra/command'
+require 'specinfra/command_factory'
 require 'specinfra/command_result'
 require 'specinfra/configuration'
 require 'specinfra/runner'
@@ -16,7 +17,7 @@ module Specinfra
     end
 
     def command
-      Specinfra::Command::Base
+      Specinfra::CommandFactory
     end
 
     def backend

data/spec/backend/exec/build_command_spec.rb

@@ -4,13 +4,13 @@ describe Specinfra::Backend::Exec do
   describe '#build_command' do
     context 'with simple command' do
       it 'should escape spaces' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
     context 'with complex command' do
       it 'should escape special chars' do
-        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(Specinfra.backend.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
     end
 
@@ -24,7 +24,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom shell' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/usr/local/bin/tcsh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/usr/local/bin/tcsh -c test\ -f\ /etc/passwd'
       end
     end
 
@@ -38,7 +38,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom shell' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/usr/test\ \&\ spec/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/usr/test\ \&\ spec/bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
@@ -52,7 +52,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom path' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/foo/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/foo/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
       end
     end
 
@@ -66,7 +66,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom path' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/test & spec/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq 'env PATH="/opt/bin:/opt/test & spec/bin:$PATH" /bin/sh -c test\ -f\ /etc/passwd'
       end
     end
   end

data/spec/backend/ssh/build_command_spec.rb

@@ -13,11 +13,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'should not prepend sudo' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
 
       it 'should escape special characters' do
-        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(Specinfra.backend.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
     end
 
@@ -30,11 +30,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'should prepend sudo' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
 
       it 'should escape special characters' do
-        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
+        expect(Specinfra.backend.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
       end
     end
 
@@ -54,11 +54,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1a' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
       end
 
       it 'command pattern 2a' do
-        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
+        expect(Specinfra.backend.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq %q{/usr/local/bin/sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)}
       end
     end
 
@@ -78,11 +78,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1b' do
-        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
 
       it 'command pattern 2b' do
-        expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
+        expect(Specinfra.backend.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
 
     end
@@ -104,12 +104,12 @@ describe Specinfra::Backend::Ssh do
       end
 
       context 'command pattern 1a' do
-        subject { Specinfra.backend.build_command('test -f /etc/passwd') }
+        subject { Specinfra.backend.send(:build_command, 'test -f /etc/passwd') }
         it { should eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd} }
       end
 
       context 'command pattern 2a' do
-        subject { Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+        subject { Specinfra.backend.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
         it { should eq %q{sudo -p 'Password: ' /bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)} }
       end
     end

data/spec/command/{base_spec.rb → factory_spec.rb}

@@ -9,21 +9,21 @@ describe 'create_command_class work correctly' do
     before do
       set :os, :family => 'base'
     end
-    it { expect(Specinfra::Command::Base.create_command_class('file')).to eq Specinfra::Command::Base::File }
+    it { expect(Specinfra.command.send(:create_command_class, 'file')).to eq Specinfra::Command::Base::File }
   end
 
   context 'family: redhat, release: nil' do
     before do
       set :os, :family => 'redhat'
     end
-    it { expect(Specinfra::Command::Base.create_command_class('file')).to eq Specinfra::Command::Redhat::Base::File }
+    it { expect(Specinfra.command.send(:create_command_class, 'file')).to eq Specinfra::Command::Redhat::Base::File }
   end
 
   context 'family: redhat, release: 7' do
     before do
       set :os, :family => 'redhat', :release => 7
     end
-    it { expect(Specinfra::Command::Base.create_command_class('file')).to eq Specinfra::Command::Redhat::V7::File }
+    it { expect(Specinfra.command.send(:create_command_class, 'file')).to eq Specinfra::Command::Redhat::V7::File }
   end
 end
 

data/spec/command/redhat/interface_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 property[:os] = nil
 set :os, { :family => 'redhat', :release => 7 }
 
-describe Specinfra.command.create_command_class('interface') do
+describe Specinfra.command.send(:create_command_class, 'interface') do
    it { should be_an_instance_of(Specinfra::Command::Linux::Base::Interface) }
 end
 

data/wercker.yml

@@ -36,7 +36,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:centos65
-        code: rake spec:centos65
+        code: DIGITALOCEAN=true rake spec:centos65
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant up centos70
@@ -52,7 +52,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:centos70
-        code: rake spec:centos70
+        code: DIGITALOCEAN=true rake spec:centos70
         cwd: $WORKING_DIR
     - script:
         name: Run vagrant up ubuntu1404
@@ -68,7 +68,7 @@ build:
         cwd: $WORKING_DIR
     - script:
         name: Run rake spec:ubuntu1404
-        code: rake spec:ubuntu1404
+        code: DIGITALOCEAN=true rake spec:ubuntu1404
         cwd: $WORKING_DIR
 
   after-steps:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta32
+  version: 2.0.0.beta33
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -292,6 +292,7 @@ files:
 - lib/specinfra/command/windows/base/scheduled_task.rb
 - lib/specinfra/command/windows/base/service.rb
 - lib/specinfra/command/windows/base/user.rb
+- lib/specinfra/command_factory.rb
 - lib/specinfra/command_result.rb
 - lib/specinfra/configuration.rb
 - lib/specinfra/helper.rb
@@ -322,7 +323,7 @@ files:
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/base/file_spec.rb
-- spec/command/base_spec.rb
+- spec/command/factory_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
@@ -362,7 +363,7 @@ test_files:
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/command/base/file_spec.rb
-- spec/command/base_spec.rb
+- spec/command/factory_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb