specinfra 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 121e7af246fe65b06bd3a329b7cb9ae0033f547e
-  data.tar.gz: cbfb56fd735652160824ccc683e695ec255dd82e
+  metadata.gz: c2a34388ef731cc6c85b1d09eb986532df27b100
+  data.tar.gz: 174c6e9109477422d83c20448d8cd9a33e7d20e2
 SHA512:
-  metadata.gz: 1dd10759511986d426b809a36f4178ec6af45100d6f6c4fc5e7e1071edac2e2eafbe63d72264b7dafc40a25fb02e111d0e3d9149198992778402014232cbda62
-  data.tar.gz: 08a596c0c4335f3f565da659c74a75abacefd335eb67f3ea50a3a12039a6b2f47b6c70045929f6d8c1023835cec1465ffbf9d46b7d4a1762a8db0d1b12fa7053
+  metadata.gz: a4101e8b477b3ad6e05ff5a470e5b7a8c8dc06de7d0dc175e847a1eab06a45b064c75e8758fb54c47fe04699ba3b1cea552a6691667805e36710101cb844bd54
+  data.tar.gz: 4a19851d9253e2173992f8007f8fbcfecc8aa495b786dbaa5accc794326d48d238ad9664bcbd1c54b60bd54a2f0e1a5e28f7592d3db583bbb47efe0fba2bb780

data/lib/specinfra/command/debian.rb

@@ -3,18 +3,21 @@ module SpecInfra
     class Debian < Linux
       def check_enabled(service, level=3)
         # Until everything uses Upstart, this needs an OR.
-        "ls /etc/rc#{level}.d/ | grep -- #{escape(service)} || grep 'start on' /etc/init/#{escape(service)}.conf"
+        "ls /etc/rc#{level}.d/ | grep -- '^S..#{escape(service)}' || grep 'start on' /etc/init/#{escape(service)}.conf"
       end
 
       def check_installed(package, version=nil)
         escaped_package = escape(package)
-        cmd = "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
         if version
-          cmd = "#{cmd} && dpkg -s #{escaped_package} | grep -E '^Version: #{escape(version)}$'"
+          cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^install ok installed #{escape(version)}$'"
+        else
+          cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep '^install ok installed$'"
         end
         cmd
       end
 
+      alias :check_installed_by_apt :check_installed
+
       def install(package)
         "apt-get -y install #{package}"
       end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler