specinfra 2.0.0.beta39 → 2.0.0.beta40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4869bddc0b58d1d96be8b134f86a1db95da7e7a
-  data.tar.gz: 01335a334effed793e6405079f36d992a89751e0
+  metadata.gz: 415fa68c9465d8581bed706262749f345b44ffca
+  data.tar.gz: 8c972ee50cbd48223f08516e318e6433fc0d2620
 SHA512:
-  metadata.gz: 605dd5bf906f89e8bef9b420c769c63641f344a92ae5f024469d40d9f3222d88faaa7b35daec700a1abbc9783a7eaf971f68c62222ad7c42219456945831ddff
-  data.tar.gz: d5ff331fc2a40a67925591a472d9bc6e97a13a24c5ac348d4dfa2ce1f1dbcdb9d9125b22d58b3bae341bd157a04fd738cbb330d33e181ca54e936dcfeabaa6bb
+  metadata.gz: c359f55bf22ff89d027966259e9437f6889364046497fa3333a5af2caa5cccf01aa49aab7f49ef8b1b73940f1a9413fdaf055a124074181a8e470b4f0d36dfa6
+  data.tar.gz: f95f1216c907051bff437c917c8099a6e762272e1820ba459e11f8b9de496b21dab087ebd3b5e875f6493f9da144cfa49ff92be8c924872a09d735696de62ff1

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

@@ -35,10 +35,10 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
       from ||= '1'
       to ||= '$'
       sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-      sed_end = "sed -n 1,#{escape(to)}p"
+      sed += " | sed -n 1,#{escape(to)}p" if from != '1' and to != '$'
       checker_with_regexp = check_contains_with_regexp("-", expected_pattern)
       checker_with_fixed  = check_contains_with_fixed_strings("-", expected_pattern)
-      "#{sed} | #{sed_end} | #{checker_with_regexp} || #{sed} | #{sed_end} | #{checker_with_fixed}"
+      "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
     end
 
     def check_contains_lines(file, expected_lines, from=nil, to=nil)
@@ -73,7 +73,7 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
     end
 
     def check_is_mounted(path)
-      regexp = "on #{path}"
+      regexp = "on #{path} "
       "mount | grep -w -- #{escape(regexp)}"
     end
 

data/lib/specinfra/command/ubuntu/base/ppa.rb

@@ -1,11 +1,11 @@
 class Specinfra::Command::Ubuntu::Base::Ppa < Specinfra::Command::Debian::Base::Ppa
   class << self
     def check_exists(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o "deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     def check_is_enabled(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     private

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta39"
+  VERSION = "2.0.0.beta40"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta39
+  version: 2.0.0.beta40
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh