specinfra 2.0.0.beta39 → 2.0.0.beta40
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 +4 -4
- data/lib/specinfra/command/base/file.rb +3 -3
- data/lib/specinfra/command/ubuntu/base/ppa.rb +2 -2
- data/lib/specinfra/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 415fa68c9465d8581bed706262749f345b44ffca
|
|
4
|
+
data.tar.gz: 8c972ee50cbd48223f08516e318e6433fc0d2620
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c359f55bf22ff89d027966259e9437f6889364046497fa3333a5af2caa5cccf01aa49aab7f49ef8b1b73940f1a9413fdaf055a124074181a8e470b4f0d36dfa6
|
|
7
|
+
data.tar.gz: f95f1216c907051bff437c917c8099a6e762272e1820ba459e11f8b9de496b21dab087ebd3b5e875f6493f9da144cfa49ff92be8c924872a09d735696de62ff1
|
|
@@ -35,10 +35,10 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
|
|
|
35
35
|
from ||= '1'
|
|
36
36
|
to ||= '$'
|
|
37
37
|
sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
|
|
38
|
-
|
|
38
|
+
sed += " | sed -n 1,#{escape(to)}p" if from != '1' and to != '$'
|
|
39
39
|
checker_with_regexp = check_contains_with_regexp("-", expected_pattern)
|
|
40
40
|
checker_with_fixed = check_contains_with_fixed_strings("-", expected_pattern)
|
|
41
|
-
"#{sed} | #{
|
|
41
|
+
"#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
|
|
42
42
|
end
|
|
43
43
|
|
|
44
44
|
def check_contains_lines(file, expected_lines, from=nil, to=nil)
|
|
@@ -73,7 +73,7 @@ class Specinfra::Command::Base::File < Specinfra::Command::Base
|
|
|
73
73
|
end
|
|
74
74
|
|
|
75
75
|
def check_is_mounted(path)
|
|
76
|
-
regexp = "on #{path}"
|
|
76
|
+
regexp = "on #{path} "
|
|
77
77
|
"mount | grep -w -- #{escape(regexp)}"
|
|
78
78
|
end
|
|
79
79
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
class Specinfra::Command::Ubuntu::Base::Ppa < Specinfra::Command::Debian::Base::Ppa
|
|
2
2
|
class << self
|
|
3
3
|
def check_exists(package)
|
|
4
|
-
%Q{find /etc/apt/ -name \*.list | xargs grep -o "deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
|
|
4
|
+
%Q{find /etc/apt/ -name \*.list | xargs grep -o "deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
|
|
5
5
|
end
|
|
6
6
|
|
|
7
7
|
def check_is_enabled(package)
|
|
8
|
-
%Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
|
|
8
|
+
%Q{find /etc/apt/ -name \*.list | xargs grep -o "^deb +http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
private
|
data/lib/specinfra/version.rb
CHANGED
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: 2.0.0.
|
|
4
|
+
version: 2.0.0.beta40
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Gosuke Miyashita
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-08-
|
|
11
|
+
date: 2014-08-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: net-ssh
|