specinfra 2.0.0.beta15 → 2.0.0.beta16

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Windows::Base::Group < Specinfra::Command::Windows::Base
-  def check_exists(group)
-    group_id, domain = windows_account group
-    Backend::PowerShell::Command.new do
-      using 'find_group.ps1'
-      exec "(FindGroup -groupName '#{group_id}'#{domain.nil? ? "" : " -domain '#{domain}'"}) -ne $null"
+  class << self
+    def check_exists(group)
+      group_id, domain = windows_account group
+      Backend::PowerShell::Command.new do
+        using 'find_group.ps1'
+        exec "(FindGroup -groupName '#{group_id}'#{domain.nil? ? "" : " -domain '#{domain}'"}) -ne $null"
+      end
     end
   end
 end

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

@@ -1,22 +1,24 @@
 class Specinfra::Command::Windows::Base::Host < Specinfra::Command::Windows::Base
-  def check_is_resolvable(name, type)
-    if type == "hosts"
-      cmd = "@(Select-String -path (Join-Path -Path $($env:windir) -ChildPath 'system32/drivers/etc/hosts') -pattern '#{name}\\b').count -gt 0"
-    else
-      cmd = "@([System.Net.Dns]::GetHostAddresses('#{name}')).count -gt 0"
+  class << self
+    def check_is_resolvable(name, type)
+      if type == "hosts"
+        cmd = "@(Select-String -path (Join-Path -Path $($env:windir) -ChildPath 'system32/drivers/etc/hosts') -pattern '#{name}\\b').count -gt 0"
+      else
+        cmd = "@([System.Net.Dns]::GetHostAddresses('#{name}')).count -gt 0"
+      end
+      Backend::PowerShell::Command.new { exec cmd }
     end
-    Backend::PowerShell::Command.new { exec cmd }
-  end
 
-  def check_is_reachable(host, port, proto, timeout)
-    if port.nil?
-      Backend::PowerShell::Command.new do
-        exec "(New-Object System.Net.NetworkInformation.Ping).send('#{host}').Status -eq 'Success'"
-      end
-    else
-      Backend::PowerShell::Command.new do
-        using 'is_remote_port_listening.ps1'
-        exec"(IsRemotePortListening -hostname #{host} -port #{port} -timeout #{timeout} -proto #{proto}) -eq $true"
+    def check_is_reachable(host, port, proto, timeout)
+      if port.nil?
+        Backend::PowerShell::Command.new do
+          exec "(New-Object System.Net.NetworkInformation.Ping).send('#{host}').Status -eq 'Success'"
+        end
+      else
+        Backend::PowerShell::Command.new do
+          using 'is_remote_port_listening.ps1'
+          exec"(IsRemotePortListening -hostname #{host} -port #{port} -timeout #{timeout} -proto #{proto}) -eq $true"
+        end
       end
     end
   end

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

@@ -1,17 +1,19 @@
 class Specinfra::Command::Windows::Base::HotFix < Specinfra::Command::Windows::Base
-  def check_is_installed(description, hot_fix_id=nil)
-    hot_fix_id_match = /(KB\d+)/i.match(description)
-    hot_fix_id = hot_fix_id_match ? hot_fix_id_match[1] : description if hot_fix_id.nil?
+  class << self
+    def check_is_installed(description, hot_fix_id=nil)
+      hot_fix_id_match = /(KB\d+)/i.match(description)
+      hot_fix_id = hot_fix_id_match ? hot_fix_id_match[1] : description if hot_fix_id.nil?
 
-    args = [ 
-      '-description', "'#{description}'",
-      '-hotFixId', "'#{hot_fix_id}'"
-    ]
+      args = [ 
+        '-description', "'#{description}'",
+        '-hotFixId', "'#{hot_fix_id}'"
+      ]
  
-    cmd = "(FindInstalledHotFix #{args.join(' ')})" 
-    Backend::PowerShell::Command.new do
-      using 'find_installed_hot_fix.ps1'
-      exec "#{cmd} -eq $true"
+      cmd = "(FindInstalledHotFix #{args.join(' ')})" 
+      Backend::PowerShell::Command.new do
+        using 'find_installed_hot_fix.ps1'
+        exec "#{cmd} -eq $true"
+      end
     end
   end
 end

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

@@ -1,15 +1,17 @@
 class Specinfra::Command::Windows::Base::IisAppPool < Specinfra::Command::Windows::Base
-  def check_exists(name)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "@(FindIISAppPool -name '#{name}').count -gt 0"
+  class << self
+    def check_exists(name)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "@(FindIISAppPool -name '#{name}').count -gt 0"
+      end
     end
-  end
 
-  def check_has_dotnet_version(name, dotnet)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "(FindIISAppPool -name '#{name}').managedRuntimeVersion -match 'v#{dotnet}'"
+    def check_has_dotnet_version(name, dotnet)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "(FindIISAppPool -name '#{name}').managedRuntimeVersion -match 'v#{dotnet}'"
+      end
     end
   end
 end

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

@@ -1,36 +1,38 @@
 class Specinfra::Command::Windows::Base::IisWebsite < Specinfra::Command::Windows::Base
-  def check_is_enabled(name)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "(FindIISWebsite -name '#{name}').serverAutoStart -eq $true"
+  class << self
+    def check_is_enabled(name)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "(FindIISWebsite -name '#{name}').serverAutoStart -eq $true"
+      end
     end
-  end
 
-  def check_is_installed(name)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "@(FindIISWebsite -name '#{name}').count -gt 0"
+    def check_is_installed(name)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "@(FindIISWebsite -name '#{name}').count -gt 0"
+      end
     end
-  end
 
-  def check_is_running(name)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "(FindIISWebsite -name '#{name}').state -eq 'Started'"
+    def check_is_running(name)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "(FindIISWebsite -name '#{name}').state -eq 'Started'"
+      end
     end
-  end
 
-  def check_is_in_app_pool(name, app_pool)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "(FindIISWebsite -name '#{name}').applicationPool -match '#{app_pool}'"
+    def check_is_in_app_pool(name, app_pool)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "(FindIISWebsite -name '#{name}').applicationPool -match '#{app_pool}'"
+      end
     end
-  end
 
-  def check_has_physical_path(name, path)
-    Backend::PowerShell::Command.new do
-      using 'find_iis_component.ps1'
-      exec "[System.Environment]::ExpandEnvironmentVariables( ( FindIISWebsite -name '#{name}' ).physicalPath ).replace('\\', '/' ) -eq ('#{path}'.trimEnd('/').replace('\\', '/'))"
+    def check_has_physical_path(name, path)
+      Backend::PowerShell::Command.new do
+        using 'find_iis_component.ps1'
+        exec "[System.Environment]::ExpandEnvironmentVariables( ( FindIISWebsite -name '#{name}' ).physicalPath ).replace('\\', '/' ) -eq ('#{path}'.trimEnd('/').replace('\\', '/'))"
+      end
     end
   end
 end

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

@@ -1,9 +1,11 @@
 class Specinfra::Command::Windows::Base::Package < Specinfra::Command::Windows::Base
-  def check_is_installed(package, version=nil)
-    version_selection = version.nil? ? "" : "-appVersion '#{version}'"
-    Backend::PowerShell::Command.new do
-      using 'find_installed_application.ps1'
-      exec "(FindInstalledApplication -appName '#{package}' #{version_selection}) -eq $true"
+  class << self
+    def check_is_installed(package, version=nil)
+      version_selection = version.nil? ? "" : "-appVersion '#{version}'"
+      Backend::PowerShell::Command.new do
+        using 'find_installed_application.ps1'
+        exec "(FindInstalledApplication -appName '#{package}' #{version_selection}) -eq $true"
+      end
     end
   end
 end

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

@@ -1,15 +1,17 @@
 class Specinfra::Command::Windows::Base::Port < Specinfra::Command::Windows::Base
-  def check_is_listening(port, options=nil)
-    Backend::PowerShell::Command.new do
-      using 'is_port_listening.ps1'
-      exec "IsPortListening -portNumber #{port}"
+  class << self
+    def check_is_listening(port, options=nil)
+      Backend::PowerShell::Command.new do
+        using 'is_port_listening.ps1'
+        exec "IsPortListening -portNumber #{port}"
+      end
     end
-  end
 
-  def check_is_listening_with_protocol(port, protocol)
-    Backend::PowerShell::Command.new do
-      using 'is_port_listening.ps1'
-      exec "IsPortListening -portNumber #{port} -protocol '#{protocol}'"
+    def check_is_listening_with_protocol(port, protocol)
+      Backend::PowerShell::Command.new do
+        using 'is_port_listening.ps1'
+        exec "IsPortListening -portNumber #{port} -protocol '#{protocol}'"
+      end
     end
   end
 end

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

@@ -1,7 +1,9 @@
 class Specinfra::Command::Windows::Base::Process < Specinfra::Command::Windows::Base
-  def check_process(process)
-    Backend::PowerShell::Command.new do
-      exec "(Get-Process '#{process}') -ne $null"
+  class << self
+    def check_process(process)
+      Backend::PowerShell::Command.new do
+        exec "(Get-Process '#{process}') -ne $null"
+      end
     end
   end
 end

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

@@ -1,43 +1,44 @@
 class Specinfra::Command::Windows::Base::RegistryKey < Specinfra::Command::Windows::Base
-  REGISTRY_KEY_TYPES = {
-    :type_string       => 'String',
-    :type_binary       => 'Binary',
-    :type_dword        => 'DWord',
-    :type_qword        => 'QWord',
-    :type_multistring  => 'MultiString',
-    :type_expandstring => 'ExpandString'
-  }
+  class << self
+    REGISTRY_KEY_TYPES = {
+      :type_string       => 'String',
+      :type_binary       => 'Binary',
+      :type_dword        => 'DWord',
+      :type_qword        => 'QWord',
+      :type_multistring  => 'MultiString',
+      :type_expandstring => 'ExpandString'
+    }
 
-  def check_exists(key_name)
-    cmd = "(Get-Item 'Registry::#{key_name}') -ne $null"
-    Backend::PowerShell::Command.new { exec cmd }
-  end
+    def check_exists(key_name)
+      cmd = "(Get-Item 'Registry::#{key_name}') -ne $null"
+      Backend::PowerShell::Command.new { exec cmd }
+    end
 
-  def check_has_property(key_name, key_property)
-    cmd = "(Get-Item 'Registry::#{key_name}').GetValueKind('#{key_property[:name]}') -eq '#{REGISTRY_KEY_TYPES[key_property[:type]]}'"
-    Backend::PowerShell::Command.new { exec cmd }
-  end
+    def check_has_property(key_name, key_property)
+      cmd = "(Get-Item 'Registry::#{key_name}').GetValueKind('#{key_property[:name]}') -eq '#{REGISTRY_KEY_TYPES[key_property[:type]]}'"
+      Backend::PowerShell::Command.new { exec cmd }
+    end
 
-  def check_has_value(key_name, key_property)
-    value = convert_key_property_value key_property
-    cmd = "(Compare-Object (Get-Item 'Registry::#{key_name}').GetValue('#{key_property[:name]}') #{value}) -eq $null"
-    Backend::PowerShell::Command.new { exec cmd }
-  end
+    def check_has_value(key_name, key_property)
+      value = convert_key_property_value key_property
+      cmd = "(Compare-Object (Get-Item 'Registry::#{key_name}').GetValue('#{key_property[:name]}') #{value}) -eq $null"
+      Backend::PowerShell::Command.new { exec cmd }
+    end
 
-  private
-  def convert_key_property_value property
-    case property[:type]
-    when :type_binary
-      byte_array = [property[:value]].pack('H*').bytes.to_a
-      "([byte[]] #{byte_array.join(',')})"
-    when :type_dword
-      [property[:value].rjust(8, '0').scan(/[0-9a-f]{2}/i).reverse.join].pack("H*").unpack("l").first
-    when :type_qword
-      property[:value].hex
-    else
-      string_array = property[:value].split("\n").map {|s| "'#{s}'"}.reduce {|acc, s| "#{acc},#{s}"}
-      "@(#{string_array})"
+    private
+    def convert_key_property_value property
+      case property[:type]
+      when :type_binary
+        byte_array = [property[:value]].pack('H*').bytes.to_a
+        "([byte[]] #{byte_array.join(',')})"
+      when :type_dword
+        [property[:value].rjust(8, '0').scan(/[0-9a-f]{2}/i).reverse.join].pack("H*").unpack("l").first
+      when :type_qword
+        property[:value].hex
+      else
+        string_array = property[:value].split("\n").map {|s| "'#{s}'"}.reduce {|acc, s| "#{acc},#{s}"}
+        "@(#{string_array})"
+      end
     end
   end
-
 end

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

@@ -1,8 +1,10 @@
 class Specinfra::Command::Windows::Base::ScheduledTask < Specinfra::Command::Windows::Base
-  def check_exists(name)
-    Backend::PowerShell::Command.new do
-      using 'find_scheduled_task.ps1'
-      exec "(FindScheduledTask -name '#{name}').TaskName -eq '\\#{name}'"
+  class << self
+    def check_exists(name)
+      Backend::PowerShell::Command.new do
+        using 'find_scheduled_task.ps1'
+        exec "(FindScheduledTask -name '#{name}').TaskName -eq '\\#{name}'"
+      end
     end
   end
 end

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

@@ -1,29 +1,31 @@
 class Specinfra::Command::Windows::Base::Service < Specinfra::Command::Windows::Base
-  def check_is_installed(service)
-    Backend::PowerShell::Command.new do
-      using 'find_service.ps1'
-      exec "@(FindService -name '#{service}').count -gt 0"
+  class << self
+    def check_is_installed(service)
+      Backend::PowerShell::Command.new do
+        using 'find_service.ps1'
+        exec "@(FindService -name '#{service}').count -gt 0"
+      end
     end
-  end
 
-  def check_has_start_mode(service, mode)
-    Backend::PowerShell::Command.new do
-      using 'find_service.ps1'
-      exec  "'#{mode}' -match (FindService -name '#{service}').StartMode -and (FindService -name '#{service}') -ne $null"
+    def check_has_start_mode(service, mode)
+      Backend::PowerShell::Command.new do
+        using 'find_service.ps1'
+        exec  "'#{mode}' -match (FindService -name '#{service}').StartMode -and (FindService -name '#{service}') -ne $null"
+      end
     end
-  end
 
-  def check_is_enabled(service, level=nil)
-    Backend::PowerShell::Command.new do
-      using 'find_service.ps1'
-      exec "(FindService -name '#{service}').StartMode -eq 'Auto'"
+    def check_is_enabled(service, level=nil)
+      Backend::PowerShell::Command.new do
+        using 'find_service.ps1'
+        exec "(FindService -name '#{service}').StartMode -eq 'Auto'"
+      end
     end
-  end
 
-  def check_is_running(service)
-    Backend::PowerShell::Command.new do
-      using 'find_service.ps1'
-      exec "(FindService -name '#{service}').State -eq 'Running'"
+    def check_is_running(service)
+      Backend::PowerShell::Command.new do
+        using 'find_service.ps1'
+        exec "(FindService -name '#{service}').State -eq 'Running'"
+      end
     end
   end
 end

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

@@ -1,20 +1,22 @@
 class Specinfra::Command::Windows::Base::User < Specinfra::Command::Windows::Base
-  def check_exists(user)
-    user_id, domain = windows_account user
-    Backend::PowerShell::Command.new do
-      using 'find_user.ps1'
-      exec "(FindUser -userName '#{user_id}'#{domain.nil? ? "" : " -domain '#{domain}'"}) -ne $null"
+  class << self
+    def check_exists(user)
+      user_id, domain = windows_account user
+      Backend::PowerShell::Command.new do
+        using 'find_user.ps1'
+        exec "(FindUser -userName '#{user_id}'#{domain.nil? ? "" : " -domain '#{domain}'"}) -ne $null"
+      end
     end
-  end
 
-  def check_belongs_to_group(user, group)
-    user_id, user_domain = windows_account user
-    group_id, group_domain = windows_account group
-    Backend::PowerShell::Command.new do
-      using 'find_user.ps1'
-      using 'find_group.ps1'
-      using 'find_usergroup.ps1'
-      exec "(FindUserGroup -userName '#{user_id}'#{user_domain.nil? ? "" : " -userDomain '#{user_domain}'"} -groupName '#{group_id}'#{group_domain.nil? ? "" : " -groupDomain '#{group_domain}'"}) -ne $null"
+    def check_belongs_to_group(user, group)
+      user_id, user_domain = windows_account user
+      group_id, group_domain = windows_account group
+      Backend::PowerShell::Command.new do
+        using 'find_user.ps1'
+        using 'find_group.ps1'
+        using 'find_usergroup.ps1'
+        exec "(FindUserGroup -userName '#{user_id}'#{user_domain.nil? ? "" : " -userDomain '#{user_domain}'"} -groupName '#{group_id}'#{group_domain.nil? ? "" : " -groupDomain '#{group_domain}'"}) -ne $null"
+      end
     end
   end
 end

data/lib/specinfra/runner.rb

@@ -1,7 +1,6 @@
 module Specinfra
   class Runner
-    include Singleton
-    def method_missing(meth, *args, &block)
+    def self.method_missing(meth, *args, &block)
       if os.include?(:family) && os[:family] == 'windows'
         Specinfra.backend.send(meth, *args)
       else

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta15"
+  VERSION = "2.0.0.beta16"
 end

data/spec/command/base_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Specinfra::Command::Base do
+describe 'create_command_class work correctly' do
   after do
     property[:os_by_host] = nil
   end
@@ -9,20 +9,28 @@ describe Specinfra::Command::Base do
     before do
       set :os, :family => 'base'
     end
-    it { expect(subject.command_class('file')).to be Specinfra::Command::Base::File }
+    it { expect(Specinfra::Command::Base.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(subject.command_class('file')).to be Specinfra::Command::Redhat::Base::File }
+    it { expect(Specinfra::Command::Base.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
-    xit { expect(subject.command_class('file')).to be Specinfra::Command::Redhat::V7::File }
+    it { expect(Specinfra::Command::Base.create_command_class('file')).to eq Specinfra::Command::Redhat::V7::File }
   end
 end
+
+
+
+
+
+
+
+