jmcarbo-imapstore 0.4.2 → 0.4.5

data/README.rdoc

@@ -8,7 +8,7 @@ ruby gem to use an imap server as a file storage device
 
 == USAGE
 
-* recursive storign files
+* recursive storing files
 
 imapstore -c put -r -d <folder> -f <files>
 

data/bin/imapstore

@@ -12,7 +12,7 @@ opt = GetOptions.new(%w( help subject=s command=s dir=s files=@s recursive! vers
 
 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 "                 -i <imapstore> -x --recursive --versioned --all -t <text of message>"
 	puts "       imapstore -h"
 	exit 0
 end
@@ -28,18 +28,25 @@ versioned = opt['versioned']
 verbose = opt['x'] || false
 text = opt['text'] || "no text"
 
+
+
+
 begin
+
 if COMMAND_LIST.include? command 
   if command == 'setup'
 	  IMAPSTORE::Imapstore.create_config_file
     exit
   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)
+	puts "Mailstore #{imapstore} opened" if verbose
+	
 	i.versioned=versioned if versioned!=nil
 	i.verbose = verbose
-	
+
+	puts "Executing command #{command}" if verbose
 	case command
 		when 'ls':
 			files.each do |f|
@@ -50,8 +57,9 @@ if COMMAND_LIST.include? command
 				end	
 			end
 		when 'put':
-			
+			puts "Storing files" if verbose
 			files.each do |f|
+				f = File.expand_path(f)
 				local_dir = File.dirname(f)
 				f = local_dir + "/**/" + File.basename(f) if recursive
 
@@ -60,8 +68,12 @@ if COMMAND_LIST.include? command
 						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)
+						if File.exists?(f2)
+							puts "Storing file #{f2} in remote dir \"#{remote_dir}\""
+							i.store_file(f2,remote_dir,subject)
+						else
+							puts "File #{f2} does not exist."
+						end
 					end
 				end
 			end
@@ -92,13 +104,16 @@ if COMMAND_LIST.include? command
 			
 			i.snipplet(subject,text,dir, nil)
 		else
-			puts "unimplemented command #{command}"	
+			raise "unimplemented command #{command}"	
 	end
 			
 
 
 	i.disconnect
+else
+	puts "command #{command} is unimplemented"
 end
+
 rescue
 	puts "An error has occured #{$!}"
 end

data/lib/imapstore/imapstore.rb

@@ -18,13 +18,15 @@ default:
   store_tag: IMAPSTORE
   imap_server: imap.gmail.com
   imap_port: 993
-
+	ssl: true
+	
 other:
   email: other_account@gmail.com
   password: password
   store_tag: IMAPSTORE
   imap_server: imap.gmail.com
   imap_port: 993
+  ssl: true
 END
 
     def self.create_config_file(file = File.expand_path('~/.imapstore/config.yml'))
@@ -36,11 +38,13 @@ END
     end
     
 	  def initialize(file = File.expand_path('~/.imapstore/config.yml'), imapstore="default")
+			puts "Initializing IMAP" if @verbose
 			@versioned = true
 			@verbose = false
-			
-	    get_config(file, imapstore)
-	    connect
+			 
+			puts "Getting configuration file #{file} for account #{imapstore}" if @verbose
+			get_config(file, imapstore)
+			connect
 	  end
 	
 		def versioned
@@ -75,13 +79,17 @@ END
 			@verbose
 		end
 		
-		def verbose=value
+		def verbose=(value)
 			@verbose = value
 		end
 		
 	  def connect()
 	    if !@imap && @email && @password && @imap_server && @imap_port
-	      @imap = Net::IMAP.new(@imap_server, @imap_port, true)
+				if(@ssl == true)
+	      	@imap = Net::IMAP.new(@imap_server, @imap_port, true)
+				else
+	      	@imap = Net::IMAP.new(@imap_server, @imap_port, false)
+				end
 	      @imap.login(@email, @password)
 	    end
 	  end
@@ -109,26 +117,29 @@ END
 	    @store_tag = aConfig[imapstore]['store_tag'] || "IMAPSTORE"
 			@imap_server = aConfig[imapstore]['imap_server']
 			@imap_port = aConfig[imapstore]['imap_port']
+			@ssl = aConfig[imapstore]['ssl'] || false
 	    #END CONFIGURATION SECTION
+	
+			aConfig
 	  end
 	
 		def snipplet(subject = "snipplet", body = "", folder="snipplets", file = nil)
 			puts "Storing snipplet" if @verbose
 			
 			mail = TMail::Mail.new
-	  	mail.to = @email
-	  	mail.from = @email
-  		mail.subject = subject
-
-	  	mail.date = Time.now
-	  	mail.mime_version = '1.0'
+			  	mail.to = @email
+			  	mail.from = @email
+		  		mail.subject = subject
+		
+			  	mail.date = Time.now
+			  	mail.mime_version = '1.0'
 			
-	  	mailpart1=TMail::Mail.new
-	  	mailpart1.set_content_type 'text', 'plain'
-	  	mailpart1.body = body
-	  	mail.parts << mailpart1
-	  	mail.set_content_type 'multipart', 'mixed'
-
+			  	mailpart1=TMail::Mail.new
+			  	mailpart1.set_content_type 'text', 'plain'
+			  	mailpart1.body = body
+			  	mail.parts << mailpart1
+			  	mail.set_content_type 'multipart', 'mixed'
+		
 			# 	  	if file && FileTest.exists?(file)
 			# 	  		mailpart=TMail::Mail.new
 			# 	  		mailpart.body = Base64.encode64(chunk.to_s)
@@ -140,14 +151,14 @@ END
 			@imap.append(folder, mail.to_s, [:Seen], Time.now)
 			
 		end
-
+		
 		def store_file_chunk( file, folder = "INBOX", subject = "", chunk=nil, chunk_no=0, max_chunk_no=0 )
 			if(max_chunk_no>0)
 				puts "Storing part #{chunk_no} of #{max_chunk_no}"
 			end
-	    basename = File.basename(file)
+			    basename = File.basename(file)
 			version = 0
-
+		
 			if max_chunk_no == 0
 				tag = "#{@store_tag}[#{basename}]"
 			else
@@ -164,12 +175,12 @@ END
 			@imap.expunge
 			
 			mail = TMail::Mail.new
-	  	mail.to = @email
-	  	mail.from = @email
+			  	mail.to = @email
+			  	mail.from = @email
 			if max_chunk_no == 0
-	  		mail.subject = "#{@store_tag}[#{basename}]"
+			  		mail.subject = "#{@store_tag}[#{basename}]"
 			else
-	  		mail.subject = "#{@store_tag}[#{basename}](#{chunk_no}-#{max_chunk_no})"
+			  		mail.subject = "#{@store_tag}[#{basename}](#{chunk_no}-#{max_chunk_no})"
 			end
 			
 			if version > 0
@@ -180,36 +191,36 @@ END
 				mail.subject = mail.subject + ": #{subject}"
 			end
 			
-	  	mail.date = Time.now
-	  	mail.mime_version = '1.0'
-
-	  	mailpart1=TMail::Mail.new
-	  	mailpart1.set_content_type 'text', 'plain'
-	  	mailpart1.body = "This is a mail storage message of file #{file}"	
-	  	mail.parts << mailpart1
-	  	mail.set_content_type 'multipart', 'mixed'
-
-	  	if FileTest.exists?(file)
-	  		mailpart=TMail::Mail.new
-	  		mailpart.body = Base64.encode64(chunk.to_s)
-	  		mailpart.transfer_encoding="Base64"
+			  	mail.date = Time.now
+			  	mail.mime_version = '1.0'
+		
+			  	mailpart1=TMail::Mail.new
+			  	mailpart1.set_content_type 'text', 'plain'
+			  	mailpart1.body = "This is a mail storage message of file #{file}"	
+			  	mail.parts << mailpart1
+			  	mail.set_content_type 'multipart', 'mixed'
+		
+			  	if FileTest.exists?(file)
+			  		mailpart=TMail::Mail.new
+			  		mailpart.body = Base64.encode64(chunk.to_s)
+			  		mailpart.transfer_encoding="Base64"
 				if max_chunk_no == 0
-	  			mailpart['Content-Disposition'] = "attachment; filename=#{CGI::escape(basename)}"
+			  			mailpart['Content-Disposition'] = "attachment; filename=#{CGI::escape(basename)}"
 				else
-	  			mailpart['Content-Disposition'] = "attachment; filename=#{CGI::escape(basename)}_#{chunk_no}-#{max_chunk_no}"
+			  			mailpart['Content-Disposition'] = "attachment; filename=#{CGI::escape(basename)}_#{chunk_no}-#{max_chunk_no}"
 				end
-	  		mail.parts.push(mailpart)
-	  	end
-
-
-	  	@imap.append(folder, mail.to_s, [:Seen], File.new(file).atime)
-
+			  		mail.parts.push(mailpart)
+			  	end
+		
+		
+			  	@imap.append(folder, mail.to_s, [:Seen], File.new(file).atime)
+		
 		end
 		
-	  def store_file( file, folder = "INBOX", subject = "")
-
-	  	@imap.create(folder) if !@imap.list("", folder)
-
+			  def store_file( file, folder = "INBOX", subject = "")
+		
+			  	@imap.create(folder) if !@imap.list("", folder)
+		
 			size = File.size(file) 
 			if(size > MAX_FILE_SIZE)
 				remaining = size
@@ -227,12 +238,12 @@ END
 				content=File.open(file).read
 				store_file_chunk( file, folder, subject, content)
 			end
-	  end
-	
+			  end
+			
 		def transverse(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false, folder_only=false)
 		  file_list=[]
-
-
+		
+		
 			
 			
 			begin
@@ -241,7 +252,7 @@ END
 				puts "..... fetching #{target_folder} " if @verbose	
 					
 				@imap.list(target_folder, "*").each do |folder|
-
+		
 					puts "..... transversing #{folder.name} " if @verbose
 								
 					if ((recursive == true) && (target_folder == "" ? true : folder.name.match(/^#{target_folder}(\/.+)*$/))) || (folder.name == target_folder) 
@@ -250,9 +261,9 @@ END
 						yield(folder.name, nil, nil, nil, nil) if block_given?
 					
 						if((!folder.attr.include? :Noselect) && (folder_only==false))
-
+		
 					    @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"])
@@ -266,14 +277,14 @@ END
 			rescue
 			end
 			
-	    file_list.sort
+			    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)
+			  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
@@ -282,7 +293,7 @@ END
 								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
 								File.open(file_name,"w").write(m.body)
@@ -290,21 +301,21 @@ END
 				    end
 				end
 			end
-	  end
-
-
-
-	  def rm_file(target_folder = "INBOX", glob = /.+/, recursive = false, dot_files = false)
+			  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|
 				if file && message_id
-	      	@imap.store(message_id, "+FLAGS", [:Deleted]) 
+			      	@imap.store(message_id, "+FLAGS", [:Deleted]) 
 					@imap.expunge
 				end
 			end
 						
-	    file_list
-	  end
-
+			    file_list
+			  end
+		
 		def mkdir(folder)
 			@imap.create(folder)
 		end
@@ -319,11 +330,11 @@ END
 				
 				if file && message_id
 					puts "..... actually removing dir #{folder} file #{file_name}" if @verbose
-	      	@imap.store(message_id, "+FLAGS", [:Deleted]) 
+			      	@imap.store(message_id, "+FLAGS", [:Deleted]) 
 					@imap.expunge
 				end
 			end
-
+		
 			
 			folders.each do |folder|
 				puts "..... actually removing dir #{folder}" if @verbose

data/lib/imapstore.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jmcarbo-imapstore
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.5
 platform: ruby
 authors: 
 - Joan Marc Carbo Arnau