itamae-plugin-resource-daemontools_service 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62e1c8bf385519952d4198d46e971d106fdba0a
-  data.tar.gz: cb952cf722dc8923444750262d6854a215286198
+  metadata.gz: 6e45984ee2b35354f357ed041f68754b18a5af4e
+  data.tar.gz: 7721e4b5c2a26c21ab0f11f279729739eec17dc0
 SHA512:
-  metadata.gz: 9c764f407e051fc222d56bd250ffb11e7a1a4737b90b8cf2f2903b26388880c390e9a48307ca7bf94bce114523160864ad2fc13cf488b8959029a88053187c13
-  data.tar.gz: 68ab940a6585739cec458998b0b46e16aa1a0acf72706eacf46c2b3f5bf26e753ad16c38148193b2c999a20a3539555742182c340c6dec21cb03f5a0ba2fa3da
+  metadata.gz: 1140cf4e83596b0ad53939fd23d0d497fb5588e70b272cddb6937823628d55ec49f5397f4e786c523483486d39420195344a47e2a348a2dba2cb64797bb85038
+  data.tar.gz: f9fe3613689220f5790037473882af505774636934763d40ca75e8f48516aad64d5b48385be1150b27aae1ba1b57a589de8dca3de18083bf2f8d73cbbfa03718

data/README.md

@@ -33,10 +33,14 @@ end
 
 Options:
 
-- service_dir (optional)
-    - directory that svscan monitors. default is `/service`
 - directory (required)
-    - directory contains `run` file. The basename is used to link to `/service/#{basename(directory)}`
+    - directory contains `run` file. This directory is symlinked. 
+- service_dir (option)
+    - directory that svscan monitors. default is `/service`
+- svc_command (option)
+    - the path of the svc command. default is `svc`
+- svstat_command (option)
+    - the path of the svstat command. default is `svstat`
 
 ## Acknowledgement
 

data/examples/daemontools_service.rb

@@ -16,71 +16,71 @@ execute "start svscan" do
   not_if "initctl status svscan | grep running"
 end
 
-# sync test scripts
 directory "/tmp/service"
 
-remote_directory "/tmp/service/test/" do
-  source "files/tmp/service/test/"
-end
-
-# tests
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:enable]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:enable]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:start]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:start]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:reload]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:reload]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:stop]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:stop]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:restart]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:restart]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:disable]
-end
-
-daemontools_service "test" do
-  directory "/tmp/service/test"
-  action [:disable]
+%w[with_log without_log].each do |_service|
+  # sync test scripts
+  remote_directory "/tmp/service/#{_service}/" do
+    source "files/tmp/service/#{_service}/"
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:enable]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:enable]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:start]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:start]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:reload]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:reload]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:stop]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:stop]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:restart]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:restart]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:disable]
+  end
+
+  daemontools_service "#{_service}" do
+    directory "/tmp/service/#{_service}"
+    action [:disable]
+  end
 end

data/examples/files/tmp/service/without_log/run

@@ -0,0 +1,7 @@
+#!/bin/sh
+exec 2>&1
+set -e
+exec envdir ./env \
+  sh -c '
+    exec vmstat 1 2>&1
+  '

data/itamae-plugin-resource-daemontools_service.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "itamae-plugin-resource-daemontools_service"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Naotoshi Seo"]
   spec.email         = ["sonots@gmail.com"]
   spec.summary       = %q{Itamae resource plugin to manage daemontools service.}

data/lib/itamae/plugin/resource/daemontools_service.rb

@@ -7,10 +7,10 @@ module Itamae
         define_attribute :action, default: :nothing
         define_attribute :name, type: String, default_name: true
 
-        define_attribute :service_directory, type: String, default: '/service'
         define_attribute :directory, type: String
-        define_attribute :svc_command, type: String, default: '/usr/local/bin/svc'
-        define_attribute :svstat_command, type: String, default: '/usr/local/bin/svstat'
+        define_attribute :service_dir, type: String, default: '/service'
+        define_attribute :svc_command, type: String, default: 'svc'
+        define_attribute :svstat_command, type: String, default: 'svstat'
 
         def initialize(*args)
           super
@@ -25,11 +25,11 @@ module Itamae
         end
 
         def service_name
-          shell_escape(File.basename(attributes.directory))
+          shell_escape(attributes.name)
         end
 
         def service_link
-          "#{shell_escape(attributes.service_directory)}/#{service_name}"
+          "#{shell_escape(attributes.service_dir)}/#{service_name}"
         end
 
         def pre_action
@@ -52,63 +52,53 @@ module Itamae
 
         def action_start(options)
           if current.enabled && !current.running
-            run_command("sudo #{svc_command} -u #{service_link}")
+            run_command("#{svc_command} -u #{service_link}")
           end
         end
 
         def action_stop(options)
           if current.enabled && current.running
-            run_command("sudo #{svc_command} -d #{service_link}")
+            run_command("#{svc_command} -d #{service_link}")
           end
         end
 
         def action_restart(options)
           if current.enabled && current.running
-            run_command("sudo #{svc_command} -t #{service_link}")
+            run_command("#{svc_command} -t #{service_link}")
           end
         end
 
         def action_reload(options)
           if current.enabled && current.running
-            run_command("sudo #{svc_command} -h #{service_link}")
+            run_command("#{svc_command} -h #{service_link}")
           end
         end
 
         def action_enable(options)
           if !current.enabled
-            # run_command("sudo ln -sf #{attributes.directory} #{service_link}")
-            run_command("sudo ln -sf #{attributes.directory} #{shell_escape(attributes.service_directory)}/")
+            run_command("ln -snf #{attributes.directory} #{service_link}")
           end
         end
 
         def action_disable(options)
           if current.enabled
-            service_dot_link = "#{shell_escape(attributes.service_directory)}/.#{service_name}"
-            command = <<-"EOF"
-              sudo mv #{service_link} #{service_dot_link}
-              sudo #{svc_command} -dx #{service_dot_link}
-              if [ -d #{service_dot_link}/log ]; then
-                sudo #{svc_command} -dx #{service_dot_link}/log
-              fi
-              sudo rm -f #{service_dot_link}
-            EOF
-            run_command(command)
+            run_command("( cd #{service_link} && rm -f #{service_link} && svc -dx . log )")
           end
         end
 
-        # private
+        private
 
         def service_status!
           if run_command("test -L #{service_link} && test -f #{service_link}/run", error: false).exit_status == 0
             current.enabled = true
-            result = run_command("sudo #{svstat_command} #{service_link}", error: false)
+            result = run_command("#{svstat_command} #{service_link}", error: false)
             if result.exit_status == 0
 
               retry_count = 4
               while result.stdout =~ /: supervise not running/ or result.stdout =~ /: unable to open supervise\/ok/
                 sleep 1
                 retry_count -= 1
-                result = run_command("sudo #{svstat_command} #{service_link}", error: false)
+                result = run_command("#{svstat_command} #{service_link}", error: false)
                 break if retry_count < 0
               end
 

data/test.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-bundle exec itamae ssh --vagrant -h vagrant-centos examples/daemontools_service.rb
+bundle exec itamae ssh -l debug --vagrant -h vagrant-centos examples/daemontools_service.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-resource-daemontools_service
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,11 @@ files:
 - Vagrantfile
 - examples/daemontools_service.rb
 - examples/files/etc/init/svscan.conf
-- examples/files/tmp/service/test/env/.gitkeep
-- examples/files/tmp/service/test/log/run
-- examples/files/tmp/service/test/run
+- examples/files/tmp/service/with_log/env/.gitkeep
+- examples/files/tmp/service/with_log/log/run
+- examples/files/tmp/service/with_log/run
+- examples/files/tmp/service/without_log/env/.gitkeep
+- examples/files/tmp/service/without_log/run
 - itamae-plugin-resource-daemontools_service.gemspec
 - lib/itamae/plugin/resource/daemontools_service.rb
 - spec/itamae/plugin/resource/daemontools_service_spec.rb