jmcarbo-imapstore 0.0.3 → 0.1.0

data/bin/imapstore

@@ -6,7 +6,7 @@ require 'imapstore'
 require 'getoptions'
 
 COMMAND_LIST = ['ls', 'rm', 'put', 'get', 'rmdir', 'mkdir', 'quota', 'setup' ]
-opt = GetOptions.new(%w(help subject=s command=s dir=s files=@s recursive! versioned! ))
+opt = GetOptions.new(%w(help subject=s command=s dir=s files=@s recursive! versioned! all! ))
 
 if opt['help']
 	puts "Usage: imapstore -c <#{COMMAND_LIST.join(', ')}> -s <subject> -d <folder> -f <file list or glob> "
@@ -20,8 +20,10 @@ dir = opt['dir'] || "INBOX"
 files = opt['files'] || "*"
 subject = opt['subject'] || ""
 recursive = opt['recursive'] || false
+all = opt['all'] || false
 versioned = opt['versioned']
 
+
 begin
 if COMMAND_LIST.include? command 
   if command == 'setup'
@@ -36,16 +38,23 @@ if COMMAND_LIST.include? command
 			files.each do |f|
 				f = /.+/ if f == '*'
 				
-				i.ls(dir, Regexp.new(f)).each do |a|
+				i.ls(dir, Regexp.new(f), recursive, all).each do |a|
 					puts a
 				end	
 			end
 		when 'put':
+			
 			files.each do |f|
-				Dir.glob(f) do |f2|
+				local_dir = File.dirname(f)
+				f = local_dir + "/**/" + File.basename(f) if recursive
+
+				Dir.glob(f, all==true ? File::FNM_DOTMATCH : 0) do |f2|					
 					if(!File.directory? f2)
-						puts "Storing file #{f2}"
-						i.store_file(f2,dir,subject)
+						remote_dir = dir
+						append_dir = File.dirname(f2).sub(/^#{local_dir}\/*/,"")
+						remote_dir = remote_dir + "/" + append_dir if append_dir != ""
+						puts "Storing file #{f2} in remote dir \"#{remote_dir}\""
+						i.store_file(f2,remote_dir,subject)
 					end
 				end
 			end
@@ -53,7 +62,7 @@ if COMMAND_LIST.include? command
 			files.each do |f|
 				f = /.+/ if f == '*'
 				puts "Getting files"
-				i.get_file(dir, Regexp.new(f)).each do |a|
+				i.get_file(dir, Regexp.new(f), recursive, all).each do |a|
 					puts a
 				end	
 			end
@@ -61,14 +70,14 @@ if COMMAND_LIST.include? command
 			files.each do |f|
 				f = /.+/ if f == '*'
 				puts "Deleting files"
-				i.rm_file(dir, Regexp.new(f)).each do |a|
+				i.rm_file(dir, Regexp.new(f), recursive, all).each do |a|
 					puts a
 				end	
 			end			
 		when 'mkdir':
 			i.mkdir(dir)
 		when 'rmdir':
-			i.rmdir(dir)
+			i.rmdir(dir, recursive, all)
 		when 'quota':
 			q = i.quota("INBOX")
 			puts "Used  #{q[1]['usage'].to_s} of #{q[1]['quota'].to_s}"

data/lib/imapstore.rb

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

data/lib/imapstore/imapstore.rb

@@ -180,60 +180,63 @@ END
 				store_file_chunk( file, folder, subject, content)
 			end
 	  end
+	
+		def transverse(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false, folder_only=false)
+		  file_list=[]
+
+			@imap.list(target_folder, "*").each do |folder|
+				if ((recursive == true) && (folder.name.match(/^#{target_folder}(\/.+)*$/))) || (folder.name == target_folder) 
+					file_list << folder.name
+					yield(folder.name, nil, nil, nil, nil) if block_given?
+					
+					if((!folder.attr.include? :Noselect) && (folder_only==false))
 
-	  def ls(folder = "INBOX", glob = /.+/)
-			if folder == "/"
-				return @imap.list("","*").map { |d| d.name }.sort
+				    @imap.select(folder.name)
+
+				    @imap.search(["NOT", "DELETED"]).each do |message_id|
+				      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)
+						end
+					end
+				end
 			end
-			
-	    file_list = []
-	    @imap.select(folder)
-	    @imap.search(["NOT", "DELETED"]).each do |message_id|
-	      a = @imap.fetch(message_id, "RFC822")
-	      mail = TMail::Mail.parse(a[0].attr["RFC822"])
-	      file_name = mail.subject.match(/^[^\[]+\[([^\]]+)\]/)[1]
-	      file_list << file_name if file_name.match(glob)
-	    end
-	    file_list
+
+	    file_list.sort			
+		end
+
+	  def ls(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
+			transverse(target_folder, glob, recursive, dot_files, false)
 	  end
 
-	  def get_file(folder = "INBOX", glob = /.+/)			
-	    file_list = []
-	    @imap.select(folder)
-	    @imap.search(["NOT", "DELETED"]).each do |message_id|
-	      a = @imap.fetch(message_id, "RFC822")
-	      mail = TMail::Mail.parse(a[0].attr["RFC822"])
-	      file_name = mail.subject.match(/^[^\[]+\[([^\]]+)\]/)[1]
-				if file_name.match(glob)
-					if mail.multipart? then
-					    mail.parts.each do |m|
-					      if !m.main_type
-									File.open(file_name,"w").write(m.body)
+	  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
+
+									file_name = append_dir + "/" + file_name
 								end
-					    end
-					end
-					
-	      	file_list << file_name
+								File.open(file_name,"w").write(m.body)
+							end
+				    end
 				end
-	    end
-	    file_list
+			end
 	  end
 
 
 
-	  def rm_file(folder = "INBOX", glob = /.+/)
-	    file_list = []
-
-	    @imap.select(folder)
-	    @imap.search(["NOT", "DELETED"]).each do |message_id|
-	      a = @imap.fetch(message_id, "RFC822")
-	      mail = TMail::Mail.parse(a[0].attr["RFC822"])
-	      file_name = mail.subject.match(/^[^\[]+\[([^\]]+)\]/)[1]
-	      if glob && file_name.match(glob)
-	        @imap.store(message_id, "+FLAGS", [:Deleted]) 
-	        file_list << file_name
-	      end
-	    end
+	  def rm_file(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|
+	      @imap.store(message_id, "+FLAGS", [:Deleted]) if file && message_id
+			end
+			
 	    @imap.expunge
 
 	    file_list
@@ -243,9 +246,11 @@ END
 			@imap.create(folder)
 		end
 		
-		def rmdir(folder)
-			rm_file(folder)
-			@imap.delete(folder)
+		def rmdir(folder, recursive = false, dot_files = false)
+			transverse(target_folder, glob, false, dot_files, true) do |folder, file, message_id, mail, file_name|
+				rm_file(folder)
+				@imap.delete(folder)
+			end
 		end
 		
 		def quota(folder)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jmcarbo-imapstore
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joan Marc Carbo Arnau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 -08:00
+date: 2009-01-10 00:00:00 -08:00
 default_executable: imapstore
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe