specinfra 1.27.5 → 2.0.0.beta1

data/lib/specinfra/command/solaris.rb

@@ -28,7 +28,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 -- #{escape(entry_escaped)}"
         else
@@ -76,10 +76,9 @@ module SpecInfra
         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_file_contain_with_regexp("/dev/stdin", expected_pattern)
         checker_with_fixed  = check_file_contain_with_fixed_strings("/dev/stdin", expected_pattern)
-        "#{sed} | #{sed_end} | #{checker_with_regexp}|| #{sed} | #{sed_end} | #{checker_with_fixed}"
+        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
       end
 
       def check_belonging_group(user, group)

data/lib/specinfra/command/ubuntu.rb

@@ -4,20 +4,6 @@ module SpecInfra
       def check_running(service)
         "service #{escape(service)} status && service #{escape(service)} status | grep 'running'"
       end
-
-      def check_ppa(package)
-        %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
-      end
-
-      def check_ppa_enabled(package)
-        %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
-      end
-
-      private
-
-      def to_apt_line_uri(repo)
-        escape(repo.gsub(/^ppa:/,''))
-      end
     end
   end
 end

data/lib/specinfra/command/windows.rb

@@ -53,7 +53,7 @@ module SpecInfra
 
       def check_file_contain(file, pattern)
         Backend::PowerShell::Command.new do
-          exec %Q![[Io.File]::ReadAllText("#{file}") -match '#{convert_regexp(pattern)}'!
+          exec "[Io.File]::ReadAllText('#{file}') -match '#{convert_regexp(pattern)}'"
         end
       end
 
@@ -62,12 +62,12 @@ module SpecInfra
         to ||= '$'
         Backend::PowerShell::Command.new do
           using 'crop_text.ps1'
-          exec %Q!(CropText -text ([Io.File]::ReadAllText("#{file}")) -fromPattern '#{convert_regexp(from)}' -toPattern '#{convert_regexp(to)}') -match '#{pattern}'!
+          exec %Q[(CropText -text ([Io.File]::ReadAllText('#{file}')) -fromPattern '#{convert_regexp(from)}' -toPattern '#{convert_regexp(to)}') -match '#{pattern}']
         end
       end
 
       def get_file_content(file)
-        %Q![Io.File]::ReadAllText("#{file}")!
+        "[Io.File]::ReadAllText('#{file}')"
       end
 
       def check_access_by_user(file, user, access)
@@ -290,27 +290,6 @@ module SpecInfra
           exec "[System.Environment]::ExpandEnvironmentVariables( ( FindIISWebsite -name '#{name}' ).physicalPath ).replace('\\', '/' ) -eq ('#{path}'.trimEnd('/').replace('\\', '/'))"
         end
       end
-    
-      def check_iis_website_binding(name, port, protocol, ipAddress, hostHeader)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindSiteBindings -name '#{name}' -protocol '#{protocol}' -hostHeader '#{hostHeader}' -port #{port} -ipAddress '#{ipAddress}').count -gt 0"
-        end
-      end
-
-      def check_iis_website_virtual_dir(name, vdir, path)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindSiteVirtualDir -name '#{name}' -vdir '#{vdir}' -path '#{path}') -eq $true"
-        end
-      end
-
-      def check_iis_website_application(name, app, pool, physicalPath)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindSiteApplication -name '#{name}' -app '#{app}' -pool '#{pool}' -physicalPath '#{physicalPath}') -eq $true"
-        end
-      end
 
       def check_iis_app_pool(name)
         Backend::PowerShell::Command.new do
@@ -326,66 +305,10 @@ module SpecInfra
         end
       end
 
-      def check_32bit_enabled(name)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').enable32BitAppOnWin64 -eq $true"
-        end
-      end
-
-      def check_managed_pipeline_mode(name, mode)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').managedPipelineMode -eq '#{mode}'"
-        end
-      end
-
-      def check_idle_timeout(name, minutes)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').processModel.idleTimeout.Minutes -eq #{minutes}"
-        end
-      end
-
-      def check_identity_type(name, type)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').processModel.identityType -eq '#{type}'"
-        end
-      end
-
-      def check_user_profile(name)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').processModel.loadUserProfile -eq $true"
-        end
-      end
-
-      def check_username(name, username)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').processModel.username -eq '#{username}'"
-        end
-      end
-
-      def check_periodic_restart(name, minutes)
-        Backend::PowerShell::Command.new do
-          using 'find_iis_component.ps1'
-          exec "(FindIISAppPool -name '#{name}').recycling.periodicRestart.time.TotalMinutes -eq #{minutes}"
-        end
-      end
-
-      def check_scheduled_task(name)
-        Backend::PowerShell::Command.new do
-          using 'find_scheduled_task.ps1'
-          exec "(FindScheduledTask -name '#{name}').TaskName -eq '\\#{name}'"
-        end
-      end
-
       private
 
       def item_has_attribute item, attribute
