specinfra 2.0.0.beta6 → 2.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59de503cd2a6e1e99e571d21abe145d4901c62e
-  data.tar.gz: 4c84a1001c9c5df401c3195fd9c957b33c43b8c0
+  metadata.gz: f2b797f05a2673cff2af1dfb512c2c1eccfba25e
+  data.tar.gz: 4be834e13201caddecb6396a37e3a5e07de85c62
 SHA512:
-  metadata.gz: 4367b260c7854879384d8f9292fdd9ae4eda45693445d951e675c91140e0c068ff76e52df1b8f7b878b77063410f84680f7b51713b499219e0c543536fe02c4b
-  data.tar.gz: c69205dad07e42abab0fab31fdfdd8873a3964cd50395ec4c9f9b2223154803d42da040407600b8d2511828b852575f9a25793ac6f9fdb6113893467641cf2d6
+  metadata.gz: 1e83591f78930f3b70ae8c5ddde2e64dd3103b7118e7137835d2d9d687340788748f7fe72e4f29eb10df44cc483d643914237af73b7839a589d7a7502d3237e7
+  data.tar.gz: 4f1fe283366bf8d44541120d9c60a2f5fcb7e976f40db6e046897ea027ac107f72a198f101b76b15a3eaaf2788abb7e0913df2c1aeb2002639c2647577794b89

data/Rakefile

@@ -9,7 +9,7 @@ if defined?(RSpec)
   task :spec => 'spec:all'
 
   namespace :spec do
-    task :all => [ :helper, :backend, :configuration ]
+    task :all => [ :helper, :backend, :configuration, :command ]
 
     RSpec::Core::RakeTask.new(:helper) do |t|
       t.pattern = "spec/helper/*_spec.rb"
@@ -33,7 +33,7 @@ if defined?(RSpec)
     end
 
     RSpec::Core::RakeTask.new(:command) do |t|
-      t.pattern = "spec/command/*.rb"
+      t.pattern = "spec/command/**/*.rb"
     end
   end
 end

data/lib/specinfra.rb

@@ -35,3 +35,28 @@ if defined?(RSpec)
     end
   end
 end
+
+class Class
+  def subclasses
+    result = []
+    ObjectSpace.each_object(Class) do |k|
+      result << k if k < self
+    end
+    result
+  end
+end
+
+class String
+  def to_snake_case
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end
+
+  def to_camel_case
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map{|e| e.capitalize}.join
+  end
+end

data/lib/specinfra/backend/exec.rb

@@ -55,8 +55,8 @@ module Specinfra
         end
       end
 
-      def check_running(process)
-        ret = run_command(commands.check_running(process))
+      def check_service_is_running(service)
+        ret = run_command(commands.check_service_is_running(service))
 
         # In Ubuntu, some services are under upstart and "service foo status" returns
         # exit status 0 even though they are stopped.
@@ -65,14 +65,14 @@ module Specinfra
 
         # If the service is not registered, check by ps command
         if ret.exit_status == 1
-          ret = run_command(commands.check_process(process))
+          ret = run_command(commands.check_process_is_running(service))
         end
 
         ret.success?
       end
 
-      def check_monitored_by_monit(process)
-        ret = run_command(commands.check_monitored_by_monit(process))
+      def check_service_is_monitored_by_monit(process)
+        ret = run_command(commands.check_service_is_monitored_by_monit(process))
         return false unless ret.stdout != nil && ret.success?
 
         retlines = ret.stdout.split(/[\r\n]+/).map(&:strip)
@@ -82,8 +82,8 @@ module Specinfra
         retlines[proc_index+2].match(/\Amonitoring status\s+monitored\Z/i) != nil
       end
 
-      def check_readable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file)).stdout.strip)
+      def check_file_is_readable(file, by_whom)
+        mode = sprintf('%04s',run_command(commands.get_file_mode(file)).stdout.strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
         case by_whom
@@ -98,8 +98,8 @@ module Specinfra
         end
       end
 
-      def check_writable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file)).stdout.strip)
+      def check_file_is_writable(file, by_whom)
+        mode = sprintf('%04s',run_command(commands.get_file_mode(file)).stdout.strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
         case by_whom
@@ -114,8 +114,8 @@ module Specinfra
         end
       end
 
-      def check_executable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file)).stdout.strip)
+      def check_file_is_executable(file, by_whom)
+        mode = sprintf('%04s',run_command(commands.get_file_mode(file)).stdout.strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
         case by_whom
@@ -130,8 +130,8 @@ module Specinfra
         end
       end
 
-      def check_mounted(path, expected_attr, only_with)
-        ret = run_command(commands.check_mounted(path))
+      def check_file_is_mounted(path, expected_attr, only_with)
+        ret = run_command(commands.check_file_is_mounted(path))
         if expected_attr.nil? || ret.failure?
           return ret.success?
         end
@@ -163,9 +163,9 @@ module Specinfra
         end
       end
 
-      def check_routing_table(expected_attr)
+      def check_routing_table_has_entry(expected_attr)
         return false if ! expected_attr[:destination]
-        ret = run_command(commands.check_routing_table(expected_attr[:destination]))
+        ret = run_command(commands.check_routing_table_has_entry(expected_attr[:destination]))
         return false if ret.failure?
 
         ret.stdout.gsub!(/\r\n/, "\n")
@@ -183,94 +183,6 @@ module Specinfra
         true
       end
 
-      def check_os
-        return Specinfra.configuration.os if Specinfra.configuration.os
-        arch = run_command('uname -m').stdout.strip
-        # 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
-
-          if release =~ /7./
-            { :family => 'RedHat7', :release => release, :arch => arch }
-          else
-            { :family => 'RedHat', :release => release, :arch => arch }
-          end
-        elsif run_command('ls /etc/system-release').success?
-          { :family => 'RedHat', :release => nil, :arch => arch } # Amazon Linux
-        elsif run_command('ls /etc/SuSE-release').success?
-          line = run_command('cat /etc/SuSE-release').stdout
-          if line =~ /SUSE Linux Enterprise Server (\d+)/
-            release = $1
-            family = 'SuSE'
-          elsif line =~ /openSUSE (\d+\.\d+|\d+)/
-            release = $1
-            family = 'OpenSUSE'
-          end
-          { :family => family, :release => release, :arch => arch }
-        elsif run_command('ls /etc/debian_version').success?
-          lsb_release = run_command("lsb_release -ir")
-          if lsb_release.success?
-            if lsb_release.stdout =~ /:/
-              distro = lsb_release.stdout.split("\n").first.split(':').last
-              release = lsb_release.stdout.split("\n").last.split(':').last.strip
-            end
-          else
-            lsb_release = run_command("cat /etc/lsb-release")
-            if lsb_release.success?
-              lsb_release.stdout.each_line do |line|
-                distro = line.split('=').last if line =~ /^DISTRIB_ID=/
-                release = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
-              end
-            end
-          end
-          distro ||= 'Debian'
-          release ||= nil
-          { :family => distro.strip, :release => release, :arch => arch }
-        elsif run_command('ls /etc/gentoo-release').success?
-          { :family => 'Gentoo', :release => nil, :arch => arch }
-        elsif run_command('ls /usr/lib/setup/Plamo-*').success?
-          { :family => 'Plamo', :release => nil, :arch => arch }
-        elsif run_command('ls /var/run/current-system/sw').success?
-          { :family => 'NixOS', :release => nil, :arch => arch }
-        elsif run_command('uname -s').stdout =~ /AIX/i
-          { :family => 'AIX', :release => nil, :arch => arch }
-        elsif ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i
-          if uname =~ /5.10/
-            { :family => 'Solaris10', :release => nil, :arch => arch }
-          elsif run_command('grep -q "Oracle Solaris 11" /etc/release').success?
-            { :family => 'Solaris11', :release => nil, :arch => arch }
-          elsif run_command('grep -q SmartOS /etc/release').success?
-            { :family => 'SmartOS', :release => nil, :arch => arch }
-          else
-            { :family => 'Solaris', :release => nil, :arch => arch }
-          end
-        elsif run_command('uname -s').stdout =~ /Darwin/i
-          { :family => 'Darwin', :release => nil }
-        elsif ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
-          if uname =~ /10./
-            { :family => 'FreeBSD10', :release => nil, :arch => arch }
-          else
-            { :family => 'FreeBSD', :release => nil, :arch => arch }
-          end
-        elsif run_command('uname -sr').stdout =~ /Arch/i
-          { :family => 'Arch', :release => nil, :arch => arch }
-        elsif run_command('uname -s').stdout =~ /OpenBSD/i
-          { :family => 'OpenBSD', :release => nil, :arch => arch }
-        else
-          { :family => 'Base', :release => nil, :arch => arch }
-        end
-      end
-
       def copy_file(from, to)
         begin
           FileUtils.cp(from, to)

data/lib/specinfra/backend/ssh.rb

@@ -77,7 +77,7 @@ module Specinfra
 
             channel.on_extended_data do |ch, type, data|
               if data.match /you must have a tty to run sudo/
-                abort 'Please set "SpecInfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropriate file.'
+                abort 'Please set "Specinfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropriate file.'
               end
 
               if data.match /^sudo: no tty present and no askpass program specified/

data/lib/specinfra/command.rb

@@ -1,29 +1,208 @@
-require "specinfra/command/base"
-
-# Linux
-require "specinfra/command/linux"
-require "specinfra/command/arch"
-require "specinfra/command/debian"
-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/opensuse"
-require "specinfra/command/fedora"
-require "specinfra/command/nixos"
-
-# Solaris
-require "specinfra/command/solaris"
-require "specinfra/command/solaris10"
-require "specinfra/command/solaris11"
-require "specinfra/command/smartos"
-
-# Others
-require "specinfra/command/aix"
-require "specinfra/command/darwin"
-require "specinfra/command/freebsd"
-require "specinfra/command/freebsd10"
-require "specinfra/command/openbsd"
-require "specinfra/command/windows"
+module Specinfra::Command; end
+
+# Module
+require 'specinfra/command/module'
+require 'specinfra/command/module/systemd'
+require 'specinfra/command/module/zfs'
+
+# Base
+require 'specinfra/command/base'
+require 'specinfra/command/base/cron'
+require 'specinfra/command/base/file'
+require 'specinfra/command/base/group'
+require 'specinfra/command/base/host'
+require 'specinfra/command/base/interface'
+require 'specinfra/command/base/ipfilter'
+require 'specinfra/command/base/ipnat'
+require 'specinfra/command/base/iptables'
+require 'specinfra/command/base/kernel_module'
+require 'specinfra/command/base/lxc_container'
+require 'specinfra/command/base/mail_alias'
+require 'specinfra/command/base/package'
+require 'specinfra/command/base/port'
+require 'specinfra/command/base/ppa'
+require 'specinfra/command/base/process'
+require 'specinfra/command/base/routing_table'
+require 'specinfra/command/base/selinux'
+require 'specinfra/command/base/service'
+require 'specinfra/command/base/user'
+require 'specinfra/command/base/yumrepo'
+require 'specinfra/command/base/zfs'
+
+# Linux (inhefit Base)
+require 'specinfra/command/linux'
+require 'specinfra/command/linux/base'
+require 'specinfra/command/linux/base/file'
+require 'specinfra/command/linux/base/interface'
+require 'specinfra/command/linux/base/iptables'
+require 'specinfra/command/linux/base/kernel_module'
+require 'specinfra/command/linux/base/lxc_container'
+require 'specinfra/command/linux/base/package'
+require 'specinfra/command/linux/base/ppa'
+require 'specinfra/command/linux/base/selinux'
+require 'specinfra/command/linux/base/service'
+require 'specinfra/command/linux/base/yumrepo'
+require 'specinfra/command/linux/base/zfs'
+
+# RedHat (inherit Linux)
+require 'specinfra/command/redhat'
+require 'specinfra/command/redhat/base'
+require 'specinfra/command/redhat/base/file'
+require 'specinfra/command/redhat/base/iptables'
+require 'specinfra/command/redhat/base/package'
+require 'specinfra/command/redhat/base/service'
+require 'specinfra/command/redhat/base/yumrepo'
+
+# RedHat V5 (inherit RedHat)
+require 'specinfra/command/redhat/v5'
+require 'specinfra/command/redhat/v5/iptables'
+
+# RedHat V7 (inherit RedHat)
+require 'specinfra/command/redhat/v7'
+require 'specinfra/command/redhat/v7/service'
+
+# Fedora (inherit RedhHat)
+require 'specinfra/command/fedora'
+require 'specinfra/command/fedora/base'
+require 'specinfra/command/fedora/base/service'
+
+# Fedora >= V15 (inherit Fedora)
+require 'specinfra/command/fedora/v15'
+require 'specinfra/command/fedora/v15/service'
+
+# AIX (inherit Base)
+require 'specinfra/command/aix'
+require 'specinfra/command/aix/base'
+require 'specinfra/command/aix/base/file'
+require 'specinfra/command/aix/base/group'
+require 'specinfra/command/aix/base/package'
+require 'specinfra/command/aix/base/port'
+require 'specinfra/command/aix/base/service'
+require 'specinfra/command/aix/base/user'
+
+# Arch (inherit Linux)
+require 'specinfra/command/arch'
+require 'specinfra/command/arch/base'
+require 'specinfra/command/arch/base/file'
+require 'specinfra/command/arch/base/service'
+require 'specinfra/command/arch/base/package'
+
+# Darwin (inherit Base)
+require 'specinfra/command/darwin'
+require 'specinfra/command/darwin/base'
+require 'specinfra/command/darwin/base/file'
+require 'specinfra/command/darwin/base/service'
+require 'specinfra/command/darwin/base/package'
+require 'specinfra/command/darwin/base/port'
+
+# Debian (inherit Linux)
+require 'specinfra/command/debian'
+require 'specinfra/command/debian/base'
+require 'specinfra/command/debian/base/package'
+require 'specinfra/command/debian/base/ppa'
+require 'specinfra/command/debian/base/service'
+
+# Ubuntu (inherit Debian)
+require 'specinfra/command/ubuntu'
+require 'specinfra/command/ubuntu/base'
+require 'specinfra/command/ubuntu/base/ppa'
+require 'specinfra/command/ubuntu/base/service'
+
+# Gentoo (inherit Linux)
+require 'specinfra/command/gentoo'
+require 'specinfra/command/gentoo/base'
+require 'specinfra/command/gentoo/base/package'
+require 'specinfra/command/gentoo/base/service'
+
+# Plamo (inherit Linux)
+require 'specinfra/command/plamo'
+require 'specinfra/command/plamo/base'
+require 'specinfra/command/plamo/base/package'
+require 'specinfra/command/plamo/base/service'
+
+# NixOS (inherit Linux)
+require 'specinfra/command/nixos'
+require 'specinfra/command/nixos/base'
+require 'specinfra/command/nixos/base/package'
+require 'specinfra/command/nixos/base/service'
+
+# SuSE (inherit Linux)
+require 'specinfra/command/suse'
+require 'specinfra/command/suse/base'
+require 'specinfra/command/suse/base/package'
+require 'specinfra/command/suse/base/service'
+
+# OpenSuSE (inherit SuSE)
+require 'specinfra/command/opensuse'
+require 'specinfra/command/opensuse/base'
+require 'specinfra/command/opensuse/base/service'
+
+# FreeBSD (inherit Base)
+require 'specinfra/command/freebsd'
+require 'specinfra/command/freebsd/base'
+require 'specinfra/command/freebsd/base/file'
+require 'specinfra/command/freebsd/base/package'
+require 'specinfra/command/freebsd/base/port'
+require 'specinfra/command/freebsd/base/service'
+
+# FreeBSD V10 (inherit FreeBSD)
+require 'specinfra/command/freebsd/v10'
+require 'specinfra/command/freebsd/v10/package'
+
+# OpenBSD (inherit Base)
+require 'specinfra/command/openbsd'
+require 'specinfra/command/openbsd/base'
+require 'specinfra/command/openbsd/base/file'
+require 'specinfra/command/openbsd/base/interface'
+require 'specinfra/command/openbsd/base/mail_alias'
+require 'specinfra/command/openbsd/base/package'
+require 'specinfra/command/openbsd/base/port'
+require 'specinfra/command/openbsd/base/service'
+require 'specinfra/command/openbsd/base/user'
+
+# Solaris (inherit Base)
+require 'specinfra/command/solaris'
+require 'specinfra/command/solaris/base'
+require 'specinfra/command/solaris/base/cron'
+require 'specinfra/command/solaris/base/file'
+require 'specinfra/command/solaris/base/group'
+require 'specinfra/command/solaris/base/host'
+require 'specinfra/command/solaris/base/ipfilter'
+require 'specinfra/command/solaris/base/ipnat'
+require 'specinfra/command/solaris/base/package'
+require 'specinfra/command/solaris/base/port'
+require 'specinfra/command/solaris/base/service'
+require 'specinfra/command/solaris/base/user'
+require 'specinfra/command/solaris/base/zfs'
+
+# Solaris 10 (inherit Solaris)
+require 'specinfra/command/solaris/v10'
+require 'specinfra/command/solaris/v10/file'
+require 'specinfra/command/solaris/v10/group'
+require 'specinfra/command/solaris/v10/host'
+require 'specinfra/command/solaris/v10/package'
+require 'specinfra/command/solaris/v10/user'
+
+# SmartOS (inherit Solaris)
+require 'specinfra/command/smartos'
+require 'specinfra/command/smartos/base'
+require 'specinfra/command/smartos/base/package'
+require 'specinfra/command/smartos/base/service'
+
+# Windows (inherit nothing)
+require 'specinfra/command/windows'
+require 'specinfra/command/windows/base'
+require 'specinfra/command/windows/base/feature'
+require 'specinfra/command/windows/base/file'
+require 'specinfra/command/windows/base/group'
+require 'specinfra/command/windows/base/host'
+require 'specinfra/command/windows/base/hot_fix'
+require 'specinfra/command/windows/base/iis_app_pool'
+require 'specinfra/command/windows/base/iis_website'
+require 'specinfra/command/windows/base/package'
+require 'specinfra/command/windows/base/port'
+require 'specinfra/command/windows/base/process'
+require 'specinfra/command/windows/base/service'
+require 'specinfra/command/windows/base/user'
+require 'specinfra/command/windows/base/registry_key'
+require 'specinfra/command/windows/base/scheduled_task'