capistrano-systemd-multiservice 0.1.0.beta5 → 0.1.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e907c342bb48b769dcda1949f5f32e9b4c22fc2706429515c8a3c0fa364247
-  data.tar.gz: 8fe738be3e7bf63ac8da2f6b232e54b944a9c3d5a166ed8588306c1ab9bc4eb9
+  metadata.gz: 2047d118d3aa56c85a22f1a77c68d26e735e5d9c082393b2a460a6718047f26d
+  data.tar.gz: 3652b1dd931ad5207dd404934224671a6cadfa2b231f9c7865652fb3b709af45
 SHA512:
-  metadata.gz: eafb7fd4f40ea4cdae224cc9ec8325097b2361587f699cb5595f0e3d33bebfb487f7a3d1f90f7eff7c1547e39a147916e7b37032c5943c04278e33dcac8dd326
-  data.tar.gz: 6ad4883b9e6ea4b3004e1cf92f2d63ca9a09ad96da94abb9b8d16d513e99af9f51ed998932f8fcc3ec4c421bd1b7fc54d07c7d9adec9b6fd4015a24a51d6033e
+  metadata.gz: ec6a1ea1067b9b55667a105b03631e32f6e227729dad674822fb45d9c828db4c133d4cb9c52de7f7f1e498b007a37081b189d862c6b6f53bcc08f597dc389592
+  data.tar.gz: ff2e0e40974270950668461097a0a00bf022079c2fc940f20c7fe7263b6f238a2d00072bc6ca0b0d83dbc4127303cddd3fa9c63ca27a5013478c3441cfcb4e4c

data/README.md

@@ -26,8 +26,8 @@ Add these lines to your Capfile:
 
 ```ruby
 require "capistrano/systemd/multiservice"
-install_plugin Capistrano::Systemd::MultiService.new("example1")
-install_plugin Capistrano::Systemd::MultiService.new("example2")
+install_plugin Capistrano::Systemd::MultiService.new_service("example1")
+install_plugin Capistrano::Systemd::MultiService.new_service("example2")
 ```
 
 And put `config/systemd/example1.service.erb` (and `config/systemd/example2.service.erb`, ...) like this:
@@ -70,7 +70,7 @@ cap STAGE deploy
 
 ## Capistrano Tasks
 
-With `install_plugin Capistrano::Systemd::MultiService.new("example1")`,
+With `install_plugin Capistrano::Systemd::MultiService.new_service("example1")`,
 following tasks are defined.
 
 - `systemd:example1:setup`
@@ -85,11 +85,11 @@ following tasks are defined.
 - `systemd:example1:enable`
 - `systemd:example1:disable`
 
-See lib/capistrano/tasks/systemd/multiservice.rake, lib/capistrano/systemd/multiservice.rb for details.
+See lib/capistrano/tasks/systemd/multiservice/system\_service.rake, lib/capistrano/systemd/multiservice/system\_service.rb for details.
 
 ## Configuration Variables
 
-With `install_plugin Capistrano::Systemd::MultiService.new("example1")`,
+With `install_plugin Capistrano::Systemd::MultiService.new_service("example1")`,
 following Configuration variables are defined.
 
 - `:systemd_example1_role`
@@ -100,7 +100,7 @@ following Configuration variables are defined.
 - `:systemd_example1_service`
 - `:systemd_example1_instance_services`
 
-See lib/capistrano/systemd/multiservice.rb for details.
+See lib/capistrano/systemd/multiservice/system\_service.rb for details.
 
 ## Examples
 
@@ -112,8 +112,8 @@ See lib/capistrano/systemd/multiservice.rb for details.
 ## ...snip...
 
 require 'capistrano/systemd/multiservice'
