specinfra 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7857f7f542d40c25cd7138efdd6d5aefa7fbd7a
-  data.tar.gz: 13c98e2dfdca6e367b3f1b09b786fd081ab80b19
+  metadata.gz: 889ec3f197231cdaf1fb4641bd6f86186766ab1c
+  data.tar.gz: 94b1cd8b4b41bdf1734535e2e7009d41f66ceeb4
 SHA512:
-  metadata.gz: f4be82be5167d8df79e2cfe96b8060dad85579ce9221c051ef74ad085046ad3767b2727911106660f93e6388ff086a3082371ee80c538fdd83d64d37b4a5050c
-  data.tar.gz: 445ce20f467f67007be13da2bd2a7ead00604a535f874d32c46aba277c930e4b82317af8aa68e21f13131716d25863a919d11a6db1c3b094cad98580ab62409f
+  metadata.gz: 9b9cb54c3c577cda964b261b6259c0ea8f49419b21f245a3064fba32ac0f32a05b62d3f4da9788edcaa091a0ba49a66672f5e4e67f8992a99dde2bc8e7355b9c
+  data.tar.gz: f93a0ffa3cbd463d7a1869c11144317ec4ae1d2029b5cebd0f6ed50d1f4687d29f2b387b58781c1633c39e16955f16d85a3d0052b43fe25b65f583ca0aa7f733

data/lib/specinfra/command/base.rb

@@ -121,6 +121,10 @@ module SpecInfra
         "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
       end
 
+      def check_process_count(process, count)
+        "test $(ps aux | grep -w -- #{escape(process)} | grep -v grep | wc -l) -eq #{escape(count)}"
+      end
+
       def get_process(process, opts)
         "ps -C #{escape(process)} -o #{opts[:format]} | head -1"
       end

data/lib/specinfra/command/ubuntu.rb

@@ -6,11 +6,17 @@ module SpecInfra
       end
 
       def check_ppa(package)
-        "find /etc/apt/ -name \*.list | xargs grep -o \"deb http://ppa.launchpad.net/#{escape(package)}\""
+        %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
       end
 
       def check_ppa_enabled(package)
-        "find /etc/apt/ -name \*.list | xargs grep -o \"^deb http://ppa.launchpad.net/#{escape(package)}\""
+        %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      end
+
+      private
+
+      def to_apt_line_uri(repo)
+        escape(repo.gsub(/^ppa:/,''))
       end
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.13.1"
+  VERSION = "1.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Gosuke Miyashita