specinfra 2.56.1 → 2.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf74716f2704ffcad67d6e36dcf2c6bb6f0c5707
-  data.tar.gz: f405ec5ca49edb1c800b7ba736bef4b3e2be22d1
+  metadata.gz: d24a1acbadc806d97bbda90ee8907c35e31ea19b
+  data.tar.gz: b46a7ee86831215bea8b8f7dbb977ce512538cc2
 SHA512:
-  metadata.gz: a6cc4ed26aed76e9a1279edaccff02cec490b441931f82cd565b0e79f682cc849bbbd7e4789e7f4f3724fe2a9f264bc80abf3d6829fb25c5a64e767aac8290b7
-  data.tar.gz: b5cbb014f685f4fcc8be9079f950e789fb4668ff02b3319c00db3c260548224d2259dea620df282b5d88c85ec67139af3dd633ccc22fb24ca0f937e628d84839
+  metadata.gz: e0b3e580f92c17869122842e8f9558215cbf140556a38f82d7a9b557cd20c9e6e3595e12fc60505fbcc930d166fb7788cc6e9b13e93757a31c782b6a0c3c6c57
+  data.tar.gz: e4174827c25101980c269a523e34925f9d796d5fbfed29d758b33428dbb66b73ca0991c7c4454b77aceb6c8a85bdcba0157c01075dd834d38ba5d24480237955

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

@@ -1,10 +1,11 @@
 class Specinfra::Command::Base::Package < Specinfra::Command::Base
   class << self
     def check_is_installed_by_gem(name, version=nil)
-      regexp = "^#{name}"
-      cmd = "gem list --local | grep -iw -- #{escape(regexp)}"
-      cmd = %Q!#{cmd} | grep -w -- "[( ]#{escape(version)}[,)]"! if version
-      cmd
+      gem_installed_command("gem", name, version)
+    end
+
+    def check_is_installed_by_td_agent_gem(name, version=nil)
+      gem_installed_command("/usr/sbin/td-agent-gem", name, version)
     end
 
     def check_is_installed_by_rvm(name, version=nil)
@@ -47,5 +48,14 @@ class Specinfra::Command::Base::Package < Specinfra::Command::Base
       cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
       cmd
     end
+
+    private
+
+    def gem_installed_command(gem_binary, name, version=nil)
+      regexp = "^#{name}"
+      cmd = "#{gem_binary} list --local | grep -iw -- #{escape(regexp)}"
+      cmd = %Q!#{cmd} | grep -w -- "[( ]#{escape(version)}[,)]"! if version
+      cmd
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.56.1"
+  VERSION = "2.57.0"
 end

data/spec/command/base/package_spec.rb

@@ -6,6 +6,10 @@ describe get_command(:check_package_is_installed_by_gem, 'serverspec', '2.0.0')
   it { should eq 'gem list --local | grep -iw -- \\^serverspec | grep -w -- "[( ]2.0.0[,)]"' }
 end
 
+describe get_command(:check_package_is_installed_by_td_agent_gem, 'fluent-plugin-forest', '0.3.0') do
+  it { should eq '/usr/sbin/td-agent-gem list --local | grep -iw -- \\^fluent-plugin-forest | grep -w -- "[( ]0.3.0[,)]"' }
+end
+
 describe get_command(:check_package_is_installed_by_rvm, 'rbx', '2.4.1') do
   it { should eq 'rvm list strings | grep -iw -- \\^rbx | grep -w -- 2.4.1' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.56.1
+  version: 2.57.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp