colloquy_log_to_text 1.2 → 1.2.1

data/bin/colloquy_log_to_text

@@ -1,11 +1,27 @@
 #!/usr/bin/env ruby
 
+require 'trollop'
+
 $:.push File.expand_path("../lib/", __FILE__)
 
 require 'colloquy_log_to_text'
 
-args = ARGV.dup
+opts = Trollop::options do
+  version "colloquy_log_to_text #{ColloquyLogToText.version} (c) 2011 Mark Szymanski"
+  banner <<-EOS
+colloquy_log_to_text is a simple program to convert Colloquy's awful XML logs into plain text.
+
+Usage:
+    colloquy_log_to_text [options] <filenames>+
+
+Note that each file given must be a .colloquyTranscript file.
+
+Where [options] are:
+EOS
+end
 
-ColloquyLogToText.parse_args(args)
+ARGV.each do |file|
+  ColloquyLogToText.convert(file)
+end
 
 exit 0

data/lib/colloquy_log_to_text.rb

@@ -1,5 +1,5 @@
 require 'colloquy_log_to_text/colloquy_log_to_text'
-require 'colloquy_log_to_text/parse_args'
+require 'colloquy_log_to_text/version'
 require 'bundler/setup'
 require 'nokogiri'
 require 'date'

data/lib/colloquy_log_to_text/version.rb

@@ -1,5 +1,5 @@
 class ColloquyLogToText
   def self.version
-    "1.2"
+    "1.2.1"
   end
 end

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: colloquy_log_to_text
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  version: "1.2"
+  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors: 
 - Mark Szymanski
@@ -13,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -06:00
-default_executable: 
+date: 2011-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -24,11 +20,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: A simple gem to convert Colloquy's awful XML logs into plain text.
 email: mrman208@me.com
 executables: 
@@ -41,10 +46,8 @@ files:
 - README.md
 - lib/colloquy_log_to_text/colloquy_log_to_text.rb
 - lib/colloquy_log_to_text/version.rb
-- lib/colloquy_log_to_text/parse_args.rb
 - lib/colloquy_log_to_text.rb
 - bin/colloquy_log_to_text
-has_rdoc: true
 homepage: http://github.com/mrman208/colloquy_log_to_text
 licenses: []
 
@@ -58,21 +61,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.7.1
 signing_key: 
 specification_version: 3
 summary: A simple gem to convert Colloquy's awful XML logs into plain text.

data/lib/colloquy_log_to_text/parse_args.rb

@@ -1,25 +0,0 @@
-require 'colloquy_log_to_text/version'
-
-class ColloquyLogToText
-  def self.parse_args(args)
-    argc = args.count
-    if argc < 1
-      puts "Error: No Colloquy log files specified."
-      exit 1
-    end
-
-    for arg in args
-      case arg
-      when "-h"
-        puts "Usage: colloquy_log_to_text [-h] <LOGFILE> [[LOGFILE2]...]"
-        puts "The log file specified (.colloquyTranscript) will then be converted into plain text."
-        puts "The -h option is used to display this help message."
-        exit 0
-      when "-v"
-        puts ColloquyLogToText.version
-      else
-          ColloquyLogToText.convert(arg)
-      end
-    end
-  end
-end