capistrano-procsd 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3750ba4bc43d0a0bbb89551c6fe7b8a7aed6256d0ee80eff0d30da7b104fb814
-  data.tar.gz: 50eb8cada745c68fe0f4c3f795f85228831a413a5c87ffa666efaade8541a540
+  metadata.gz: 678f36b61233ee76105780721fa080ebb1408fea53b2721cf1af759f7506e6b0
+  data.tar.gz: 45f9889af566c91b88f864d8cb1619b2298311e986c6421ffc45c27108b6b357
 SHA512:
-  metadata.gz: ae68476dbfd4e433134b0c39907c6b4ccf5aad6599f80985af3faca56a76cf3422423e39679107dba7301ea1e2b285f11df980cd37fb555f30091573097514b8
-  data.tar.gz: aad52774d9cd39733df3fd11779b90bc44b7948420c2f0c01d861d67050198dab0bb73198ab2b115a8925f386d4a296e6b381768afe611a05401affb91a5cbf7
+  metadata.gz: c953b465c7e78772927a04e2c559e28fca5feb40a3cd3e18b71746c3c1359560abc4ed8b8b0010544f9b58adb810ed727051ed2be582df8588556fede6d98a36
+  data.tar.gz: dcdc13860d1c7c224c154084549012c92f97b4a5511a03179b6c3da6c303183f719dda8dd6242430e180fae44c5c46d46297c29187bb6861377150d168a889e9

data/README.md

@@ -23,7 +23,7 @@ Add to your application `Gemfile` somewhere:
 # Gemfile
 
 group :development do
-  gem 'capistrano-procsd' require: false
+  gem 'capistrano-procsd', require: false
 end
 ```
 
@@ -45,9 +45,10 @@ after "deploy:publishing", "procsd:create_or_restart"
 
 Done!
 
-### Note about procsd location on the remote server
+### Procsd location on the remote server
+#### System-wide
 
-Configuration above assumes that you have `$ procsd` executable somewhere in the system path on your remote server. You can install gem system-wide this way:
+Configuration above assumes that you have `$ procsd` executable somewhere in the global system path on your remote server. You can install gem system-wide this way:
 
 ```bash
 # Install ruby system-wide from apt repositories:
@@ -55,9 +56,16 @@ $ sudo apt install ruby
 
 # Install procsd gem system-wide:
 $ sudo gem install procsd
+
+# Check the procsd installed path:
+$ sudo which procsd
+/usr/local/bin/procsd
 ```
+> Like you see, Procsd installed to the system bin path /usr/local/bin/ and can be accessed from any user and kind of connection (including default Capistrano non-interactive, non-login ssh connection)
+
+#### Local user installation using Rbenv
 
-Or, if you already use [Rbenv](https://github.com/rbenv/rbenv) you can do instead following:
+There is another way if you don't want to install Ruby system-wide for some reason and use [Rbenv](https://github.com/rbenv/rbenv) instead:
 
 Add `procsd` gem to your application Gemfile:
 
@@ -96,6 +104,8 @@ append :bundle_bins, "procsd"
 
 At the first deploy `$ bundle exec cap production deploy` app services will be created and started. You will be prompted to fill in remote user password (make sure that your deploy user added to the sudo group `adduser deploy sudo`).
 
+### Start/Stop/Restart services without sudo password
+
 If you don't want to type password each time while deploying, you can add start/stop/restart commands to the sudoers file:
 
 1. Login to the remote server, `cd` into application folder, and type `$ procsd config sudoers`. Example:
@@ -111,7 +121,7 @@ deploy ALL=NOPASSWD: /bin/systemctl start sample_app.target, /bin/systemctl stop
 Now try to call restart task `$ bundle exec cap production procsd:restart`. If all is fine, task will execute without password prompt.
 
 
-**Also, steps above can be done automatically:**
+**Note: steps above can be done automatically as well:**
 
 ```ruby
 # config/deploy.rb

data/capistrano-procsd.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name     = "capistrano-procsd"
-  spec.version  = "0.1.0"
+  spec.version  = "0.2.0"
   spec.authors  = ["Victor Afanasev"]
   spec.email    = ["vicfreefly@gmail.com"]
 

data/lib/capistrano/tasks/procsd.rake

@@ -69,7 +69,7 @@ namespace :procsd do
     arguments = args[:arguments]
 
     on roles(:all) do
-      ssh_exec cmd_with_env("procsd status #{arguments}")
+      ssh_exec cmd_with_env("procsd status #{arguments}"), task_name: :status
     end
   end
 
@@ -78,14 +78,14 @@ namespace :procsd do
     arguments = args[:arguments]
 
     on roles(:all) do
-      ssh_exec cmd_with_env("procsd logs #{arguments}")
+      ssh_exec cmd_with_env("procsd logs #{arguments}"), task_name: :logs
     end
   end
 
   desc "List all services"
   task :list do
     on roles(:all) do
-      ssh_exec cmd_with_env("procsd list")
+      ssh_exec cmd_with_env("procsd list"), task_name: :list
     end
   end
 
@@ -97,19 +97,19 @@ namespace :procsd do
     raise "Please provide a command to run" if cmd.nil? || cmd.empty?
 
     on roles(:all) do
-      ssh_exec cmd_with_env(cmd)
+      ssh_exec cmd_with_env(cmd), task_name: :run
     end
   end
 
   ###
 
   private def cmd_with_env(cmd)
-    cmd = cmd.split(" ", 2)
+    cmd = cmd.strip.split(" ", 2)
     cmd[0] = cmd[0].to_sym
     command(cmd, {}).to_s
   end
 
-  private def ssh_exec(command)
+  private def ssh_exec(command, task_name:)
     full_command = %W(ssh #{host.user}@#{host.hostname} -t)
 
     ssh_options = fetch(:ssh_options, {})
@@ -120,7 +120,8 @@ namespace :procsd do
     command = "'cd #{release_path} && #{command}'"
     full_command << command
 
-    puts "Executing: `#{full_command.join(' ')}`\n\n"
-    exec full_command.join(" ")
+    cmd = full_command.join(" ")
+    puts Airbrussh::Colors.blue("procsd:#{task_name} ") + Airbrussh::Colors.yellow(cmd)
+    exec cmd
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-procsd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Victor Afanasev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano