specinfra 0.0.12 → 0.0.13

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 121e7af246fe65b06bd3a329b7cb9ae0033f547e
4
- data.tar.gz: cbfb56fd735652160824ccc683e695ec255dd82e
3
+ metadata.gz: c2a34388ef731cc6c85b1d09eb986532df27b100
4
+ data.tar.gz: 174c6e9109477422d83c20448d8cd9a33e7d20e2
5
5
  SHA512:
6
- metadata.gz: 1dd10759511986d426b809a36f4178ec6af45100d6f6c4fc5e7e1071edac2e2eafbe63d72264b7dafc40a25fb02e111d0e3d9149198992778402014232cbda62
7
- data.tar.gz: 08a596c0c4335f3f565da659c74a75abacefd335eb67f3ea50a3a12039a6b2f47b6c70045929f6d8c1023835cec1465ffbf9d46b7d4a1762a8db0d1b12fa7053
6
+ metadata.gz: a4101e8b477b3ad6e05ff5a470e5b7a8c8dc06de7d0dc175e847a1eab06a45b064c75e8758fb54c47fe04699ba3b1cea552a6691667805e36710101cb844bd54
7
+ data.tar.gz: 4a19851d9253e2173992f8007f8fbcfecc8aa495b786dbaa5accc794326d48d238ad9664bcbd1c54b60bd54a2f0e1a5e28f7592d3db583bbb47efe0fba2bb780
@@ -3,18 +3,21 @@ module SpecInfra
3
3
  class Debian < Linux
4
4
  def check_enabled(service, level=3)
5
5
  # Until everything uses Upstart, this needs an OR.
6
- "ls /etc/rc#{level}.d/ | grep -- #{escape(service)} || grep 'start on' /etc/init/#{escape(service)}.conf"
6
+ "ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf"
7
7
  end
8
8
 
9
9
  def check_installed(package, version=nil)
10
10
  escaped_package = escape(package)
11
- cmd = "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
12
11
  if version
13
- cmd = "#{cmd} && dpkg -s #{escaped_package} | grep -E '^Version: #{escape(version)}$'"
12
+ cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^install ok installed #{escape(version)}$'"
13
+ else
14
+ cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep '^install ok installed$'"
14
15
  end
15
16
  cmd
16
17
  end
17
18
 
19
+ alias :check_installed_by_apt :check_installed
20
+
18
21
  def install(package)
19
22
  "apt-get -y install #{package}"
20
23
  end
@@ -1,3 +1,3 @@
1
1
  module Specinfra
2
- VERSION = "0.0.12"
2
+ VERSION = "0.0.13"
3
3
  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: 0.0.12
4
+ version: 0.0.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gosuke Miyashita
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-14 00:00:00.000000000 Z
11
+ date: 2013-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler