pidgin2adium 2.0.0 → 2.0.1

data/History.txt

@@ -1,6 +1,10 @@
-=== 1.0.0 / 2009-09-27
-
-* 1 major enhancement
+=== 2.0.1 / 2009-12-06
+* Fix timestamps so they show up in Adium chat log viewer
 
-  * Birthday!
+=== 2.0.0 / 2009-11-24
+* Added documentation, available at http://pidgin2adium.rubyforge.org/rdoc/
+* Added public interface for scripting purposes
+* Removed -o and -l options. Now gem automatically outputs to Adium log dir with no intermediate folder.
 
+=== 1.0.0 / 2009-09-27
+* Birthday!

data/README.rdoc

@@ -25,12 +25,16 @@ the person to whom you are chatting.
 Note that aliases are lower-cased and space is removed, so providing "Gabe B-W,
 GBW" is the same as providing "gabeb-w,gbw".
 
+You do not need to provide your screenname in the alias list.
+
 ===Example (using script)
 Assuming that:
 * your Pidgin log files are in the "pidgin-logs" folder
 * your various aliases in your chats are "Gabe", "Gabe B-W", and "gbw"
-Then run:
- pidgin2adium -i pidgin-logs -a "Gabe, Gabe B-W, gbw"
+Then run (at the command line):
+ $ pidgin2adium -i pidgin-logs -a "Gabe, Gabe B-W, gbw"
+Or:
+ $ pidgin2adium -i pidgin-logs -a gabe,gabeb-w,gbw
 
 ===Example (using library)
 The library style allows you to parse a log file and get back a

data/Rakefile.rb

@@ -3,20 +3,24 @@ gem 'hoe', '>= 2.1.0'
 require 'hoe'
 require 'fileutils'
 require './lib/pidgin2adium.rb'
+require 'hanna/rdoctask'
 
+Hoe.plugin :gemcutter
 Hoe.plugin :newgem
-# Hoe.plugin :website
+Hoe.plugin :website
 # Hoe.plugin :cucumberfeatures
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'pidgin2adium' do
-  self.developer('Gabe B-W', 'gbw@brandeis.edu')
+  self.developer('Gabe B-W', 'pidgin2adium@brandeis.edu')
   self.extra_rdoc_files = %w{README.rdoc}
   #self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # this is default value
   # self.extra_deps         = [['activesupport','>= 2.0.2']]
 end
+# Use hanna RDoc template
+$hoe.spec.rdoc_options = %w{--main README.rdoc -T hanna}
 
 require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }

data/lib/pidgin2adium.rb

@@ -14,7 +14,7 @@ module Pidgin2Adium
     ADIUM_LOG_DIR = File.expand_path('~/Library/Application Support/Adium 2.0/Users/Default/Logs/') << '/' 
     # These files/directories show up in Dir.entries()
     BAD_DIRS = %w{. .. .DS_Store Thumbs.db .system}
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
 
     def log_msg(str) #:nodoc
 	puts str.to_s
@@ -29,7 +29,8 @@ module Pidgin2Adium
     end
 
     #######################
-    private :log_msg, :oops, :error
+    #So that we can use log_msg when calling delete_search_indexes() by itself
+    module_function :log_msg, :oops, :error
     #######################
 
     # Returns a LogFile instance or false if an error occurred.

data/lib/pidgin2adium/log_parser.rb

@@ -162,14 +162,28 @@ module Pidgin2Adium
 	#################
 
 	def get_time_zone_offset()
+	    # We must have a tz_offset or else the Adium Chat Log viewer
+	    # doesn't read the date correctly and then:
+	    # 1) the log has an empty start date column in the viewer
+	    # 2) The timestamps are all the same for the whole log
 	    tz_match = /([-\+]\d+)[A-Z]{3}\.(?:txt|htm|html)/.match(@src_path)
-	    tz_offset = tz_match[1] rescue ''
+	    if tz_match[1]
+		tz_offset = tz_match[1]
+	    else
+		zone = Time.local(Time.new.year).zone
+		# "-0500" (3d rather than 2d to allow for "+")
+		tz_offset = sprintf('+%03d00', Time.zone_offset(zone) / 3600)
+	    end
 	    return tz_offset
 	end
 
 	#--
-	# Adium time format: YYYY-MM-DD\THH.MM.SS[+-]TZ_HRS like:
+	# Adium time format: YYYY-MM-DD\THH:MM:SS[+-]TZ_HRS like:
+	# 2008-10-05T22:26:20-0800
+	# HOWEVER:
+	# If it's the first line, then return it like this (note periods):
 	# 2008-10-05T22.26.20-0800
+	# because it will be used in the filename.
 	#++
 	# Converts a pidgin datestamp to an Adium one.
 	def create_adium_time(time, is_first_line = false)
@@ -207,7 +221,12 @@ module Pidgin2Adium
 		log_msg("Continuing...")
 		year,month,day,hour,min,sec = ParseDate.parsedate(time)
 	    end
-	    return Time.local(year,month,day,hour,min,sec).strftime("%Y-%m-%dT%H.%M.%S#{@tz_offset}")
+	    if is_first_line
+		adium_time = Time.local(year,month,day,hour,min,sec).strftime("%Y-%m-%dT%H.%M.%S#{@tz_offset}")
+	    else
+		adium_time = Time.local(year,month,day,hour,min,sec).strftime("%Y-%m-%dT%H:%M:%S#{@tz_offset}")
+	    end
+	    return adium_time
 	end
 
 	# Extract required data from the file. Run by parse.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pidgin2adium
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Gabe B-W
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-12-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,7 @@ description: |-
   Adium format.
   Note that it assumes a Mac OS X environment with Adium installed.
 email: 
-- gbw@brandeis.edu
+- pidgin2adium@brandeis.edu
 executables: 
 - pidgin2adium
 extensions: []
@@ -55,6 +55,8 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
+- -T
+- hanna
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement