specinfra 2.0.0.beta38 → 2.0.0.beta39

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 60e39a9acb4823ac00ff500c25aac712864afb95
4
- data.tar.gz: de0970a4443c83606403c92d1d58ef4d938a0597
3
+ metadata.gz: f4869bddc0b58d1d96be8b134f86a1db95da7e7a
4
+ data.tar.gz: 01335a334effed793e6405079f36d992a89751e0
5
5
  SHA512:
6
- metadata.gz: 7522cfbd716e5b09a38b45c3060f2e09d61a3264cd3099240380f5c9fb69c0071bf51ac220fba24bed543312fba39033b85526d86d70b6f58a88c67553869df0
7
- data.tar.gz: 07507396ca2dd332d387a13e84b72eeeff9a833207f617d1976c8d669719e2c87aff4974d7dc5b5e360d1a81b33abe7ffacaf8363c4a9b26602fdb89ee2a1a0a
6
+ metadata.gz: 605dd5bf906f89e8bef9b420c769c63641f344a92ae5f024469d40d9f3222d88faaa7b35daec700a1abbc9783a7eaf971f68c62222ad7c42219456945831ddff
7
+ data.tar.gz: d5ff331fc2a40a67925591a472d9bc6e97a13a24c5ac348d4dfa2ce1f1dbcdb9d9125b22d58b3bae341bd157a04fd738cbb330d33e181ca54e936dcfeabaa6bb
@@ -1,17 +1,19 @@
1
1
  class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
2
2
  def self.detect
3
3
  if run_command('ls /etc/debian_version').success?
4
+ distro = nil
5
+ release = nil
4
6
  lsb_release = run_command("lsb_release -ir")
5
7
  if lsb_release.success?
6
- if lsb_release.stdout =~ /:/
7
- distro = lsb_release.stdout.split("\n").first.split(':').last
8
- release = lsb_release.stdout.split("\n").last.split(':').last.strip
8
+ lsb_release.stdout.each_line do |line|
9
+ distro = line.split(':').last.strip if line =~ /^Distributor ID:/
10
+ release = line.split(':').last.strip if line =~ /^Release:/
9
11
  end
10
12
  else
11
13
  lsb_release = run_command("cat /etc/lsb-release")
12
14
  if lsb_release.success?
13
15
  lsb_release.stdout.each_line do |line|
14
- distro = line.split('=').last if line =~ /^DISTRIB_ID=/
16
+ distro = line.split('=').last.strip if line =~ /^DISTRIB_ID=/
15
17
  release = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
16
18
  end
17
19
  end
@@ -1,3 +1,3 @@
1
1
  module Specinfra
2
- VERSION = "2.0.0.beta38"
2
+ VERSION = "2.0.0.beta39"
3
3
  end
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.beta38
4
+ version: 2.0.0.beta39
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-21 00:00:00.000000000 Z
11
+ date: 2014-08-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-ssh