specinfra 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eeb384bd812671cb87c1f274afddb397675c6e1
-  data.tar.gz: 487011418240f72292df698c40a1831ff7791ff9
+  metadata.gz: 70f7556e9dcace36186080224bef836c802b3fcf
+  data.tar.gz: ae8e0d6ece4a05af3cf412d192e2037f2d2560c3
 SHA512:
-  metadata.gz: f7390e25288b043c110fdc3d4457f8ef954295ed328fc92323c90f61612eb4327aa55b9faaa5cc5354c5c084b5927b89573ebba93c190876b12703f877e9b336
-  data.tar.gz: 19f3f6388cd7eb6479efd3393d717ffd02791c1b234a53f74634c253430d99e286aa461208fc06cea0ff7be44eb3fcb04f4f2c5b8095dd919dbb431263bfa8c4
+  metadata.gz: 407b914ed6cac6229abef08620af2f46e03742bc8ff3ea4a06710b6576af9a64f77844ac31ab51787b7e77d65b9b37f0d0849ec24fa52004bcab03f41b131188
+  data.tar.gz: 48b97124a501b9b53b1ea54f6713b6414aef318da473a2fa09d090a09744e8c5a9165963c063620ee5d841bd6557abd890c16a46e01c41b2e75134e8c82cfce1

data/lib/specinfra/backend/exec.rb

@@ -181,12 +181,24 @@ module SpecInfra
 
       def check_os
         return SpecInfra.configuration.os if SpecInfra.configuration.os
-        if run_command('ls /etc/redhat-release').success?
+        # Fedora also has an /etc/redhat-release so the Fedora check must
+        # come before the RedHat check
+        if run_command('ls /etc/fedora-release').success?
+          line = run_command('cat /etc/redhat-release').stdout
+          if line =~ /release (\d[\d]*)/
+            release = $1
+          end
+          { :family => 'Fedora', :release => release }
+        elsif run_command('ls /etc/redhat-release').success?
           line = run_command('cat /etc/redhat-release').stdout
           if line =~ /release (\d[\d.]*)/
             release = $1
           end
-          { :family => 'RedHat', :release => release }
+          if release =~ /7./
+            { :family => 'RedHat7', :release => release }
+          else
+            { :family => 'RedHat', :release => release }
+          end
         elsif run_command('ls /etc/system-release').success?
           { :family => 'RedHat', :release => nil } # Amazon Linux
         elsif run_command('ls /etc/SuSE-release').success?

data/lib/specinfra/command/fedora.rb

@@ -0,0 +1,29 @@
+module SpecInfra
+  module Command
+    class Fedora < RedHat
+      def check_enabled(service, target="multi-user.target")
+        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
+        if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+          super
+        else
+          # Fedora 15+ uses systemd which no longer has runlevels but targets
+          # For backwards compatibility, Fedora provides pseudo targets for
+          # runlevels
+          if target.is_a? Integer
+            target = "runlevel#{target}.target"
+          end
+          "systemctl --plain list-dependencies #{target} | grep '^#{escape(service)}.service$'"
+        end
+      end
+
+      def check_running(service)
+        host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
+        if property.has_key?(:os_by_host) && property[:os_by_host][host][:release].to_i < 15
+          super
+        else
+          "systemctl is-active #{escape(service)}.service"
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/redhat7.rb

@@ -0,0 +1,9 @@
+module SpecInfra
+  module Command
+    class RedHat7 < RedHat
+      def check_enabled(service, level=3)
+        "systemctl --plain list-dependencies runlevel#{level}.target | grep '^#{escape(service)}.service$'"
+      end
+    end
+  end
+end

data/lib/specinfra/command.rb

@@ -8,7 +8,9 @@ require "specinfra/command/ubuntu"
 require "specinfra/command/gentoo"
 require "specinfra/command/plamo"
 require "specinfra/command/redhat"
+require "specinfra/command/redhat7"
 require "specinfra/command/suse"
+require "specinfra/command/fedora"
 
 # Solaris
 require "specinfra/command/solaris"

data/lib/specinfra/helper/os.rb

@@ -6,12 +6,14 @@ module SpecInfra
       'Arch',
       'Darwin',
       'Debian',
+      'Fedora',
       'FreeBSD',
       'FreeBSD10',
       'Gentoo',
       'OpenBSD',
       'Plamo',
       'RedHat',
+      'RedHat7',
       'SuSE',
       'SmartOS',
       'Solaris',

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/specinfra/command/base.rb
 - lib/specinfra/command/darwin.rb
 - lib/specinfra/command/debian.rb
+- lib/specinfra/command/fedora.rb
 - lib/specinfra/command/freebsd.rb
 - lib/specinfra/command/freebsd10.rb
 - lib/specinfra/command/gentoo.rb
@@ -132,6 +133,7 @@ files:
 - lib/specinfra/command/openbsd.rb
 - lib/specinfra/command/plamo.rb
 - lib/specinfra/command/redhat.rb
+- lib/specinfra/command/redhat7.rb
 - lib/specinfra/command/smartos.rb
 - lib/specinfra/command/solaris.rb
 - lib/specinfra/command/solaris10.rb