specinfra 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee7e3575550560a4002026f928b774ac07d5147
-  data.tar.gz: 05a56f3bda351636daf017ae8ba3bda7f1e0c40a
+  metadata.gz: a57b2d08f95569aeb857d6017f2e156976ba050c
+  data.tar.gz: 30045d3ab0a840cdca3f193c1618e7b179bd669b
 SHA512:
-  metadata.gz: 1c2f25c85525b5ddce9b04f0f3b338ba3c2b1bdbc9aa0fdeb3f9c6e937681c57efcd7c6d9c9348ebba947e38a79e31045dab77f3653ec68b60cc2e7c503caa0c
-  data.tar.gz: 55b9f9079421c1e268557e21a315a9024d403b609a1b1ad2bc17f482dbaf5ba3158b0a591ab343fea1c1c8234bf545a2e93868c3607b16bd9b747381288fed5c
+  metadata.gz: cdbd20dc2d38ad0d66e7ec84244c79fe7cbf1039bcf55c5eb626fda768916302590bb3dead630f8f87b9c0296f65bc082a361b343952274b32d8e34a9223b7a2
+  data.tar.gz: 513565d427cebdb3573488a371b3e7f43dead08d3a17152567cf3275ea4a19b64aa72b4499332873ae0e21b78e6d01882ff83253decbb25bc7d9009c86636a78

data/lib/specinfra/backend/exec.rb

@@ -25,6 +25,19 @@ module Specinfra::Backend
       FileUtils.cp(from, to)
     end
 
+    def build_command(cmd)
+      shell = Specinfra.configuration.shell || '/bin/sh'
+      cmd = cmd.shelljoin if cmd.is_a?(Array)
+      cmd = "#{shell.shellescape} -c #{cmd.shellescape}"
+
+      path = Specinfra.configuration.path
+      if path
+        cmd = %Q{env PATH="#{path}" #{cmd}}
+      end
+
+      cmd
+    end
+
     private
     def with_env
       keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE
@@ -50,19 +63,6 @@ module Specinfra::Backend
       end
     end
 
-    def build_command(cmd)
-      shell = Specinfra.configuration.shell || '/bin/sh'
-      cmd = cmd.shelljoin if cmd.is_a?(Array)
-      cmd = "#{shell.shellescape} -c #{cmd.shellescape}"
-
-      path = Specinfra.configuration.path
-      if path
-        cmd = %Q{env PATH="#{path}" #{cmd}}
-      end
-
-      cmd
-    end
-
     def add_pre_command(cmd)
       if Specinfra.configuration.pre_command
         pre_cmd = build_command(Specinfra.configuration.pre_command)

data/lib/specinfra/backend/lxc.rb

@@ -21,6 +21,7 @@ module Specinfra::Backend
       end
       CommandResult.new :stdout => out, :exit_status => ret.exitstatus
     end
+
     def build_command(cmd)
       cmd
     end

data/lib/specinfra/backend/ssh.rb

@@ -33,11 +33,6 @@ module Specinfra::Backend
       run_command(Specinfra.command.get(:move_file, tmp, to))
     end
 
-    private
-    def prompt
-      'Password: '
-    end
-
     def build_command(cmd)
       cmd = super(cmd)
       user = Specinfra.configuration.ssh_options[:user]
@@ -48,6 +43,11 @@ module Specinfra::Backend
       cmd
     end
 
+    private
+    def prompt
+      'Password: '
+    end
+
     def with_env
       env = Specinfra.configuration.env || {}
       env[:LANG] ||= 'C'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

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.send(:build_command, 'test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.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.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\)'
+        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\)'
       end
     end
 
@@ -24,7 +24,7 @@ describe Specinfra::Backend::Exec do
       end
 
       it 'should use custom shell' do
-        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/usr/local/bin/tcsh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.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.send(:build_command, 'test -f /etc/passwd')).to eq '/usr/test\ \&\ spec/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.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.send(: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.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.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'
+        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'
       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.send(:build_command, 'test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.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.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\)'
+        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\)'
       end
     end
 
@@ -30,11 +30,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'should prepend sudo' do
-        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq %q{sudo -p 'Password: ' /bin/sh -c test\ -f\ /etc/passwd}
+        expect(Specinfra.backend.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.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\)}
+        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\)}
       end
     end
 
@@ -54,11 +54,11 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1a' do
-        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}
+        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}
       end
 
       it 'command pattern 2a' do
-        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\)}
+        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\)}
       end
     end
 
@@ -78,16 +78,14 @@ describe Specinfra::Backend::Ssh do
       end
 
       it 'command pattern 1b' do
-        expect(Specinfra.backend.send(:build_command, 'test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
+        expect(Specinfra.backend.build_command('test -f /etc/passwd')).to eq '/bin/sh -c test\ -f\ /etc/passwd'
       end
 
       it 'command pattern 2b' do
-        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\)'
+        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\)'
       end
-
     end
 
-
     context 'with sudo on alternative path' do
       before do
         RSpec.configure do |c|
@@ -104,12 +102,12 @@ describe Specinfra::Backend::Ssh do
       end
 
       context 'command pattern 1a' do
-        subject { Specinfra.backend.send(:build_command, 'test -f /etc/passwd') }
+        subject { Specinfra.backend.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.send(:build_command, 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+        subject { Specinfra.backend.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh