process_controller 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c0fdaba921a31141fc660a1999ad02bca254c4
-  data.tar.gz: 52ce088b4ae7143835788a5b4e30a922725701ba
+  metadata.gz: 03944c105460bf09eebb44beb003ca715e647b3a
+  data.tar.gz: 4c8435e788c94c2a8600b981a90a1d8204d58ab3
 SHA512:
-  metadata.gz: cb40d357cd17f1c49dee43deabdefa563dee4ee0551da9be2a227bccc64eec34ec7d1d3a4f8db8933b5c10984718a814a8d66eae86cb39b4f0a3a574946140e9
-  data.tar.gz: df426ecc2d5b4dfe55954edbf1f927ea49949e4b2e53722f778189b5d84dafbecef5186e90304e6341804c4ac7466405dd9907a3229e22f7a170b00c5a51330b
+  metadata.gz: 0be8d8349b415d9afc46d5a658f53a24f9029c8506ed79f40bbbbe8178e53655aaeecdc575e06594e9bc35d5098ba0fd4e8b969135198ff991f5aa5dc1ef740a
+  data.tar.gz: 3d8d22ffa58538c57a0236d3983739373c04d41ae9949a5b80017ab48514086a35569bb63a809b8dbc24e59063471f86c8f9073abe8cd692f355b7d98f68e950

data/lib/control/version.rb

@@ -1,3 +1,3 @@
 module Control
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/lib/control_helper.rb

@@ -7,12 +7,12 @@ module ControlHelper
 		if pid_filename
 			get_pid_from_file(pid_filename)
 		else
-			search_by_string = retreive_search_string(options)
+			search_by_string = retrieve_search_string(options)
 			find_pid_with_ps(search_by_string)
 		end
 	end
 	
-	def retreive_search_string(options)
+	def retrieve_search_string(options)
 		attributes = Control_P::OPTIONS_ATTRIBUTES
 		find_by = options.fetch(attributes[:find_pid_by], Control_P::FIND_BY_OPTIONS[:app_filename])
 		#TODO validate find_by is in Control_P::FIND_BY_OPTIONS
@@ -31,8 +31,8 @@ module ControlHelper
 	
 
 	def find_pid_with_ps(search_by_string)
-		pid = nil
 		search_string = "ps aux | grep #{search_by_string} | grep -v grep"
+		pid = nil
 		p "searching by #{search_string}"
 		procs = `#{search_string}` # todo add grep
 
@@ -48,6 +48,16 @@ module ControlHelper
 		pid
 	end
 
+
+	def is_pid_alive?(process_id)
+		search_string =  "ps -p #{process_id} -o comm="
+		p "searching by #{search_string}"
+		procs = `#{search_string}` # todo add grep
+		p "found procs #{procs}"
+
+		procs == ''
+	end
+
 	def exit_if_not_running!(options)
 		old_pid = find_app_pid(options)
 		unless app_running?(old_pid)
@@ -127,14 +137,15 @@ module ControlHelper
 	end
 
 	def make_sure_pid_is_real!(pid, pid_filename)
-		find_pid = find_pid_with_ps(pid)
-		if find_pid.nil?
+		# TODO - fix this . don't validate by name but by pid (ps -p 'pid' -o comm=)
+		# http://superuser.com/questions/632979/if-i-know-the-pid-number-of-a-process-how-can-i-get-its-name
+		if is_pid_alive?(pid)
+			pid
+		else
 			p "didn't really find pid running, deleting the file #{pid_filename}"
 			delete_file(pid_filename)
-			return nil
+			nil
 		end
-
-		find_pid
 	end
 
 	def delete_file(file_name)
@@ -168,7 +179,7 @@ module ControlHelper
 		if pid
 			p "#{prefix} Ok, Restarted. new pid #{pid}"
 			if http_server?(options) && !skip_workers_message?(options)
-				if Dir[Control_P::WORKERS_STARTED_EXTENTION].length < 1 
+				if Dir[Control_P::WORKERS_STARTED_EXTENSION].length < 1
 					p 'no workers has seemed to be started, check it out.'
 					exit(1)
 				end 
@@ -183,17 +194,17 @@ module ControlHelper
 
 	#TODO add option to overwrite the file names
 	def print_workers_started_and_stopped(options)
-		print_workers_and_delete_files!('workers started', Control_P::WORKERS_STARTED_EXTENTION)
-		print_workers_and_delete_files!('workers closed', Control_P::WORKERS_CLOSED_EXTENTION)
+		print_workers_and_delete_files!('workers started', Control_P::WORKERS_STARTED_EXTENSION)
+		print_workers_and_delete_files!('workers closed', Control_P::WORKERS_CLOSED_EXTENSION)
 	end
 
 	def skip_workers_message?(options)
 		options.fetch(Control_P::OPTIONS_ATTRIBUTES[:skip_workers_message], false)
 	end
 
-	def print_workers_and_delete_files!(type, extention)
-		p "#{Dir[extention].length.to_s} #{type}"
-		Dir.glob(extention).each { |f| File.delete(f) }
+	def print_workers_and_delete_files!(type, extension)
+		p "#{Dir[extension].length.to_s} #{type}"
+		Dir.glob(extension).each { |f| File.delete(f) }
 	end
 
 	def http_server?(options)

data/lib/process_controller.rb

@@ -10,8 +10,8 @@ class Control_P
 							start_command: 'start_command', skip_workers_message: 'skip_workers_message'}.with_indifferent_access
 
 	FIND_BY_OPTIONS = {app_filename: 'app_filename', port_num: 'port_num', app_name: 'app_name', pid_file: 'pid_file'}.with_indifferent_access
-	WORKERS_STARTED_EXTENTION = '*.started'
-	WORKERS_CLOSED_EXTENTION = '*.closed'
+	WORKERS_STARTED_EXTENSION = '*.started'
+	WORKERS_CLOSED_EXTENSION = '*.closed'
 
 	HOSTNAME = Socket.gethostname
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_controller
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - ohad partuck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport