rush 0.5.1 → 0.6

data/Rakefile

@@ -31,7 +31,7 @@ require 'rake/rdoctask'
 require 'fileutils'
 include FileUtils
 
-version = "0.5.1"
+version = "0.6"
 name = "rush"
 
 spec = Gem::Specification.new do |s|

data/lib/rush/entry.rb

@@ -62,17 +62,17 @@ class Rush::Entry
 		false
 	end
 
-	# Timestamp of entry creation.
-	def created_at
+	# Timestamp of most recent change to the entry (permissions, contents, etc).
+	def changed_at
 		stat[:ctime]
 	end
 
-	# Timestamp that entry was last modified on.
+	# Timestamp of last modification of the contents.
 	def last_modified
 		stat[:mtime]
 	end
 
-	# Timestamp that entry was last accessed on.
+	# Timestamp that entry was last accessed (read from or written to).
 	def last_accessed
 		stat[:atime]
 	end

data/lib/rush/local.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'yaml'
+require 'timeout'
 
 # Rush::Box uses a connection object to execute all rush commands.  If the box
 # is local, Rush::Connection::Local is created.  The local connection is the
@@ -280,14 +281,24 @@ class Rush::Connection::Local
 	end
 
 	# Terminate a process, by pid.
-	def kill_process(pid)
-		::Process.kill('TERM', pid)
-
-		# keep trying until it's dead (technique borrowed from god)
-		5.times do
-			return if !process_alive(pid)
-			sleep 0.5
-			::Process.kill('TERM', pid) rescue nil
+	def kill_process(pid, options={})
+		# time to wait before terminating the process, in seconds
+		wait = options[:wait] || 3
+
+		if wait > 0
+			::Process.kill('TERM', pid)
+
+			# keep trying until it's dead (technique borrowed from god)
+			begin
+				Timeout.timeout(wait) do
+					loop do
+						return if !process_alive(pid)
+						sleep 0.5
+						::Process.kill('TERM', pid) rescue nil
+					end
+				end
+			rescue Timeout::Error
+			end
 		end
 
 		::Process.kill('KILL', pid) rescue nil
@@ -373,7 +384,7 @@ class Rush::Connection::Local
 			when 'size'           then size(params[:full_path])
 			when 'processes'      then YAML.dump(processes)
 			when 'process_alive'  then process_alive(params[:pid]) ? '1' : '0'
-			when 'kill_process'   then kill_process(params[:pid].to_i)
+			when 'kill_process'   then kill_process(params[:pid].to_i, YAML.load(params[:payload]))
 			when 'bash'           then bash(params[:payload], params[:user], params[:background] == 'true')
 		else
 			raise UnknownAction

data/lib/rush/process.rb

@@ -22,7 +22,11 @@ class Rush::Process
 	end
 
 	def inspect   # :nodoc:
-		"#{box} process #{@pid}: #{@cmdline}"
+		if box.to_s != 'localhost'
+			"#{box} #{@pid}: #{@cmdline}"
+		else
+			"#{@pid}: #{@cmdline}"
+		end
 	end
 
 	# Returns the Rush::Process parent of this process.
@@ -41,8 +45,8 @@ class Rush::Process
 	end
 
 	# Terminate the process.
-	def kill
-		box.connection.kill_process(pid)
+	def kill(options={})
+		box.connection.kill_process(pid, options)
 	end
 
 	def ==(other)       # :nodoc:

data/lib/rush/process_set.rb

@@ -32,8 +32,8 @@ class Rush::ProcessSet
 	end
 
 	# Kill all processes in the set.
-	def kill
-		processes.each { |p| p.kill }
+	def kill(options={})
+		processes.each { |p| p.kill(options) }
 	end
 
 	# Check status of all processes in the set, returns an array of booleans.

data/lib/rush/remote.rb

@@ -78,8 +78,8 @@ class Rush::Connection::Remote
 		transmit(:action => 'process_alive', :pid => pid)
 	end
 
-	def kill_process(pid)
-		transmit(:action => 'kill_process', :pid => pid)
+	def kill_process(pid, options={})
+		transmit(:action => 'kill_process', :pid => pid, :payload => YAML.dump(options))
 	end
 
 	def bash(command, user, background)

data/spec/entry_spec.rb

@@ -30,8 +30,8 @@ describe Rush::Entry do
 		Rush::Entry.new('/1/2/../3').full_path.should == '/1/3'
 	end
 
-	it "knows its created_at time" do
-		@entry.created_at.should == File.stat(@filename).ctime
+	it "knows its changed_at time" do
+		@entry.changed_at.should == File.stat(@filename).ctime
 	end
 
 	it "knows its last_modified time" do

data/spec/local_spec.rb

@@ -96,8 +96,8 @@ describe Rush::Connection::Local do
 	end
 
 	it "receive -> kill_process" do
-		@con.should_receive(:kill_process).with(123).and_return(true)
-		@con.receive(:action => 'kill_process', :pid => '123')
+		@con.should_receive(:kill_process).with(123, :wait => 10).and_return(true)
+		@con.receive(:action => 'kill_process', :pid => '123', :payload => YAML.dump(:wait => 10))
 	end
 
 	it "receive -> bash (foreground)" do
@@ -288,11 +288,25 @@ EOPS
 		@con.process_alive(99999).should be_false
 	end
 
-	it "kills a process by pid" do
-		::Process.should_receive(:kill).at_least(:once)
+	it "kills a process by pid sending a TERM" do
+		@con.stub!(:process_alive).and_return(false)
+		::Process.should_receive(:kill).with('TERM', 123).once
 		@con.kill_process(123)
 	end
 
+	it "kills a process by pid sending a KILL signal if TERM doesn't work" do
+		@con.stub!(:process_alive).and_return(true)
+		::Process.should_receive(:kill).with('TERM', 123).at_least(:twice)
+		::Process.should_receive(:kill).with('KILL', 123)
+		@con.kill_process(123)
+	end
+
+	it "kills a process by pid without sending TERM if :wait is zero" do
+		::Process.should_not_receive(:kill).with('TERM', 123)
+		::Process.should_receive(:kill).with('KILL', 123)
+		@con.kill_process(123, :wait => 0)
+	end
+
 	it "does not raise an error if the process is already dead" do
 		::Process.should_receive(:kill).and_raise(Errno::ESRCH)
 		lambda { @con.kill_process(123) }.should_not raise_error

data/spec/remote_spec.rb

@@ -93,8 +93,8 @@ describe Rush::Connection::Local do
 	end
 
 	it "transmits kill_process" do
-		@con.should_receive(:transmit).with(:action => 'kill_process', :pid => 123)
-		@con.kill_process(123)
+		@con.should_receive(:transmit).with(:action => 'kill_process', :pid => 123, :payload => YAML.dump(:wait => 10))
+		@con.kill_process(123, :wait => 10)
 	end
 
 	it "transmits bash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rush
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: "0.6"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,51 +45,51 @@ files:
 - Rakefile
 - bin/rush
 - bin/rushd
-- lib/rush.rb
 - lib/rush
-- lib/rush/embeddable_shell.rb
+- lib/rush/access.rb
+- lib/rush/array_ext.rb
+- lib/rush/box.rb
+- lib/rush/commands.rb
 - lib/rush/config.rb
-- lib/rush/head_tail.rb
-- lib/rush/search_results.rb
+- lib/rush/dir.rb
+- lib/rush/embeddable_shell.rb
 - lib/rush/entry.rb
-- lib/rush/find_by.rb
+- lib/rush/exceptions.rb
 - lib/rush/file.rb
+- lib/rush/find_by.rb
+- lib/rush/fixnum_ext.rb
+- lib/rush/head_tail.rb
 - lib/rush/local.rb
-- lib/rush/ssh_tunnel.rb
-- lib/rush/shell.rb
-- lib/rush/server.rb
+- lib/rush/process.rb
 - lib/rush/process_set.rb
-- lib/rush/array_ext.rb
 - lib/rush/remote.rb
-- lib/rush/fixnum_ext.rb
-- lib/rush/commands.rb
-- lib/rush/process.rb
-- lib/rush/dir.rb
+- lib/rush/search_results.rb
+- lib/rush/server.rb
+- lib/rush/shell.rb
+- lib/rush/ssh_tunnel.rb
 - lib/rush/string_ext.rb
-- lib/rush/box.rb
-- lib/rush/exceptions.rb
-- lib/rush/access.rb
-- spec/remote_spec.rb
-- spec/rush_spec.rb
-- spec/base.rb
-- spec/ssh_tunnel_spec.rb
-- spec/local_spec.rb
-- spec/embeddable_shell_spec.rb
+- lib/rush.rb
 - spec/access_spec.rb
-- spec/file_spec.rb
-- spec/string_ext_spec.rb
 - spec/array_ext_spec.rb
+- spec/base.rb
+- spec/box_spec.rb
 - spec/commands_spec.rb
 - spec/config_spec.rb
-- spec/fixnum_ext_spec.rb
-- spec/search_results_spec.rb
-- spec/process_spec.rb
-- spec/shell_spec.rb
 - spec/dir_spec.rb
+- spec/embeddable_shell_spec.rb
 - spec/entry_spec.rb
+- spec/file_spec.rb
 - spec/find_by_spec.rb
-- spec/box_spec.rb
+- spec/fixnum_ext_spec.rb
+- spec/local_spec.rb
 - spec/process_set_spec.rb
+- spec/process_spec.rb
+- spec/remote_spec.rb
+- spec/rush_spec.rb
+- spec/search_results_spec.rb
+- spec/shell_spec.rb
+- spec/ssh_tunnel_spec.rb
+- spec/string_ext_spec.rb
 has_rdoc: true
 homepage: http://rush.heroku.com/
 post_install_message: