pidgin2adium 3.1.1 → 3.2.0

data/Rakefile

@@ -1,19 +1,21 @@
 require 'rubygems'
 require 'rake'
+require './lib/version.rb'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "pidgin2adium"
+    gem.version = Pidgin2Adium::VERSION
     gem.summary = %Q{Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format}
     gem.description = %Q{Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format.}
     gem.email = "gbw@brandeis.edu"
     gem.homepage = "http://github.com/gabebw/pidgin2adium"
     gem.authors = ["Gabe Berke-Williams"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_development_dependency(%q<bundler>, [">= 0.9.26"])
+    gem.add_development_dependency(%q<bundler>, [">= 1.0.0"])
     gem.add_development_dependency(%q<jeweler>, [">= 0"])
-    gem.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    gem.add_development_dependency(%q<rspec>, [">= 1.3.0"])
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -22,22 +24,22 @@ end
 
 begin
   # RSpec 2
-  gem "rspec", ">= 2.0.0.beta.18"
+  gem "rspec", ">= 2.0.0"
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.spec_opts << %w{-Ilib -Ispec}
+    spec.rspec_opts = %w{-Ilib -Ispec}
     spec.pattern = 'spec/**/*_spec.rb'
   end
 
   RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.spec_opts << %w{-Ilib -Ispec}
+    spec.rspec_opts = %w{-Ilib -Ispec}
     spec.pattern = 'spec/**/*_spec.rb'
     spec.rcov = true
   end
 rescue Gem::LoadError
   # RSpec 1
-  gem "rspec"
+  gem "rspec", "~> 1.3.0"
   require 'spec/rake/spectask'
 
   Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -50,6 +52,9 @@ rescue Gem::LoadError
     spec.pattern = 'spec/**/*_spec.rb'
     spec.rcov = true
   end
+rescue Gem::LoadError => bang
+  puts "!! Please install RSpec: `gem install rspec`"
+  raise bang
 end
 
 task :spec => :check_dependencies
@@ -59,7 +64,7 @@ task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = Pidgin2Adium::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "pidgin2adium #{version}"

data/lib/pidgin2adium.rb

@@ -5,6 +5,7 @@
 
 require 'fileutils'
 require 'time'
+require 'version'
 require 'pidgin2adium/parsers/all'
 
 module Pidgin2Adium
@@ -13,124 +14,121 @@ 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 = "3.1.0"
-  # "-0500" (3d rather than 2d to allow for "+")
-  DEFAULT_TZ_OFFSET = sprintf('%+03d00', Time.zone_offset(Time.now.zone) / 3600)
   # For displaying after we finish converting
   @@oops_messages = []
   @@error_messages = []
 
-    def log_msg(str) #:nodoc:
-      puts str.to_s
-    end
-
-    def oops(str) #:nodoc:
-      @@oops_messages << str
-      warn("Oops: #{str}")
-    end
+  def log_msg(str) #:nodoc:
+    puts str.to_s
+  end
 
-    def error(str) #:nodoc:
-      @@error_messages << str
-      warn("Error: #{str}")
-    end
+  def oops(str) #:nodoc:
+    @@oops_messages << str
+    warn("Oops: #{str}")
+  end
 
-    #######################
-    #So that we can use log_msg when calling delete_search_indexes() by itself
-    module_function :log_msg, :oops, :error
-    #######################
+  def error(str) #:nodoc:
+    @@error_messages << str
+    warn("Error: #{str}")
+  end
 
-    # Parses the provided log.
-    # Returns a LogFile instance or false if an error occurred.
-    def parse(logfile_path, my_aliases)
-      logfile_path = File.expand_path(logfile_path)
-      ext = File.extname(logfile_path).sub('.', '').downcase
+  #######################
+  #So that we can use log_msg when calling delete_search_indexes() by itself
+  module_function :log_msg, :oops, :error
+  #######################
 
-      if(ext == "html" || ext == "htm")
-        parser = HtmlLogParser.new(logfile_path, my_aliases)
-      elsif(ext == "txt")
-        parser = TextLogParser.new(logfile_path, my_aliases)
-      else
-        error("Doing nothing, logfile is not a text or html file. Path: #{logfile_path}.")
-        return false
-      end
+  # Parses the provided log.
+  # Returns a LogFile instance or false if an error occurred.
+  def parse(logfile_path, my_aliases)
+    logfile_path = File.expand_path(logfile_path)
+    ext = File.extname(logfile_path).sub('.', '').downcase
 
-      return parser.parse()
+    if(ext == "html" || ext == "htm")
+      parser = HtmlLogParser.new(logfile_path, my_aliases)
+    elsif(ext == "txt")
+      parser = TextLogParser.new(logfile_path, my_aliases)
+    else
+      error("Doing nothing, logfile is not a text or html file. Path: #{logfile_path}.")
+      return false
     end
 
-    # Parses the provided log and writes out the log in Adium format.
-    # Returns:
-    #  * true if it successfully converted and wrote out the log,
-    #  * false if an error occurred, or
-    #  * Pidgin2Adium::FILE_EXISTS if file already exists AND
-    #    opts[:overwrite] = false.
-    #
-    # You can add options using the _opts_ hash, which can have the following
-    # keys, all of which are optional:
-    # * *overwrite*: If true, then overwrite even if log is found.
-    #	Defaults to false.
-    # * *output_dir*: The top-level dir to put the logs in.
-    #   Logs under output_dir are still each in their own folders, etc.
-    #   Defaults to Pidgin2Adium::ADIUM_LOG_DIR
-    def parse_and_generate(logfile_path, my_aliases, opts = {})
-      opts = {} unless opts.is_a?(Hash)
-      overwrite = !!opts[:overwrite]
-      if opts.key?(:output_dir)
-        output_dir = opts[:output_dir]
-      else
-        output_dir = ADIUM_LOG_DIR
-      end
+    return parser.parse()
+  end
 
-      unless File.directory?(output_dir)
-        puts "Output log directory (#{output_dir}) does not exist or is not a directory."
-        begin
-          FileUtils.mkdir_p(output_dir)
-        rescue Errno::EACCES
-          puts "Permission denied, could not create output directory (#{output_dir})"
-          return false
-        end
-      end
+  # Parses the provided log and writes out the log in Adium format.
+  # Returns:
+  #  * true if it successfully converted and wrote out the log,
+  #  * false if an error occurred, or
+  #  * Pidgin2Adium::FILE_EXISTS if file already exists AND
+  #    opts[:overwrite] = false.
+  #
+  # You can add options using the _opts_ hash, which can have the following
+  # keys, all of which are optional:
+  # * *overwrite*: If true, then overwrite even if log is found.
+  #	Defaults to false.
+  # * *output_dir*: The top-level dir to put the logs in.
+  #   Logs under output_dir are still each in their own folders, etc.
+  #   Defaults to Pidgin2Adium::ADIUM_LOG_DIR
+  def parse_and_generate(logfile_path, my_aliases, opts = {})
+    opts = {} unless opts.is_a?(Hash)
+    overwrite = !!opts[:overwrite]
+    if opts.key?(:output_dir)
+      output_dir = opts[:output_dir]
+    else
+      output_dir = ADIUM_LOG_DIR
+    end
 
-      logfile_obj = parse(logfile_path, my_aliases)
-      return false if logfile_obj == false
-      dest_file_path = logfile_obj.write_out(overwrite, output_dir)
-      if dest_file_path == false
-        error("Successfully parsed file, but failed to write it out. Path: #{logfile_path}.")
+    unless File.directory?(output_dir)
+      puts "Output log directory (#{output_dir}) does not exist or is not a directory."
+      begin
+        FileUtils.mkdir_p(output_dir)
+      rescue Errno::EACCES
+        puts "Permission denied, could not create output directory (#{output_dir})"
         return false
-      elsif dest_file_path == FILE_EXISTS
-        log_msg("File already exists.")
-        return FILE_EXISTS
-      else
-        log_msg("Output to: #{dest_file_path}")
-        return true
       end
     end
 
-    # Newly-converted logs are viewable in the Adium Chat Transcript
-    # Viewer, but are not indexed, so a search of the logs doesn't give
-    # results from the converted logs. To fix this, we delete the cached log
-    # indexes, which forces Adium to re-index.
-    #
-    # Note: This function is run by LogConverter after converting all of its
-    # files.  LogFile.write_out intentionally does _not_ run it in order to
-    # allow for batch-processing of files. Thus, you will probably want to run
-    # Pidgin2Adium.delete_search_indexes after running LogFile.write_out in
-    # your own scripts.
-    def delete_search_indexes()
-      log_msg "Deleting log search indexes in order to force re-indexing of imported logs..."
-      dirty_file = File.expand_path("~/Library/Caches/Adium/Default/DirtyLogs.plist")
-      log_index_file = File.expand_path("~/Library/Caches/Adium/Default/Logs.index")
-      [dirty_file, log_index_file].each do |f|
-        if File.exist?(f)
-          if File.writable?(f)
-            File.delete(f)
-          else
-            error("File exists but is not writable. Please delete it yourself: #{f}")
-          end
+    logfile_obj = parse(logfile_path, my_aliases)
+    return false if logfile_obj == false
+    dest_file_path = logfile_obj.write_out(overwrite, output_dir)
+    if dest_file_path == false
+      error("Successfully parsed file, but failed to write it out. Path: #{logfile_path}.")
+      return false
+    elsif dest_file_path == FILE_EXISTS
+      log_msg("File already exists.")
+      return FILE_EXISTS
+    else
+      log_msg("Output to: #{dest_file_path}")
+      return true
+    end
+  end
+
+  # Newly-converted logs are viewable in the Adium Chat Transcript
+  # Viewer, but are not indexed, so a search of the logs doesn't give
+  # results from the converted logs. To fix this, we delete the cached log
+  # indexes, which forces Adium to re-index.
+  #
+  # Note: This function is run by LogConverter after converting all of its
+  # files.  LogFile.write_out intentionally does _not_ run it in order to
+  # allow for batch-processing of files. Thus, you will probably want to run
+  # Pidgin2Adium.delete_search_indexes after running LogFile.write_out in
+  # your own scripts.
+  def delete_search_indexes()
+    log_msg "Deleting log search indexes in order to force re-indexing of imported logs..."
+    dirty_file = File.expand_path("~/Library/Caches/Adium/Default/DirtyLogs.plist")
+    log_index_file = File.expand_path("~/Library/Caches/Adium/Default/Logs.index")
+    [dirty_file, log_index_file].each do |f|
+      if File.exist?(f)
+        if File.writable?(f)
+          File.delete(f)
+        else
+          error("File exists but is not writable. Please delete it yourself: #{f}")
         end
       end
-      log_msg "...done."
-      log_msg "When you next start the Adium Chat Transcript Viewer, it will re-index the logs, which may take a while."
     end
+    log_msg "...done."
+    log_msg "When you next start the Adium Chat Transcript Viewer, it will re-index the logs, which may take a while."
+  end
 
-    module_function :parse, :parse_and_generate, :delete_search_indexes
+  module_function :parse, :parse_and_generate, :delete_search_indexes
 end

data/lib/pidgin2adium/log_file.rb

@@ -41,11 +41,8 @@ module Pidgin2Adium
 
     # Returns contents of log file
     def to_s
-      if @chat_str.nil?
-        # Faster than inject() or each()
-        @chat_str = @chat_lines.map{|l| l.to_s }.join
-      end
-      return @chat_str
+      # Faster than inject() or each()
+      @chat_str ||= @chat_lines.map{|l| l.to_s }.join
     end
 
     def each(&blk)

data/lib/pidgin2adium/messages/message.rb

@@ -8,15 +8,32 @@ module Pidgin2Adium
   # appropriate for putting in an Adium log file.
   # Subclasses: XMLMessage, AutoReplyMessage, StatusMessage, Event.
   class Message
+    include Comparable
     def initialize(sender, time, buddy_alias)
       # The sender's screen name
       @sender = sender
       # The time the message was sent, in Adium format (e.g.
       # "2008-10-05T22:26:20-0800")
       @time = time
+      @time_object = Time.parse(@time)
       # The receiver's alias (NOT screen name)
       @buddy_alias = buddy_alias
     end
     attr_accessor :sender, :time, :buddy_alias
+
+    # Compare this Message to +other_message+, based on their timestamps.
+    # Returns a number < 0 if this message was sent before +other_message+,
+    # 0 if they were sent at the same time, and a number > 0 if this message
+    # was sent after +other_message+.
+    def <=>(other_message)
+      return @time_object - other_message.time_object
+    end
+
+    protected
+      # Protected because Time.parse doesn't have exactly the right time
+      # zone. It works fine for <=>, though.
+      def time_object
+        return @time_object
+      end
   end
 end

data/lib/pidgin2adium/parsers/basic_parser.rb

@@ -34,8 +34,6 @@ module Pidgin2Adium
       # us an alias.
       @user_alias = user_aliases.split(',')[0]
 
-      @tz_offset = get_time_zone_offset()
-
       @log_file_is_valid = true
       begin
         file = File.new(@src_path, 'r')
@@ -48,28 +46,20 @@ module Pidgin2Adium
         return nil
       end
 
-      # Time regexes must be set before pre_parse().
-      # "4/18/2007 11:02:00 AM" => %w{4, 18, 2007, 11, 02, 00, AM}
+      # Time regexes must be set before pre_parse!().
+      # "4/18/2007 11:02:00 AM" => %w{4, 18, 2007}
       # ONLY used (if at all) in first line of chat ("Conversation with...at...")
-      @time_regex_first_line = %r{^(\d{1,2})/(\d{1,2})/(\d{4}) (\d{1,2}):(\d{2}):(\d{2}) ([AP]M)$}
-      # "2007-04-17 12:33:13" => %w{2007, 04, 17, 12, 33, 13}
-      @time_regex = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/
+      @time_regex_first_line = %r{^(\d{1,2})/(\d{1,2})/(\d{4}) \d{1,2}:\d{2}:\d{2} [AP]M$}
+      # "2007-04-17 12:33:13" => %w{2007, 04, 17}
+      @time_regex = /^(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}$/
 
       begin
-        @service,
-          @user_SN,
-          @partner_SN,
-          # @basic_time_info is for files that only have the full
-          # timestamp at the top; we can use it to fill in the minimal
-          # per-line timestamps. It is a hash with 3 keys:
-          # * :year
-          # * :mon
-          # * :mday (day of month)
-          # You should be able to fill everything else in. If you can't,
-          # something's wrong.
-          @basic_time_info,
-          # When the chat started, in Adium's format
-          @adium_chat_time_start = pre_parse()
+        successfully_set_variables = pre_parse!
+        if not successfully_set_variables
+          error("Failed to set some key variables: #{@src_path}")
+          @log_file_is_valid = false
+          return
+        end
       rescue InvalidFirstLineError
         # The first line isn't parseable
         @log_file_is_valid = false
@@ -173,119 +163,76 @@ module Pidgin2Adium
       return LogFile.new(@file_content, @service, @user_SN, @partner_SN, @adium_chat_time_start)
     end
 
-    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)
-      if tz_match and tz_match[1]
-        tz_offset = tz_match[1]
-      else
-        tz_offset = Pidgin2Adium::DEFAULT_TZ_OFFSET
-      end
-      return tz_offset
+    # Returns a Time object, or nil if the format string doesn't match the
+    # time string.
+    def strptime(time, format)
+      date_hash = Date._strptime(time, format)
+      return nil if date_hash.nil?
+      # Fill in any blanks using @basic_time_info
+      date_hash = @basic_time_info.merge(date_hash)
+      time = Time.local(date_hash[:year], date_hash[:mon], date_hash[:mday],
+                        date_hash[:hour], date_hash[:min], date_hash[:sec],
+                        date_hash[:sec_fraction], date_hash[:zone])
+      time
     end
 
