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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2047d118d3aa56c85a22f1a77c68d26e735e5d9c082393b2a460a6718047f26d
-  data.tar.gz: 3652b1dd931ad5207dd404934224671a6cadfa2b231f9c7865652fb3b709af45
+  metadata.gz: 726e8687fd294f14c8ed7195517956cc76bb10fd1e9bd8f04c15b1fd186b6f4c
+  data.tar.gz: d0b7b77144a8cc0d82fd41569d4675e2b9fc32bed0de06b46b884af59ac723c4
 SHA512:
-  metadata.gz: ec6a1ea1067b9b55667a105b03631e32f6e227729dad674822fb45d9c828db4c133d4cb9c52de7f7f1e498b007a37081b189d862c6b6f53bcc08f597dc389592
-  data.tar.gz: ff2e0e40974270950668461097a0a00bf022079c2fc940f20c7fe7263b6f238a2d00072bc6ca0b0d83dbc4127303cddd3fa9c63ca27a5013478c3441cfcb4e4c
+  metadata.gz: 832a682e621ef833e0e7d7df21a58743bf659e713258a2b0c6bbee96072f48f0128cdf6ab507adf32978fa268c78b474252ce86b06c8e8d1d31076e37f5e0a8d
+  data.tar.gz: 18ded94ca09b014d6a95d716ff6fda3656277a87fbb98125e358987381940dcee9f217aafb945356c56d5c8ae848740cfda369c66fdcf15e0d356a9b9ffbbf6b

data/.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '10:00'
+    timezone: Asia/Tokyo
+  open-pull-requests-limit: 10
+  reviewers:
+  - minimum2scp
+  - nagachika
+  - akm

data/.travis.yml

@@ -1,8 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.9
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-before_install: gem install bundler -v 1.16.2
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
+  - 2.7.1
+before_install: gem install bundler -v 2.1.4

data/README.md

@@ -68,6 +68,20 @@ cap STAGE systemd:example1:setup systemd:example2:setup
 cap STAGE deploy
 ```
 
+### User services
+
+To have the service installed under your own user rather than root
+
+```ruby
+require "capistrano/systemd/multiservice"
+install_plugin Capistrano::Systemd::MultiService.new_service("example1", service_type: 'user')
+install_plugin Capistrano::Systemd::MultiService.new_service("example2", service_type: 'user')
+```
+
+If using the user service type services will be installed in your users home directory under ``` /.config/systemd/user ```.
+Systemd commands on those services can be run by passing a `--user` flag, e.g. ```systemctl --user list-unit-files```
+Nothing else in setup should require change and Capistrano tasks should remain the same as when installing system services.
+
 ## Capistrano Tasks
 
 With `install_plugin Capistrano::Systemd::MultiService.new_service("example1")`,

data/capistrano-systemd-multiservice.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capistrano", ">= 3.7.0", "< 3.12.0"
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_dependency "capistrano", ">= 3.7.0", "< 3.16.0"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "mocha", "~> 1.2"

data/lib/capistrano/systemd/multiservice.rb

@@ -1,11 +1,22 @@
 require "capistrano/systemd/multiservice/version"
 require "capistrano/systemd/multiservice/system_service"
+require "capistrano/systemd/multiservice/user_service"
 
 module Capistrano
   module Systemd
     module MultiService
-      def self.new_service(app)
-        SystemService.new(app)
+      SERVICE_TYPES = %w[system user].freeze
+
+      class ServiceTypeError < RuntimeError; end
+
+      def self.new_service(app, service_type: 'system')
+        service_type = service_type.to_s
+        unless SERVICE_TYPES.include?(service_type)
+          raise ServiceTypeError,
+                "Service type has to be one of #{SERVICE_TYPES}"
+        end
+
+        const_get("#{service_type.capitalize}Service").new(app)
       end
     end
   end

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

@@ -71,6 +71,10 @@ module Capistrano
           }
         end
 
+        def default_units_dir
+          "/etc/systemd/system"
+        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))
@@ -106,10 +110,6 @@ module Capistrano
           backend.execute(*args)
         end
 
-        def default_units_dir
-          "/etc/systemd/system"
-        end
-
         private
 
         def setup_service(buf, src, dest)

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

@@ -0,0 +1,28 @@
+require_relative './system_service'
+
+module Capistrano
+  module Systemd
+    module MultiService
+      class UserService < SystemService
+        def systemctl(*args)
+          args.unshift :systemctl, '--user'
+          backend.execute(*args)
+        end
+
+        def remove
+          backend.execute :rm, '-f', '--', fetch(:"#{prefix}_units_dest")
+        end
+
+        def default_units_dir
+          "/home/#{fetch(:user)}/.config/systemd/user"
+        end
+
+        protected
+
+        def setup_service(buf, src, dest)
+          backend.upload! buf, dest
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Systemd
     module MultiService
-      VERSION = "0.1.0.beta6"
+      VERSION = "0.1.0.beta11"
     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.beta6
+  version: 0.1.0.beta11
 platform: ruby
 authors:
 - YAMADA Tsuyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -19,7 +19,7 @@ dependencies:
         version: 3.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: 3.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -105,6 +106,7 @@ files:
 - capistrano-systemd-multiservice.gemspec
 - lib/capistrano/systemd/multiservice.rb
 - lib/capistrano/systemd/multiservice/system_service.rb
+- lib/capistrano/systemd/multiservice/user_service.rb
 - lib/capistrano/systemd/multiservice/version.rb
 - lib/capistrano/tasks/systemd/multiservice/system_service.rake
 homepage: https://github.com/groovenauts/capistrano-systemd-multiservice
@@ -126,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: Capistrano Plugin to control services by systemd