aleksi-rush 0.6.6 → 0.6.7

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/lib/rush/commands.rb

@@ -8,6 +8,11 @@
 #   box['/etc/'].search /localhost/            # entire directory
 #   box['/etc/**/*.conf'].search /localhost/   # arbitrary list
 module Rush::Commands
+	def self.included(base)
+		base.extend(Rush::ExternalCommands)
+		Rush::ExternalCommands::COMMANDS_TO_ADD.each { |command| base.add_command(command) }
+	end
+
 	# The entries command must return an array of Rush::Entry items.  This
 	# varies by class that it is mixed in to.
 	def entries
@@ -41,15 +46,17 @@ module Rush::Commands
 		end
 	end
 
-	# Invoke vi on one or more files - only works locally.
-	def vi(*args)
-		names = entries.map { |f| f.quoted_path }.join(' ')
-		system "vim #{names} #{args.join(' ')}"
-	end
+end
 
-	# Invoke TextMate on one or more files - only works locally.
-	def mate(*args)
-		names = entries.map { |f| f.quoted_path }.join(' ')
-		system "mate #{names} #{args.join(' ')}"
+module Rush::ExternalCommands
+	COMMANDS_TO_ADD = [:vim, :mate, :kate, :gedit]
+
+	def add_command(command)
+		if system("which #{command} > /dev/null 2>&1")
+			define_method(command) do |*args|
+				names = entries.map { |f| f.quoted_path }.join(' ')
+				system("#{command} #{args.join(' ')} #{names}")
+			end
+		end
 	end
 end

data/lib/rush/local.rb

@@ -349,7 +349,7 @@ class Rush::Connection::Local
 	def close_all_descriptors(keep_open = [])
 		3.upto(256) do |fd|
 			next if keep_open.include?(fd)
-			IO::new(fd).close rescue nil
+			IO::new(fd, "r").close rescue nil
 		end
 	end
 
@@ -370,10 +370,10 @@ class Rush::Connection::Local
 			when 'destroy'        then destroy(params[:full_path])
 			when 'purge'          then purge(params[:full_path])
 			when 'create_dir'     then create_dir(params[:full_path])
-			when 'rename'         then rename(params[:path], params[:name], params[:new_name], params[:force])
-			when 'copy'           then copy(params[:src], params[:dst], params[:force])
+			when 'rename'         then rename(params[:path], params[:name], params[:new_name], !!params[:force])
+			when 'copy'           then copy(params[:src], params[:dst], !!params[:force])
 			when 'read_archive'   then read_archive(params[:full_path])
-			when 'write_archive'  then write_archive(params[:payload], params[:dir], params[:force])
+			when 'write_archive'  then write_archive(params[:payload], params[:dir], !!params[:force])
 			when 'index'          then index(params[:base_path], params[:glob]).join("\n") + "\n"
 			when 'stat'           then YAML.dump(stat(params[:full_path]))
 			when 'set_access'     then set_access(params[:full_path], Rush::Access.from_hash(params))

data/spec/commands_spec.rb

@@ -44,4 +44,12 @@ describe Rush::Commands do
 	it "counts lines of the contained files" do
 		@dir.files.line_count.should == 2
 	end
+
+	it "adds external commands when mixed-in" do
+		class SomeNewClass; include Rush::Commands; end
+		obj = SomeNewClass.new
+		Rush::ExternalCommands::COMMANDS_TO_ADD.each do |command|
+			obj.should respond_to(command) if system("which #{command} > /dev/null 2>&1")
+		end
+	end
 end

data/spec/local_spec.rb

@@ -43,12 +43,12 @@ describe Rush::Connection::Local do
 	end
 
 	it "receive -> rename(path, name, new_name)" do
-		@con.should_receive(:rename).with('path', 'name', 'new_name')
+		@con.should_receive(:rename).with('path', 'name', 'new_name', false)
 		@con.receive(:action => 'rename', :path => 'path', :name => 'name', :new_name => 'new_name')
 	end
 
 	it "receive -> copy(src, dst)" do
-		@con.should_receive(:copy).with('src', 'dst')
+		@con.should_receive(:copy).with('src', 'dst', false)
 		@con.receive(:action => 'copy', :src => 'src', :dst => 'dst')
 	end
 
@@ -58,7 +58,7 @@ describe Rush::Connection::Local do
 	end
 
 	it "receive -> write_archive(archive, dir)" do
-		@con.should_receive(:write_archive).with('archive', 'dir')
+		@con.should_receive(:write_archive).with('archive', 'dir', false)
 		@con.receive(:action => 'write_archive', :dir => 'dir', :payload => 'archive')
 	end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Adam Wiggins, Aleksey Palazhchenko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +03:00
+date: 2010-04-04 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,24 +119,24 @@ signing_key:
 specification_version: 3
 summary: A Ruby replacement for bash+ssh.
 test_files: 
-- spec/string_ext_spec.rb
-- spec/box_spec.rb
-- spec/entry_spec.rb
-- spec/shell_spec.rb
-- spec/process_spec.rb
-- spec/process_set_spec.rb
-- spec/local_spec.rb
-- spec/file_spec.rb
+- spec/access_spec.rb
 - spec/array_ext_spec.rb
+- spec/base.rb
+- spec/box_spec.rb
+- spec/commands_spec.rb
 - spec/config_spec.rb
 - spec/dir_spec.rb
-- spec/base.rb
-- spec/fixnum_ext_spec.rb
-- spec/ssh_tunnel_spec.rb
-- spec/access_spec.rb
-- spec/find_by_spec.rb
 - spec/embeddable_shell_spec.rb
+- spec/entry_spec.rb
+- spec/file_spec.rb
+- spec/find_by_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/commands_spec.rb
-- spec/search_results_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