runoff 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e64409a6f2d4e87cf9b4523428e07f37881b29
-  data.tar.gz: cb8090e33791b96f0911a457225f94c3348486fe
+  metadata.gz: 81287f01814e747861a7d0e691a2d131e8bdd402
+  data.tar.gz: 46e228e6cae5e56000ff6103d507785e90894f56
 SHA512:
-  metadata.gz: c58d95c022d9418557330a5888913ff72f4d73337c9af353f95edc2a6ad7cd0a7c6f07afb1f36e547bd2ad25c5d891e19466d3e68b14f5bc317ed3ecef057180
-  data.tar.gz: 9639131d7e886b13c5e86ef6bc6979f6c0af83c2941430b60b8ce246b85b651728210bfbbc73c17f6f6e42c00ccf91036d6ae7e7bee40b9e3ee3087230450b2b
+  metadata.gz: 90fe6c30aa132ee4aa7d27178c5b169957bf1963dfc4559001f6b63880d918f7725930d94129c88e7d446743fa1a4b228b2b38fb13cb434c6a9c2c53f30b4e01
+  data.tar.gz: 577bb4c9148a6eb094a423bc36dd7ab94646456d8f16a2e1c54951af50f7db06be7d4a139f2ac7e8698ae485d56838acac258feb914161da7ea0ac0549b59825

data/bin/runoff

@@ -20,12 +20,16 @@ if command
   command.parser.order!
   command.parser.parse!
 
-  #begin
+  begin
     command.execute ARGV
-  #rescue StandardError => e
-  #  warn e.message.colorize :red
-  #  puts 'Terminated.'.colorize :yellow
-  #end
+  rescue StandardError => e
+    if ENV['DEBUG']
+      raise e
+    else
+      warn e.message.colorize :red
+      puts 'Terminated.'.colorize :yellow
+    end
+  end
 else
   puts available_commands['_none'].parser.help
 end

data/lib/runoff/adapters/adapter.rb

@@ -26,6 +26,36 @@ module Runoff
       def format_body_xml(xml_content)
         xml_content
       end
+
+      # Public: Parses a chatname into a human readable name.
+      #
+      # raw_chatname - A String with a Skype chatname.
+      #
+      # Examples
+      #
+      #   parse_chatname "#first_user/$second_user;d3d86c6b0e3b8320"
+      #   #=> first_user_second_user
+      #
+      #   parse_chatname "19:g7f8hg76f8g9d6f5ghj4357346@thread.skype"
+      #   #=> g7f8hg76f8g9d6f5ghj4357346
+      #
+      #   parse_chatname "john_doe"
+      #   #=> john_doe
+      #
+      # Returns a valid name.
+      def parse_chatname(raw_chatname)
+        case raw_chatname
+        when /\:(?<hash>.+)@/
+          $~[:hash]
+        when /#(?<first_participant>.*)\/\$(?<second_participant>.*);/
+          first_participant  = $~[:first_participant]
+          second_participant = $~[:second_participant]
+
+          [first_participant, second_participant].reject(&:empty?).join('_')
+        else
+          raw_chatname
+        end
+      end
     end
   end
 end

data/lib/runoff/adapters/json_adapter.rb

@@ -40,23 +40,6 @@ module Runoff
         parse_chatname(chatname) + '.json'
       end
 
-      # Public: Parses a chatname into a human readable name.
-      #
-      # raw_chatname - A String with a Skype chatname.
-      #
-      # Examples
-      #
-      #   parse_chatname "#first_user/$second_user;d3d86c6b0e3b8320"
-      #   # => first_user_second_user
-      #
-      # Returns a valid name.
-      def parse_chatname(raw_chatname)
-        pattern = /^#(.*)\/\$(.*);.*$/
-        parts = raw_chatname.match(pattern).captures
-
-        parts.reject(&:empty?).join('_')
-      end
-
       # Public: Formats the provided data buffer so that it could be writter to
       #         a JSON file.
       #

data/lib/runoff/adapters/txt_adapter.rb

@@ -12,6 +12,8 @@ module Runoff
       #
       #   build_entry { chatname: "#first_user/$second_user;d3d86c6b0e3b8320" ... }
       #   # => "[2014-04-18 20:20:12] first_user: This is a text"
+      #
+      # Returns a string
       def build_entry(row)
         formated_data = []
 
@@ -33,28 +35,17 @@ module Runoff
       #   get_file_name "#first_user/$second_user;d3d86c6b0e3b8320"
       #   # => first_user_second_user.txt
       #
+      #   get_file_name "19:g7f8hg76f8g9d6f5ghj4357346@thread.skype"
+      #   #=> g7f8hg76f8g9d6f5ghj4357346.txt
+      #
+      #   get_file_name "john_doe"
+      #   #=> john_doe.txt
+      #
       # Returns a valid file name.
       def get_file_name(chatname)
         parse_chatname(chatname) + '.txt'
       end
 
-      # Public: Parses a chatname into a human readable name.
-      #
-      # raw_chatname - A String with a Skype chatname.
-      #
-      # Examples
-      #
-      #   parse_chatname "#first_user/$second_user;d3d86c6b0e3b8320"
-      #   # => first_user_second_user
-      #
-      # Returns a valid name.
-      def parse_chatname(raw_chatname)
-        pattern = /^#(.*)\/\$(.*);.*$/
-        parts = raw_chatname.match(pattern).captures
-
-        parts.reject(&:empty?).join('_')
-      end
-
       # Public: Formats the provided data buffer so that it could be writter to
       #         a text file.
       #

data/lib/runoff/commandline/none.rb

@@ -27,6 +27,13 @@ module Runoff
 
     runoff <COMMAND> [SKYPE_USERNAME] [OPTIONS]
 
+  Commands:
+
+    all  - Exports all chats
+    some - Exports only specified chats
+
+  Options:
+
 END
 
           opts.on '-h', '--help', 'Displays help' do

data/lib/runoff/version.rb

@@ -1,3 +1,3 @@
 module Runoff
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runoff
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Aigars Dzerviniks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Tool to export Skype chat history from the SQLite database to text files