-    def try_to_parse_first_line_time(first_line_time)
-      formats = [
-        "%m/%d/%Y %I:%M:%S %P", # 01/22/2008 03:01:45 PM
-        "%Y-%m-%d %H:%M:%S"     # 2008-01-22 23:08:24
-      ]
+    # Tries to parse _time_ (a string) according to the formats in _formats_, which
+    # should be an array of strings. For more on acceptable format strings,
+    # see the official documentation for Time.strptime. Returns a Time
+    # object or nil (if no formats matched).
+    def try_to_parse_time_with_formats(time, formats)
       parsed = nil
       formats.each do |format|
-        begin
-          parsed = Time.strptime(first_line_time, format)
-          break
-        rescue ArgumentError
-        end
+        parsed = strptime(time, format)
+        break unless parsed.nil?
       end
       parsed
     end
 
     def try_to_parse_time(time)
       formats = [
+        "%m/%d/%Y %I:%M:%S %P", # 01/22/2008 03:01:45 PM
+        "%Y-%m-%d %H:%M:%S",    # 2008-01-22 23:08:24
         "%Y/%m/%d %H:%M:%S", # 2008/01/22 04:01:45
-        "%Y-%m-%d %H:%M:%S"  # 2008-01-22 04:01:45
+        "%Y-%m-%d %H:%M:%S",  # 2008-01-22 04:01:45
+        '%a %d %b %Y %H:%M:%S %p %Z' # "Sat 18 Apr 2009 10:43:35 AM PDT"
       ]
-      parsed = nil
-      formats.each do |format|
-        begin
-          parsed = Time.strptime(time, format)
-          break
-        rescue ArgumentError
-        end
-      end
-      parsed
+      try_to_parse_time_with_formats(time, formats)
     end
 
     def try_to_parse_minimal_time(minimal_time)
-      # 04:01:45 AM
-      minimal_format_with_ampm = "%I:%M:%S %P"
-      # 23:01:45
-      minimal_format_without_ampm = "%H:%M:%S"
-
-      time_hash = nil
+      formats = [
+        "%I:%M:%S %P", # 04:01:45 AM
+        "%H:%M:%S" # 23:01:45
+      ]
 
-      # Use Date._strptime to allow filling in the blanks on minimal
-      # timestamps
-      if minimal_time =~ /[AP]M$/
-        time_hash = Date._strptime(minimal_time, minimal_format_with_ampm)
-      else
-        time_hash = Date._strptime(minimal_time, minimal_format_without_ampm)
-      end
-      if time_hash.nil?
-        # Date._strptime returns nil on failure
-        return nil
-      end
-      # Fill in the blanks
-      time_hash[:year] = @basic_time_info[:year]
-      time_hash[:mon] = @basic_time_info[:mon]
-      time_hash[:mday] = @basic_time_info[:mday]
-      new_time = Time.local(time_hash[:year],
-                            time_hash[:mon],
-                            time_hash[:mday],
-                            time_hash[:hour],
-                            time_hash[:min],
-                            time_hash[:sec])
-      new_time
+      try_to_parse_time_with_formats(minimal_time, formats)
     end
 
