specinfra 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6118703ee530caa196ace37a17e7bb1d8e3c3eca
-  data.tar.gz: 59a757a847c01020d1779f615aac634489d267c0
+  metadata.gz: 121e7af246fe65b06bd3a329b7cb9ae0033f547e
+  data.tar.gz: cbfb56fd735652160824ccc683e695ec255dd82e
 SHA512:
-  metadata.gz: e01163f076632e187e9233343f9f2136a2c5b14da639bb4820948faf44b3f5b42681216e7eacfc57bed46f6e94eddae660db0bc69d4677077739d7f03f407ba3
-  data.tar.gz: a588c2c8a429eb37134b54b3bf5fa810f7aa3e20fc1361f7ea447f05c1e1ac7724f2a921cfb465352a0269680b64ef3b30892b69c4b20d9653eb832dfa6ee6f5
+  metadata.gz: 1dd10759511986d426b809a36f4178ec6af45100d6f6c4fc5e7e1071edac2e2eafbe63d72264b7dafc40a25fb02e111d0e3d9149198992778402014232cbda62
+  data.tar.gz: 08a596c0c4335f3f565da659c74a75abacefd335eb67f3ea50a3a12039a6b2f47b6c70045929f6d8c1023835cec1465ffbf9d46b7d4a1762a8db0d1b12fa7053

data/Rakefile

@@ -4,8 +4,18 @@ require 'rspec/core/rake_task'
 task :spec => 'spec:all'
 
 namespace :spec do
-  RSpec::Core::RakeTask.new(:all) do |t|
-    t.pattern = "spec/**/*_spec.rb"
+  task :all => [ :helper, :backend, :configuration ]
+
+  RSpec::Core::RakeTask.new(:helper) do |t|
+    t.pattern = "spec/helper/*_spec.rb"
+  end
+
+  RSpec::Core::RakeTask.new(:backend) do |t|
+    t.pattern = "spec/backend/*/*_spec.rb"
+  end
+
+  RSpec::Core::RakeTask.new(:configuration) do |t|
+    t.pattern = "spec/configuration_spec.rb"
   end
 end
 

data/lib/specinfra/backend/ssh.rb

@@ -20,7 +20,9 @@ module SpecInfra
 
       def build_command(cmd)
         cmd = super(cmd)
-        if SpecInfra.configuration.ssh.options[:user] != 'root'
+        user = SpecInfra.configuration.ssh.options[:user]
+        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} ")
@@ -32,7 +34,8 @@ module SpecInfra
         cmd = super(cmd)
         user = SpecInfra.configuration.ssh.options[:user]
         pre_command = SpecInfra.configuration.pre_command
-        if pre_command && user != 'root'
+        disable_sudo = SpecInfra.configuration.disable_sudo
+        if pre_command && user != 'root' && !disable_sudo
           cmd = "#{sudo} #{cmd}"
         end
         cmd

data/lib/specinfra/configuration.rb

@@ -1,7 +1,7 @@
 module SpecInfra
   module Configuration
     class << self
-      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path, :pass_prompt].freeze
+      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path, :sudo_disable, :pass_prompt].freeze
 
       def defaults
         VALID_OPTIONS_KEYS.inject({}) { |o, k| o.merge!(k => send(k)) }

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/specinfra.rb

@@ -21,6 +21,7 @@ if defined?(RSpec)
     c.add_setting :host,          :default => nil
     c.add_setting :ssh,           :default => nil
     c.add_setting :sudo_password, :default => nil
+    c.add_setting :disable_sudo,  :default => false
     c.add_setting :winrm,         :default => nil
     SpecInfra.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
     c.before :each do

data/spec/backend/ssh/build_command_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::Ssh
+
+ssh = double
+
+
+describe 'build command with sudo' do
+  before :each do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+      c.sudo_path = nil
+    end
+  end
+
+  context 'command pattern 1' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq 'sudo test -f /etc/passwd' }
+  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 'sudo test ! -f /etc/selinux/config || (sudo getenforce | grep -i -- disabled && sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+  end
+
+  context 'command pattern 3' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "sudo dpkg -s apache2 && ! sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+end
+
+# Alternate path for sudo command:
+sudo_path = '/usr/local/bin'
+
+describe 'build command with sudo on alternate path' do
+  before :each do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+      c.sudo_path = "#{sudo_path}"
+    end
+  end
+
+
+  context 'command pattern 1a' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq "#{sudo_path}/sudo test -f /etc/passwd" }
+  end
+
+  context 'command pattern 2a' do
+    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+    it { should eq "#{sudo_path}/sudo test ! -f /etc/selinux/config || (#{sudo_path}/sudo getenforce | grep -i -- disabled && #{sudo_path}/sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
+  end
+
+  context 'command pattern 3a' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "#{sudo_path}/sudo dpkg -s apache2 && ! #{sudo_path}/sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+
+  after :each do
+    RSpec.configure do |c|
+      c.sudo_path = nil
+    end
+  end
+
+end
+
+describe 'build command without sudo' do
+  before :each do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+      c.disable_sudo = true
+    end
+  end
+
+  context 'command pattern 1b' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq 'test -f /etc/passwd' }
+  end
+
+  context 'command pattern 2b' do
+    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+    it { should eq 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+  end
+
+  context 'command pattern 3b' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+
+  after :each do
+    RSpec.configure do |c|
+      c.disable_sudo = false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'specinfra'
+require 'rspec/mocks/standalone'
 
 include SpecInfra::Helper::Exec
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,8 @@ files:
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/version.rb
-- spec/configurtaion_spec.rb
+- spec/backend/ssh/build_command_spec.rb
+- spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
 - spec/helper/properties_spec.rb
 - spec/spec_helper.rb
@@ -139,7 +140,8 @@ signing_key:
 specification_version: 4
 summary: Common layer for serverspec and configspec
 test_files:
-- spec/configurtaion_spec.rb
+- spec/backend/ssh/build_command_spec.rb
+- spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
 - spec/helper/properties_spec.rb
 - spec/spec_helper.rb