-        %Q!((Get-Item -Path "#{item}" -Force).attributes.ToString() -Split ', ') -contains '#{attribute}'!
+        "((Get-Item -Path '#{item}' -Force).attributes.ToString() -Split ', ') -contains '#{attribute}'"
       end
 
       def convert_key_property_value property

data/lib/specinfra/command.rb

@@ -8,11 +8,7 @@ require "specinfra/command/ubuntu"
 require "specinfra/command/gentoo"
 require "specinfra/command/plamo"
 require "specinfra/command/redhat"
-require "specinfra/command/redhat7"
 require "specinfra/command/suse"
-require "specinfra/command/opensuse"
-require "specinfra/command/fedora"
-require "specinfra/command/nixos"
 
 # Solaris
 require "specinfra/command/solaris"

data/lib/specinfra/configuration.rb

@@ -3,6 +3,7 @@ module SpecInfra
     class << self
       VALID_OPTIONS_KEYS = [
         :path,
+        :shell,
         :pre_command,
         :stdout,
         :stderr,
@@ -19,15 +20,6 @@ module SpecInfra
         VALID_OPTIONS_KEYS.inject({}) { |o, k| o.merge!(k => send(k)) }
       end
 
-      # Define os method explicitly to avoid stack level
-      # too deep caused by Helpet::DetectOS#os
-      def os
-        if @os.nil? && defined?(RSpec) && RSpec.configuration.respond_to?(:os)
-          @os = RSpec.configuration.os
-        end
-        @os
-      end
-
       def method_missing(meth, val=nil)
         key = meth.to_s
         key.gsub!(/=$/, '')

data/lib/specinfra/helper/detect_os.rb

@@ -2,34 +2,18 @@ module SpecInfra
   module Helper
     module DetectOS
       def commands
-        self.class.const_get('SpecInfra').const_get('Command').const_get(os[:family]).new
-      end
-
-      def os
         property[:os_by_host] = {} if ! property[:os_by_host]
-        host_port = current_host_and_port
+        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
 
-        if property[:os_by_host][host_port]
-          os_by_host = property[:os_by_host][host_port]
+        if property[:os_by_host][host]
+          os = property[:os_by_host][host]
         else
           # Set command object explicitly to avoid `stack too deep`
-          os_by_host = backend(SpecInfra::Command::Base.new).check_os
-          property[:os_by_host][host_port] = os_by_host
-        end
-
-        os_by_host
-      end
-
-      private
-
-      # put this in a module for better reuse
-      def current_host_and_port
-        if SpecInfra.configuration.ssh
-          [SpecInfra.configuration.ssh.host, SpecInfra.configuration.ssh.options[:port]]
-        else
-          ['localhost', nil]
+          os = backend(SpecInfra::Command::Base.new).check_os
+          property[:os_by_host][host] = os
         end
+        self.class.const_get('SpecInfra').const_get('Command').const_get(os[:family]).new
       end
     end
   end
-end
+end

data/lib/specinfra/helper/os.rb

@@ -6,17 +6,13 @@ module SpecInfra
       'Arch',
       'Darwin',
       'Debian',
-      'Fedora',
       'FreeBSD',
       'FreeBSD10',
       'Gentoo',
-      'NixOS',
       'OpenBSD',
       'Plamo',
       'RedHat',
-      'RedHat7',
       'SuSE',
-      'OpenSUSE',
       'SmartOS',
       'Solaris',
       'Solaris10',

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.27.5"
+  VERSION = "2.0.0.beta1"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -2,31 +2,74 @@ require 'spec_helper'
 
 include SpecInfra::Helper::Exec
 
-describe 'build command with path' do
-  before :each do
-    RSpec.configure do |c|
-      c.path = '/sbin:/usr/sbin'
+describe SpecInfra::Backend::Exec do
+  describe '#build_command' do
+    context 'with simple command' do
+      it 'should escape spaces' do
+        expect(backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+      end
     end
-  end
 
-  context 'command pattern 1' do
-    subject { backend.build_command('test -f /etc/passwd') }
-    it { should eq 'env PATH=/sbin:/usr/sbin:$PATH test -f /etc/passwd' }
-  end
+    context 'with complex command' do
+      it 'should escape special chars' do
+        expect(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\)'
+      end
+    end
 
-  context 'command pattern 2' do
-    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
-      it { should eq 'env PATH=/sbin:/usr/sbin:$PATH test ! -f /etc/selinux/config || (env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- disabled && env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
-  end
+    context 'with custom shell' do
+      before do
+        RSpec.configure {|c| c.shell = '/usr/local/bin/tcsh' }
+      end
 
-  context 'command pattern 3' do
-    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
-    it { should eq "env PATH=/sbin:/usr/sbin:$PATH dpkg -s apache2 && ! env PATH=/sbin:/usr/sbin:$PATH dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
-  end
+      after do
+        RSpec.configure {|c| c.shell = nil }
+      end
+
+      it 'should use custom shell' do
+        expect(backend.build_command('test -f /etc/passwd')).to eq '/usr/local/bin/tcsh -c test\ -f\ /etc/passwd'
+      end
+    end
+
+    context 'with custom shell that needs escaping' do
+      before do
+        RSpec.configure {|c| c.shell = '/usr/test & spec/bin/sh' }
+      end
+
+      after do
+        RSpec.configure {|c| c.shell = nil }
+      end
+
+      it 'should use custom shell' do
+        expect(backend.build_command('test -f /etc/passwd')).to eq '/usr/test\ \&\ spec/bin/sh -c test\ -f\ /etc/passwd'
+      end
+    end
 
-  after :each do
-    RSpec.configure do |c|
-      c.path = nil
+    context 'with custom path' do
+      before do
+        RSpec.configure {|c| c.path = '/opt/bin:/opt/foo/bin' }
+      end
+
+      after do
+        RSpec.configure {|c| c.path = nil }
+      end
+
+      it 'should use custom path' do
+        expect(backend.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
+
+    context 'with custom path that needs escaping' do
+      before do
+        RSpec.configure {|c| c.path = '/opt/bin:/opt/test & spec/bin' }
+      end
+
+      after do
+        RSpec.configure {|c| c.path = nil }
+      end
+
+      it 'should use custom path' do
+        expect(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'
+      end
     end
   end
 end
@@ -35,61 +78,57 @@ describe 'check_os' do
   context 'test ubuntu with lsb_release command' do
     subject { backend.check_os }
     it do
+      mock_success_response = double(
+        :run_command_response,
+        :success? => true,
+        :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
+      )
+      mock_failure_response = double :run_command_response, :success? => false
       backend.should_receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
-          double(
-            :run_command_response,
-            :success? => true,
-            :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
-          )
-        elsif args == 'uname -m'
-          double :run_command_response, :success? => true, :stdout => "x86_64\n"
+          mock_success_response
         else
-          double :run_command_response, :success? => false
+          mock_failure_response
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'Ubuntu', :release => '12.04'})
     end
   end
 
   context 'test ubuntu with /etc/lsb-release' do
     subject { backend.check_os }
     it do
-      backend.should_receive(:run_command).at_least(1).times do |args|
-        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
-          double(
-            :run_command_response,
-            :success? => true,
-            :stdout => <<-EOF
-DISTRIB_ID=Ubuntu
+      mock_success_response = double(
+        :run_command_response,
+        :success? => true,
+        :stdout => %Q(DISTRIB_ID=Ubuntu
 DISTRIB_RELEASE=12.04
 DISTRIB_CODENAME=precise
 DISTRIB_DESCRIPTION="Ubuntu 12.04.2 LTS"
-EOF
-          )
-        elsif args == 'uname -m'
-          double :run_command_response, :success? => true, :stdout => "x86_64\n"
+)
+      )
+      mock_failure_response = double :run_command_response, :success? => false
+      backend.should_receive(:run_command).at_least(1).times do |args|
+        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
+          mock_success_response
         else
-          double :run_command_response, :success? => false
+          mock_failure_response
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'Ubuntu', :release => '12.04'})
     end
   end
 
   context 'test debian (no lsb_release or lsb-release)' do
     subject { backend.check_os }
     it do
+      mock_success_response = double :run_command_response, :success? => true
+      mock_failure_response = double :run_command_response, :success? => false
       backend.should_receive(:run_command).at_least(1).times do |args|
-        if args == 'ls /etc/debian_version'
-          double :run_command_response, :success? => true
-        elsif args == 'uname -m'
-          double :run_command_response, :success? => true, :stdout => "x86_64\n"
-        else
-          double :run_command_response, :success? => false
-        end
+        args == 'ls /etc/debian_version' ? mock_success_response : mock_failure_response
       end
-      should eq({:family => 'Debian', :release => nil, :arch => 'x86_64' })
+      should eq({:family => 'Debian', :release => nil})
     end
   end
 end
+