-
-    #--
-    # 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.
     # Returns a string representation of _time_ or
     # nil if it couldn't parse the provided _time_.
-    def create_adium_time(time, is_first_line = false)
+    def create_adium_time(time)
       return nil if time.nil?
-      if is_first_line
-        new_time = try_to_parse_first_line_time(time)
-      else
-        new_time = try_to_parse_time(time)
-        if new_time.nil?
-          new_time = try_to_parse_minimal_time(time)
-        end
+      new_time = try_to_parse_time(time)
+      if new_time.nil?
+        new_time = try_to_parse_minimal_time(time)
       end
 
       return nil if new_time.nil?
 
-      if is_first_line
-        adium_time = new_time.strftime("%Y-%m-%dT%H.%M.%S#{@tz_offset}")
-      else
-        adium_time = new_time.strftime("%Y-%m-%dT%H:%M:%S#{@tz_offset}")
-      end
-      adium_time
+      new_time.xmlschema
     end
 
-    # Extract required data from the file. Run by parse.
-    def pre_parse
+    # Extract required data from the file. Run by parse. Sets these
+    # variables:
+    # * @service
+    # * @user_SN
+    # * @partner_SN
+    # * @basic_time_info
+    # * @adium_chat_time_start
+    # Returns true if none of these variables are false or nil.
+    def pre_parse!
       # Deal with first line.
 
       # the first line is special. It tells us (in order of regex groups):
@@ -297,27 +244,43 @@ module Pidgin2Adium
       if first_line_match.nil?
         raise InvalidFirstLineError
       else
-        service = first_line_match[4]
+        # first_line_match is like so:
+        # ["Conversation with BUDDY_PERSON at 2006-12-21 22:36:06 on awesome SN (aim)",
+        #  "BUDDY_PERSON",
+        #  "2006-12-21 22:36:06",
+        #  "awesome SN",
+        #  "aim"]
+        @service = first_line_match[4]
         # @user_SN is normalized to avoid "AIM.name" and "AIM.na me" folders
-        user_SN = first_line_match[3].downcase.tr(' ', '')
-        partner_SN = first_line_match[1]
+        @user_SN = first_line_match[3].downcase.tr(' ', '')
+        @partner_SN = first_line_match[1]
         pidgin_chat_time_start = first_line_match[2]
-        basic_time_info = case pidgin_chat_time_start
-                          when @time_regex
-                            {:year => $1.to_i,
-                             :mon => $2.to_i,
-                             :mday => $3.to_i}
-                          when @time_regex_first_line
-                            {:year => $3.to_i,
-                             :mon => $1.to_i,
-                             :mday => $2.to_i}
-                          end
-        adium_chat_time_start = create_adium_time(pidgin_chat_time_start, true)
-        return [service,
-          user_SN,
-          partner_SN,
-          basic_time_info,
-          adium_chat_time_start]
+        # @basic_time_info is for files that only have the full
+        # timestamp at the top; we can use it to fill in the minimal
+        # per-line timestamps. It is a hash with 3 keys:
+        # * :year
+        # * :mon
+        # * :mday (day of month)
+        # You should be able to fill everything else in. If you can't,
+        # something's wrong.
+        @basic_time_info = case pidgin_chat_time_start
+                           when @time_regex
+                             {:year => $1.to_i,
+                              :mon => $2.to_i,
+                              :mday => $3.to_i}
+                           when @time_regex_first_line
+                             {:year => $3.to_i,
+                              :mon => $1.to_i,
+                              :mday => $2.to_i}
+                           end
+        # Need @basic_time_info set for create_adium_time
+        # When the chat started, in Adium's format
+        @adium_chat_time_start = create_adium_time(pidgin_chat_time_start)
+        [@service,
+          @user_SN,
+          @partner_SN,
+          @basic_time_info,
+          @adium_chat_time_start].all?
       end
     end
 

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Pidgin2Adium
+  VERSION = "3.2.0"
+end

data/pidgin2adium.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pidgin2adium}
-  s.version = "3.1.1"
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe Berke-Williams"]
-  s.date = %q{2010-08-13}
+  s.date = %q{2010-10-12}
   s.default_executable = %q{pidgin2adium}
   s.description = %q{Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format.}
   s.email = %q{gbw@brandeis.edu}
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
      "Manifest.txt",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
      "bin/pidgin2adium",
      "config/website.yml",
      "ext/balance_tags_c/balance_tags_c.c",
@@ -50,6 +49,7 @@ Gem::Specification.new do |s|
      "lib/pidgin2adium/parsers/basic_parser.rb",
      "lib/pidgin2adium/parsers/html_log_parser.rb",
      "lib/pidgin2adium/parsers/text_log_parser.rb",
+     "lib/version.rb",
      "pidgin2adium.gemspec",
      "spec/balance_tags_c_extn_spec.rb",
      "spec/basic_parser_spec.rb",
@@ -90,18 +90,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, [">= 0.9.26"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<bundler>, [">= 0.9.26"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<bundler>, [">= 0.9.26"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end
 

data/spec/basic_parser_spec.rb

@@ -13,24 +13,6 @@ describe "BasicParser" do
     end
   end
 
-  describe "#get_time_zone_offset" do
-    context "with no timezone available" do
-      it "should return the local time zone" do
-        bp = Pidgin2Adium::BasicParser.new(@text_logfile_path,
-                                           @aliases)
-        bp.get_time_zone_offset.should == @current_tz_offset
-      end
-    end
-
-    context "with a time zone available" do
-      it "should return the logfiles's time zone" do
-        bp = Pidgin2Adium::BasicParser.new(@html_logfile_path,
-                                           @aliases)
-        bp.get_time_zone_offset.should == "-0500"
-      end
-    end
-  end
-
   describe "#create_adium_time" do
     before(:each) do
       @first_line_time = "4/18/2007 11:02:00 AM"
@@ -46,23 +28,23 @@ describe "BasicParser" do
     end
 
     it "should parse a first line time correctly" do
-      time = @bp.create_adium_time(@first_line_time, true)
-      time.should == "2007-04-18T11.02.00-0500"
+      time = @bp.create_adium_time(@first_line_time)
+      time.should =~ /2007-04-18T11:02:00-\d{2}:00/
     end
 
     it "should parse a normal time correctly" do
       time = @bp.create_adium_time(@time)
-      time.should == "2007-08-20T12:33:13-0500"
+      time.should =~ /2007-08-20T12:33:13-\d{2}:00/
     end
 
     it "should parse a minimal time correctly" do
       time = @bp.create_adium_time(@minimal_time)
-      time.should == "2008-01-15T04:22:05-0500"
+      time.should =~ /2008-01-15T04:22:05-\d{2}:00/
     end
 
     it "should parse a minimal time without AM/PM correctly" do
       time = @bp.create_adium_time(@minimal_time_2)
-      time.should == "2008-01-15T04:22:05-0500"
+      time.should =~ /2008-01-15T04:22:05-\d{2}:00/
     end
 
     it "should return an array of nils for an invalid time" do
@@ -92,7 +74,7 @@ describe "BasicParser" do
                          'othersn', # my SN
                          'aolsystemmsg', # other person's SN
                          {:year=>2008, :mon=>1, :mday=>15}, # basic time info
-                         '2008-01-15T07.14.45-0500' # chat start time
+                         '2008-01-15T07:14:45-05:00' # chat start time
                         ]
     end
   end
@@ -129,7 +111,7 @@ describe "BasicParser" do
         "To sign off the other location(s), reply to this message " + "with the number 1. Click " +
         "<a href='http://www.aim.com/password/routing.adp'>here</a> " +
         "for more information."
-      @matches = ['2008-01-15T07.14.45-0500', # time
+      @matches = ['2008-01-15T07.14.45-05:00', # time
                   'AOL System Msg', # alias
                   nil, # not an auto-reply
                   body # message body

data/spec/html_log_parser_spec.rb

@@ -128,7 +128,7 @@ describe "HtmlLogParser" do
       first_msg.sender.should == "aolsystemmsg"
       first_msg.buddy_alias.should == "AOL System Msg"
       # Use regex to ignore time zone
-      first_msg.time.should =~ /^2008-01-15T07:14:45[-+]\d{2}00$/
+      first_msg.time.should =~ /^2008-01-15T07:14:45[-+]\d{2}:00$/
       # This fails due to balance_tags_c().
       good_body = %Q{Your screen name (otherSN) is now signed into AOL(R) Instant Messenger (TM) in 2 locations.} + " " +
         %Q{To sign off the other location(s), reply to this message with the number 1.} + " " +
@@ -137,13 +137,13 @@ describe "HtmlLogParser" do
 
       second_msg.sender.should == "othersn"
       second_msg.buddy_alias.should == "Gabe B-W"
-      second_msg.time.should =~ /^2008-01-15T07:14:48[-+]\d{2}00$/
+      second_msg.time.should =~ /^2008-01-15T07:14:48[-+]\d{2}:00$/
       second_msg.body.should == "1"
 
       third_msg.sender.should == "aolsystemmsg"
       third_msg.buddy_alias.should == "AOL System Msg"
       # Use regex to ignore time zone
-      third_msg.time.should =~ /^2008-01-15T07:14:48[-+]\d{2}00$/
+      third_msg.time.should =~ /^2008-01-15T07:14:48[-+]\d{2}:00$/
       third_msg.body.should == "Your other AIM sessions have been signed-off.  You are now signed-on from 1 location(s)."
     end
   end

data/spec/log_file_spec.rb

@@ -73,6 +73,18 @@ describe "LogFile" do
         end
       end
     end
+
+    describe "#max" do
+      it "should return the most recent message" do
+        @logfile.max.should == @messages.last
+      end
+    end
+
+    describe "#min" do
+      it "should return the oldest message" do
+        @logfile.min.should == @messages.first
+      end
+    end
   end
 
   describe "#write_out" do

data/spec/text_log_parser_spec.rb

@@ -36,7 +36,7 @@ describe "TextLogParser" do
       msg.body.should == "what are you doing tomorrow?"
       msg.buddy_alias.should == "Gabe B-W"
       # Use regex to ignore time zone
-      msg.time.should =~ /^2006-12-21T22:36:11[-+]\d{2}00$/
+      msg.time.should =~ /^2006-12-21T22:36:11[-+]\d{2}:00$/
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 1
-  - 1
-  version: 3.1.1
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Gabe Berke-Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -04:00
 default_executable: pidgin2adium
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 0
         - 0
-        - 9
-        - 26
-        version: 0.9.26
+        version: 1.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,9 +55,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id003
 description: Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format.
@@ -80,7 +80,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/pidgin2adium
 - config/website.yml
 - ext/balance_tags_c/balance_tags_c.c
@@ -100,6 +99,7 @@ files:
 - lib/pidgin2adium/parsers/basic_parser.rb
 - lib/pidgin2adium/parsers/html_log_parser.rb
 - lib/pidgin2adium/parsers/text_log_parser.rb
+- lib/version.rb
 - pidgin2adium.gemspec
 - spec/balance_tags_c_extn_spec.rb
 - spec/basic_parser_spec.rb

data/VERSION

@@ -1 +0,0 @@
-3.1.1