specinfra 2.33.1 → 2.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfdda15e9c52311a0d5e24589dcc58b65f3be07b
-  data.tar.gz: 463ca1d7e2baa498d1be6f4f8619ffc12ee1dc5a
+  metadata.gz: c7770fd21e92746495faaeabbcccdb5590a7c22b
+  data.tar.gz: b3a64e48ef28c3ffdea1532382c4a029d0efea09
 SHA512:
-  metadata.gz: 9eb5310383f8844abbae06634adad3d8d086ba6c50bb41dcca1dd79096bc2e986ba5e23b60c49e63d60b68aa2abd809cbde649238ebcb679a6abdad6057faf14
-  data.tar.gz: af72cbc235163f369693d96f679bb2766df79c44bc651832009a1e0ceba607e75ec1598adead0c8e45713ef993fa0775e685387800c610c39476e3681c5f3c98
+  metadata.gz: c23382cfab4758f8f3b98351e59cde4f19e9fd8832c0e04f8405c960694bf8c5123f4663c49ea690d7ce2376611aff118436a5231522abe501bae8a035e02366
+  data.tar.gz: b8e6ca1b31f2fbb5e0d55471ae0a9d6e7970d89e16cabfe5ed6314675baacf5bfdd485a2e77d9bace685e5a8aa4bf8ae375d5379434db004935ddda42329da6d

data/lib/specinfra/command.rb

@@ -5,6 +5,15 @@ end
 
 # Module
 require 'specinfra/command/module'
+require 'specinfra/command/module/service/init'
+require 'specinfra/command/module/service/systemd'
+require 'specinfra/command/module/service/daemontools'
+require 'specinfra/command/module/service/supervisor'
+require 'specinfra/command/module/service/upstart'
+require 'specinfra/command/module/service/runit'
+require 'specinfra/command/module/service/monit'
+require 'specinfra/command/module/service/god'
+require 'specinfra/command/module/service/delegator'
 require 'specinfra/command/module/systemd'
 require 'specinfra/command/module/zfs'
 

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

@@ -1,31 +1,15 @@
 class Specinfra::Command::Base::Service < Specinfra::Command::Base
   class << self
-    def check_is_running(service)
-      "service #{escape(service)} status"
-    end
-
-    def check_is_running_under_supervisor(service)
-      "supervisorctl status #{escape(service)} | grep RUNNING"
-    end
-
-    def check_is_running_under_upstart(service)
-      "initctl status #{escape(service)} | grep running"
-    end
-
-    def check_is_running_under_daemontools(service)
-      "svstat /service/#{escape(service)} | grep -E 'up \\(pid [0-9]+\\)'"
-    end
-
-    def check_is_running_under_runit(service)
-      "sv status #{escape(service)} | grep -E '^run: '"
-    end
-
-    def check_is_monitored_by_monit(service)
-      "monit status"
-    end
-
-    def check_is_monitored_by_god(service)
-      "god status #{escape(service)}"
-    end
+    include Specinfra::Command::Module::Service::Init
+    include Specinfra::Command::Module::Service::Systemd
+    include Specinfra::Command::Module::Service::Daemontools
+    include Specinfra::Command::Module::Service::Supervisor
+    include Specinfra::Command::Module::Service::Upstart
+    include Specinfra::Command::Module::Service::Runit
+    include Specinfra::Command::Module::Service::Monit
+    include Specinfra::Command::Module::Service::God
+    extend  Specinfra::Command::Module::Service::Delegator
+
+    def_delegator_service_under :init
   end
 end

data/lib/specinfra/command/module/service/daemontools.rb

@@ -0,0 +1,41 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Daemontools
+          def check_is_enabled_under_daemontools(service)
+            "test -L /service/#{escape(service)} && test -f /service/#{escape(service)}/run"
+          end
+
+          def check_is_running_under_daemontools(service)
+            "svstat /service/#{escape(service)} | grep -E 'up \\(pid [0-9]+\\)'"
+          end
+
+          def enable_under_daemontools(service, directory)
+            "ln -snf #{escape(directory)} /service/#{escape(service)}"
+          end
+
+          def disable_under_daemontools(service)
+            "( cd /service/#{escape(service)} && rm -f /service/#{escape(service)} && svc -dx . && [ -d log ] && svc -dx log )"
+          end
+
+          def start_under_daemontools(service)
+            "svc -u /service/#{escape(service)}"
+          end
+
+          def stop_under_daemontools(service)
+            "svc -d /service/#{escape(service)}"
+          end
+
+          def restart_under_daemontools(service)
+            "svc -t /service/#{escape(service)}"
+          end
+
+          def reload_under_daemontools(service)
+            "svc -h /service/#{escape(service)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/delegator.rb

@@ -0,0 +1,20 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Delegator
+          def def_delegator_service_under(under)
+            self.send(:alias_method, :check_is_enabled, :"check_is_enabled_under_#{under}")
+            self.send(:alias_method, :check_is_running, :"check_is_running_under_#{under}")
+            self.send(:alias_method, :enable,           :"enable_under_#{under}")
+            self.send(:alias_method, :disable,          :"disable_under_#{under}")
+            self.send(:alias_method, :start,            :"start_under_#{under}")
+            self.send(:alias_method, :stop,             :"stop_under_#{under}")
+            self.send(:alias_method, :restart,          :"restart_under_#{under}")
+            self.send(:alias_method, :reload,           :"reload_under_#{under}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/god.rb

@@ -0,0 +1,13 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module God
+          def check_is_monitored_by_god(service)
+            "god status #{escape(service)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/init.rb

@@ -0,0 +1,42 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Init
+          def check_is_enabled_under_init(service, level=3)
+            "chkconfig --list #{escape(service)} | grep #{level}:on"
+          end
+
+          def check_is_running_under_init(service)
+            "service #{escape(service)} status"
+          end
+
+          def enable_under_init(service)
+            "chkconfig #{escape(service)} on"
+          end
+
+          def disable_under_init(service)
+            "chkconfig #{escape(service)} off"
+          end
+
+          def start_under_init(service)
+            "service #{escape(service)} start"
+          end
+
+          def stop_under_init(service)
+            "service #{escape(service)} stop"
+          end
+
+          def restart_under_init(service)
+            "service #{escape(service)} restart"
+          end
+
+          def reload_under_init(service)
+            "service #{escape(service)} reload"
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/specinfra/command/module/service/monit.rb

@@ -0,0 +1,13 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Monit
+          def check_is_monitored_by_monit(service)
+            "monit status"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/runit.rb

@@ -0,0 +1,13 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Runit
+          def check_is_running_under_runit(service)
+            "sv status #{escape(service)} | grep -E '^run: '"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/supervisor.rb

@@ -0,0 +1,13 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Supervisor
+          def check_is_running_under_supervisor(service)
+            "supervisorctl status #{escape(service)} | grep RUNNING"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/systemd.rb

@@ -0,0 +1,48 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Systemd
+          def check_is_enabled_under_systemd(service, level="multi-user.target")
+            if level.to_s =~ /^\d+$/
+              level = "runlevel#{level}.target"
+            end
+            unless service.match(/\.(service|mount|device|socket)$/)
+              service += '.service'
+            end
+
+            "systemctl --plain list-dependencies #{level} | grep '\\(^\\| \\)#{escape(service)}$'"
+          end
+
+          def check_is_running_under_systemd(service)
+            "systemctl is-active #{escape(service)}"
+          end
+
+          def enable_under_systemd(service)
+            "systemctl enable #{escape(service)}"
+          end
+
+          def disable_under_systemd(service)
+            "systemctl disable #{escape(service)}"
+          end
+
+          def start_under_systemd(service)
+            "systemctl start #{escape(service)}"
+          end
+
+          def stop_under_systemd(service)
+            "systemctl stop #{escape(service)}"
+          end
+
+          def restart_under_systemd(service)
+            "systemctl restart #{escape(service)}"
+          end
+
+          def reload_under_systemd(service)
+            "systemctl reload #{escape(service)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/upstart.rb

@@ -0,0 +1,13 @@
+module Specinfra
+  module Command
+    module Module
+      module Service
+        module Upstart
+          def check_is_running_under_upstart(service)
+            "initctl status #{escape(service)} | grep running"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/systemd.rb

@@ -2,44 +2,9 @@ module Specinfra
   module Command
     module Module
       module Systemd
-        def check_is_enabled(service, level="multi-user.target")
-          if level.to_s =~ /^\d+$/
-            level = "runlevel#{level}.target"
-          end
-          unless service.match(/\.(service|mount|device|socket)$/)
-            service += '.service'
-          end
-
-          "systemctl --plain list-dependencies #{level} | grep '\\(^\\| \\)#{escape(service)}$'"
-        end
-
-        def check_is_running(service)
-          "systemctl is-active #{escape(service)}"
-        end
-
-        def enable(service)
-          "systemctl enable #{escape(service)}"
-        end
-
-        def disable(service)
-          "systemctl disable #{escape(service)}"
-        end
-
-        def start(service)
-          "systemctl start #{escape(service)}"
-        end
-
-        def stop(service)
-          "systemctl stop #{escape(service)}"
-        end
-
-        def restart(service)
-          "systemctl restart #{escape(service)}"
-        end
-
-        def reload(service)
-          "systemctl reload #{escape(service)}"
-        end
+        include Specinfra::Command::Module::Service::Systemd
+        extend  Specinfra::Command::Module::Service::Delegator
+        def_delegator_service_under :systemd
       end
     end
   end

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

@@ -1,38 +1,2 @@
 class Specinfra::Command::Redhat::Base::Service < Specinfra::Command::Linux::Base::Service
-  class << self
-    def check_is_enabled(service, level=3)
-      "chkconfig --list #{escape(service)} | grep #{level}:on"
-    end
-
-    def enable(service)
-      "chkconfig #{escape(service)} on"
-    end
-
-    def disable(service)
-      "chkconfig #{escape(service)} off"
-    end
-
-    def start(service)
-      "service #{escape(service)} start"
-    end
-
-    def stop(service)
-      "service #{escape(service)} stop"
-    end
-
-    def restart(service)
-      "service #{escape(service)} restart"
-    end
-
-    def reload(service)
-      "service #{escape(service)} reload"
-    end
-  end
 end
-
-
-
-
-
-
-

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.33.1"
+  VERSION = "2.34.0"
 end

data/spec/command/module/service/daemontools_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Module::Service::Daemontools do
+  class Specinfra::Command::Module::Service::Daemontools::Test < Specinfra::Command::Base
+    extend Specinfra::Command::Module::Service::Daemontools
+  end
+  let(:klass) { Specinfra::Command::Module::Service::Daemontools::Test }
+  it { expect(klass.check_is_enabled_under_daemontools('httpd')).to eq "test -L /service/httpd && test -f /service/httpd/run" }
+  it { expect(klass.check_is_running_under_daemontools('httpd')).to eq "svstat /service/httpd | grep -E 'up \\(pid [0-9]+\\)'" }
+  it { expect(klass.enable_under_daemontools('httpd', '/tmp/service/httpd')).to eq 'ln -snf /tmp/service/httpd /service/httpd' }
+  it { expect(klass.disable_under_daemontools('httpd')).to eq '( cd /service/httpd && rm -f /service/httpd && svc -dx . && [ -d log ] && svc -dx log )' }
+  it { expect(klass.start_under_daemontools('httpd')).to   eq 'svc -u /service/httpd' }
+  it { expect(klass.stop_under_daemontools('httpd')).to    eq 'svc -d /service/httpd' }
+  it { expect(klass.restart_under_daemontools('httpd')).to eq 'svc -t /service/httpd' }
+  it { expect(klass.reload_under_daemontools('httpd')).to  eq 'svc -h /service/httpd' }
+end
+
+

data/spec/command/module/service/init_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Module::Service::Init do
+  class Specinfra::Command::Module::Service::Init::Test < Specinfra::Command::Base
+    extend Specinfra::Command::Module::Service::Init
+  end
+  let(:klass) { Specinfra::Command::Module::Service::Init::Test }
+  it { expect(klass.check_is_enabled_under_init('httpd')).to eq "chkconfig --list httpd | grep 3:on" }
+  it { expect(klass.check_is_running_under_init('httpd')).to eq 'service httpd status' }
+  it { expect(klass.enable_under_init('httpd')).to  eq 'chkconfig httpd on' }
+  it { expect(klass.disable_under_init('httpd')).to eq 'chkconfig httpd off' }
+  it { expect(klass.start_under_init('httpd')).to   eq 'service httpd start' }
+  it { expect(klass.stop_under_init('httpd')).to    eq 'service httpd stop' }
+  it { expect(klass.restart_under_init('httpd')).to eq 'service httpd restart' }
+  it { expect(klass.reload_under_init('httpd')).to  eq 'service httpd reload' }
+end
+
+

data/spec/command/module/service/systemd_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Module::Service::Systemd do
+  class Specinfra::Command::Module::Service::Systemd::Test < Specinfra::Command::Base
+    extend Specinfra::Command::Module::Service::Systemd
+  end
+  let(:klass) { Specinfra::Command::Module::Service::Systemd::Test }
+  it { expect(klass.check_is_enabled_under_systemd('httpd')).to eq "systemctl --plain list-dependencies multi-user.target | grep '\\(^\\| \\)httpd.service$'" }
+  it { expect(klass.check_is_running_under_systemd('httpd')).to eq 'systemctl is-active httpd' }
+  it { expect(klass.enable_under_systemd('httpd')).to  eq 'systemctl enable httpd' }
+  it { expect(klass.disable_under_systemd('httpd')).to eq 'systemctl disable httpd' }
+  it { expect(klass.start_under_systemd('httpd')).to   eq 'systemctl start httpd' }
+  it { expect(klass.stop_under_systemd('httpd')).to    eq 'systemctl stop httpd' }
+  it { expect(klass.restart_under_systemd('httpd')).to eq 'systemctl restart httpd' }
+  it { expect(klass.reload_under_systemd('httpd')).to  eq 'systemctl reload httpd' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.33.1
+  version: 2.34.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -247,6 +247,15 @@ files:
 - lib/specinfra/command/linux/base/yumrepo.rb
 - lib/specinfra/command/linux/base/zfs.rb
 - lib/specinfra/command/module.rb
+- lib/specinfra/command/module/service/daemontools.rb
+- lib/specinfra/command/module/service/delegator.rb
+- lib/specinfra/command/module/service/god.rb
+- lib/specinfra/command/module/service/init.rb
+- lib/specinfra/command/module/service/monit.rb
+- lib/specinfra/command/module/service/runit.rb
+- lib/specinfra/command/module/service/supervisor.rb
+- lib/specinfra/command/module/service/systemd.rb
+- lib/specinfra/command/module/service/upstart.rb
 - lib/specinfra/command/module/systemd.rb
 - lib/specinfra/command/module/zfs.rb
 - lib/specinfra/command/nixos.rb
@@ -403,6 +412,9 @@ files:
 - spec/command/linux/ip6tables_spec.rb
 - spec/command/linux/selinux_module_spec.rb
 - spec/command/linux/selinux_spec.rb
+- spec/command/module/service/daemontools_spec.rb
+- spec/command/module/service/init_spec.rb
+- spec/command/module/service/systemd_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/redhat/interface_spec.rb
@@ -466,6 +478,9 @@ test_files:
 - spec/command/linux/ip6tables_spec.rb
 - spec/command/linux/selinux_module_spec.rb
 - spec/command/linux/selinux_spec.rb
+- spec/command/module/service/daemontools_spec.rb
+- spec/command/module/service/init_spec.rb
+- spec/command/module/service/systemd_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/redhat/interface_spec.rb