-install_plugin Capistrano::Systemd::MultiService.new('unicorn')
-install_plugin Capistrano::Systemd::MultiService.new('delayed_job')
+install_plugin Capistrano::Systemd::MultiService.new_service('unicorn')
+install_plugin Capistrano::Systemd::MultiService.new_service('delayed_job')
 
 ## ...snip...
 ```

data/lib/capistrano/systemd/multiservice/system_service.rb

@@ -0,0 +1,124 @@
+require "erb"
+require "stringio"
+require "capistrano/plugin"
+
+module Capistrano
+  module Systemd
+    module MultiService
+      class SystemService < ::Capistrano::Plugin
+        attr_reader :app
+
+        def initialize(app)
+          @app = app
+          super()
+        end
+
+        def nsp
+          @app.to_sym
+        end
+
+        def prefix
+          "systemd_#{@app}"
+        end
+
+        def define_tasks
+          eval_rakefile File.expand_path("../../../tasks/systemd/multiservice/system_service.rake", __FILE__)
+        end
+
+        def register_hooks
+          after   "deploy:check",          "systemd:#{nsp}:validate"
+          after   "systemd:#{nsp}:setup",  "systemd:#{nsp}:daemon-reload"
+          after   "systemd:#{nsp}:setup",  "systemd:#{nsp}:enable"
+          before  "systemd:#{nsp}:remove", "systemd:#{nsp}:disable"
+          after   "systemd:#{nsp}:remove", "systemd:#{nsp}:daemon-reload"
+        end
+
+        def set_defaults
+          set_if_empty :"#{prefix}_role", ->{ :app }
+
+          set_if_empty :"#{prefix}_units_src", ->{ Dir["config/systemd/#{@app}{,@}.*.erb"].sort }
+
+          set_if_empty :"#{prefix}_units_dir", ->{ default_units_dir }
+
+          set_if_empty :"#{prefix}_units_dest", ->{
+            fetch(:"#{prefix}_units_src").map{|src|
+              "%s/%s_%s" % [ fetch(:"#{prefix}_units_dir"), fetch(:application), File.basename(src, ".erb") ]
+            }
+          }
+
+          set_if_empty :"#{prefix}_instances", ->{
+            if fetch(:"#{prefix}_units_dest").map{|dst| File.basename(dst) }.find{|f| f =~ /@\.service\z/ }
+              1.times.to_a
+            else
+              nil
+            end
+          }
+
+          set_if_empty :"#{prefix}_service", ->{
+            service = fetch(:"#{prefix}_units_dest").map{|dst| File.basename(dst) }.find{|f| f =~ /\.service\z/ && f !~ /@\.service\z/ }
+            service || fetch(:"#{prefix}_instance_services")
+          }
+
+          set_if_empty :"#{prefix}_instance_services", ->{
+            if fetch(:"#{prefix}_instances")
+              fetch(:"#{prefix}_instances").map{|i|
+                service_template = fetch(:"#{prefix}_units_dest").map{|dst| File.basename(dst) }.find{|f| f =~ /@\.service\z/ }
+                service_template && service_template.sub(/@\.service\z/, "@#{i}.service")
+              }
+            else
+              []
+            end
+          }
+        end
+
+        def setup
+          fetch(:"#{prefix}_units_src").zip(fetch(:"#{prefix}_units_dest")).each do |src, dest|
+            buf = StringIO.new(ERB.new(File.read(src), nil, 2).result(binding))
+            setup_service buf, src, dest
+          end
+        end
+
+        def remove
+          backend.sudo :rm, '-f', '--', fetch(:"#{prefix}_units_dest")
+        end
+
+        def validate
+          fetch(:"#{prefix}_units_dest").each do |dest|
+            unless backend.test("[ -f #{dest} ]")
+              backend.error "#{dest} not found"
+              exit 1
+            end
+          end
+        end
+
+        def daemon_reload
+          systemctl :"daemon-reload"
+        end
+
+        %i[start stop reload restart reload-or-restart enable disable].each do |act|
+          define_method act.to_s.tr('-','_') do
+            systemctl act, fetch(:"#{prefix}_service")
+          end
+        end
+
+        def systemctl(*args)
+          args.unshift :sudo, :systemctl
+          backend.execute(*args)
+        end
+
+        def default_units_dir
+          "/etc/systemd/system"
+        end
+
+        private
+
+        def setup_service(buf, src, dest)
+          remote_tmp  = "#{fetch(:tmp_dir)}/#{File.basename(src, ".erb")}"
+          backend.upload! buf, remote_tmp
+          backend.sudo :install, '-m 644 -o root -g root -D', remote_tmp, dest
+          backend.execute :rm, remote_tmp
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/systemd/multiservice/version.rb

@@ -1,15 +1,7 @@
-begin
-  require "capistrano/plugin"
-rescue LoadError
-  module Capistrano
-    class Plugin; end
-  end
-end
-
 module Capistrano
   module Systemd
-    class MultiService < ::Capistrano::Plugin
-      VERSION = "0.1.0.beta5"
+    module MultiService
+      VERSION = "0.1.0.beta6"
     end
   end
 end

data/lib/capistrano/systemd/multiservice.rb

@@ -1,111 +1,11 @@
-require "erb"
-require "stringio"
-require "capistrano/plugin"
 require "capistrano/systemd/multiservice/version"
+require "capistrano/systemd/multiservice/system_service"
 
 module Capistrano
   module Systemd
-    class MultiService < ::Capistrano::Plugin
-      attr_reader :app
-
-      def initialize(app)
-        @app = app
-        super()
-      end
-
-      def nsp
-        @app.to_sym
-      end
-
-      def prefix
-        "systemd_#{@app}"
-      end
-
-      def define_tasks
-        eval_rakefile File.expand_path("../../tasks/systemd/multiservice.rake", __FILE__)
-      end
-
-      def register_hooks
-        after   "deploy:check",          "systemd:#{nsp}:validate"
-        after   "systemd:#{nsp}:setup",  "systemd:#{nsp}:daemon-reload"
-        after   "systemd:#{nsp}:setup",  "systemd:#{nsp}:enable"
-        before  "systemd:#{nsp}:remove", "systemd:#{nsp}:disable"
-        after   "systemd:#{nsp}:remove", "systemd:#{nsp}:daemon-reload"
-      end
-
-      def set_defaults
-        set_if_empty :"#{prefix}_role", ->{ :app }
-
-        set_if_empty :"#{prefix}_units_src", ->{ Dir["config/systemd/#{@app}{,@}.*.erb"].sort }
-
-        set_if_empty :"#{prefix}_units_dir", ->{ "/etc/systemd/system" }
-
-        set_if_empty :"#{prefix}_units_dest", ->{
-          fetch(:"#{prefix}_units_src").map{|src|
-            "%s/%s_%s" % [ fetch(:"#{prefix}_units_dir"), fetch(:application), File.basename(src, ".erb") ]
-          }
-        }
-
-        set_if_empty :"#{prefix}_instances", ->{
-          if fetch(:"#{prefix}_units_dest").map{|dst| File.basename(dst) }.find{|f| f =~ /@\.service\z/ }
-            1.times.to_a
-          else
-            nil
-          end
-        }
-
-        set_if_empty :"#{prefix}_service", ->{
-          service = fetch(:"#{prefix}_units_dest").map{|dst| File.basename(dst) }.find{|f| f =~ /\.service\z/ && f !~ /@\.service\z/ }
-          service || fetch(:"#{prefix}_instance_services")
-        }
-
-        set_if_empty :"#{prefix}_instance_services", ->{
-          if fetch(:"#{prefix}_instances")
-            fetch(:"#{prefix}_instances").map{|i|
-              service_template = fetch(:"#{prefix}_units_dest").map{|dst| File.basename(dst) }.find{|f| f =~ /@\.service\z/ }
-              service_template && service_template.sub(/@\.service\z/, "@#{i}.service")
-            }
-          else
-            []
-          end
-        }
-      end
-
-      def setup
-        fetch(:"#{prefix}_units_src").zip(fetch(:"#{prefix}_units_dest")).each do |src, dest|
-          remote_tmp  = "#{fetch(:tmp_dir)}/#{File.basename(src, ".erb")}"
-          backend.upload! StringIO.new(ERB.new(File.read(src), nil, 2).result(binding)), remote_tmp
-          backend.sudo :install, '-m 644 -o root -g root -D', remote_tmp, dest
-          backend.execute :rm, remote_tmp
-        end
-      end
-
-      def remove
-        backend.sudo :rm, '-f', '--', fetch(:"#{prefix}_units_dest")
-      end
-
-      def validate
-        fetch(:"#{prefix}_units_dest").each do |dest|
-          unless backend.test("[ -f #{dest} ]")
-            backend.error "#{dest} not found"
-            exit 1
-          end
-        end
-      end
-
-      def daemon_reload
-        systemctl :"daemon-reload"
-      end
-
-      %i[start stop reload restart reload-or-restart enable disable].each do |act|
-        define_method act.to_s.tr('-','_') do
-          systemctl act, fetch(:"#{prefix}_service")
-        end
-      end
-
-      def systemctl(*args)
-        args.unshift :sudo, :systemctl
-        backend.execute(*args)
+    module MultiService
+      def self.new_service(app)
+        SystemService.new(app)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-systemd-multiservice
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta5
+  version: 0.1.0.beta6
 platform: ruby
 authors:
 - YAMADA Tsuyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -104,8 +104,9 @@ files:
 - bin/setup
 - capistrano-systemd-multiservice.gemspec
 - lib/capistrano/systemd/multiservice.rb
+- lib/capistrano/systemd/multiservice/system_service.rb
 - lib/capistrano/systemd/multiservice/version.rb
-- lib/capistrano/tasks/systemd/multiservice.rake
+- lib/capistrano/tasks/systemd/multiservice/system_service.rake
 homepage: https://github.com/groovenauts/capistrano-systemd-multiservice
 licenses:
 - MIT