pidgin2adium 3.2.3 → 3.2.4

data/Rakefile

@@ -15,49 +15,26 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_development_dependency(%q<bundler>, [">= 1.0.0"])
     gem.add_development_dependency(%q<jeweler>, [">= 0"])
-    gem.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+    gem.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-begin
-  # RSpec 2
-  gem "rspec", ">= 2.0.0"
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.rspec_opts = %w{-Ilib -Ispec}
-    spec.pattern = 'spec/**/*_spec.rb'
-  end
-
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.rspec_opts = %w{-Ilib -Ispec}
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
-  end
-rescue Gem::LoadError
-  # RSpec 1
-  gem "rspec", "~> 1.3.0"
-  require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = %w{-Ilib -Ispec}
+  spec.pattern = 'spec/**/*_spec.rb'
+end
 
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
-  end
-rescue Gem::LoadError => bang
-  puts "!! Please install RSpec: `gem install rspec`"
-  raise bang
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.rspec_opts = %w{-Ilib -Ispec}
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :spec => :check_dependencies
 task :spec => "extconf:compile"
 
 task :default => :spec

data/bin/pidgin2adium

@@ -49,6 +49,10 @@ oparser = OptionParser.new do |opts|
     options[:force] = f
   end
 
+  opts.on('-c', '--continue', "Continue converting after hitting unparseable lines. Will print the problem lines and log at the end.") do |c|
+    options[:force_conversion] = c
+  end
+
   opts.on("-v", "--version", "Show version information") do
     puts version
     exit
@@ -95,9 +99,9 @@ if need_opts
 end
 
 extra_opts = {:overwrite => options[:force]}
-if options.has_key?(:output_dir)
-  extra_opts[:output_dir] = options[:output_dir]
-end
+
+extra_opts[:output_dir] = options[:output_dir]
+extra_opts[:force_conversion] = options[:force_conversion]
 
 log_converter = Pidgin2Adium::LogConverter.new(options[:in],
                                                options[:aliases],

data/lib/pidgin2adium.rb

@@ -39,19 +39,20 @@ module Pidgin2Adium
 
   # Parses the provided log.
   # Returns a LogFile instance or false if an error occurred.
-  def parse(logfile_path, my_aliases)
+  def parse(logfile_path, my_aliases, force_conversion)
     logfile_path = File.expand_path(logfile_path)
     ext = File.extname(logfile_path).sub('.', '').downcase
 
     if(ext == "html" || ext == "htm")
-      parser = HtmlLogParser.new(logfile_path, my_aliases)
+      parser_class = HtmlLogParser
     elsif(ext == "txt")
-      parser = TextLogParser.new(logfile_path, my_aliases)
+      parser_class = TextLogParser
     else
       error("Doing nothing, logfile is not a text or html file. Path: #{logfile_path}.")
       return false
     end
 
+    parser = parser_class.new(logfile_path, my_aliases, force_conversion)
     return parser.parse()
   end
 
@@ -72,6 +73,8 @@ module Pidgin2Adium
   def parse_and_generate(logfile_path, my_aliases, opts = {})
     opts = {} unless opts.is_a?(Hash)
     overwrite = !!opts[:overwrite]
+    force_conversion = opts[:force_conversion]
+
     if opts.key?(:output_dir)
       output_dir = opts[:output_dir]
     else
@@ -88,7 +91,7 @@ module Pidgin2Adium
       end
     end
 
-    logfile_obj = parse(logfile_path, my_aliases)
+    logfile_obj = parse(logfile_path, my_aliases, force_conversion)
     return false if logfile_obj == false
     dest_file_path = logfile_obj.write_out(overwrite, output_dir)
     if dest_file_path == false

data/lib/pidgin2adium/parsers/basic_parser.rb

@@ -35,10 +35,13 @@ module Pidgin2Adium
     # "2007-04-17 12:33:13" => %w{2007, 04, 17}
     TIME_REGEX = /^(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}$/
 
-    def initialize(src_path, user_aliases)
+    #  force_conversion: Should we continue to convert after hitting an unparseable line?
+    def initialize(src_path, user_aliases, force_conversion = false)
       @src_path = src_path
       # Whitespace is removed for easy matching later on.
       @user_aliases = user_aliases.split(',').map!{|x| x.downcase.gsub(/\s+/,'') }.uniq
+
+      @force_conversion = force_conversion
       # @user_alias is set each time get_sender_by_alias is called. It is a non-normalized
       # alias.
       # Set an initial value just in case the first message doesn't give
@@ -155,8 +158,14 @@ module Pidgin2Adium
           create_msg($~.captures)
         elsif line =~ @line_regex_status
           msg = create_status_or_event_msg($~.captures)
-          # Error occurred while parsing
-          return false if msg == false
+          if msg == false
+            if force_conversion?
+              nil # will get compacted out
+            else
+              # Error occurred while parsing
+              return false
+            end
+          end
         else
           error "Could not parse line:"
           p line
@@ -400,7 +409,16 @@ module Pidgin2Adium
           # not a libpurple event, try others
           regex, event_type = @event_map.detect{|rxp,ev_type| str =~ rxp}
           unless regex and event_type
-            error(sprintf("Error parsing status or event message, no status or event found: %p", str))
+            if force_conversion?
+              unless printed_conversion_error?
+                error("#{@src_path} was converted with the following errors:")
+                printed_conversion_error!
+              end
+            end
+
+            error(sprintf("%sError parsing status or event message, no status or event found: %p",
+                          force_conversion? ? "\t" : '', # indent if we're forcing conversion
+                          str))
             return false
           end
         end
@@ -421,5 +439,18 @@ module Pidgin2Adium
       end
       return msg
     end
+
+    # Should we continue to convert after hitting an unparseable line?
+    def force_conversion?
+      !! @force_conversion
+    end
+
+    def printed_conversion_error?
+      @printed_conversion_error == true
+    end
+
+    def printed_conversion_error!
+      @printed_conversion_error = true
+    end
   end # END BasicParser class
 end

data/lib/pidgin2adium/parsers/html_log_parser.rb

@@ -5,8 +5,8 @@ require 'balance_tags_c'
 
 module Pidgin2Adium
   class HtmlLogParser < BasicParser
-    def initialize(src_path, user_aliases)
-      super(src_path, user_aliases)
+    def initialize(src_path, user_aliases, force_conversion = false)
+      super(src_path, user_aliases, force_conversion)
       @timestamp_rx = '\(((?:\d{4}-\d{2}-\d{2} )?\d{1,2}:\d{1,2}:\d{1,2}(?: [AP]M)?)\)'
 
       # @line_regex matches a line in an HTML log file other than the

data/lib/pidgin2adium/parsers/text_log_parser.rb

@@ -3,8 +3,8 @@
 
 module Pidgin2Adium
   class TextLogParser < BasicParser
-    def initialize(src_path, user_aliases)
-      super(src_path, user_aliases)
+    def initialize(src_path, user_aliases, force_conversion = false)
+      super(src_path, user_aliases, force_conversion)
       @timestamp_rx = '\((\d{1,2}:\d{1,2}:\d{1,2})\)'
 
       # @line_regex matches a line in a TXT log file other than the first

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Pidgin2Adium
-  VERSION = "3.2.3"
+  VERSION = "3.2.4"
 end

data/pidgin2adium.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pidgin2adium}
-  s.version = "3.2.3"
+  s.version = "3.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe Berke-Williams"]
-  s.date = %q{2010-11-08}
+  s.date = %q{2011-03-16}
   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}
@@ -17,91 +17,109 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/balance_tags_c/extconf.rb"]
   s.extra_rdoc_files = [
     "ChangeLog",
-     "LICENSE",
-     "README.rdoc"
+    "LICENSE",
+    "README.rdoc"
   ]
   s.files = [
     ".autotest",
-     ".gitignore",
-     ".rspec",
-     "ChangeLog",
-     "Gemfile",
-     "LICENSE",
-     "Manifest.txt",
-     "README.rdoc",
-     "Rakefile",
-     "bin/pidgin2adium",
-     "config/website.yml",
-     "ext/balance_tags_c/balance_tags_c.c",
-     "ext/balance_tags_c/extconf.rb",
-     "lib/pidgin2adium.rb",
-     "lib/pidgin2adium/log_converter.rb",
-     "lib/pidgin2adium/log_file.rb",
-     "lib/pidgin2adium/log_parser.rb",
-     "lib/pidgin2adium/message.rb",
-     "lib/pidgin2adium/messages/all.rb",
-     "lib/pidgin2adium/messages/auto_reply_message.rb",
-     "lib/pidgin2adium/messages/event.rb",
-     "lib/pidgin2adium/messages/message.rb",
-     "lib/pidgin2adium/messages/status_message.rb",
-     "lib/pidgin2adium/messages/xml_message.rb",
-     "lib/pidgin2adium/parsers/all.rb",
-     "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",
-     "spec/html_log_parser_spec.rb",
-     "spec/log_converter_spec.rb",
-     "spec/log_file_spec.rb",
-     "spec/logfiles/2006-12-21.223606.txt",
-     "spec/logfiles/2008-01-15.071445-0500PST.htm",
-     "spec/logfiles/2008-01-15.071445-0500PST.html",
-     "spec/pidgin2adium_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/test-output/README.md",
-     "spec/test-output/html_log_output.xml",
-     "spec/test-output/text_log_output.xml",
-     "spec/text_log_parser_spec.rb",
-     "tasks/extconf.rake",
-     "tasks/extconf/balance_tags_c.rake"
+    ".rspec",
+    "ChangeLog",
+    "Gemfile",
+    "LICENSE",
+    "Manifest.txt",
+    "README.rdoc",
+    "Rakefile",
+    "bin/pidgin2adium",
+    "config/website.yml",
+    "ext/balance_tags_c/balance_tags_c.c",
+    "ext/balance_tags_c/extconf.rb",
+    "lib/pidgin2adium.rb",
+    "lib/pidgin2adium/log_converter.rb",
+    "lib/pidgin2adium/log_file.rb",
+    "lib/pidgin2adium/log_parser.rb",
+    "lib/pidgin2adium/message.rb",
+    "lib/pidgin2adium/messages/all.rb",
+    "lib/pidgin2adium/messages/auto_reply_message.rb",
+    "lib/pidgin2adium/messages/event.rb",
+    "lib/pidgin2adium/messages/message.rb",
+    "lib/pidgin2adium/messages/status_message.rb",
+    "lib/pidgin2adium/messages/xml_message.rb",
+    "lib/pidgin2adium/parsers/all.rb",
+    "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",
+    "spec/html_log_parser_spec.rb",
+    "spec/log_converter_spec.rb",
+    "spec/log_file_spec.rb",
+    "spec/logfiles/2006-12-21.223606.txt",
+    "spec/logfiles/2008-01-15.071445-0500PST.htm",
+    "spec/logfiles/2008-01-15.071445-0500PST.html",
+    "spec/pidgin2adium_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/test-output/README.md",
+    "spec/test-output/html_log_output.xml",
+    "spec/test-output/text_log_output.xml",
+    "spec/text_log_parser_spec.rb",
+    "tasks/extconf.rake",
+    "tasks/extconf/balance_tags_c.rake"
   ]
   s.homepage = %q{http://github.com/gabebw/pidgin2adium}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format}
   s.test_files = [
     "spec/balance_tags_c_extn_spec.rb",
-     "spec/basic_parser_spec.rb",
-     "spec/html_log_parser_spec.rb",
-     "spec/log_converter_spec.rb",
-     "spec/log_file_spec.rb",
-     "spec/pidgin2adium_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/text_log_parser_spec.rb"
+    "spec/basic_parser_spec.rb",
+    "spec/html_log_parser_spec.rb",
+    "spec/log_converter_spec.rb",
+    "spec/log_file_spec.rb",
+    "spec/pidgin2adium_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/text_log_parser_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<pidgin2adium>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
     else
+      s.add_dependency(%q<pidgin2adium>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     end
   else
+    s.add_dependency(%q<pidgin2adium>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
   end
 end
 

data/spec/basic_parser_spec.rb

@@ -53,7 +53,7 @@ describe "BasicParser" do
     end
   end
 
-  describe "#pre_parse" do
+  describe "#pre_parse!" do
     it "should raise an error for an invalid first line" do
       bp =  Pidgin2Adium::BasicParser.new(
               File.join(@current_dir,
@@ -61,21 +61,41 @@ describe "BasicParser" do
                         "invalid-first-line.txt"),
               @aliases)
       lambda do
-        bp.pre_parse()
+        bp.pre_parse!()
       end.should raise_error(Pidgin2Adium::InvalidFirstLineError)
     end
 
-    it "should return correct info for an valid first line" do
+    it "should return true when everything can be parsed" do
       bp =  Pidgin2Adium::BasicParser.new(@html_logfile_path,
                                           @aliases)
-      results = bp.pre_parse()
-      results.should be_instance_of(Array)
-      results.should == ['aim', # service
-                         'othersn', # my SN
-                         'aolsystemmsg', # other person's SN
-                         {:year=>2008, :mon=>1, :mday=>15}, # basic time info
-                         '2008-01-15T07:14:45-05:00' # chat start time
-                        ]
+      bp.pre_parse!.should be_true
+    end
+
+    describe "correctly setting variables" do
+      before do
+        @bp =  Pidgin2Adium::BasicParser.new(@html_logfile_path, @aliases)
+        @bp.pre_parse!()
+      end
+
+      it "should correctly set @service" do
+        @bp.instance_variable_get('@service').should == 'aim'
+      end
+
+      it "should correctly set user_SN" do
+        @bp.instance_variable_get('@user_SN').should == 'othersn'
+      end
+
+      it "should correctly set partner_SN" do
+        @bp.instance_variable_get('@partner_SN').should == 'aolsystemmsg'
+      end
+
+      it "should correctly set basic_time_info" do
+        @bp.instance_variable_get('@basic_time_info').should == {:year=>2008, :mon=>1, :mday=>15}
+      end
+
+      it "should correctly set adium_chat_time_start" do
+        @bp.instance_variable_get('@adium_chat_time_start').should == '2008-01-15T07:14:45-05:00'
+      end
     end
   end
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pidgin2adium
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 2
-  - 3
-  version: 3.2.3
+  prerelease: 
+  version: 3.2.4
 platform: ruby
 authors: 
 - Gabe Berke-Williams
@@ -14,52 +10,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: pidgin2adium
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
+  name: pidgin2adium
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.4.0
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 1.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id010
 description: Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format.
 email: gbw@brandeis.edu
 executables: 
@@ -72,7 +135,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .autotest
-- .gitignore
 - .rspec
 - ChangeLog
 - Gemfile
@@ -123,8 +185,8 @@ homepage: http://github.com/gabebw/pidgin2adium
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -132,21 +194,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format

data/.gitignore

@@ -1,29 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.bundle
-ext/balance_tags_c/Makefile
-ext/balance_tags_c/balance_tags_c.bundle
-ext/balance_tags_c/balance_tags_c.o
-.rvmrc
-spec/output-dir
-spec/nonexistent_output_dir
-Gemfile.lock