rush 0.5 → 0.5.1

data/Rakefile

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

data/lib/rush.rb

@@ -54,6 +54,11 @@ module Rush
 	def self.box
 		@@box = Rush::Box.new
 	end
+
+	# Quote a path for use in backticks, say.
+	def self.quote(path)
+		path.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/n, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
+	end
 end
 
 module Rush::Connection; end

data/lib/rush/commands.rb

@@ -43,13 +43,13 @@ module Rush::Commands
 
 	# Invoke vi on one or more files - only works locally.
 	def vi(*args)
-		names = entries.map { |f| f.full_path }.join(' ')
+		names = entries.map { |f| f.quoted_path }.join(' ')
 		system "vim #{names} #{args.join(' ')}"
 	end
 
 	# Invoke TextMate on one or more files - only works locally.
 	def mate(*args)
-		names = entries.map { |f| f.full_path }.join(' ')
+		names = entries.map { |f| f.quoted_path }.join(' ')
 		system "mate #{names} #{args.join(' ')}"
 	end
 end

data/lib/rush/dir.rb

@@ -46,6 +46,8 @@ class Rush::Dir < Rush::Entry
 			find_by_name(key)
 		end
 	end
+	# Slashes work as well, e.g. dir/'subdir/file'
+	alias_method :/, :[]
 
 	def find_by_name(name)    # :nodoc:
 		Rush::Entry.factory("#{full_path}/#{name}", box)
@@ -120,7 +122,7 @@ class Rush::Dir < Rush::Entry
 
 	# Run a bash command starting in this directory.  Options are the same as Rush::Box#bash.
 	def bash(command, options={})
-		box.bash "cd #{full_path} && #{command}", options
+		box.bash "cd #{quoted_path} && #{command}", options
 	end
 
 	# Destroy all of the contents of the directory, leaving it fresh and clean.

data/lib/rush/entry.rb

@@ -18,6 +18,8 @@ class Rush::Entry
 	def self.factory(full_path, box=nil)
 		if full_path.tail(1) == '/'
 			Rush::Dir.new(full_path, box)
+		elsif File.directory?(full_path)
+			Rush::Dir.new(full_path, box)
 		else
 			Rush::File.new(full_path, box)
 		end
@@ -48,6 +50,10 @@ class Rush::Entry
 		"#{@path}/#{@name}"
 	end
 
+	def quoted_path
+		Rush.quote(full_path)
+	end
+
 	# Return true if the entry currently exists on the filesystem of the box.
 	def exists?
 		stat
@@ -82,13 +88,14 @@ class Rush::Entry
 	def rename(new_name)
 		connection.rename(@path, @name, new_name)
 		@name = new_name
+		self
 	end
 
 	# Rename an entry to another name within the same dir.  The existing object
 	# will not be affected, but a new object representing the newly-created
 	# entry will be returned.
 	def duplicate(new_name)
