specinfra 2.56.1 → 2.57.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/specinfra/command/base/package.rb +14 -4
- data/lib/specinfra/version.rb +1 -1
- data/spec/command/base/package_spec.rb +4 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d24a1acbadc806d97bbda90ee8907c35e31ea19b
|
|
4
|
+
data.tar.gz: b46a7ee86831215bea8b8f7dbb977ce512538cc2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e0b3e580f92c17869122842e8f9558215cbf140556a38f82d7a9b557cd20c9e6e3595e12fc60505fbcc930d166fb7788cc6e9b13e93757a31c782b6a0c3c6c57
|
|
7
|
+
data.tar.gz: e4174827c25101980c269a523e34925f9d796d5fbfed29d758b33428dbb66b73ca0991c7c4454b77aceb6c8a85bdcba0157c01075dd834d38ba5d24480237955
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
class Specinfra::Command::Base::Package < Specinfra::Command::Base
|
|
2
2
|
class << self
|
|
3
3
|
def check_is_installed_by_gem(name, version=nil)
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
gem_installed_command("gem", name, version)
|
|
5
|
+
end
|
|
6
|
+
|
|
7
|
+
def check_is_installed_by_td_agent_gem(name, version=nil)
|
|
8
|
+
gem_installed_command("/usr/sbin/td-agent-gem", name, version)
|
|
8
9
|
end
|
|
9
10
|
|
|
10
11
|
def check_is_installed_by_rvm(name, version=nil)
|
|
@@ -47,5 +48,14 @@ class Specinfra::Command::Base::Package < Specinfra::Command::Base
|
|
|
47
48
|
cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
|
|
48
49
|
cmd
|
|
49
50
|
end
|
|
51
|
+
|
|
52
|
+
private
|
|
53
|
+
|
|
54
|
+
def gem_installed_command(gem_binary, name, version=nil)
|
|
55
|
+
regexp = "^#{name}"
|
|
56
|
+
cmd = "#{gem_binary} list --local | grep -iw -- #{escape(regexp)}"
|
|
57
|
+
cmd = %Q!#{cmd} | grep -w -- "[( ]#{escape(version)}[,)]"! if version
|
|
58
|
+
cmd
|
|
59
|
+
end
|
|
50
60
|
end
|
|
51
61
|
end
|
data/lib/specinfra/version.rb
CHANGED
|
@@ -6,6 +6,10 @@ describe get_command(:check_package_is_installed_by_gem, 'serverspec', '2.0.0')
|
|
|
6
6
|
it { should eq 'gem list --local | grep -iw -- \\^serverspec | grep -w -- "[( ]2.0.0[,)]"' }
|
|
7
7
|
end
|
|
8
8
|
|
|
9
|
+
describe get_command(:check_package_is_installed_by_td_agent_gem, 'fluent-plugin-forest', '0.3.0') do
|
|
10
|
+
it { should eq '/usr/sbin/td-agent-gem list --local | grep -iw -- \\^fluent-plugin-forest | grep -w -- "[( ]0.3.0[,)]"' }
|
|
11
|
+
end
|
|
12
|
+
|
|
9
13
|
describe get_command(:check_package_is_installed_by_rvm, 'rbx', '2.4.1') do
|
|
10
14
|
it { should eq 'rvm list strings | grep -iw -- \\^rbx | grep -w -- 2.4.1' }
|
|
11
15
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: specinfra
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.57.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Gosuke Miyashita
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-04-
|
|
11
|
+
date: 2016-04-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: net-scp
|