pidgin2adium 3.0.0 → 3.0.1

data/.autotest

@@ -1,7 +1,4 @@
 Autotest.add_hook :initialize do |at|
-  at.add_mapping(/ext\/.*\/(.*)\.[ch]/) do |_, m|
-        ["test/test_#{m[1]}_extn.rb"]
-      end
 end
 
 Autotest.add_hook :run_command do |at|

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.bundle

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,11 @@
+source 'http://gemcutter.org'
+
+group :runtime do
+  gem "rake"
+end
+
+group :development do
+  gem "bundler", ">= 0.9.26"
+  gem "jeweler"
+  gem "rspec", ">= 1.2.9"
+end

data/History.txt

@@ -1,3 +1,11 @@
+=== 3.0.1 / 2010-08-07
+Bugfix release:
+* balance_tags_c.c: Use rb_eval_string instead of rb_reg_regcomp to avoid
+  segfaults (commit #733ce88b0836256e14f0, fixes #27811)
+Non-user-facing stuff:
+* Switched to Jeweler, RSpec, and Bundler
+* Rakefile now doesn't choke if Hanna gem isn't installed
+
 === 3.0.0 / 2010-01-31
 * balance_tags.rb is now a C extension (Pidgin2Adium.balance_tags_c)
   - the pure-ruby mixin balance_tags (without the trailing "_c") is gone

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Gabe Berke-Williams
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,5 +1,6 @@
-== pidgin2adium
-* http://rubyforge.org/projects/pidgin2adium/
+= pidgin2adium
+* http://github.com/gabebw/pidgin2adium
+* http://rubygems.org/gems/pidgin2adium
 
 == DESCRIPTION:
 Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the
@@ -38,7 +39,7 @@ Or:
 
 ===Example (using library)
 The library style allows you to parse a log file and get back a LogFile[link:classes/Pidgin2Adium/LogFile.html] instance for easy reading, manipulation, etc. If you don't need to do anything with the individual messages, use Pidgin2Adium.parse[link:classes/Pidgin2Adium.html#M000002].
- 
+
  require 'pidgin2adium'
  logfile = Pidgin2Adium.parse("/path/to/log/file.html", "gabe,gbw,gabeb-w")
  if logfile == false
@@ -89,7 +90,7 @@ The library style allows you to parse a log file and get back a LogFile[link:cla
 If you want to parse the file and write it out instead of just parsing it, use Pidgin2Adium.parse_and_generate.
 
 Note: For batch processing, use LogConverter[link:classes/Pidgin2Adium/LogConverter.html].
- 
+
  require 'pidgin2adium'
  # Both options are optional; without :output_dir, writes to Adium log dir
  # (which is usually what you want anyway).
@@ -107,27 +108,16 @@ With thanks to Li Ma, whose blog post at
 http://li-ma.blogspot.com/2008/10/pidgin-log-file-to-adium-log-converter.html
 helped tremendously.
 
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009 Gabriel Berke-Williams
+== Note on Patches/Pull Requests
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+== Copyright
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2010 Gabe Berke-Williams. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,68 @@
+require 'rubygems'
+require 'rake'
+require 'bundler'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "pidgin2adium"
+    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_bundler_dependencies
+  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.beta.18"
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.spec_opts << %w{-Ilib -Ispec}
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
+
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.spec_opts << %w{-Ilib -Ispec}
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
+rescue Gem::LoadError
+  # RSpec 1
+  gem "rspec"
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "pidgin2adium #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+Dir['tasks/**/*.rake'].each { |t| load t }

data/VERSION

@@ -0,0 +1 @@
+3.0.1

data/bin/pidgin2adium_profiler

@@ -0,0 +1 @@
+

data/config/website.yml

@@ -0,0 +1,2 @@
+host: gbw@rubyforge.org
+remote_dir: /var/www/gforge-projects/pidgin2adium/

data/ext/balance_tags_c/balance_tags_c.c

@@ -1,9 +1,9 @@
 /*
  * Balances tags of string using a modified stack. Returns a balanced string.
- * 
+ *
  * From Wordpress's formatting.php and rewritten in C by
  * Gabe Berke-Williams, 2010.
- * 
+ *
  * Original Author:: Leonard Lin <leonard@acm.org>
  * License:: GPL v2.0
  * Copyright:: November 4, 2001
@@ -52,7 +52,7 @@ VALUE balance_tags_c(VALUE mod, VALUE text){
 	    rb_str_new2("font"));
     // 1: tagname, with possible leading "/"
     // 2: attributes
-    VALUE tag_regex = rb_reg_regcomp(rb_str_new2("<(\\/?\\w*)\\s*([^>]*)>"));
+    VALUE tag_regex = rb_eval_string("/<(\\/?\\w*)\\s*([^>]*)>/");
     VALUE pos;  // position in text
     VALUE match;
     VALUE tag;
@@ -68,8 +68,8 @@ VALUE balance_tags_c(VALUE mod, VALUE text){
 	    rb_str_new2("<    !--"));
 
     // WP bug fix for LOVE <3 (and other situations with '<' before a number)
-    rb_funcall(text, rb_intern("gsub!"), 2,
-	    rb_reg_regcomp(rb_str_new2("<([0-9]{1})")),
+    rb_funcall(text,rb_intern("gsub!"), 2,
+            rb_eval_string("/<([0-9]{1})/"),
 	    rb_str_new2("&lt;\\1"));
 
     pos = rb_funcall(text, rb_intern("=~"), 1, tag_regex);
@@ -96,7 +96,7 @@ VALUE balance_tags_c(VALUE mod, VALUE text){
 		// if stacktop value == tag close value then pop
 		// Close Tag
 		tag = rb_str_append(rb_str_new2("</"), tag);
-		rb_str_concat(tag, rb_str_new2(">")); 
+		rb_str_concat(tag, rb_str_new2(">"));
 		// Pop
 		rb_ary_pop(tagstack);
 		stacksize--;
@@ -137,7 +137,7 @@ VALUE balance_tags_c(VALUE mod, VALUE text){
 			tagqueue = rb_str_new2("</");
 			rb_str_concat(tagqueue, rb_ary_pop(tagstack));
 			rb_str_concat(tagqueue, rb_str_new2(">"));
-			stacksize--; 
+			stacksize--;
 		    }
 		    rb_ary_push(tagstack, tag);
 		    stacksize++;

data/lib/pidgin2adium.rb

@@ -9,125 +9,125 @@ require 'fileutils'
 require 'pidgin2adium/log_parser'
 
 module Pidgin2Adium
-    # Returned by LogFile.write_out if the output logfile already exists.
-    FILE_EXISTS = 42
-    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.0.0"
-    # For displaying after we finish converting
-    @@oops_messages = []
-    @@error_messages = []
+  # Returned by LogFile.write_out if the output logfile already exists.
+  FILE_EXISTS = 42
+  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.0.1"
+  # For displaying after we finish converting
+  @@oops_messages = []
+  @@error_messages = []
 
-    def log_msg(str) #:nodoc:
-	puts str.to_s
-    end
+  def log_msg(str) #:nodoc:
+    puts str.to_s
+  end
 
-    def oops(str) #:nodoc:
-	@@oops_messages << str
-	warn("Oops: #{str}")
-    end
+  def oops(str) #:nodoc:
+    @@oops_messages << str
+    warn("Oops: #{str}")
+  end
 
-    def error(str) #:nodoc:
-	@@error_messages << str
-	warn("Error: #{str}")
-    end
+  def error(str) #:nodoc:
+    @@error_messages << str
+    warn("Error: #{str}")
+  end
 
-    #######################
-    #So that we can use log_msg when calling delete_search_indexes() by itself
-    module_function :log_msg, :oops, :error
-    #######################
+  #######################
+  #So that we can use log_msg when calling delete_search_indexes() by itself
+  module_function :log_msg, :oops, :error
+  #######################
 
-    # 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
+  # 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
 
-	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
+    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
+
+    return parser.parse()
+  end
+
+  # Parses the provided log and writes out the log in Adium format.
+  # Returns the path to the converted 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()
+    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 the path to the converted 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
-	
-	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
 
-	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
+    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
-	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."
+  # 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
     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