specinfra 0.2.0 → 0.2.1

data/lib/specinfra/backend/ssh.rb

@@ -84,13 +84,16 @@ module SpecInfra
 
       def sudo
         sudo_path = SpecInfra.configuration.sudo_path
-        if sudo_path
-          "#{sudo_path}/sudo"
-        else
-          'sudo'
+        sudo_path += '/' if sudo_path
+
+        sudo_options = SpecInfra.configuration.sudo_options
+        if sudo_options
+          sudo_options = sudo_options.join(' ') if sudo_options.is_a?(Array)
+          sudo_options = ' ' + sudo_options
         end
-      end
 
+        "#{sudo_path}sudo#{sudo_options}"
+      end
     end
   end
 end

data/lib/specinfra/configuration.rb

@@ -1,7 +1,16 @@
 module SpecInfra
   module Configuration
     class << self
-      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path, :disable_sudo, :pass_prompt].freeze
+      VALID_OPTIONS_KEYS = [
+        :path,
+        :pre_command,
+        :stdout,
+        :stderr,
+        :sudo_path,
+        :disable_sudo,
+        :pass_prompt,
+        :sudo_options
+      ].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.2.0"
+  VERSION = "0.2.1"
 end

data/spec/backend/ssh/build_command_spec.rb

@@ -96,3 +96,38 @@ describe 'build command without sudo' do
     end
   end
 end
+
+sudo_options = ['-p', '"[sudo] password for"']
+sudo_options_string = ' -p "[sudo] password for"'
+
+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_options = sudo_options
+    end
+  end
+
+
+  context 'command pattern 1a' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq "sudo#{sudo_options_string} 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#{sudo_options_string} test ! -f /etc/selinux/config || (sudo#{sudo_options_string} getenforce | grep -i -- disabled && sudo#{sudo_options_string} 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#{sudo_options_string} dpkg -s apache2 && ! sudo#{sudo_options_string} dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+
+  after :each do
+    RSpec.configure do |c|
+      c.sudo_options = nil
+    end
+  end
+end

metadata

@@ -1,64 +1,76 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: specinfra
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  hash: 21
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-01-10 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Common layer for serverspec and configspec
-email:
+email: 
 - gosukenator@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -115,31 +127,41 @@ files:
 - spec/helper/properties_spec.rb
 - spec/spec_helper.rb
 - specinfra.gemspec
-homepage: ''
-licenses:
+has_rdoc: true
+homepage: ""
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Common layer for serverspec and configspec
-test_files:
+test_files: 
 - spec/backend/ssh/build_command_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1daab8e0c532a3aefde28e5b3112866ed64263a0
-  data.tar.gz: c7280e34053256ca4edc0593aad49aff63c2695c
-SHA512:
-  metadata.gz: ceb475126ef0a1811966621577e3217305f55972e3c82eec621ab82c789a42922afa3c46a24ed19ed98cb64f3e0f2a49ecc86f1f150b921a8705139dcb9afdd2
-  data.tar.gz: 5609f02da64a4d96876d2381a2befe657bd10e79f5036b245816e58c1f4c130b1891067bf3d314b03325794ed912825e91061a0cd828a20fbe297ed62efb83eb