pidgin2adium 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a19269fc564ee7b96212824080a049dcc6fe3b8
-  data.tar.gz: 5314c9de5efe136193a156a71cd09ce65cccd72b
+  metadata.gz: 11238761943e30b94a55fc7cef7580f57975eef4
+  data.tar.gz: 67eedc3c5478f8f8889521c78e2d098218d30de0
 SHA512:
-  metadata.gz: 60269903641f9776950be83fa2fa99a0cf72c09d5826f30eaf0bc5c94e79678d5e8485d1a1bb450b53e93a1c18d8ff014be0e2863c164b2183f1a96e0f5d6cdd
-  data.tar.gz: 3c52742c8416ca06cc4d2695c0e78b3c648e0bc43441bebe82b072e91dfb304e7c520d5fe5cce37c2821ba5bbc99da1300c83c4a4636810a18bc9da6b55437dd
+  metadata.gz: 3088e7518c59327ea9745d65b843a95e72fe84df3d4a295669aff4cd0f858fb77151184b93ec0b9ec8a6bc15165d37ce868d976582df5ac23adb2b316bdbf9fc
+  data.tar.gz: bde9956789c48e3b5503f335fedf090df15af49c7df0d9f7d3d9766012692ccc0079534d1b0a4dc01fdc58be72b92d3f543aa98ecd8a1c3673c275e131f7dc25

data/NEWS.md

@@ -1,8 +1,14 @@
-### HEAD (unreleased)
+### 4.0.0.beta2
+
+* Extract `Pidgin2Adium::Cli`
+* Fix bugs
+* Print error and progress messages
+
+### 4.0.0.beta1
 
 * Massive refactoring
+* Use Pipio gem to parse logs
 * Chat times respect time zones instead of assuming inputs are UTC
-* Remove C extension
 * Test against Travis
 
 ### 3.3.0 / 2011-10-16

data/bin/pidgin2adium

@@ -1,38 +1,5 @@
 #!/usr/bin/env ruby
 
 require "pidgin2adium"
-require "optparse"
 
-options = {}
-
-parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{File.basename($0)} -i PIDGIN_LOG_DIR"
-
-  parser.on('-i', '--in IN_DIR', 'Directory where pidgin logs are stored') do |in_directory|
-    options[:in_directory] = in_directory
-  end
-
-  parser.on('-a', '--aliases "gabebw,Gabe B-W"', "Your aliases from Pidgin") do |aliases|
-    options[:aliases] = aliases.split(",")
-  end
-
-  parser.on("-v", "--version", "Show version information") do
-    puts "Pidgin2Adium, version #{Pidgin2Adium::VERSION}"
-    exit
-  end
-
-  parser.on_tail("-h", "--help", "Show this message") do
-    puts parser
-    exit
-  end
-end
-
-parser.parse!
-
-if options[:in_directory] && options[:aliases]
-  runner = Pidgin2Adium::Runner.new(options[:in_directory], option[:aliases])
-  runner.run
-else
-  STDERR.puts "Please provide -i/--in argument and -a/--aliases. Run with --help for more information"
-  exit 1
-end
+Pidgin2Adium::Cli.new(ARGV).parse_and_run

data/lib/pidgin2adium.rb

@@ -1,5 +1,11 @@
+require 'fileutils'
+require 'optparse'
+require 'pathname'
+
 require 'pipio'
+
 require 'pidgin2adium/version'
+require 'pidgin2adium/cli'
 require 'pidgin2adium/file_finder'
 require 'pidgin2adium/runner'
 require 'pidgin2adium/adium_chat_file_creator'

data/lib/pidgin2adium/adium_chat_file_creator.rb

@@ -1,5 +1,3 @@
-require "pathname"
-
 module Pidgin2Adium
   class AdiumChatFileCreator
     def initialize(file_path, aliases, output_directory = Runner::ADIUM_LOG_DIRECTORY)
@@ -9,12 +7,17 @@ module Pidgin2Adium
     end
 
     def create
-      create_containing_directory
-      File.open(path, 'w') do |file|
-        file.puts xml_prolog
-        file.puts opening_chat_tag
-        file.puts chat.to_s
-        file.puts closing_chat_tag
+      if chat
+        create_containing_directory
+        File.open(path, 'w') do |file|
+          file.puts xml_prolog
+          file.puts opening_chat_tag
+          file.puts chat.to_s
+          file.puts closing_chat_tag
+        end
+        true
+      else
+        false
       end
     end
 

data/lib/pidgin2adium/cli.rb

@@ -0,0 +1,48 @@
+module Pidgin2Adium
+  class Cli
+    def initialize(args, stdout: STDOUT, stderr: STDERR)
+      @arguments = args
+      @stdout = stdout
+      @stderr = stderr
+      @options = {}
+    end
+
+    def parse_and_run
+      parser.parse!(@arguments)
+
+      if @options[:in_directory] && @options[:aliases]
+        runner = Runner.new(@options[:in_directory], @options[:aliases])
+        runner.run
+      else
+        @stderr.puts "Please provide -i/--in argument and -a/--aliases. Run with --help for more information"
+        exit 1
+      end
+    end
+
+    private
+
+    def parser
+      @parser ||= OptionParser.new do |parser|
+        parser.banner = "Usage: #{File.basename($0)} -i PIDGIN_LOG_DIR"
+
+        parser.on('-i', '--in IN_DIR', 'Directory where pidgin logs are stored') do |in_directory|
+          @options[:in_directory] = in_directory
+        end
+
+        parser.on('-a', '--aliases "gabebw,Gabe B-W"', "Your aliases from Pidgin") do |aliases|
+          @options[:aliases] = aliases.split(",")
+        end
+
+        parser.on("-v", "--version", "Show version information") do
+          @stdout.puts "Pidgin2Adium, version #{Pidgin2Adium::VERSION}"
+          exit
+        end
+
+        parser.on_tail("-h", "--help", "Show this message") do
+          @stdout.puts parser
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/pidgin2adium/runner.rb

@@ -10,7 +10,12 @@ module Pidgin2Adium
 
     def run
       files_to_parse.each do |file_path|
-        AdiumChatFileCreator.new(file_path, @aliases, @output_directory).create
+        success = AdiumChatFileCreator.new(file_path, @aliases, @output_directory).create
+        if success
+          $stdout.print "."
+        else
+          $stderr.puts "\n!! Could not parse #{file_path}"
+        end
       end
     end
 

data/lib/pidgin2adium/version.rb

@@ -1,3 +1,3 @@
 module Pidgin2Adium
-  VERSION = "4.0.0.beta1"
+  VERSION = "4.0.0.beta2"
 end

data/spec/features/parse_pidgin_log_file_spec.rb

@@ -5,30 +5,84 @@ describe "Parse a Pidgin log file" do
     FileUtils.rm_rf(tmp_directory)
   end
 
-  it "outputs to the correct file" do
+  context "with good input" do
+    before do
+      $stdout = StringIO.new
+    end
+
+    it "outputs to the correct file" do
+      runner = Pidgin2Adium::Runner.new(
+        path_containing_good_pidgin_logs,
+        ["Gabe B-W"],
+        output_path
+      )
+
+      runner.run
+
+      path = Dir["#{output_path}/**/*.xml"].first
+
+      expect(path).to eq File.join(
+        tmp_directory,
+        "AIM.jiggerificbug",
+        "them@gmail.com",
+        "them@gmail.com (2014-03-16T23:55:43#{tz_offset}).chatlog",
+        "them@gmail.com (2014-03-16T23:55:43#{tz_offset}).xml",
+      )
+    end
+
+    it "does not print an error message" do
+      $stderr = StringIO.new
+
+      runner = Pidgin2Adium::Runner.new(
+        path_containing_good_pidgin_logs,
+        ["Gabe B-W"],
+        output_path
+      )
+
+      runner.run
+
+      expect($stderr.string).to eq ""
+    end
+
+    it "prints a dot to stdout" do
+      $stdout = StringIO.new
+
+      runner = Pidgin2Adium::Runner.new(
+        path_containing_good_pidgin_logs,
+        ["Gabe B-W"],
+        output_path
+      )
+
+      runner.run
+
+      expect($stdout.string).to eq "."
+    end
+
+  end
+
+  it "prints an error message if the chat is unparseable" do
+    $stderr = StringIO.new
+
     runner = Pidgin2Adium::Runner.new(
-      path_containing_pidgin_logs,
+      path_containing_bad_pidgin_logs,
       ["Gabe B-W"],
       output_path
     )
 
     runner.run
 
-    path = Dir["#{output_path}/**/*.xml"].first
-
-    expect(path).to eq File.join(
-      tmp_directory,
-      "AIM.jiggerificbug",
-      "them@gmail.com",
-      "them@gmail.com (2014-03-16T23:55:43#{tz_offset}).chatlog",
-      "them@gmail.com (2014-03-16T23:55:43#{tz_offset}).xml",
-    )
+    expect($stderr.string).to match /Could not parse.*bad_input\/bad.html/
   end
 
-  def path_containing_pidgin_logs
+
+  def path_containing_good_pidgin_logs
     File.join(SPEC_ROOT, "fixtures", "input")
   end
 
+  def path_containing_bad_pidgin_logs
+    File.join(SPEC_ROOT, "fixtures", "bad_input")
+  end
+
   def output_path
     File.expand_path(File.join(SPEC_ROOT, "..", "tmp"))
   end

data/spec/fixtures/bad_input/bad.html

@@ -0,0 +1,3 @@
+<h1>Conversation with chat1841285841606654112</h1>
+<FONT SIZE="2">(02:54:06)</FONT> <B>Gabe entered the room.</B><BR>
+<FONT SIZE="2">(02:54:06)</FONT> <B>the other one entered the room.</B><BR>

data/spec/pidgin2adium/cli_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+describe Pidgin2Adium::Cli do
+  context "#parse" do
+    it "passes in_directory and aliases to a Runner" do
+      runner = double("runner", run: nil)
+      allow(Pidgin2Adium::Runner).to receive(:new).and_return(runner)
+
+      argv = %w(--in home --aliases gabe,me)
+      cli = Pidgin2Adium::Cli.new(argv)
+      cli.parse_and_run
+
+      expect(Pidgin2Adium::Runner).to have_received(:new).with(
+        "home", %w(gabe me)
+      )
+      expect(runner).to have_received(:run)
+    end
+
+    it "prints to stderr if --in is missing" do
+      stderr = StringIO.new
+
+      cli = Pidgin2Adium::Cli.new(%w(-a hello), stderr: stderr)
+
+      rescuing_from_exit { cli.parse_and_run }
+
+      expect(stderr.string).to include "Please provide"
+    end
+
+    it "prints to stderr if --aliases is missing" do
+      stderr = StringIO.new
+
+      cli = Pidgin2Adium::Cli.new(%w(--in home), stderr: stderr)
+
+      rescuing_from_exit { cli.parse_and_run }
+
+      expect(stderr.string).to include "Please provide"
+    end
+
+    it "prints its version" do
+      stdout = StringIO.new
+
+      cli = Pidgin2Adium::Cli.new(%w(-v), stdout: stdout)
+
+      rescuing_from_exit { cli.parse_and_run }
+
+      expect(stdout.string).to eq "Pidgin2Adium, version #{Pidgin2Adium::VERSION}\n"
+    end
+
+    def rescuing_from_exit
+      begin
+        yield
+      rescue SystemExit
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pidgin2adium
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Gabe Berke-Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pipio
@@ -99,14 +99,17 @@ files:
 - bin/pidgin2adium
 - lib/pidgin2adium.rb
 - lib/pidgin2adium/adium_chat_file_creator.rb
+- lib/pidgin2adium/cli.rb
 - lib/pidgin2adium/file_finder.rb
 - lib/pidgin2adium/runner.rb
 - lib/pidgin2adium/version.rb
 - pidgin2adium.gemspec
 - spec/features/parse_pidgin_log_file_spec.rb
+- spec/fixtures/bad_input/bad.html
 - spec/fixtures/input/input.html
 - spec/fixtures/output.xml
 - spec/pidgin2adium/adium_chat_file_creator_spec.rb
+- spec/pidgin2adium/cli_spec.rb
 - spec/pidgin2adium/file_finder_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gabebw/pidgin2adium
@@ -135,8 +138,10 @@ specification_version: 4
 summary: A fast, easy way to convert Pidgin (gaim) logs to the Adium format.
 test_files:
 - spec/features/parse_pidgin_log_file_spec.rb
+- spec/fixtures/bad_input/bad.html
 - spec/fixtures/input/input.html
 - spec/fixtures/output.xml
 - spec/pidgin2adium/adium_chat_file_creator_spec.rb
+- spec/pidgin2adium/cli_spec.rb
 - spec/pidgin2adium/file_finder_spec.rb
 - spec/spec_helper.rb