imapstore 0.4.4 → 0.5.2

data/Rakefile

@@ -9,11 +9,11 @@ $hoe = Hoe.new('imapstore', IMAPSTORE::VERSION) do |p|
   #p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
-    ['rdoc','>= 2.2.0'],
     ['tmail','>= 1.2.3'],
     ['getoptions','>= 0.1']
   ]
   p.extra_dev_deps = [
+    ['rdoc','>= 2.2.0'],
     ['newgem', ">= #{::Newgem::VERSION}"]
   ]
   

data/bin/imapstore

@@ -3,17 +3,21 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'rubygems'
 require 'imapstore'
+require 'rdoc/ri/ri_paths'
 require 'getoptions'
 #old versions of ruby require this
-require 'rdoc/ri/ri_paths'
+
+def print_help
+	puts "Usage: imapstore -c <#{COMMAND_LIST.join(', ')}> -s <subject> -d <folder> -f <file list or glob> "
+	puts "                 -i <imapstore> -x --recursive --versioned --all -t <text of message> -p password"
+	puts "       imapstore -h"
+end
 
 COMMAND_LIST = ['ls', 'rm', 'put', 'get', 'rmdir', 'mkdir', 'quota', 'setup', 'snipplet' ]
-opt = GetOptions.new(%w( help subject=s command=s dir=s files=@s recursive! versioned! all! imapstore:s x! text=s))
+opt = GetOptions.new(%w( help password=s subject=s command=s dir=s files=@s recursive! versioned! all! imapstore:s x! text=s ))
 
 if opt['help']
-	puts "Usage: imapstore -c <#{COMMAND_LIST.join(', ')}> -s <subject> -d <folder> -f <file list or glob> "
-	puts "                 -i <imapstore> -x --recursive --versioned --all"
-	puts "       imapstore -h"
+	print_help
 	exit 0
 end
 
@@ -27,7 +31,7 @@ all = opt['all'] || false
 versioned = opt['versioned']
 verbose = opt['x'] || false
 text = opt['text'] || "no text"
-
+password = opt['password']
 
 
 
@@ -40,7 +44,7 @@ if COMMAND_LIST.include? command
   end
 
 	puts "Opening mailstore #{imapstore} configured in #{File.expand_path('~/.imapstore/config.yml')}" if verbose
-	i = IMAPSTORE::Imapstore.new(File.expand_path('~/.imapstore/config.yml'), imapstore)
+	i = IMAPSTORE::Imapstore.new(File.expand_path('~/.imapstore/config.yml'), imapstore, password)
 	puts "Mailstore #{imapstore} opened" if verbose
 	
 	i.versioned=versioned if versioned!=nil
@@ -116,4 +120,5 @@ end
 
 rescue
 	puts "An error has occured #{$!}"
+	print_help
 end

data/lib/imapstore.rb

@@ -4,6 +4,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'imapstore/imapstore.rb'
 
 module IMAPSTORE
-  VERSION = '0.4.4'
+  VERSION = '0.5.2'
 
 end

data/lib/imapstore/imapstore.rb

@@ -37,11 +37,13 @@ END
 			end      
     end
     
-	  def initialize(file = File.expand_path('~/.imapstore/config.yml'), imapstore="default")
+	  def initialize(file = File.expand_path('~/.imapstore/config.yml'), imapstore="default", password=nil)
 			puts "Initializing IMAP" if @verbose
 			@versioned = true
 			@verbose = false
-			 
+			
+			@password = password
+			
 			puts "Getting configuration file #{file} for account #{imapstore}" if @verbose
 			get_config(file, imapstore)
 			connect
@@ -84,6 +86,7 @@ END
 		end
 		
 	  def connect()
+			raise "No password given" if @password == nil
 	    if !@imap && @email && @password && @imap_server && @imap_port
 				if(@ssl == true)
 	      	@imap = Net::IMAP.new(@imap_server, @imap_port, true)
@@ -113,7 +116,7 @@ END
 
 	    #COFIGURATION SECTION
 	    @email = aConfig[imapstore]['email']
-	    @password = aConfig[imapstore]['password']
+	    @password = aConfig[imapstore]['password'] if aConfig[imapstore]['password']
 	    @store_tag = aConfig[imapstore]['store_tag'] || "IMAPSTORE"
 			@imap_server = aConfig[imapstore]['imap_server']
 			@imap_port = aConfig[imapstore]['imap_port']
@@ -217,9 +220,9 @@ END
 		
 		end
 		
-			  def store_file( file, folder = "INBOX", subject = "")
+		def store_file( file, folder = "INBOX", subject = "")
 		
-			  	@imap.create(folder) if !@imap.list("", folder)
+			@imap.create(folder) if !@imap.list("", folder)
 		
 			size = File.size(file) 
 			if(size > MAX_FILE_SIZE)
@@ -242,11 +245,7 @@ END
 			
 		def transverse(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false, folder_only=false)
 		  file_list=[]
-		
-		
-			
-			
-			begin
+			#begin
 				target_folder = "" if target_folder == "/"
 				
 				puts "..... fetching #{target_folder} " if @verbose	
@@ -258,7 +257,9 @@ END
 					if ((recursive == true) && (target_folder == "" ? true : folder.name.match(/^#{target_folder}(\/.+)*$/))) || (folder.name == target_folder) 
 						puts "..... got hit transversing #{folder.name} " if @verbose
 						file_list << folder.name
-						yield(folder.name, nil, nil, nil, nil) if block_given?
+						if(block_given?)
+							yield(folder.name, nil, nil, nil, nil, nil) 
+						end
 					
 						if((!folder.attr.include? :Noselect) && (folder_only==false))
 		
@@ -268,45 +269,72 @@ END
 					      a = @imap.fetch(message_id, "RFC822")
 					      mail = TMail::Mail.parse(a[0].attr["RFC822"])
 					      file_name = mail.subject.match(/^[^\[]+\[([^\]]+)\]/)[1]
-					      file_list << folder.name + "/" + file_name if file_name.match(glob)
-								yield(folder.name, file_name, message_id, mail, file_name) if block_given? && file_name.match(glob)
+								puts "Considering #{file_name}" if @verbose
+								
+								parts = mail.subject.match(/^[^\[]+\[[^\]]+\]\(([0-9]+)\-([0-9]+)\)/)
+								file_part = parts[1]
+								max_parts = parts[2]
+								if file_name.match(glob)
+					      	file_list << folder.name + "/" + file_name 
+									yield(folder.name, file_name, message_id, mail, file_part, max_parts) if block_given? 
+								end
 							end
 						end
 					end
 				end
-			rescue
-			end
+			#rescue
+			#end
 			
 			    file_list.sort
 		end
 		
-			  def ls(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
+		def ls(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
 			transverse(target_folder, glob, recursive, dot_files, false)
-			  end
-		
-			  def get_file(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
-			file_list = transverse(target_folder, glob, recursive, dot_files, false) do |folder, file, message_id, mail, file_name|
-				
-				if mail && mail.multipart? then
-				    mail.parts.each do |m|
-				      if !m.main_type
-								append_dir = folder.sub(/^#{target_folder}\/*/,"")
-								if append_dir != ""
-									Dir.mkdir(append_dir) if !File.exists? append_dir
+		end
 		
-									file_name = append_dir + "/" + file_name
-								end
-								File.open(file_name,"w").write(m.body)
+		def get_file(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
+			multipart_files = Hash.new
+			file_list = transverse(target_folder, glob, recursive, dot_files, false) do |folder, file_name, message_id, mail, file_part, max_parts|
+				if(file_name && mail.parts)	
+					mail.parts.each do |m|
+						if !m.main_type
+							append_dir = folder
+							append_dir.sub!(/^#{target_folder}\/*/,"")
+							if append_dir != ""
+								Dir.mkdir(append_dir) if !File.exists? append_dir		
+								file_name = append_dir + "/" + file_name
 							end
-				    end
+						
+						 	if(file_part)
+								multipart_files[file_name] = max_parts if !multipart_files[file_name]							
+						 		file_name = file_name + "_#{file_part}_#{max_parts}"
+						 	end
+							puts "Getting file #{file_name}" if @verbose	
+							
+							File.open(file_name,"w") do |f|
+								f.write(m.body)
+							end
+						end
+					end
 				end
 			end
-			  end
+			
+			multipart_files.each do |key,value|
+				puts "Fusing #{key} ---- #{value}" if @verbose
+				File.open(key,"w") do |f|
+					1.upto(value.to_i) do |step|
+						f.write(File.open("#{key}_#{step}_#{value}").read)
+						File.unlink("#{key}_#{step}_#{value}")
+					end
+				end
+			end
+			return file_list
+		end
 		
 		
 		
 			  def rm_file(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
-			file_list = transverse(target_folder, glob, false, dot_files, false) do |folder, file, message_id, mail, file_name|
+			file_list = transverse(target_folder, glob, false, dot_files, false) do |folder, file_name, message_id, mail, file_part, max_parts|
 				if file && message_id
 			      	@imap.store(message_id, "+FLAGS", [:Deleted]) 
 					@imap.expunge
@@ -324,7 +352,7 @@ END
 			folders = []
 			puts "..... Deleting #{target_folder}" if @verbose
 			
-			transverse(target_folder, /.+/, recursive, dot_files, false) do |folder, file, message_id, mail, file_name|	
+			transverse(target_folder, /.+/, recursive, dot_files, false) do |folder, file, message_id, mail, file_part, max_parts|	
 				puts "..... assigning dir #{folder} for removal" if @verbose
 				folders << folder if !(folders.include? folder)
 				

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imapstore
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.5.2
 platform: ruby
 authors: 
 - Joan Marc Carbo Arnau
@@ -9,38 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 +01:00
+date: 2009-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: tmail
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: tmail
+  name: getoptions
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: "0.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: getoptions
-  type: :runtime
+  name: rdoc
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: 2.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem