procsd 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c4a1dba4f8d57cec70cebb0cffd95d3f6e51ab256f534790bac042ec11078e2
-  data.tar.gz: 40ca2c7432f1ab690c61b073d305245a2b74e957627cd286907ee0e5c1ca3c61
+  metadata.gz: a029c6f4d0953cc9b21f3508a14e9057a4386fd53c786167737a9097c4175f13
+  data.tar.gz: 2f3fa1f897cb3bbf65aa6e00c1b8fbc0c3f1bde13d5dc559514633404ef691ce
 SHA512:
-  metadata.gz: ecbf43025ab6387543cec6775655575af81cb12f590828f4f00fbf5261444d3e06427c252f095fd943493963822f703f87532fe4c8ff7afb6b8c2c8c139cf8e8
-  data.tar.gz: 01c8d0561473679da4dcae1203fccf4f8168b72c9e298719459eba1ca4774e934b2c32db3e3536ed6a1d4a40361d264019042f5e73a7f93656da9b5cbb5f6c23
+  metadata.gz: 6f5a266a604bdbc1cbd9519b510a1eabf801d753d8497729a7ed64c2acedcfd6d1873f16da89896fedb5e49467f7c987c09e53ddef6d2d1ff947cbd07501173e
+  data.tar.gz: 8724b65f9e834e5654690148a0c21444608add28c60df412dd76d47ad18f2c2edbef20ae8029de39b2431a2c6585531656e7b4a629d0427f71e717c4bd314d8b

data/CHANGELOG.md

@@ -1,4 +1,30 @@
 # CHANGELOG
+## 0.3.0
+* **Breaking change:** `.procsd.yml` renamed to `procsd.yml` (without dot)
+* **Breaking change:** `environment` option in the procsd.yml now has hash format, not array:
+
+Was:
+```
+environment:
+  - PORT=2501
+  - RAILS_ENV=production
+  - RAILS_LOG_TO_STDOUT=true
+```
+
+Now:
+```
+environment:
+  PORT: 2501
+  RAILS_ENV: production
+  RAILS_LOG_TO_STDOUT: true
+```
+
+* Add `--or-restart` option for `create` command
+* Options `--user`, `--path` and `--dir` for `create` command are not required anymore (but still can be provided)
+* Add new `config` command (currently it can print only content for sudoers file: `$ procsd config sudoers`)
+* Add `--add-to-sudoers` option for `create` command to automatically add `/bin/systemctl start/stop/restart app_name.target` commands to sudoers `/etc/sudoers.d/app_name` file (passwordless sudo)
+
+
 ## 0.2.0
 * Allow to use erb inside .procsd.yml
 * Add dotenv support

data/README.md

@@ -8,6 +8,8 @@ Can we have something similar on the cheap Ubuntu VPS from DigitalOcean? Yes we
 
 ## Getting started
 
+**Note:** latest version of Procsd is `0.3.0`. Since version `0.2.0` there are some breaking changes. Check the [CHANGELOG.md](CHANGELOG.md). Run `$ gem update procsd` or `$ bundle update procsd` (if you have already installed procsd) to update to the latest version.
+
 > Install `procsd` first: `$ gem install procsd`. Required Ruby version is `>= 2.3.0`.
 
 Let's say you have following application's Procfile:
@@ -16,17 +18,18 @@ Let's say you have following application's Procfile:
 web: bundle exec rails server -p $PORT
 worker: bundle exec sidekiq -e $RAILS_ENV
 ```
-and you want to have one instance of web process && two instances of worker process. Create inside application directory `.procsd.yml` config file:
+and you want to have one instance of web process && two instances of worker process. Create inside application directory `procsd.yml` config file:
 
 ```yaml
 app: sample_app
 formation: web=1,worker=2
 environment:
-  - PORT=2500
-  - RAILS_ENV=production
-  - RAILS_LOG_TO_STDOUT=true
+  PORT: 2501
+  RAILS_ENV: production
+  RAILS_LOG_TO_STDOUT: true
 ```
-> The only required option in `.procsd.yml` is `app` (application's name). Also you can provide custom Systemd directory path (`systemd_dir` option, default is _/etc/systemd/system_)
+
+> The only required option in `procsd.yml` is `app` (application name). Also you can provide custom Systemd directory path (`systemd_dir` option, default is _/etc/systemd/system_)
 
 Configuration is done.
 
@@ -36,9 +39,13 @@ Configuration is done.
 > Note: `create` command needs to provide a few arguments: _--user_ (name of the current user), _--dir_ (application's working directory) and `--path` (user's $PATH). Usually it's fine to provide them like on example below:
 
 ```
-deploy@server:~/sample_app$ procsd create -u $USER -d $PWD -p $PATH
+deploy@server:~/sample_app$ procsd create
 
+Value of the --user option: deploy
+Value of the --dir option: /home/deploy/sample_app
+Value of the --path option: /home/deploy/.rbenv/shims:/home/deploy/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
 Systemd directory: /etc/systemd/system
+
       create  sample_app-web.1.service
       create  sample_app-worker.1.service
       create  sample_app-worker.2.service
@@ -47,8 +54,19 @@ Created symlink /etc/systemd/system/multi-user.target.wants/sample_app.target
 Enabled app target sample_app.target
 Reloaded configuraion (daemon-reload)
 App services were created and enabled. Run `start` to start them
+
+Note: add following line to the sudoers file (`$ sudo visudo`) if you don't want to type password each time for start/stop/restart commands:
+deploy ALL=NOPASSWD: /bin/systemctl start sample_app.target, /bin/systemctl stop sample_app.target, /bin/systemctl restart sample_app.target
 ```
 
+You can provide additional options for `create` command:
+* `--user` - name of the user, default is current _$USER_ env variable
+* `--dir` - application's working directory, default is current _$PWD_ env variable
+* `--path` - $PATH to include to the each service. Default is current _$PATH_ env variable
+* `--add-to-sudoers` - if option present, procsd will create sudoers rule `/etc/sudoers.d/app_name` allowing to start/stop/restart app services without password prompt.
+* `--or-restart` - if option present and servides already created, procsd will skip creation and instead call `restart` command
+
+
 ### Start application
 > Other control commands: `stop` and `restart`
 
@@ -120,7 +138,7 @@ deploy@server:~/sample_app$ procsd status
 2018-11-04T01:54:17+0400 sample_app-worker.2[8827]: 2018-11-03T21:54:17.716Z 8827 TID-gniahzm1r INFO: Starting processing, hit Ctrl-C to stop
 ```
 
-Also you can see status in a short format:
+Also you can see status in short format:
 
 ```
 deploy@server:~/sample_app$ procsd status --short
@@ -175,18 +193,19 @@ Systemd provides [a lot of possibilities](https://www.digitalocean.com/community
 $ procsd --help
 
 Commands:
-  procsd --version, -v                                         # Print the version
-  procsd create d, --dir=$PWD p, --path=$PATH u, --user=$USER  # Create and enable app services
-  procsd destroy                                               # Stop, disable and remove app services
-  procsd disable                                               # Disable app target
-  procsd enable                                                # Enable app target
-  procsd help [COMMAND]                                        # Describe available commands or one specific command
-  procsd list                                                  # List all app services
-  procsd logs                                                  # Show app services logs
-  procsd restart                                               # Restart app services
-  procsd start                                                 # Start app services
-  procsd status                                                # Show app services status
-  procsd stop                                                  # Stop app services
+  procsd --version, -v   # Print the version
+  procsd config          # Show configuration. Available types: sudoers
+  procsd create          # Create and enable app services
+  procsd destroy         # Stop, disable and remove app services
+  procsd disable         # Disable app target
+  procsd enable          # Enable app target
+  procsd help [COMMAND]  # Describe available commands or one specific command
+  procsd list            # List all app services
+  procsd logs            # Show app services logs
+  procsd restart         # Restart app services
+  procsd start           # Start app services
+  procsd status          # Show app services status
+  procsd stop            # Stop app services
 ```
 
 
@@ -209,30 +228,31 @@ Procsd following one rule: simplicity. For export it uses static service files (
 ```
 deploy@server:~/sample_app$ VERBOSE=true procsd logs -n 3
 
-> Executing command: journalctl --no-pager --all --no-hostname --output short-iso -n 3 --unit sample_app-web.1.service --unit sample_app-worker.1.service --unit sample_app-worker.2.service
+> Executing command: `journalctl --no-pager --no-hostname --all --output short-iso -n 3 --unit sample_app-*`
 
 -- Logs begin at Sun 2018-10-21 00:38:42 +04, end at Sun 2018-11-04 19:17:01 +04. --
 2018-11-04T19:11:59+0400 sample_app-worker.2[29907]: 2018-11-04T15:11:59.597Z 29907 TID-gne5aeyuz INFO: Upgrade to Sidekiq Pro for more features and support: http://sidekiq.org
 2018-11-04T19:11:59+0400 sample_app-worker.2[29907]: 2018-11-04T15:11:59.597Z 29907 TID-gne5aeyuz INFO: Booting Sidekiq 5.2.2 with redis options {:id=>"Sidekiq-server-PID-29907", :url=>nil}
 2018-11-04T19:11:59+0400 sample_app-worker.2[29907]: 2018-11-04T15:11:59.601Z 29907 TID-gne5aeyuz INFO: Starting processing, hit Ctrl-C to stop
 ```
-* You can use extended format of a Procfile to provide additional restart/stop commands for a process:
-> Keep in mind that syntax below is not supported by Foreman or Heroku
+* You can use extended format of processes commands inside `procsd.yml` to provide additional restart/stop commands for processes:
 
 > All possible options: `start`, `restart` and `stop`
+> If procsd.yml has `processes:` option defined, then content of Procfile will be ignored
 
 ```yml
-web:
-  start: bundle exec rails server -p $PORT
-  restart: bundle exec pumactl phased-restart
-worker: bundle exec sidekiq -e production
+processes:
+  web:
+    start: bundle exec rails server -p $PORT
+    restart: bundle exec pumactl phased-restart
+  worker: bundle exec sidekiq -e production
+app: sample_app
 ```
 
 Why? For example default Ruby on Rails application server [Puma](http://puma.io/) supports [Phased or Rolling restart](https://github.com/puma/puma/blob/master/docs/restart.md#normal-vs-hot-vs-phased-restart) feature. If you provide separate `restart`command for a process, then this command will be called (`$ procsd restart`) by Systemd instead of just killing and starting process again.
 
 
 ## ToDo
-* Add Capistrano integration examples
 * Optional possibility to generate Ngnix config (with out-of-box SSL using [Certbot](https://certbot.eff.org/lets-encrypt/ubuntubionic-nginx)) for an application to use Ngnix as a proxy and serve static files
 * Add integration with [Inspeqtor](https://github.com/mperham/inspeqtor) to monitor application services and get alert notifications if something happened
 

data/lib/procsd.rb

@@ -4,4 +4,5 @@ require 'procsd/version'
 
 module Procsd
   DEFAULT_SYSTEMD_DIR = "/etc/systemd/system".freeze
+  SUDOERS_DIR = "/etc/sudoers.d".freeze
 end

data/lib/procsd/cli.rb

@@ -5,27 +5,73 @@ require_relative 'generator'
 module Procsd
   class CLI < Thor
     class ConfigurationError < StandardError; end
+    class ArgumentError < StandardError; end
     map %w[--version -v] => :__print_version
 
     desc "create", "Create and enable app services"
-    option :user, aliases: :u, type: :string, required: true, banner: "$USER"
-    option :dir,  aliases: :d, type: :string, required: true, banner: "$PWD"
-    option :path, aliases: :p, type: :string, required: true, banner: "$PATH"
+    option :user, aliases: :u, type: :string, banner: "$USER"
+    option :dir,  aliases: :d, type: :string, banner: "$PWD"
+    option :path, aliases: :p, type: :string, banner: "$PATH"
+    option :'or-restart', type: :boolean, banner: "Create and start app services if not created yet, otherwise restart"
+    option :'add-to-sudoers', type: :boolean, banner: "Create sudoers rule at /etc/sudoers.d/app_name to allow manage app target without password prompt"
     def create
       preload!
 
       if !target_exist?
+        opts = {
+          user: options["user"] || ENV["USER"],
+          dir: options["dir"] || ENV["PWD"],
+          path: options["path"] || fetch_path_env
+        }
+
+        opts.each do |key, value|
+          if value.nil? || value.empty?
+            say("Can't fetch value for --#{key}, please provide it as an argument", :red) and return
+          else
+            say "Value of the --#{key} option: #{value}"
+          end
+        end
+
         gen = Generator.new
-        gen.export!(services, procsd: @procsd, options: options)
+        gen.export!(services, config: @config, options: options.merge(opts))
 
         enable
         if execute %w(sudo systemctl daemon-reload)
           say("Reloaded configuraion (daemon-reload)", :green)
         end
 
-        say("App services were created and enabled. Run `start` to start them", :green)
+        if options["or-restart"]
+          start
+          say("App services were created, enabled and started", :green)
+        else
+          say("App services were created and enabled. Run `start` to start them", :green)
+        end
+
+        sudoers_rule_content = generate_sudoers_rule(opts[:user])
+        if options["add-to-sudoers"]
+          sudoers_file_temp_path = "/tmp/#{app_name}"
+          sudoers_file_dest_path = "#{SUDOERS_DIR}/#{app_name}"
+          if Dir.exist?(SUDOERS_DIR)
+            File.open(sudoers_file_temp_path, "w") { |f| f.puts sudoers_rule_content }
+            execute %W(sudo chown root:root #{sudoers_file_temp_path})
+            execute %W(sudo chmod 0440 #{sudoers_file_temp_path})
+            if execute %W(sudo mv #{sudoers_file_temp_path} #{sudoers_file_dest_path})
+              say("Sudoers file #{sudoers_file_dest_path} was created", :green)
+            end
+          else
+            say "Directory #{SUDOERS_DIR} does not exist, sudoers file wan't created"
+          end
+        else
+          say "Note: add following line to the sudoers file (`$ sudo visudo`) if you don't " \
+            "want to type password each time for start/stop/restart commands:"
+          puts sudoers_rule_content
+        end
       else
-        say("App target `#{target_name}` already exists", :red)
+        if options["or-restart"]
+          restart
+        else
+          say("App target `#{target_name}` already exists", :red)
+        end
       end
     end
 
@@ -39,17 +85,20 @@ module Procsd
 
         services.keys.push(target_name).each do |filename|
           path = File.join(systemd_dir, filename)
-          if File.exist? path
-            execute %W(sudo rm #{path})
-            say "Deleted #{path}"
-          end
+          execute %W(sudo rm #{path}) and say "Deleted #{path}" if File.exist? path
         end
 
         if execute %w(sudo systemctl daemon-reload)
           say("Reloaded configuraion (daemon-reload)", :green)
         end
-
         say("App services were stopped, disabled and removed", :green)
+
+        sudoers_file_path = "#{SUDOERS_DIR}/#{app_name}"
+        if File.exist?(sudoers_file_path)
+          if yes?("Remove sudoers rule #{sudoers_file_path} ? (yes/no)")
+            say("Sudoers file removed", :green) if execute %W(sudo rm #{sudoers_file_path})
+          end
+        end
       else
         say_target_not_exists
       end
@@ -60,12 +109,9 @@ module Procsd
       preload!
       say_target_not_exists and return unless target_exist?
 
-      if target_enabled?
-        say "App target #{target_name} already enabled"
-      else
-        if execute %W(sudo systemctl enable #{target_name})
-          say("Enabled app target #{target_name}", :green)
-        end
+      say "Note: app target #{target_name} already enabled" if target_enabled?
+      if execute %W(sudo systemctl enable #{target_name})
+        say("Enabled app target #{target_name}", :green)
       end
     end
 
@@ -74,12 +120,9 @@ module Procsd
       preload!
       say_target_not_exists and return unless target_exist?
 
-      if !target_enabled?
-        say "App target #{target_name} already disabled"
-      else
-        if execute %W(sudo systemctl disable #{target_name})
-          say("Disabled app target #{target_name}", :green)
-        end
+      say "Note: app target #{target_name} already disabled" if !target_enabled?
+      if execute %W(sudo systemctl disable #{target_name})
+        say("Disabled app target #{target_name}", :green)
       end
     end
 
@@ -88,12 +131,9 @@ module Procsd
       preload!
       say_target_not_exists and return unless target_exist?
 
-      if target_active?
-        say "Already started/active (#{target_name})"
-      else
-        if execute %W(sudo systemctl start #{target_name})
-          say("Started app services (#{target_name})", :green)
-        end
+      say "Note: app target #{target_name} already started/active" if target_active?
+      if execute %W(sudo systemctl start #{target_name})
+        say("Started app services (#{target_name})", :green)
       end
     end
 
@@ -102,12 +142,9 @@ module Procsd
       preload!
       say_target_not_exists and return unless target_exist?
 
-      if !target_active?
-        say "Already stopped/inactive (#{target_name})"
-      else
-        if execute %W(sudo systemctl stop #{target_name})
-          say("Stopped app services (#{target_name})", :green)
-        end
+      say "Note: app target #{target_name} already stopped/inactive" if !target_active?
+      if execute %W(sudo systemctl stop #{target_name})
+        say("Stopped app services (#{target_name})", :green)
       end
     end
 
@@ -118,10 +155,10 @@ module Procsd
 
       # If one of the child services of a target has `ExecReload` and `ReloadPropagatedFrom`
       # options defined, then use `reload-or-restart` to call all services (not the main target)
-      # because https://github.com/systemd/systemd/issues/10638
+      # because of systemd bug https://github.com/systemd/systemd/issues/10638
       success =
-        if services.any? { |_, command| command["restart"] }
-          execute %w(sudo systemctl reload-or-restart) + services.keys
+        if has_reload?
+          execute %W(sudo systemctl reload-or-restart #{app_name}-* --all)
         else
           execute %W(sudo systemctl restart #{target_name})
         end
@@ -139,19 +176,12 @@ module Procsd
       say_target_not_exists and return unless target_exist?
 
       if options["short"]
-        command = %w(sudo systemctl list-units --no-pager --no-legend --all)
+        command = %w(systemctl list-units --no-pager --no-legend --all)
       else
-        command = %w(sudo systemctl status --no-pager --output short-iso)
-      end
-
-      if options["target"]
-        command << target_name
-      else
-        filtered = filter_services(service_name)
-        say("Can't find any services matching given name: #{service_name}", :red) and return if filtered.empty?
-        command += filtered
+        command = %w(systemctl status --no-pager --output short-iso --all)
       end
 
+      command << (options["target"] ? target_name : "#{app_name}-#{service_name}*")
       execute command
     end
 
@@ -164,17 +194,14 @@ module Procsd
     def logs(service_name = nil)
       preload!
 
-      command = %w(sudo journalctl --no-pager --all --no-hostname --output short-iso)
+      command = %w(journalctl --no-pager --no-hostname --all --output short-iso)
       command.push("-n", options.fetch("num", "100"))
       command.push("-f") if options["tail"]
       command.push("--system") if options["system"]
       command.push("--priority", options["priority"]) if options["priority"]
       command.push("--grep", "'" + options["grep"] + "'") if options["grep"]
 
-      filtered = filter_services(service_name)
-      say("Can't find any services matching given name: #{service_name}", :red) and return if filtered.empty?
-
-      filtered.each { |service| command.push("--unit", service) }
+      command.push("--unit", "#{app_name}-#{service_name}*")
       execute command
     end
 
@@ -183,7 +210,7 @@ module Procsd
       preload!
       say_target_not_exists and return unless target_exist?
 
-      execute %W(sudo systemctl list-dependencies #{target_name})
+      execute %W(systemctl list-dependencies #{target_name})
     end
 
     desc "--version, -v", "Print the version"
@@ -191,9 +218,42 @@ module Procsd
       puts VERSION
     end
 
+    desc "config", "Show configuration. Available types: sudoers"
+    def config(name)
+      preload!
+
+      case name
+      when "sudoers"
+        say generate_sudoers_rule(ENV["USER"])
+      else
+        raise ArgumentError, "Wring type of argument: #{name}"
+      end
+    end
+
     private
 
+    def generate_sudoers_rule(user)
+      commands = []
+      systemctl_path = `which systemctl`.strip
+
+      %w(start stop restart).each { |cmd| commands << "#{systemctl_path} #{cmd} #{target_name}" }
+      commands << "#{systemctl_path} reload-or-restart #{app_name}-\\* --all" if has_reload?
+
+      "#{user} ALL=NOPASSWD: #{commands.join(', ')}"
+    end
+
+    def has_reload?
+      services.any? { |_, opts| opts["restart"] }
+    end
+
+    def fetch_path_env
+      # get value of the $PATH env variable including ~/.bashrc as well (-i flag)
+      `/bin/bash -ilc 'echo $PATH'`.strip
+    end
+
     def execute(command)
+      trap("INT") { puts "\nInterrupted" ; exit 130 }
+
       say("> Executing command: `#{command.join(' ')}`", :yellow) if ENV["VERBOSE"] == "true"
       system *command
     end
@@ -202,20 +262,12 @@ module Procsd
       say("App target #{target_name} is not exists", :red)
     end
 
-    def filter_services(service_name)
-      if service_name
-        services.keys.select { |s| s.include?("#{app_name}-#{service_name}") }
-      else
-        services.keys
-      end
-    end
-
     def target_exist?
       File.exist?(File.join systemd_dir, target_name)
     end
 
     def systemd_dir
-      @procsd["systemd_dir"]
+      @config[:systemd_dir]
     end
 
     def target_enabled?
@@ -231,15 +283,15 @@ module Procsd
     end
 
     def app_name
-      @procsd["app"]
+      @config[:app]
     end
 
     def services
       all = {}
-      @procfile.each do |process_name, process_command|
-        processes_count = @procsd["formation"][process_name] || 1
-        processes_count.times do |i|
-          all["#{app_name}-#{process_name}.#{i + 1}.service"] = process_command
+      @config[:processes].each do |process_name, opts|
+        opts["count"].times do |i|
+          commands = { "start" => opts["start"], "stop" => opts["stop"], "restart" => opts["restart"] }
+          all["#{app_name}-#{process_name}.#{i + 1}.service"] = commands
         end
       end
 
@@ -247,32 +299,55 @@ module Procsd
     end
 
     def preload!
-      raise ConfigurationError, "Procfile file doesn't exists" unless File.exist? "Procfile"
-      raise ConfigurationError, ".procsd.yml config file doesn't exists" unless File.exist? ".procsd.yml"
+      @config = {}
 
-      @procfile = YAML.load_file("Procfile")
-      @procsd = YAML.load(ERB.new(File.read ".procsd.yml").result)
-      raise ConfigurationError, "Missing app name in the .procsd.yml file" unless @procsd["app"]
+      unless system("which", "systemctl", [:out, :err]=>"/dev/null")
+        raise ConfigurationError, "Your OS doesn't has systemctl executable available"
+      end
+      raise ConfigurationError, "Config file procsd.yml doesn't exists" unless File.exist? "procsd.yml"
+      begin
+        procsd = YAML.load(ERB.new(File.read "procsd.yml").result)
+      rescue => e
+        raise ConfigurationError, "Can't read procsd.yml: #{e.inspect}"
+      end
 
-      @procfile.each do |process_name, process_command|
-        if process_command.kind_of?(Hash)
-          unless process_command["start"]
-            raise ConfigurationError, "Missing start command for #{process_name} process in the Procfile"
-          end
-        else
-          @procfile[process_name] = { "start" => process_command }
+      raise ConfigurationError, "Missing app name in the procsd.yml file" unless procsd["app"]
+      @config[:app] = procsd["app"]
+
+      # If procsd.yml doesn't contains processes defined, try to read Procfile
+      unless procsd["processes"]
+        msg = "Procfile doesn't exists. Define processes in procsd.yml or create Procfile"
+        raise ConfigurationError, msg unless File.exist? "Procfile"
+        begin
+          procfile = YAML.load_file("Procfile")
+        rescue => e
+          raise ConfigurationError, "Can't read Procfile: #{e.inspect}"
         end
       end
 
-      if formation = @procsd["formation"]
-        @procsd["formation"] = formation.split(",").map { |f| f.split("=") }.to_h
-        @procsd["formation"].each { |k, v| @procsd["formation"][k] = v.to_i }
+      if procsd["formation"]
+        formation = procsd["formation"].split(",").map { |f| f.split("=") }.to_h
+        formation.each { |k, v| formation[k] = v.to_i }
       else
-        @procsd["formation"] = {}
+        formation = {}
+      end
+
+      processes = procsd["processes"] || procfile
+      processes.each do |process_name, opts|
+        if opts.kind_of?(Hash)
+          raise ConfigurationError, "Missing start command for `#{process_name}` process" unless opts["start"]
+        else
+          processes[process_name] = { "start" => opts }
+        end
+
+        unless processes[process_name]["count"]
+          processes[process_name]["count"] = formation[process_name] || 1
+        end
       end
 
-      @procsd["environment"] ||= []
-      @procsd["systemd_dir"] ||= DEFAULT_SYSTEMD_DIR
+      @config[:processes] = processes
+      @config[:environment] = procsd["environment"] || {}
+      @config[:systemd_dir] = procsd["systemd_dir"] || DEFAULT_SYSTEMD_DIR
     end
   end
 end

data/lib/procsd/generator.rb

@@ -6,12 +6,12 @@ module Procsd
       File.dirname(__FILE__)
     end
 
-    def export!(services, procsd:, options:)
+    def export!(services, config:, options:)
       self.destination_root = "/tmp"
-      @procsd = procsd
-      say "Systemd directory: #{@procsd["systemd_dir"]}"
+      @config = config
+      say "Systemd directory: #{@config[:systemd_dir]}"
 
-      app_name = @procsd["app"]
+      app_name = @config[:app]
       target_name = "#{app_name}.target"
 
       services.each do |service_name, service_command|
@@ -19,8 +19,9 @@ module Procsd
           "target_name" => target_name,
           "id" => service_name.sub(".service", ""),
           "command" => service_command,
-          "environment" => @procsd["environment"]
+          "environment" => @config[:environment]
         )
+
         generate(service_name, service_config, type: :service)
       end
 
@@ -33,12 +34,14 @@ module Procsd
 
     private
 
-    def generate(filename, confing, type:)
-      template("templates/#{type}.erb", filename, confing)
+    def generate(filename, conf, type:)
+      template("templates/#{type}.erb", filename, conf)
 
       source_path = File.join(destination_root, filename)
-      dest_path = File.join(@procsd["systemd_dir"], filename)
+      dest_path = File.join(@config[:systemd_dir], filename)
       system "sudo", "mv", source_path, dest_path
+    ensure
+      File.delete(source_path) if File.exist? source_path
     end
   end
 end

data/lib/procsd/templates/service.erb

@@ -26,6 +26,6 @@ StandardInput=null
 SyslogIdentifier=<%= config["id"] %>
 
 Environment="PATH=<%= config["path"] %>"
-<% config["environment"].each do |env| -%>
-Environment="<%= env %>"
+<% config["environment"].each do |key, value| -%>
+Environment="<%= key %>=<%= value %>"
 <% end -%>

data/lib/procsd/templates/target.erb

@@ -1,5 +1,4 @@
 [Unit]
-Description=<%= config["app"] %> target
 Wants=<%= config["services"].join(" ") %>
 
 [Install]

data/lib/procsd/version.rb

@@ -1,3 +1,3 @@
 module Procsd
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procsd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Afanasev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor