sup 0.0.8 → 0.1

data/lib/sup/modes/buffer-list-mode.rb

@@ -23,7 +23,7 @@ protected
 
   def regen_text
     @bufs = BufferManager.buffers.sort_by { |name, buf| name }
-    width = @bufs.map { |name, buf| buf.mode.name.length }.max
+    width = @bufs.max_of { |name, buf| buf.mode.name.length }
     @text = @bufs.map do |name, buf|
       sprintf "%#{width}s  %s", buf.mode.name, name
     end

data/lib/sup/modes/completion-mode.rb

@@ -0,0 +1,55 @@
+module Redwood
+
+class CompletionMode < ScrollMode
+  INTERSTITIAL = "  "
+
+  def initialize list, opts={}
+    @list = list
+    @header = opts[:header]
+    @prefix_len = opts[:prefix_len]
+    @lines = nil
+    super :slip_rows => 1, :twiddles => false
+  end
+
+  def lines
+    update_lines unless @lines
+    @lines.length
+  end
+
+  def [] i
+    update_lines unless @lines
+    @lines[i]
+  end
+
+  def roll; if at_bottom? then jump_to_start else page_down end end
+
+private
+
+  def update_lines
+    width = buffer.content_width
+    max_length = @list.max_of { |s| s.length }
+    num_per = buffer.content_width / (max_length + INTERSTITIAL.length)
+    @lines = [@header].compact
+    @list.each_with_index do |s, i|
+      if @prefix_len
+        @lines << [] if i % num_per == 0
+        if @prefix_len < s.length
+          prefix = s[0 ... @prefix_len]
+          suffix = s[(@prefix_len + 1) .. -1]
+          char = s[@prefix_len].chr
+
+          @lines.last += [[:none, sprintf("%#{max_length - suffix.length - 1}s", prefix)],
+                          [:completion_character_color, char],
+                          [:none, suffix + INTERSTITIAL]]
+        else
+          @lines.last += [[:none, sprintf("%#{max_length}s#{INTERSTITIAL}", s)]]
+        end
+      else
+        @lines << "" if i % num_per == 0
+        @lines.last += sprintf "%#{max_length}s#{INTERSTITIAL}", s
+      end
+    end
+  end
+end
+
+end

data/lib/sup/modes/compose-mode.rb

@@ -1,36 +1,17 @@
 module Redwood
 
 class ComposeMode < EditMessageMode
-  attr_reader :body, :header
-
   def initialize opts={}
-    super()
-    @header = {
+    header = {
       "From" => AccountManager.default_account.full_address,
-      "Message-Id" => gen_message_id,
     }
 
-    @header["To"] = opts[:to].map { |p| p.full_address }.join(", ") if opts[:to]
-    @header["Cc"] = opts[:cc].map { |p| p.full_address }.join(", ") if opts[:cc]
-    @header["Bcc"] = opts[:bcc].map { |p| p.full_address }.join(", ") if opts[:bcc]
-    @header["Subject"] = opts[:subj] if opts[:subj]
-
-    @body = (opts[:body] || []) + sig_lines
-    regen_text
-  end
-
-  def lines; @text.length; end
-  def [] i; @text[i]; end
-
-protected
-
-  def handle_new_text new_header, new_body
-    @header = new_header
-    @body = new_body
-  end
+    header["To"] = opts[:to].map { |p| p.full_address }.join(", ") if opts[:to]
+    header["Cc"] = opts[:cc].map { |p| p.full_address }.join(", ") if opts[:cc]
+    header["Bcc"] = opts[:bcc].map { |p| p.full_address }.join(", ") if opts[:bcc]
+    header["Subject"] = opts[:subj] if opts[:subj]
 
-  def regen_text
-    @text = header_lines(@header - EditMessageMode::NON_EDITABLE_HEADERS) + [""] + @body
+    super :header => header, :body => (opts[:body] || [])
   end
 end
 

data/lib/sup/modes/contact-list-mode.rb

@@ -23,7 +23,7 @@ class ContactListMode < LineCursorMode
     k.add :search, "Search for messages from particular people", 'S'
   end
 
-  def initialize mode = :regular
+  def initialize mode=:regular
     @mode = mode
     @tags = Tagger.new self
     @num = nil

data/lib/sup/modes/edit-message-mode.rb

@@ -1,33 +1,53 @@
 require 'tempfile'
 require 'socket' # just for gethostname!
+require 'pathname'
+require 'rmail'
 
 module Redwood
 
+class SendmailCommandFailed < StandardError; end
+
 class EditMessageMode < LineCursorMode
   FORCE_HEADERS = %w(From To Cc Bcc Subject)
   MULTI_HEADERS = %w(To Cc Bcc)
   NON_EDITABLE_HEADERS = %w(Message-Id Date)
 
   attr_reader :status
+  attr_accessor :body, :header
   bool_reader :edited
 
   register_keymap do |k|
     k.add :send_message, "Send message", 'y'
     k.add :edit, "Edit message", 'e', :enter
     k.add :save_as_draft, "Save as draft", 'P'
+    k.add :attach_file, "Attach a file", 'a'
+    k.add :delete_attachment, "Delete an attachment", 'd'
   end
 
-  def initialize *a
-    super
+  def initialize opts={}
+    @header = opts.delete(:header) || {} 
+    @body = opts.delete(:body) || []
+    @body += sig_lines if $config[:edit_signature]
     @attachments = []
+    @attachment_lines = {}
+    @message_id = "<#{Time.now.to_i}-sup-#{rand 10000}@#{Socket.gethostname}>"
     @edited = false
+
+    super opts
+    regen_text
   end
 
+  def lines; @text.length end
+  def [] i; @text[i] end
+
+  ## a hook
+  def handle_new_text header, body; end
+
   def edit
     @file = Tempfile.new "sup.#{self.class.name.gsub(/.*::/, '').camel_to_hyphy}"
-    @file.puts header_lines(header - NON_EDITABLE_HEADERS)
+    @file.puts header_lines(@header - NON_EDITABLE_HEADERS)
     @file.puts
-    @file.puts body
+    @file.puts @body
     @file.close
 
     editor = $config[:editor] || ENV['EDITOR'] || "/usr/bin/vi"
@@ -36,9 +56,11 @@ class EditMessageMode < LineCursorMode
     BufferManager.shell_out "#{editor} #{@file.path}"
     @edited = true if File.mtime(@file.path) > mtime
 
-    new_header, new_body = parse_file(@file.path)
-    NON_EDITABLE_HEADERS.each { |h| new_header[h] = header[h] if header[h] }
-    handle_new_text new_header, new_body
+    BufferManager.kill_buffer self.buffer unless @edited
+
+    header, @body = parse_file @file.path
+    @header = header - NON_EDITABLE_HEADERS
+    handle_new_text @header, @body
     update
   end
 
@@ -46,15 +68,37 @@ class EditMessageMode < LineCursorMode
     !edited? || BufferManager.ask_yes_or_no("Discard message?")
   end
 
-protected
+  def attach_file
+    fn = BufferManager.ask_for_filenames :attachment, "File name (enter for browser): "
+    fn.each { |f| @attachments << Pathname.new(f) }
+    update
+  end
 
-  def gen_message_id
-    "<#{Time.now.to_i}-sup-#{rand 10000}@#{Socket.gethostname}>"
+  def delete_attachment
+    i = curpos - @attachment_lines_offset
+    if i >= 0 && i < @attachments.size && BufferManager.ask_yes_or_no("Delete attachment #{@attachments[i]}?")
+      @attachments.delete_at i
+      update
+    end
   end
 
+protected
+
   def update
     regen_text
-    buffer.mark_dirty
+    buffer.mark_dirty if buffer
+  end
+
+  def regen_text
+    top = header_lines(@header - NON_EDITABLE_HEADERS) + [""]
+    @text = top + @body
+    @text += sig_lines unless $config[:edit_signature]
+
+    unless @attachments.empty?
+      @text += [""]
+      @attachment_lines_offset = @text.length
+      @text += @attachments.map { |f| [[:attachment_color, "+ Attachment: #{f} (#{f.human_size})"]] }
+    end
   end
 
   def parse_file fn
@@ -108,23 +152,27 @@ protected
   def send_message
     return unless edited? || BufferManager.ask_yes_or_no("Message unedited. Really send?")
 
-    raise "no message id!" unless header["Message-Id"]
     date = Time.now
     from_email = 
-      if header["From"] =~ /<?(\S+@(\S+?))>?$/
+      if @header["From"] =~ /<?(\S+@(\S+?))>?$/
         $1
       else
         AccountManager.default_account.email
       end
 
     acct = AccountManager.account_for(from_email) || AccountManager.default_account
-    SentManager.write_sent_message(date, from_email) { |f| write_message f, true, date }
     BufferManager.flash "Sending..."
 
-    IO.popen(acct.sendmail, "w") { |p| write_message p, true, date }
-
-    BufferManager.kill_buffer buffer
-    BufferManager.flash "Message sent!"
+    begin
+      IO.popen(acct.sendmail, "w") { |p| write_full_message_to p, date }
+      raise SendmailCommandFailed, "Couldn't execute #{acct.sendmail}" unless $? == 0
+      SentManager.write_sent_message(date, from_email) { |f| write_full_message_to f, date }
+      BufferManager.kill_buffer buffer
+      BufferManager.flash "Message sent!"
+    rescue SystemCallError, SendmailCommandFailed => e
+      Redwood::log "Problem sending mail: #{e.message}"
+      BufferManager.flash "Problem sending mail: #{e.message}"
+    end
   end
 
   def save_as_draft
@@ -133,22 +181,49 @@ protected
     BufferManager.flash "Saved for later editing."
   end
 
-  def sig_lines
-    sigfn = (AccountManager.account_for(header["From"]) || 
-             AccountManager.default_account).sig_file
+  def write_full_message_to f, date=Time.now
+    m = RMail::Message.new
+    @header.each do |k, v|
+      next if v.nil? || v.empty?
+      m.header[k] = 
+        case v
+        when String
+          v
+        when Array
+          v.join ", "
+        end
+    end
 
-    if sigfn && File.exists?(sigfn)
-      ["", "-- "] + File.readlines(sigfn).map { |l| l.chomp }
+    m.header["Date"] = date.rfc2822
+    m.header["Message-Id"] = @message_id
+    m.header["User-Agent"] = "Sup/#{Redwood::VERSION}"
+
+    if @attachments.empty?
+      m.header["Content-Disposition"] = "inline"
+      m.header["Content-Type"] = "text/plain; charset=#{$encoding}"
+      m.body = @body.join
+      m.body += sig_lines.join("\n") unless $config[:edit_signature]
     else
-      []
+      body_m = RMail::Message.new
+      body_m.body = @body.join
+      body_m.body += sig_lines.join("\n") unless $config[:edit_signature]
+      
+      m.add_part body_m
+      @attachments.each { |fn| m.add_attachment fn.to_s }
     end
+    f.puts m.to_s
   end
 
-  def write_message f, full_header=true, date=Time.now
-    raise ArgumentError, "no pre-defined date: header allowed" if header["Date"]
-    f.puts header_lines(header)
-    f.puts "Date: #{date.rfc2822}"
-    if full_header
+  ## this is going to change soon: draft messages (currently written
+  ## with full=false) will be output as yaml.
+  def write_message f, full=true, date=Time.now
+    raise ArgumentError, "no pre-defined date: header allowed" if @header["Date"]
+    f.puts header_lines(@header)
+    f.puts <<EOS
+Date: #{date.rfc2822}
+Message-Id: #{@message_id}
+EOS
+    if full
       f.puts <<EOS
 Mime-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
@@ -159,7 +234,22 @@ EOS
 
     f.puts
     f.puts @body.map { |l| l =~ /^From / ? ">#{l}" : l }
+    f.puts sig_lines if full unless $config[:edit_signature]
   end  
+
+private
+
+  def sig_lines
+    p = PersonManager.person_for @header["From"]
+    sigfn = (AccountManager.account_for(p.email) || 
+             AccountManager.default_account).signature
+
+    if sigfn && File.exists?(sigfn)
+      ["", "-- "] + File.readlines(sigfn).map { |l| l.chomp }
+    else
+      []
+    end
+  end
 end
 
 end

data/lib/sup/modes/file-browser-mode.rb

@@ -0,0 +1,108 @@
+require 'pathname'
+
+module Redwood
+
+## meant to be spawned via spawn_modal!
+class FileBrowserMode < LineCursorMode
+  RESERVED_ROWS = 1
+
+  register_keymap do |k|
+    k.add :back, "Go back to previous directory", "B"
+    k.add :view, "View file", "v"
+    k.add :select_file_or_follow_directory, "Select the highlighted file, or follow the directory", :enter
+    k.add :reload, "Reload file list", "R"
+  end
+
+  bool_reader :done
+  attr_reader :value
+
+  def initialize dir="."
+    @dirs = [Pathname.new(dir).realpath]
+    @done = false
+    @value = nil
+    regen_text
+    super :skip_top_rows => RESERVED_ROWS
+  end
+
+  def cwd; @dirs.last end
+  def lines; @text.length; end
+  def [] i; @text[i]; end
+
+protected
+  
+  def back
+    return if @dirs.size == 1
+    @dirs.pop
+    reload
+  end
+
+  def reload
+    regen_text
+    buffer.mark_dirty
+  end
+
+  def view
+     name, f = @files[curpos - RESERVED_ROWS]
+    return unless f && f.file?
+
+    begin
+      BufferManager.spawn f.to_s, TextMode.new(f.readlines.join)
+    rescue SystemCallError => e
+      BufferManager.flash e.message
+    end
+  end
+
+  def select_file_or_follow_directory
+    name, f = @files[curpos - RESERVED_ROWS]
+    return unless f
+
+    if f.directory? && f.to_s != "."
+      if f.readable?
+        @dirs.push f
+        reload
+      else
+        BufferManager.flash "Permission denied - #{f.realpath}"
+      end
+    else
+      begin
+        @value = [f.realpath.to_s]
+        @done = true
+      rescue SystemCallError => e
+        BufferManager.flash e.message
+      end
+    end
+  end
+
+  def regen_text
+    @files = 
+      begin
+        cwd.entries.sort_by do |f|
+          [f.directory? ? 0 : 1, f.basename.to_s]
+        end
+      rescue SystemCallError => e
+        BufferManager.flash "Error: #{e.message}"
+        [Pathname.new("."), Pathname.new("..")]
+      end.map do |f|
+      real_f = cwd + f
+      name = f.basename.to_s +
+        case
+        when real_f.symlink?
+          "@"
+        when real_f.directory?
+          "/"
+        else
+          ""
+        end
+      [name, real_f]
+    end
+
+    size_width = @files.max_of { |name, f| f.human_size.length }
+    time_width = @files.max_of { |name, f| f.human_time.length }
+
+    @text = ["#{cwd}:"] + @files.map do |name, f|
+      sprintf "%#{time_width}s %#{size_width}s %s", f.human_time, f.human_size, name
+    end
+  end
+end
+
+end