epi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b9988a9dbc6d3cbacd39fd072b343c6175eaab
-  data.tar.gz: a0f18a237c97efb644e0afeb7e8a61b9d5680edf
+  metadata.gz: b5e7e4338b1beae6f3f58eb12974ea98b1093d0a
+  data.tar.gz: 1b9090a1e6de1c5f6ae089afb5c716d524afa5da
 SHA512:
-  metadata.gz: 584215c982e7ba5c564033e6ae248f123ae8935b487c90be273795e4ecf45b82a89a526e1ffcb76ff57c85bc459e978c0b87e896abc2fffc4e1a3bda2f163c90
-  data.tar.gz: 55665a0b346ca8188f1c9945ee21610b759ca70f0e31ef70ca4b0e1aaa7b09d2427e6a4675c313628427dc11dbce9180af7ffbd5f3ef2cdb3e6df087ce99e179
+  metadata.gz: e3da43bc5ee0f6f19b9d39cda86029b0c076a16bad0d5e6fa4d40aebac2c0c9555643cfae13c436a5afd60635034b5c1893a774e9cf5c7d6d5289d24d26987d4
+  data.tar.gz: f2efd89e32244861ce7532f02cf7d4dd22447f1a2ada753a951e3da7006802625bb8b872b8dbf4afb1254859de11c4bf00a564fe31b7057eae9ace4209a4e79b

data/lib/epi/job.rb

@@ -112,9 +112,7 @@ module Epi
     end
 
     def running_processes
-      pids.map do |proc_id, pid|
-        [proc_id, ProcessStatus[pid] || RunningProcess.new(pid)]
-      end.to_h
+      pids.map { |proc_id, pid| [proc_id, ProcessStatus[pid] || RunningProcess.new(pid)] }.select { |_, v| v.was_alive? }.to_h
     end
 
     def running_count

data/lib/epi/launch.rb

@@ -29,12 +29,9 @@ module Epi
     else
 
       # Command and arguments that need to be escaped
-      command.each { |part| cmd << ' ' << Shellwords.escape(part) }
+      command.each { |part| cmd << ' ' << escape(part) }
     end
 
-    # Include `su` command if a user is given
-    cmd = "su #{user} -c #{cmd}" if user
-
     # STDOUT and STDERR redirection
     {:>> => stdout, :'2>>' => stderr}.each do |arrow, dest|
       cmd << " #{arrow} #{dest || '/dev/null'}" unless TrueClass === dest
@@ -43,8 +40,11 @@ module Epi
     # Run in background, and return PID of backgrounded process
     cmd << ' & echo $!'
 
+    # Include `su` command if a user is given
+    cmd = "su #{user} -c #{escape cmd}" if user
+
     # Include the working directory
-    cmd = "cd #{Shellwords.escape cwd} && (#{cmd})" if cwd
+    cmd = "cd #{escape cwd} && (#{cmd})" if cwd
 
     # Convert environment variables to strings, and merge them with the current environment
     env = ENV.to_h.merge(env).map { |k, v| [k.to_s, v.to_s] }.to_h
@@ -56,4 +56,10 @@ module Epi
       logger.info "Process #{pid} started: #{`ps -p #{pid} -o command=`.chomp}"
     end
   end
+
+  private
+
+  def self.escape(*args)
+    Shellwords.escape *args
+  end
 end

data/lib/epi/process_status.rb

@@ -54,7 +54,7 @@ module Epi
       @running_processes = {}
 
       # Run `ps`
-      result = %x(ps x -o #{RunningProcess::PS_FORMAT})
+      result = %x(ps ax -o #{RunningProcess::PS_FORMAT})
 
       # Split into lines, and get rid of the first (heading) line
       @lines = result.lines[1..-1].map { |line| [line.lstrip.split(/\s/, 2).first.to_i, line] }.to_h

data/lib/epi/version.rb

@@ -1,3 +1,3 @@
 module Epi
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -106,3 +106,4 @@ signing_key:
 specification_version: 4
 summary: Epinephrine
 test_files: []
+has_rdoc: