pidgin2adium 3.0.1 → 3.1.0

data/spec/spec_helper.rb

@@ -1,19 +1,72 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'pidgin2adium'
-begin
-  # RSpec 2
-  gem 'rspec', '>= 2.0.0.beta.18'
-  require 'rspec'
-  constant = RSpec
-rescue Gem::LoadError
-  # RSpec 1
-  gem 'rspec', '~> 1.3'
-  require 'spec'
-  require 'spec/autorun'
-  constant = Spec::Runner
-end
+require 'fileutils'
+
+# Pidgin2Adium.oops and Pidgin2Adium.warn both use warn() to output errors.
+# Setting $-w (the warning level) to nil suppresses them, which makes for
+# much prettier test output.
+$-w=nil # OMGHAX
+
+# Wrap it in a lambda so that we can pass it to Spork.prefork, if spork is installed.
+prefork_block = lambda do
+  # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+
+  $LOAD_PATH.unshift(File.dirname(__FILE__))
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext', 'balance_tags_c'))
+
+  require 'pidgin2adium'
+  require 'faker'
+  require 'time' # for Time.zone_offset
 
-constant.configure do |config|
+  rspec_configure_block = lambda do |config|
+    config.before(:all) do
+      @current_dir = File.dirname(__FILE__)
+      @aliases = %w{gabebw gabeb-w gbw me}.join(',')
+      # -7 => "-0700"
+      @current_tz_offset = sprintf("%+03d00", Time.zone_offset(Time.new.zone) / 3600)
 
+      @logfile_path = File.join(@current_dir, "logfiles/")
+      @text_logfile_path = "#{@logfile_path}/2006-12-21.223606.txt"
+      @htm_logfile_path = "#{@logfile_path}/2008-01-15.071445-0500PST.htm"
+      @html_logfile_path = "#{@logfile_path}/2008-01-15.071445-0500PST.html"
+
+      @nonexistent_output_dir = File.join(@current_dir, "nonexistent_output_dir/")
+      @output_dir = File.join(@current_dir, "output-dir/")
+      FileUtils.rm_r(@nonexistent_output_dir, :force => true)
+    end
+
+    config.after(:all) do
+      # Clean up.
+      FileUtils.rm_r(@nonexistent_output_dir, :force => true)
+      FileUtils.rm_r(@output_dir, :force => true)
+    end
+  end
+
+  begin
+    # RSpec 2
+    gem 'rspec', '>= 2.0.0.beta.18'
+    require 'rspec'
+    RSpec.configure(&rspec_configure_block)
+  rescue Gem::LoadError
+    # RSpec 1
+    gem 'rspec', '~> 1.3'
+    require 'spec'
+    require 'spec/autorun'
+    Spec::Runner.configure(&rspec_configure_block)
+  end
+end
+
+begin
+  require 'rubygems'
+  require 'spork'
+  Spork.prefork(&prefork_block)
+  Spork.each_run do
+    # This code will be run each time you run your specs.
+  end
+rescue LoadError
+  puts 'To make the tests run faster, run "sudo gem install spork" then run "spork"'
+  puts 'from the base pidgin2adium directory.'
+  # Spork isn't installed.
+  prefork_block.call
 end

data/spec/test-output/README.md

@@ -0,0 +1 @@
+This folder holds already-parsed logs to allow for testing that Pidgin2Adium's output is correct.

data/spec/test-output/html_log_output.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<chat xmlns="http://purl.org/net/ulf/ns/0.4-02" account="jiggerificbug" service="AIM">
+<message sender="aolsystemmsg" time="2008-01-15T07:14:45-0500" alias="AOL System Msg"><div><span style="font-family: Helvetica; font-size: 12pt;">Your screen name (jiggerificbug) is now signed into AOL(R) Instant Messenger (TM) in 2 locations. 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.</span></div></message>
+<message sender="jiggerificbug" time="2008-01-15T07:14:48-0500" alias="Gabe B-W"><div><span style="font-family: Helvetica; font-size: 12pt;">1</span></div></message>
+<message sender="aolsystemmsg" time="2008-01-15T07:14:48-0500" alias="AOL System Msg"><div><span style="font-family: Helvetica; font-size: 12pt;">Your other AIM sessions have been signed-off.  You are now signed-on from 1 location(s).</span></div></message>
+</chat>

data/spec/test-output/text_log_output.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<chat xmlns="http://purl.org/net/ulf/ns/0.4-02" account="jiggerificbug" service="AIM">
+<message sender="jiggerificbug" time="2006-12-21T22:36:11-0700" alias="Gabe B-W"><div><span style="font-family: Helvetica; font-size: 12pt;">what are you doing tomorrow?</span></div></message>
+</chat>

data/spec/text_log_parser_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "TextLogParser" do
+  before(:each) do
+    @time = '(04:20:06)'
+    @tlp = Pidgin2Adium::TextLogParser.new(@text_logfile_path,
+                                           @aliases)
+  end
+  it "should cleanup text correctly" do
+    dirty_text = %Q{\r\n#{@time}&<b>Hello!</b> "Hi!" 'Oh no'\n}
+    # "\n" not removed if it ends a line or is followed by
+    # a timestamp
+    clean_text = %Q{\n#{@time}&amp;&lt;b&gt;Hello!&lt;/b&gt; &quot;Hi!&quot; &apos;Oh no&apos;\n}
+    @tlp.cleanup(dirty_text).should == clean_text
+  end
+
+  describe "#parse" do
+    it "should return a LogFile instance" do
+      @tlp.parse().should be_instance_of(Pidgin2Adium::LogFile)
+    end
+
+    it "should return a LogFile with the correct number of chat_lines" do
+      logfile = @tlp.parse
+      logfile.chat_lines.size.should == 1
+    end
+
+    it "should return a LogFile with the correct message type" do
+      logfile = @tlp.parse
+      logfile.chat_lines[0].should be_instance_of(Pidgin2Adium::XMLMessage)
+    end
+
+    it "should return a LogFile with the correct data" do
+      logfile = @tlp.parse
+      msg = logfile.chat_lines[0]
+      msg.sender.should == "awesomesn"
+      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$/
+    end
+  end
+end

data/tasks/extconf/balance_tags_c.rake

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 namespace :extconf do
   extension = File.basename(__FILE__, '.rake')
 
@@ -12,6 +14,8 @@ namespace :extconf do
     # "lib"
   ]
 
+  is_windows = Config::CONFIG['host_os'] =~ /mswin|mingw/
+  make_command = is_windows ? 'nmake' : 'make'
 
   task :compile => extension do
     if Dir.glob("**/#{extension}.{o,so,dll}").length == 0
@@ -32,7 +36,7 @@ namespace :extconf do
 
   file ext_so => ext_files do
     Dir.chdir(ext) do
-      sh(PLATFORM =~ /win32/ ? 'nmake' : 'make') do |ok, res|
+      sh(make_command) do |ok, res|
         if !ok
           require "fileutils"
           FileUtils.rm Dir.glob('*.{so,o,dll,bundle}')

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pidgin2adium
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 3
-  - 0
   - 1
-  version: 3.0.1
+  - 0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Gabe Berke-Williams
@@ -15,91 +14,102 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-07 00:00:00 -07:00
-default_executable: 
+date: 2010-08-13 00:00:00 -07:00
+default_executable: pidgin2adium
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: bundler
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 9
         - 26
         version: 0.9.26
-  name: bundler
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: jeweler
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
         - 9
         version: 1.2.9
-  name: rspec
-  requirement: *id003
+  type: :development
+  version_requirements: *id003
 description: Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format.
 email: gbw@brandeis.edu
 executables: 
 - pidgin2adium
-- pidgin2adium_profiler
 extensions: 
 - ext/balance_tags_c/extconf.rb
 extra_rdoc_files: 
+- ChangeLog
 - LICENSE
 - README.rdoc
 files: 
 - .autotest
 - .gitignore
 - .rspec
+- ChangeLog
 - Gemfile
-- History.txt
 - LICENSE
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/pidgin2adium
-- bin/pidgin2adium_profiler
 - config/website.yml
 - ext/balance_tags_c/balance_tags_c.c
 - ext/balance_tags_c/extconf.rb
 - lib/pidgin2adium.rb
 - lib/pidgin2adium/balance_tags.rb
+- lib/pidgin2adium/basic_parser.rb
+- lib/pidgin2adium/html_log_parser.rb
 - lib/pidgin2adium/log_converter.rb
 - lib/pidgin2adium/log_file.rb
 - lib/pidgin2adium/log_parser.rb
+- lib/pidgin2adium/message.rb
+- lib/pidgin2adium/text_log_parser.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
-- tasks/build_profiler.rake
+- 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
 has_rdoc: true
@@ -116,7 +126,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -125,7 +134,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -137,5 +145,11 @@ signing_key:
 specification_version: 3
 summary: Pidgin2Adium is a fast, easy way to convert Pidgin (formerly gaim) logs to the Adium format
 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

data/bin/pidgin2adium_profiler

@@ -1 +0,0 @@
-

data/tasks/build_profiler.rake

@@ -1,49 +0,0 @@
-desc "Build RubyProf version of pidgin2adium script"
-task :build_profiler do |t|
-    # base = location of Rakefile, e.g. repo base
-    base = Dir.pwd
-    orig_lines = File.readlines("#{base}/bin/pidgin2adium")
-    # remove "log_converter.start" line so we can surround it with RubyProf
-    lastline = orig_lines.pop
-    orig_text = orig_lines.join
-    
-    prof_file = File.new("#{base}/bin/pidgin2adium_profiler", 'w')
-new_text = <<EOF
-require 'ruby-prof'
-RubyProf.start
-log_converter.start
-result = RubyProf.stop
-printer = RubyProf::GraphHtmlPrinter.new(result)
-highest = Dir.glob('profiler_result*').sort.last
-if highest.nil?
-    # This is the first profiler html created
-    fname = "profiler_result.html"
-    f = File.new(fname, 'w')
-else
-    match = highest.match(/(\\d+)/)
-    if match
-	num = match.captures.last.to_i + 1
-	fname = "profiler_result%02d.html" % num
-	f = File.new(fname, 'w')
-    else
-	puts "!!! Oops, no match but there is definitely a profile file that exists. Unsure what happened. Outputting to stdout."
-	f = STDOUT
-    end
-end
-printer.print(f, {:filename => nil})
-EOF
-    prof_file.write(orig_text)
-    prof_file.write(new_text)
-    prof_file.close
-end
-
-desc "Set profiler to blank file"
-task :clear_profiler do
-    base = Dir.pwd
-    x = File.new("#{base}/bin/pidgin2adium_profiler", 'w')
-    x.puts
-    x.close
-end
-
-desc "Install debug version of gem, with profiler. Clears profiler file after installing."
-task :install_debug => [:build_profiler, :install_gem, :clear_profiler]