rush 0.4.1 → 0.4.2

data/Rakefile

@@ -31,7 +31,7 @@ require 'rake/rdoctask'
 require 'fileutils'
 include FileUtils
 
-version = "0.4.1"
+version = "0.4.2"
 name = "rush"
 
 spec = Gem::Specification.new do |s|
@@ -46,7 +46,6 @@ spec = Gem::Specification.new do |s|
 	s.rubyforge_project = "ruby-shell"
 
 	s.add_dependency 'mongrel'
-	s.add_dependency 'rspec'
 	s.add_dependency 'session'
 
 	s.platform = Gem::Platform::RUBY

data/lib/rush/file.rb

@@ -22,6 +22,8 @@ class Rush::File < Rush::Entry
 		connection.file_contents(full_path)
 	end
 
+	alias :read :contents
+
 	# Write to the file, overwriting whatever was already in it.
 	#
 	# Example: file.write "hello, world\n"
@@ -29,6 +31,12 @@ class Rush::File < Rush::Entry
 		connection.write_file(full_path, new_contents)
 	end
 
+	# Append new contents to the end of the file, keeping what was in it.
+	def append(contents)
+		connection.append_to_file(full_path, contents)
+	end
+	alias_method :<<, :append
+
 	# Return an array of lines from the file, similar to stdlib's File#readlines.
 	def lines
 		contents.split("\n")

data/lib/rush/local.rb

@@ -21,6 +21,14 @@ class Rush::Connection::Local
 		true
 	end
 
+	# Append contents to a file
+	def append_to_file(full_path, contents)
+		::File.open(full_path, 'a') do |f|
+			f.write contents
+		end
+		true
+	end
+
 	# Read raw bytes from a file.
 	def file_contents(full_path)
 		::File.read(full_path)
@@ -310,26 +318,34 @@ class Rush::Connection::Local
 	end
 
 	def bash_background(command, user)
-		inpipe, outpipe = IO.pipe
-
 		pid = fork do
+			inpipe, outpipe = IO.pipe
+
 			outpipe.write command
 			outpipe.close
 			STDIN.reopen(inpipe)
 
+			close_all_descriptors([inpipe.to_i])
+
 			if user and user != ''
 				exec "cd /; sudo -H -u #{user} bash"
 			else
 				exec "bash"
 			end
 		end
-		outpipe.close
 
 		Process::detach pid
 
 		pid
 	end
 
+	def close_all_descriptors(keep_open = [])
+		3.upto(256) do |fd|
+			next if keep_open.include?(fd)
+			IO::new(fd).close rescue nil
+		end
+	end
+
 	####################################
 
 	# Raised when the action passed in by RushServer is not known.
@@ -342,6 +358,7 @@ class Rush::Connection::Local
 	def receive(params)
 		case params[:action]
 			when 'write_file'     then write_file(params[:full_path], params[:payload])
+			when 'append_to_file' then append_to_file(params[:full_path], params[:payload])
 			when 'file_contents'  then file_contents(params[:full_path])
 			when 'destroy'        then destroy(params[:full_path])
 			when 'purge'          then purge(params[:full_path])

data/lib/rush/remote.rb

@@ -18,6 +18,10 @@ class Rush::Connection::Remote
 		transmit(:action => 'write_file', :full_path => full_path, :payload => contents)
 	end
 
+	def append_to_file(full_path, contents)
+		transmit(:action => 'append_to_file', :full_path => full_path, :payload => contents)
+	end
+
 	def file_contents(full_path)
 		transmit(:action => 'file_contents', :full_path => full_path)
 	end

data/spec/file_spec.rb

@@ -39,6 +39,10 @@ describe Rush::File do
 		@file.contents.should == @contents
 	end
 
+	it "read is an alias for contents" do
+		@file.read.should == @contents
+	end
+
 	it "can write new contents" do
 		@file.write('write test')
 		@file.contents.should == 'write test'

data/spec/local_spec.rb

@@ -17,6 +17,11 @@ describe Rush::Connection::Local do
 		@con.receive(:action => 'write_file', :full_path => 'file', :payload => 'contents')
 	end
 
+	it "receive -> append_to_file(file, contents)" do
+		@con.should_receive(:append_to_file).with('file', 'contents')
+		@con.receive(:action => 'append_to_file', :full_path => 'file', :payload => 'contents')
+	end
+
 	it "receive -> file_contents(file)" do
 		@con.should_receive(:file_contents).with('file').and_return('the contents')
 		@con.receive(:action => 'file_contents', :full_path => 'file').should == 'the contents'
@@ -116,6 +121,13 @@ describe Rush::Connection::Local do
 		File.read(fname).should == data
 	end
 
+	it "append_to_file appends contents to a file" do
+		fname = "#{@sandbox_dir}/a_file"
+		system "echo line1 > #{fname}"
+		@con.append_to_file(fname, 'line2')
+		File.read(fname).should == "line1\nline2"
+	end
+
 	it "file_contents reads a file's contents" do
 		fname = "#{@sandbox_dir}/a_file"
 		system "echo stuff > #{fname}"

data/spec/remote_spec.rb

@@ -17,6 +17,11 @@ describe Rush::Connection::Local do
 		@con.write_file('file', 'contents')
 	end
 
+	it "transmits append_to_file" do
+		@con.should_receive(:transmit).with(:action => 'append_to_file', :full_path => 'file', :payload => 'contents')
+		@con.append_to_file('file', 'contents')
+	end
+
 	it "transmits file_contents" do
 		@con.should_receive(:transmit).with(:action => 'file_contents', :full_path => 'file').and_return('contents')
 		@con.file_contents('file').should == 'contents'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rush
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -07:00
+date: 2008-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: session
   type: :runtime