specinfra 2.0.0.beta29 → 2.0.0.beta30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b475b396b0e94a215d943a2f7edf0973772776
-  data.tar.gz: 5ba06b04d558edc33cfc7202dd1da4ab95c36cb1
+  metadata.gz: ea053126dff9d347b4852ece95ef391bbabdd19b
+  data.tar.gz: 60e977706ddeed671ca7fabe86d8b420cff3f987
 SHA512:
-  metadata.gz: fac9490794ce3527d376f619d3834edcef8918b3bc649c593662f30d072a8dee63bc67b70e8682c9b593181e98063d2cd2a329733653a542be7c21374464537d
-  data.tar.gz: 9d207df541d529d36f9aefc62047d46a1622db73075784f7dba471eb3a883e0bf68a978c8f2b1ce7a893f7c98099971a8c91676cd7d614f983b843451ba2628a
+  metadata.gz: 0ae854501b96d2808b8576408451795ff2768caf0921c727443b75746bd466d250901c1b5db371a9de53576c271bb70f2ab7594d55f58916a130e2c5cdef4e01
+  data.tar.gz: 491a50ae31d09282ba7dc7f925681375661b6091a5e0e745760cd61917ff2cd8e20bd5923860654520db06994b7b050f7bde6ca1e1b878c97a2f4f4569d71051

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

@@ -59,14 +59,12 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
       "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
     end
 
-    def check_has_md5checksum(file, expected)
-      regexp = "^#{expected}"
-      "md5sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
+    def get_md5sum(file)
+      "md5sum #{escape(file)} | cut -d ' ' -f 1"
     end
 
-    def check_has_sha256checksum(file, expected)
-      regexp = "^#{expected}"
-      "sha256sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
+    def get_sha256sum(file)
+      "sha256sum #{escape(file)} | cut -d ' ' -f 1"
     end
 
     def get_content(file)

data/lib/specinfra/command/darwin/base/file.rb

@@ -4,12 +4,12 @@ class Specinfra::Command::Darwin::Base::File < Specinfra::Command::Base::File
       "sudo -u #{user} -s /bin/test -#{access} #{file}"
     end
 
-    def check_has_md5checksum(file, expected)
-      "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
+    def get_md5sum(file)
+      "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2-"
     end
 
-    def check_has_sha256checksum(file, expected)
-      "openssl sha256 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
+    def get_sha256sum(file)
+      "openssl sha256 #{escape(file)} | cut -d'=' -f2 | cut -c 2-"
     end
 
     def check_is_linked_to(link, target)

data/lib/specinfra/command/openbsd/base/file.rb

@@ -1,13 +1,11 @@
 class Specinfra::Command::Openbsd::Base::File < Specinfra::Command::Base::File
   class << self
-    def check_has_md5checksum(file, expected)
-      regexp = "^#{expected}"
-      "cksum -qa md5 #{escape(file)} | grep -w #{escape(regexp)}"
+    def get_md5sum(file)
+      "cksum -qa md5 #{escape(file)} | cut -d ' ' -f 1"
     end
 
-    def check_has_sha256checksum(file, expected)
-      regexp = "^#{expected}"
-      "cksum -qa sha256 #{escape(file)} | grep -w #{escape(regexp)}"
+    def get_sha256sum(file)
+      "cksum -qa sha256 #{escape(file)} | cut -d ' ' -f 1"
     end
 
     def check_is_linked_to(link, target)

data/lib/specinfra/command/solaris/v10/file.rb

@@ -30,8 +30,8 @@ class Specinfra::Command::Solaris::V10::File < Specinfra::Command::Solaris::Base
       "grep -- #{escape(expected_pattern)} #{escape(file)}"
     end
 
-    def check_has_md5checksum(file, expected)
-      "digest -a md5 -v #{escape(file)} | grep -iw -- #{escape(expected)}"
+    def get_md5sum(file)
+      "digest -a md5 -v #{escape(file)} | cut -d '=' -f 2 |  cut -c 2-"
     end
 
     # reference: http://perldoc.perl.org/functions/stat.html

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta29"
+  VERSION = "2.0.0.beta30"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta29
+  version: 2.0.0.beta30
 platform: ruby
 authors:
 - Gosuke Miyashita