-		raise NameCannotContainSlash if new_name.match(/\//)
+		raise Rush::NameCannotContainSlash if new_name.match(/\//)
 		new_full_path = "#{@path}/#{new_name}"
 		connection.copy(full_path, new_full_path)
 		self.class.new(new_full_path, box)
@@ -97,7 +104,7 @@ class Rush::Entry
 	# Copy the entry to another dir.  Returns an object representing the new
 	# copy.
 	def copy_to(dir)
-		raise NotADir unless dir.class == Rush::Dir
+		raise Rush::NotADir unless dir.class == Rush::Dir
 
 		if box == dir.box
 			connection.copy(full_path, dir.full_path)

data/lib/rush/local.rb

@@ -83,12 +83,12 @@ class Rush::Connection::Local
 	# transmitted to another server for a copy or move.  Note that archive
 	# operations have the dir name implicit in the archive.
 	def read_archive(full_path)
-		`cd #{::File.dirname(full_path)}; tar c #{::File.basename(full_path)}`
+		`cd #{Rush.quote(::File.dirname(full_path))}; tar c #{Rush.quote(::File.basename(full_path))}`
 	end
 
 	# Extract an in-memory archive to a dir.
 	def write_archive(archive, dir)
-		IO.popen("cd #{dir}; tar x", "w") do |p|
+		IO.popen("cd #{Rush::quote(dir)}; tar x", "w") do |p|
 			p.write archive
 		end
 	end
@@ -135,7 +135,7 @@ class Rush::Connection::Local
 	# Fetch the size of a dir, since a standard file stat does not include the
 	# size of the contents.
 	def size(full_path)
-		`du -sb #{full_path}`.match(/(\d+)/)[1].to_i
+		`du -sb #{Rush.quote(full_path)}`.match(/(\d+)/)[1].to_i
 	end
 
 	# Get the list of processes as an array of hashes.

data/lib/rush/shell.rb

@@ -106,42 +106,81 @@ module Rush
 			end
 		end
 
-		def path_parts(input)   # :nodoc:
-			input.match(/(\w+(?:\[[^\]]+\])*)\[(['"])([^\]]+)$/)
-			$~.to_a.slice(1, 3).push($~.pre_match)
-		rescue
-			[ nil, nil, nil, nil ]
+		def path_parts(input)		# :nodoc:
+			case input
+			when /((?:@{1,2}|\$|)\w+(?:\[[^\]]+\])*)([\[\/])(['"])([^\3]*)$/
+				$~.to_a.slice(1, 4).push($~.pre_match)
+			when /((?:@{1,2}|\$|)\w+(?:\[[^\]]+\])*)(\.)(\w*)$/
+				$~.to_a.slice(1, 3).push($~.pre_match)
+			when /((?:@{1,2}|\$|)\w+)$/
+				$~.to_a.slice(1, 1).push(nil).push($~.pre_match)
+			else
+				[ nil, nil, nil ]
+			end
+		end
+
+		def complete_method(receiver, dot, partial_name, pre)
+			path = eval("#{receiver}.full_path", @pure_binding) rescue nil
+			box = eval("#{receiver}.box", @pure_binding) rescue nil
+			if path and box
+				(box[path].methods - Object.methods).select do |e|
+					e.match(/^#{Regexp.escape(partial_name)}/)
+				end.map do |e|
+					(pre || '') + receiver + dot + e
+				end
+			end
 		end
 
-		# Try to do tab completion on dir square brackets accessors.
+		def complete_path(possible_var, accessor, quote, partial_path, pre)		# :nodoc:
+			original_var, fixed_path = possible_var, ''
+			if /^(.+\/)([^\/]*)$/ === partial_path
+				fixed_path, partial_path = $~.captures
+				possible_var += "['#{fixed_path}']"
+			end
+			full_path = eval("#{possible_var}.full_path", @pure_binding) rescue nil
+			box = eval("#{possible_var}.box", @pure_binding) rescue nil
+			if full_path and box
+				Rush::Dir.new(full_path, box).entries.select do |e|
+					e.name.match(/^#{Regexp.escape(partial_path)}/)
+				end.map do |e|
+					(pre || '') + original_var + accessor + quote + fixed_path + e.name + (e.dir? ? "/" : "")
+				end
+			end
+		end
+
+		def complete_variable(partial_name, pre)
+			lvars = eval('local_variables', @pure_binding)
+			gvars = eval('global_variables', @pure_binding)
+			ivars = eval('instance_variables', @pure_binding)
+			(lvars + gvars + ivars).select do |e|
+				e.match(/^#{Regexp.escape(partial_name)}/)
+			end.map do |e|
+				(pre || '') + e
+			end
+		end
+
+		# Try to do tab completion on dir square brackets and slash accessors.
 		#
 		# Example:
 		#
 		# dir['subd    # presing tab here will produce dir['subdir/ if subdir exists
+		# dir/'subd    # presing tab here will produce dir/'subdir/ if subdir exists
 		#
 		# This isn't that cool yet, because it can't do multiple levels of subdirs.
 		# It does work remotely, though, which is pretty sweet.
 		def completion_proc
 			proc do |input|
-				possible_var, quote, partial_path, pre = path_parts(input)
-				if possible_var
-					original_var, fixed_path = possible_var, ''
-					if /^(.+\/)([^\/]+)$/ === partial_path
-						fixed_path, partial_path = $~.captures
-						possible_var += "['#{fixed_path}']"
-					end
-					full_path = eval("#{possible_var}.full_path", @pure_binding) rescue nil
-					box = eval("#{possible_var}.box", @pure_binding) rescue nil
-					if full_path and box
-						dir = Rush::Dir.new(full_path, box)
-						return dir.entries.select do |e|
-							e.name.match(/^#{Regexp.escape(partial_path)}/)
-						end.map do |e|
-							(pre || '') + original_var + '[' + quote + fixed_path + e.name + (e.dir? ? "/" : "")
-						end
+				receiver, accessor, *rest = path_parts(input)
+				if receiver
+					case accessor
+					when /^[\[\/]$/
+						complete_path(receiver, accessor, *rest)
+					when /^\.$/
+						complete_method(receiver, accessor, *rest)
+					when nil
+						complete_variable(receiver, *rest)
 					end
 				end
-				nil
 			end
 		end
 	end

data/spec/dir_spec.rb

@@ -151,9 +151,14 @@ describe Rush::Dir do
 		@dir.bash("cat file").should == "test\n"
 	end
 
+	it "can run bash within directories with spaces" do
+		@dir.create_dir('with space').create_file('file').write('test')
+		@dir["with space/"].bash("cat file").should == "test"
+	end
+
 	it "passes bash options (e.g., :user) through to the box bash command" do
-		@box.should_receive(:bash).with('cmd', :opt1 => 1, :opt2 => 2)
-		@box.bash('cmd', :opt1 => 1, :opt2 => 2)
+		@dir.should_receive(:bash).with('cmd', :opt1 => 1, :opt2 => 2)
+		@dir.bash('cmd', :opt1 => 1, :opt2 => 2)
 	end
 
 end

data/spec/entry_spec.rb

@@ -56,6 +56,10 @@ describe Rush::Entry do
 		File.exists?("#{@sandbox_dir}/#{new_file}").should be_true
 	end
 
+	it "rename returns the renamed file" do
+		@entry.rename('file2').should == @entry.parent['file2']
+	end
+
 	it "can't rename itself if another file already exists with that name" do
 		new_file = "test3"
 		system "touch #{@sandbox_dir}/#{new_file}"

data/spec/local_spec.rb

@@ -194,6 +194,11 @@ describe Rush::Connection::Local do
 		@con.read_archive(@sandbox_dir).size.should > 50
 	end
 
+	it "read_archive works for paths with spaces" do
+		system "mkdir -p #{@sandbox_dir}/with\\ space; touch #{@sandbox_dir}/with\\ space/a"
+		@con.read_archive("#{@sandbox_dir}/with space").size.should > 50
+	end
+
 	it "write_archive to turn a byte stream into a dir" do
 		system "cd #{@sandbox_dir}; mkdir -p a; touch a/b; tar cf xfer.tar a; mkdir dst"
 		archive = File.read("#{@sandbox_dir}/xfer.tar")
@@ -202,6 +207,14 @@ describe Rush::Connection::Local do
 		File.exists?("#{@sandbox_dir}/dst/a/b").should be_true
 	end
 
+	it "write_archive works for paths with spaces" do
+		system "cd #{@sandbox_dir}; mkdir -p a; touch a/b; tar cf xfer.tar a; mkdir with\\ space"
+		archive = File.read("#{@sandbox_dir}/xfer.tar")
+		@con.write_archive(archive, "#{@sandbox_dir}/with space")
+		File.directory?("#{@sandbox_dir}/with space/a").should be_true
+		File.exists?("#{@sandbox_dir}/with space/a/b").should be_true
+	end
+
 	it "index fetches list of all files and dirs in a dir when pattern is empty" do
 		system "cd #{@sandbox_dir}; mkdir dir; touch file"
 		@con.index(@sandbox_dir, '').should == [ 'dir/', 'file' ]

data/spec/shell_spec.rb

@@ -7,6 +7,17 @@ describe Rush::Shell do
 	end
 
 	it "matches open path commands for readline tab completion" do
-		@shell.path_parts("dir['app").should == [ "dir", "'", "app", "" ]
+		@shell.path_parts("dir['app").should == [ "dir", "[", "'", "app", "" ]
+		@shell.path_parts('dir/"app').should == [ "dir", "/", '"', "app", "" ]
+	end
+
+	it "matches open path commands on globals for readline tab completion" do
+		@shell.path_parts("$dir['app").should == [ "$dir", "[", "'", "app", "" ]
+		@shell.path_parts('$dir/"app').should == [ "$dir", "/", '"', "app", "" ]
+	end
+
+	it "matches open path commands on instance vars for readline tab completion" do
+		@shell.path_parts("@dir['app").should == [ "@dir", "[", "'", "app", "" ]
+		@shell.path_parts('@dir/"app').should == [ "@dir", "/", '"', "app", "" ]
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rush
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -08:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency