specinfra 2.11.6 → 2.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 259795e097ab5ac71cb0826033e37caad658888e
-  data.tar.gz: 74d200fb1e48e79423b8c39eff4a2dc5dedef884
+  metadata.gz: 1cb5ba6a49ece8dcff20b124919abab9eb1bcfec
+  data.tar.gz: f8903251a7c3aa89a28730ce17cc038309f8f09b
 SHA512:
-  metadata.gz: 54fdcded6fbcf3ae2b2b53aa04d013ab59956143d3976c3e2bec9ed37d83b5ff85023dea318d40b8174f5b912c75e553b9231502b2f7d8dce41de180dc26cff4
-  data.tar.gz: dc1d729be92a09ff58f1087bd6801e0b33ee006ad14efb4b47090743a9bb21cb6cd567c75a7d4029bfc10fcb15e3f6150c02ce26d22a99f30750f497809397f9
+  metadata.gz: 160811348b2046e4cfc115bfa18257dda619f58468d0f88b0e3e417595ebfe2133f0de4f515ebc67f3eb13687e551f0d26a52000de07343268c95a38032555c1
+  data.tar.gz: adab7833724a34ec064d0fdd58288ed17af762c4587025b00e0360c9423043031fe47a0828808490cf7423972df742dd6d477401c8d69a8237ca56cc35ee614e

data/lib/specinfra/command/opensuse/base/service.rb

@@ -1,7 +1,12 @@
 class Specinfra::Command::Opensuse::Base::Service < Specinfra::Command::Suse::Base::Service
   class << self
+    include Specinfra::Command::Module::Systemd
     def check_is_running(service)
       "service #{escape(service)} status"
     end
+
+    def check_is_enabled(service, level=nil)
+       "systemctl is-enabled #{escape(service)}"
+    end
   end
 end

data/lib/specinfra/command_factory.rb

@@ -48,7 +48,9 @@ class Specinfra::CommandFactory
     end
 
     def breakdown(meth)
-      types = resource_types.map {|t| t.to_snake_case }.join('|')
+      # Somtimes `selinux_module' type matches `selinux' and error occurs.
+      # Reverse sorting is needed to avoid this problem.
+      types = resource_types.map {|t| t.to_snake_case }.sort.reverse.join('|')
       md = meth.to_s.match(/^([^_]+)_(#{types})_?(.+)?$/)
       if md.nil?
         message =  "Could not break down `#{meth}' to appropriate type and method.\n"

data/lib/specinfra/configuration.rb

@@ -9,6 +9,7 @@ module Specinfra
         :pre_command,
         :stdout,
         :stderr,
+        :exit_status,
         :sudo_path,
         :disable_sudo,
         :sudo_options,

data/lib/specinfra/host_inventory.rb

@@ -1,3 +1,9 @@
+require 'specinfra/host_inventory/memory'
+require 'specinfra/host_inventory/ec2'
+require 'specinfra/host_inventory/hostname'
+require 'specinfra/host_inventory/domain'
+require 'specinfra/host_inventory/fqdn'
+
 module Specinfra
   class HostInventory
     include Singleton
@@ -10,7 +16,8 @@ module Specinfra
     def [](key)
       @inventory[key.to_sym] ||= {}
       if @inventory[key.to_sym].empty?
-        @inventory[key.to_sym] = Specinfra::Runner.send("get_inventory_#{key}")
+        inventory_class = Specinfra::HostInventory.const_get(key.to_s.to_camel_case)
+        @inventory[key.to_sym] = inventory_class.get
       end
       @inventory[key.to_sym]
     end

data/lib/specinfra/host_inventory/domain.rb

@@ -0,0 +1,10 @@
+module Specinfra
+  class HostInventory
+    class Domain
+      def self.get
+        cmd = Specinfra.command.get(:get_inventory_domain)
+        Specinfra.backend.run_command(cmd).stdout.strip
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/ec2.rb

@@ -0,0 +1,9 @@
+module Specinfra
+  class HostInventory
+    class Ec2
+      def self.get
+        Specinfra::Ec2Metadata.new.get
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/fqdn.rb

@@ -0,0 +1,10 @@
+module Specinfra
+  class HostInventory
+    class Fqdn
+      def self.get
+        cmd = Specinfra.command.get(:get_inventory_fqdn)
+        Specinfra.backend.run_command(cmd).stdout.strip
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/hostname.rb

@@ -0,0 +1,10 @@
+module Specinfra
+  class HostInventory
+    class Hostname
+      def self.get
+        cmd = Specinfra.command.get(:get_inventory_hostname)
+        Specinfra.backend.run_command(cmd).stdout.strip
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory/memory.rb

@@ -0,0 +1,18 @@
+module Specinfra
+  class HostInventory
+    class Memory
+      def self.get
+        cmd = Specinfra.command.get(:get_inventory_memory)
+        ret = Specinfra.backend.run_command(cmd).stdout
+        memory = {}
+        ret.each_line do |line|
+          case line
+          when /^MemTotal:\s+(\d+) (.+)$/
+            memory['total'] = "#{$1}#{$2}"
+          end
+        end
+        memory
+      end
+    end
+  end
+end

data/lib/specinfra/processor.rb

@@ -127,11 +127,11 @@ module Specinfra
 
       if os[:family] == 'openbsd'
         match = ret.stdout.match(/^(\S+)\s+(\S+).*?(\S+[0-9]+)(\s*)$/)
-	actual_attr = {
-	  :destination => $1,
-	  :gateway     => $2,
-	  :interface   => expected_attr[:interface] ? $3 : nil
-	}
+        actual_attr = {
+          :destination => $1,
+          :gateway     => $2,
+          :interface   => expected_attr[:interface] ? $3 : nil
+        }
       else
         matches = ret.stdout.scan(/^(\S+)(?: via (\S+))? dev (\S+).+\n|^(\S+).+\n|\s+nexthop via (\S+)\s+dev (\S+).+/)
         if matches.length > 1
@@ -192,37 +192,5 @@ module Specinfra
         end
       end
     end
-
-    def self.get_inventory_memory
-      cmd = Specinfra.command.get(:get_inventory_memory)
-      ret = Specinfra.backend.run_command(cmd).stdout
-      memory = {}
-      ret.each_line do |line|
-        case line
-        when /^MemTotal:\s+(\d+) (.+)$/
-          memory['total'] = "#{$1}#{$2}"
-        end
-      end
-      memory
-    end
-
-    def self.get_inventory_ec2
-      Specinfra::Ec2Metadata.new.get
-    end
-
-    def self.get_inventory_hostname
-      cmd = Specinfra.command.get(:get_inventory_hostname)
-      Specinfra.backend.run_command(cmd).stdout.strip
-    end
-
-    def self.get_inventory_domain
-      cmd = Specinfra.command.get(:get_inventory_domain)
-      Specinfra.backend.run_command(cmd).stdout.strip
-    end
-
-    def self.get_inventory_fqdn
-      cmd = Specinfra.command.get(:get_inventory_fqdn)
-      Specinfra.backend.run_command(cmd).stdout.strip
-    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.11.6"
+  VERSION = "2.11.7"
 end

data/spec/command/linux/selinux_module_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'linux'
+
+describe get_command(:check_selinux_module_is_installed, 'dnsmasq') do
+  it { should eq "semodule -l | grep $'^dnsmasq\\t'" }
+end
+
+describe get_command(:check_selinux_module_is_enabled, 'dnsmasq') do
+  it { should eq "semodule -l | grep $'^dnsmasq\\t' | grep -v $'^dnsmasq\\t.*\\tDisabled$'" }
+end

data/spec/command/linux/selinux_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'linux'
+
+describe get_command(:check_selinux_has_mode, 'disabled') do
+  it { should eq 'test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.11.6
+  version: 2.11.7
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -334,6 +334,11 @@ files:
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/helper/set.rb
 - lib/specinfra/host_inventory.rb
+- lib/specinfra/host_inventory/domain.rb
+- lib/specinfra/host_inventory/ec2.rb
+- lib/specinfra/host_inventory/fqdn.rb
+- lib/specinfra/host_inventory/hostname.rb
+- lib/specinfra/host_inventory/memory.rb
 - lib/specinfra/processor.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/runner.rb
@@ -353,6 +358,8 @@ files:
 - spec/command/linux/interface_spec.rb
 - spec/command/linux/inventory_spec.rb
 - spec/command/linux/ip6tables_spec.rb
+- spec/command/linux/selinux_module_spec.rb
+- spec/command/linux/selinux_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
@@ -406,6 +413,8 @@ test_files:
 - spec/command/linux/interface_spec.rb
 - spec/command/linux/inventory_spec.rb
 - spec/command/linux/ip6tables_spec.rb
+- spec/command/linux/selinux_module_spec.rb
+- spec/command/linux/selinux_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb