specinfra 2.66.7 → 2.66.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd5e5c1d5cd0e496d4b9361bb5c1068ad118c8c
-  data.tar.gz: cfeba690482ec6d325945b6d0b9c45c92d7fdeac
+  metadata.gz: 561981aa1509a078fbef21551f3e23376b1710c7
+  data.tar.gz: d07b0809683d87b45f64ec6832cd30cf661c0b86
 SHA512:
-  metadata.gz: 10d4114db7c064bd5363326cad1a2559befbc95809ff1936f5a59c88d6d0f933c3e8682981a9ace752bea1f864a789674103d8698630aef06d92e78a4fae66e7
-  data.tar.gz: 9ab48fea0e5de027c4e7f76d7253db174f0ca651977faa2850fa5df43569a47b998b40f95be1da35cbc96a329939cdd24fdad6f111b008e898567eb7f0e29acc
+  metadata.gz: 89249b21c9c9d1a85687da44df54180663179b0c7ff2154f75feee6b4ad7a4a89e4c35847090518c5803446613267b541334372a23f7308a8dde059d79de3bd1
+  data.tar.gz: ad80a3b1e15891e0e0a63e29ad565402bda605654c412ca8f6e42ad85e850a63109d9eae8fd6af7224adec33c140a0a315d1eb5874fa82e89852b47eb8809dd7

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

@@ -3,7 +3,7 @@ class Specinfra::Command::Debian::Base::Package < Specinfra::Command::Linux::Bas
     def check_is_installed(package, version=nil)
       escaped_package = escape(package)
       if version
-        cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^(install|hold) ok installed #{escape(version)}$'"
+        cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^(install|hold) ok installed #{Regexp.escape(escape(version))}$'"
       else
         cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep -E '^(install|hold) ok installed$'"
       end
@@ -18,7 +18,7 @@ class Specinfra::Command::Debian::Base::Package < Specinfra::Command::Linux::Bas
       else
         full_package = package
       end
-      "DEBIAN_FRONTEND='noninteractive' apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' #{option} install #{full_package}"
+      "DEBIAN_FRONTEND='noninteractive' apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' #{option} install #{escape(full_package)}"
     end
 
     def get_version(package, opts=nil)

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

@@ -3,7 +3,8 @@ class Specinfra::Command::Redhat::Base::Package < Specinfra::Command::Linux::Bas
     def check_is_installed(package, version=nil)
       cmd = "rpm -q #{escape(package)}"
       if version
-        cmd = "#{cmd} | grep -w -- #{escape(package)}-#{escape(version)}"
+        full_package = "#{package}-#{version}"
+        cmd = "#{cmd} | grep -w -- #{Regexp.escape(escape(full_package))}"
       end
       cmd
     end
@@ -20,7 +21,7 @@ class Specinfra::Command::Redhat::Base::Package < Specinfra::Command::Linux::Bas
       else
         full_package = package
       end
-      cmd = "yum -y #{option} install #{full_package}"
+      cmd = "yum -y #{option} install #{escape(full_package)}"
     end
 
     def remove(package, option='')

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.66.7"
+  VERSION = "2.66.8"
 end

data/spec/command/debian/package_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'debian'
+
+describe get_command(:check_package_is_installed, 'telnet') do
+  it { should eq "dpkg-query -f '${Status}' -W telnet | grep -E '^(install|hold) ok installed$'" }
+end
+
+describe get_command(:check_package_is_installed, 'telnet', '0.17-36build2') do
+  it { should eq "dpkg-query -f '${Status} ${Version}' -W telnet | grep -E '^(install|hold) ok installed 0\\.17\\-36build2$'" }
+end
+
+describe get_command(:check_package_is_installed, 'linux-headers-$(uname -r)') do
+  it 'should be escaped (that is, command substitution should not work)' do
+    should eq "dpkg-query -f '${Status}' -W linux-headers-\\$\\(uname\\ -r\\) | grep -E '^(install|hold) ok installed$'"
+  end
+end
+
+describe get_command(:install_package, 'telnet') do
+  it { should eq "DEBIAN_FRONTEND='noninteractive' apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'  install telnet" }
+end
+
+describe get_command(:install_package, 'telnet', '0.17-36build2') do
+  it { should eq "DEBIAN_FRONTEND='noninteractive' apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'  install telnet\\=0.17-36build2" }
+end
+
+describe get_command(:install_package, 'linux-headers-$(uname -r)') do
+  it 'should be escaped (that is, command substitution should not work)' do
+    should eq "DEBIAN_FRONTEND='noninteractive' apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'  install linux-headers-\\$\\(uname\\ -r\\)"
+  end
+end

data/spec/command/redhat/package_spec.rb

@@ -3,6 +3,30 @@ require 'spec_helper'
 property[:os] = nil
 set :os, { :family => 'redhat' }
 
-describe  get_command(:check_package_is_installed, 'httpd') do
-  it { should eq 'rpm -q httpd' }
+describe  get_command(:check_package_is_installed, 'telnet') do
+  it { should eq 'rpm -q telnet' }
+end
+
+describe  get_command(:check_package_is_installed, 'telnet', '0.17-48.el6.x86_64') do
+  it { should eq 'rpm -q telnet | grep -w -- telnet\\-0\\.17\\-48\\.el6\\.x86_64' }
+end
+
+describe  get_command(:check_package_is_installed, 'linux-headers-$(uname -r)') do
+  it 'should be escaped (that is, command substitution should not work' do
+    should eq 'rpm -q linux-headers-\\$\\(uname\\ -r\\)'
+  end
+end
+
+describe get_command(:install_package, 'telnet') do
+  it { should eq "yum -y  install telnet" }
+end
+
+describe get_command(:install_package, 'telnet', '0.17-48.el6.x86_64') do
+  it { should eq "yum -y  install telnet-0.17-48.el6.x86_64" }
+end
+
+describe get_command(:install_package, 'linux-headers-$(uname -r)') do
+  it 'should be escaped (that is, command substitution should no work)' do
+    should eq "yum -y  install linux-headers-\\$\\(uname\\ -r\\)"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.66.7
+  version: 2.66.8
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -535,6 +535,7 @@ files:
 - spec/command/darwin/port_spec.rb
 - spec/command/darwin/process_spec.rb
 - spec/command/darwin/user_spec.rb
+- spec/command/debian/package_spec.rb
 - spec/command/debian/port_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/debian8/port_spec.rb
@@ -656,6 +657,7 @@ test_files:
 - spec/command/darwin/port_spec.rb
 - spec/command/darwin/process_spec.rb
 - spec/command/darwin/user_spec.rb
+- spec/command/debian/package_spec.rb
 - spec/command/debian/port_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/debian8/port_spec.rb