colloquy_log_to_text 1.1.6 → 1.2

data/lib/colloquy_log_to_text/colloquy_log_to_text.rb

@@ -1,7 +1,11 @@
 class ColloquyLogToText
   def self.convert(file)
-    if !file.match(/\.colloquyTranscript$/)
+    if !File.exists?(file)
+      puts "Error: File does not exist."
+      exit 1
+    elsif !file.match(/(.+)\.colloquyTranscript$/)
       puts "Error: File is not a Colloquy log."
+      exit 1
     end
       puts "Converting #{file}..."
       f = File.open(file)
@@ -10,13 +14,6 @@ class ColloquyLogToText
       f = File.open(file.gsub(".colloquyTranscript", ".txt"), "w")
       envelopes = doc.css("envelope")
       envelopes.each { |envelope|
-        messages = envelope.css("message")
-        messages.each { |message|
-          @printed_message = message.content
-          @timestamp_string = message.attr("received")
-          @timestamp = DateTime.strptime(@timestamp_string, "%F %H:%M:%S")
-          @is_action = message.attr("action")
-        }
         senders = envelope.css("sender")
         senders.each { |sender|
           @nick = sender.content
@@ -31,11 +28,18 @@ class ColloquyLogToText
             @class = "&"
           end
         }
-        if @is_action == "yes"
-          f.puts "[#{@timestamp.day}-#{@timestamp.month}-#{@timestamp.year} #{@timestamp.hour}:#{@timestamp.minute}] * #{@nick} #{@printed_message}"
-        else
-          f.puts "[#{@timestamp.day}-#{@timestamp.month}-#{@timestamp.year} #{@timestamp.hour}:#{@timestamp.minute}] <#{@class}#{@nick}> #{@printed_message}"
-        end
+        messages = envelope.css("message")
+        messages.each { |message|
+          @printed_message = message.content
+          @timestamp_string = message.attr("received")
+          @timestamp = DateTime.strptime(@timestamp_string, "%F %H:%M:%S")
+          @is_action = message.attr("action")
+          if @is_action == "yes"
+            f.puts "[#{@timestamp.day}-#{@timestamp.month}-#{@timestamp.year} #{@timestamp.hour}:#{@timestamp.minute}] * #{@nick} #{@printed_message}"
+          else
+            f.puts "[#{@timestamp.day}-#{@timestamp.month}-#{@timestamp.year} #{@timestamp.hour}:#{@timestamp.minute}] <#{@class}#{@nick}> #{@printed_message}"
+          end
+        }
       }
     end
 end

data/lib/colloquy_log_to_text/version.rb

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

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 6
-  version: 1.1.6
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Mark Szymanski