Rakefile spec/el_mixin.rb spec/line_spec.rb spec/remote_spec.rb spec/view_spec.rb @@ -38,7 +38,7 @@ class Clipboard end - def self.get key, options={} + def self.get key='0', options={} val = @@hash[key.to_s] if options[:add_linebreak] val = "#{val}\n" unless val[/\n$/] clipboard.rb @@ -168,10 +168,10 @@ class Code end if View.file =~ /\/xiki\// # If in xiki project - if View.file =~ /\/tests\// # If in spec, open corresponding file - View.open View.file.sub('/tests/', '/').sub(/_test\.rb/, '.rb') - else # Otherwise, open file corresponding test - View.open View.file.sub(/(.+)\/(.+)/, "\\1/tests/\\2").sub(/\.rb/, '_test.rb') + if View.file =~ /\/spec\// # If in spec, open corresponding file + View.open View.file.sub('/spec/', '/').sub(/_spec\.rb/, '.rb') + else # Otherwise, open file corresponding spec + View.open View.file.sub(/(.+)\/(.+)/, "\\1/spec/\\2").sub(/\.rb/, '_spec.rb') end return end code.rb @@ -68,12 +68,12 @@ class Color if Styles.inverse - Styles.define :color_rb_red, :bg => "550000" - Styles.define :color_rb_orange, :bg => "661a00" - Styles.define :color_rb_yellow, :bg => "4a4a00" - Styles.define :color_rb_green, :bg => "003300" - Styles.define :color_rb_blue, :bg => "000077" - Styles.define :color_rb_purple, :bg => "330044" + Styles.define :color_rb_red, :bg => "390000" + Styles.define :color_rb_orange, :bg => "441500" + Styles.define :color_rb_yellow, :bg => "333300" + Styles.define :color_rb_green, :bg => "002200" + Styles.define :color_rb_blue, :bg => "000055" + Styles.define :color_rb_purple, :bg => "220033" end color.rb @@ -1187,9 +1187,9 @@ class FileTree end indent += " " * Keys.prefix_or_0 # If numeric prefix, add to indent - - clip.sub! /\n+$/, '' - View.insert "#{indent}\|#{clip}\n" + clip = clip.sub /\n+$/, '' + clip.gsub! /^/, "#{indent}\|" + View.insert "#{clip}\n" end def self.enter_as_search @@ -1527,6 +1527,7 @@ class FileTree end def self.copy_path + Effects.blink(:what=>:line) # If no space at left, grab dir of file return Clipboard["0"] = View.file unless Line.matches(/^ /) file_tree.rb @@ -406,6 +406,7 @@ class KeyBindings Keys.isearch_just_select { Search.just_select } # select match Keys.isearch_just_tag { Search.isearch_just_tag } # select match Keys.isearch_just_underscores { Search.isearch_just_underscores } # make match be snake case + Keys.isearch_just_wrap { Search.isearch_just_wrap } # make match be snake case Keys.isearch_kill { Search.cut; Location.as_spot('deleted') } # cut Keys.isearch_look { Search.uncover } # Look: show results for search string in all open files # M: leave unmapped for stop key_bindings.rb @@ -368,7 +368,7 @@ class LineLauncher Console.launch :sync=>true end - self.add(/^[^\|@]+[\/\w\-]+\.\w+:\d+/) do |line| # Stack traces, etc + self.add(/^[^\|@:]+[\/\w\-]+\.\w+:\d+/) do |line| # Stack traces, etc # Match again (necessary) line =~ /([\/.\w\-]+):(\d+)/ path, line = $1, $2 line_launcher.rb @@ -7,7 +7,8 @@ class Move # Go to last line having indent def self.to_indent direction_down = true # Assume down - if Keys.prefix_u # If U, reverse + prefix = Keys.prefix_u + if prefix == :u # If U, reverse direction_down = false else column = Keys.prefix # If numeric, make that be the indent move.rb @@ -210,7 +210,7 @@ class Notes :notes_h1e => "336633", :notes_h1g => "336633", :notes_h1p => "663366", - :notes_h1m => "270000", + :notes_h1m => "662222", :notes_h1x => "333333", :notes_h1t => "005555", } @@ -281,14 +281,14 @@ class Notes if Styles.inverse Styles.define :notes_h1, - :fg => 'ffffff', :bg => "333355" + :fg => 'ffffff', :bg => "444466" Styles.define :notes_h1_pipe, - :fg => '7777aa', :bg => "333355" + :fg => '7777aa', :bg => "444466" Styles.define :notes_h2, :fg => '555588', :bg => "111122" Styles.define :notes_h2_pipe, - :fg => '333355', :bg => "111122" + :fg => '444466', :bg => "111122" end end notes.rb @@ -3,6 +3,7 @@ require 'net/ssh' require 'net/sftp' require 'timeout' require 'ol' +require 'keys' class Remote extend ElMixin @@ -23,9 +24,11 @@ class Remote def self.default_dirs= to; @@default_dirs = to; end def self.default_dirs; @@default_dirs; end + # Called when dir or file is launched def self.dir root, *path_append - user, server, port, path = self.split_root(root) - @@connections["#{user}@#{server}:#{port}"] ||= self.create_connection(user, server, port.to_i) + connection = self.connection root + + user, server, port, path = self.split_root(root) # Add slash to path if none there path << "/" unless path =~ /\/$/ @@ -39,7 +42,7 @@ class Remote timeout(6) do if path =~ /\/$/ # If a dir - out = @@connections["#{user}@#{server}:#{port}"].exec!("ls -p #{path}") + out = connection.exec!("ls -p #{path}") out ||= "" out = out.grep(/^[^#]+$/).join("") # Weed out #...# out.gsub!(/@/, '/') # Change @ to / @@ -56,13 +59,19 @@ class Remote # Download if not open already unless was_open - ftp = @@connections["#{user}@#{server}:#{port}"].sftp.connect - ftp.download!(path, local_path) + begin + connection.sftp.download!(path, local_path) + rescue Exception=>e + end end View.to_after_bar View.open local_path - return "- save - todo: make key shortcut instead!" unless was_open + + # TODO: save root path as var in buffer + $el.make_local_variable :remote_rb_server_root + server_root = "/#{user}@#{server}#{port ? ":#{port}" : ""}/" + $el.elvar.remote_rb_server_root = server_root # TODO save timestamp in buffer var # - Use it to determine whether file changed when saving @@ -71,7 +80,14 @@ class Remote end end - def self.create_connection(user, server, port) + def self.connection root + user, server, port, path = self.split_root root + address = "#{user}@#{server}:#{port}" + @@connections[address] ||= self.new_connection user, server, port.to_i + @@connections[address] + end + + def self.new_connection user, server, port begin timeout(6) do Net::SSH.start(server, user, :port => port.to_i, :paranoid => false) @@ -81,6 +97,7 @@ class Remote end end + def self.split_root root # Splits name@server:port/path root = root.dup # Append / at end if no / exists root << '/' unless root =~ /\/$/ @@ -107,18 +124,28 @@ class Remote "*remote #{file} (#{server}:#{dir})" end - def self.save_file path, connection - local_path = self.calculate_local_path path - # If not open, print error - return puts("- File no longer open!") unless Files.open? local_path + def self.save_file + local_path = View.file + # Error out if not in right place + if local_path !~ /^#{@@temp_dir}/ + View.beep + return View.message("This isn't a file the Remote code_tree retrieved") + end + + # Save if modified + $el.save_buffer if $el.buffer_modified_p - begin # Do save - sftp = connection.sftp.connect + remote_path = $el.elvar.remote_rb_server_root - sftp.upload!(local_path, path) - puts "- success!" + + # Convert to path + remote_path = self.calculate_remote_path local_path + begin # Do save + connection = self.connection $el.elvar.remote_rb_server_root + connection.sftp.upload!(local_path, remote_path) + View.message "- success!" rescue Exception => e - puts "- error: #{e.message}" + View.message "- error: #{e.message}" end end @@ -127,4 +154,16 @@ class Remote "#{@@temp_dir}/#{path.gsub('/', '-')[1..-1]}" end + def self.calculate_remote_path path + path.gsub(/^#{@@temp_dir}/, '').gsub('-', '/') + end + + def self.init + Keys.do_as_remote do + Remote.save_file + end + end + end + +# Remote.init remote.rb @@ -81,7 +81,7 @@ class Search def self.paste_here self.clear View.delete(Search.left, Search.right) - insert Clipboard.get("0") + insert Clipboard.get end def self.copy_and_comment @@ -159,7 +159,7 @@ class Search Keys.input(:prompt=>"With: ")) # If they typed 'c', use clipboard and prompt for 2nd arg elsif first == "c" - query_replace_regexp(Clipboard.get("0"), Keys.input(:prompt=>"Replace with (pause when done): ", :timed=>true)) + query_replace_regexp(Clipboard.get, Keys.input(:prompt=>"Replace with (pause when done): ", :timed=>true)) # If they typed 'c', use clipboard and prompt for 2nd arg elsif first == "l" query_replace_regexp(@@query_from, @@query_to) @@ -188,7 +188,7 @@ class Search def self.tree_grep dir = Keys.bookmark_as_path # Get path (from bookmark) input = case Keys.prefix - when :u; Clipboard.get("0") + when :u; Clipboard.get when 1; Clipboard.get("1") when 2; Clipboard.get("2") else; Keys.input(:prompt=>"Text to search for: ") @@ -562,7 +562,7 @@ class Search def self.enter_search bm=nil, input=nil # If line already has something, assume we'll add - ##foo/ to it if ! Line.matches(/^ *$/) - input = Keys.input(:prompt=>"Text to search for: ") + input = Keys.prefix_u ? Clipboard.get : Keys.input(:prompt=>"Text to search for: ") indent = Line.indent Line.to_right View.insert "\n#{indent} - ###{input}/" @@ -573,7 +573,7 @@ class Search bm ||= Keys.input(:timed=>true, :prompt=>"Enter bookmark in which to search: ") return unless bm input ||= Keys.prefix_u? ? # Do search - Clipboard.get("0") : + Clipboard.get : Keys.input(:prompt=>"Text to search for: ") if bm == "." # Do tree in dir from bookmark @@ -664,6 +664,22 @@ class Search View.to right + left_tag.length end + + def self.isearch_just_wrap + Search.clear + left, right = Search.left, Search.right + + wrap_with = Keys.input :timed=>true, :prompt=>"Enter string to wrap match with: " + + View.to(right) + View.insert wrap_with + View.to(left) + View.insert wrap_with + View.to right + wrap_with.length + end + + + def self.just_orange Search.clear Overlay.face(:notes_label, :left=>Search.left, :right=>Search.right) search.rb @@ -677,7 +677,8 @@ class View def self.expand_path path # Expand . - path = path.gsub /^\.\//, View.dir.sub(/[^\/]$/, '')+'/' + path = path.gsub /^\.\//, View.dir.sub(/\/$/, '')+'/' + # Expand ~ slash = path =~ /\/$/ # Check whether / at end path = File.expand_path path view.rb @@ -13,6 +13,7 @@ classes = Dir["**/*.rb"] classes = classes.select{|i| i !~ /xiki.rb$/} # Remove self classes = classes.select{|i| i !~ /key_bindings.rb$/} # Remove key_bindings classes = classes.select{|i| i !~ /tests\//} # Remove tests +classes = classes.select{|i| i !~ /spec\//} # Remove tests classes.map!{|i| i.sub(/\.rb$/, '')}.sort! xiki.rb 162446e7265379e32dcef83a66b5e0fc240ee813 trogdoro craig.muth@gmail.com http://github.com/trogdoro/xiki/commit/9a0fee29f78660c0180a1f55561328d47932e62c 9a0fee29f78660c0180a1f55561328d47932e62c 2009-02-15T19:50:39-08:00 2009-02-15T19:50:39-08:00 Remote tree: Keys.do_as_remote saves remote files. Rspec: added RakeFile to run specs. 6b53b0a9f31746b4a71542ca2ec0590da5d83f56 trogdoro craig.muth@gmail.com