runoff 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbece2f0614ed17f5c62f98227f7c000e3b7985
-  data.tar.gz: f10c4978d07c72e9e004d7bbdb9647c54f36bc32
+  metadata.gz: 30527da833e016b926ae2d4690df9d977dc7c0eb
+  data.tar.gz: 36ea0b94d751a0a127c4e4db3d8024d357f517be
 SHA512:
-  metadata.gz: b086d0b09ba49f49d81a376d7c4c0f8c56aa2f9f6f4ecc04851046129f53567ae07a70adb05b48bc8342f5cbc921f65c88b275f893fb05d385fd02db8c0f6bb3
-  data.tar.gz: 9b149cab21193959a02575b6ad5111a63b9b71e80e21817cc5ad7dace585db70018f12f9131511d42b15f13b8083a34239566c502ae3d155bf342ab0a42edc22
+  metadata.gz: 6d1de800329cb5cac9bea6503adea06c7aec4769691f8cfabdf6e60c113f8265aea4145f2c28b8c761462ea06f90971d17611473576d5045d996b80b0bb6b005
+  data.tar.gz: 45bd434c446a6410cf77ffc34291e31a7a0e259c99e8ec9cd1173e2ca3ca1e24678953f7f4c65b7eb7bd93909863cadd335b0871d2c2874c2a1c277e0475743c

data/README.md

@@ -36,6 +36,5 @@ Things to do in the future versions:
 
 - Parse body_xml to filter XML tags and character entities.
 - Append only new messages to the previously genetrated files instead of appending everything or create different versions for the files when using `-a false` option.
-- Add some colors.
 
 If you have something to say about this gem or anything else, you can find me on Twitter as [@aigarsdz](http://twitter.com/aigarsdz "@aigarsdz").

data/lib/runoff/file_writer.rb

@@ -1,4 +1,4 @@
-require 'zip/zip'
+require 'zip'
 require 'fileutils'
 
 module Runoff

data/lib/runoff/location.rb

@@ -25,16 +25,14 @@ module Runoff
     #
     # Returns a String that contains the path to the Skype database file.
     def self.default_skype_data_location(skype_username)
-      if RbConfig::CONFIG['host_os'] =~ /mingw/
-        location = "#{ENV['APPDATA']}\\Skype\\#{skype_username}\\main.db"
-
-        unless File.exist?("#{ENV['APPDATA']}\\Skype")
-          location = self.get_default_skype_data_location_on_windows_8 skype_username
+      case RbConfig::CONFIG['host_os']
+      when /mingw/
+        if File.exist?("#{ENV['APPDATA']}\\Skype")
+          format_windows_path "#{ENV['APPDATA']}\\Skype\\#{skype_username}\\main.db"
+        else
+          format_windows_path self.get_default_skype_data_location_on_windows_8(skype_username)
         end
-
-        location.gsub!(/\\/, '/')
-        location.gsub(/^[a-zA-Z]:/, '')
-      elsif RbConfig::CONFIG['host_os'] =~ /linux/
+      when /linux/
         "#{ENV['HOME']}/.Skype/#{skype_username}/main.db"
       else
         "#{ENV['HOME']}/Library/Application Support/Skype/#{skype_username}/main.db"
@@ -43,7 +41,22 @@ module Runoff
 
     private
 
-    # Public: Composes the default Skype database location for the Windows 8 operating system.
+    # Internal: Replaces backslashes with forward slashes and removes drive letter.
+    #
+    # path - String containing a directory path.
+    #
+    # Examples
+    #
+    #   format_windows_path 'C:\Users\username\AppData\Roaming\Skype\skype_username\main.db'
+    #   # => /Users/username/AppData/ROaming/Skype/skype_username/main.db
+    #
+    # Returns a String with modified directory path.
+    def self.format_windows_path(path)
+      path = path.gsub(/\\/, '/')
+      path.gsub(/^[a-zA-Z]:/, '')
+    end
+
+    # Internal: Composes the default Skype database location for the Windows 8 operating system.
     #
     # skype_username - A String that contains a username of the Skype account,
     #                  which database we want to access.
@@ -56,14 +69,11 @@ module Runoff
     # Returns a String that contains the path to the Skype database file.
     def self.get_default_skype_data_location_on_windows_8(skype_username)
       location = "#{ENV['HOME']}/AppData/Local/Packages"
+      skype_folder = Dir["#{location}/Microsoft.SkypeApp*"].first
 
-      Dir["#{location}/*"].each do |item|
-        if item =~ /Microsoft\.SkypeApp/
-          location = "#{item}/LocalState/#{skype_username}/main.db"
-        end
-      end
+      raise IOError.new "The default Skype directory doesn't exist." unless skype_folder
 
-      location
+      "#{skype_folder}/LocalState/#{skype_username}/main.db"
     end
   end
-end
+end

data/lib/runoff/version.rb

@@ -1,3 +1,3 @@
 module Runoff
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/test/location_test.rb

@@ -3,21 +3,27 @@ require 'minitest/unit'
 require 'runoff'
 
 class TestLocation < MiniTest::Test
-  def setup
-    @path = Runoff::Location.default_skype_data_location 'aidzis_skype'
-  end
-
   def test_must_return_a_default_path_depending_on_the_operating_system
+    path = Runoff::Location.default_skype_data_location 'aidzis_skype'
+
     if RbConfig::CONFIG['host_os'] =~ /mingw/
+      skip
       if File.exist?("#{ENV['APPDATA']}\\Skype")
-        assert_match /\/Users\/[a-zA-Z0-9]+\/AppData\/Roaming\/Skype\/aidzis_skype\/main\.db/, @path
+        assert_match /\/Users\/[a-zA-Z0-9]+\/AppData\/Roaming\/Skype\/aidzis_skype\/main\.db/, path
       else
-        assert_match /\/Users\/[a-zA-Z0-9]+\/AppData\/Local\/Packages\/[a-zA-Z0-9_\/\.]+\/aidzis_skype\/main\.db/, @path
+        assert_match /\/Users\/[a-zA-Z0-9]+\/AppData\/Local\/Packages\/[a-zA-Z0-9_\/\.]+\/aidzis_skype\/main\.db/, path
       end
     elsif RbConfig::CONFIG['host_os'] =~ /linux/
-      assert_match /\/home\/[a-zA-Z0-9]+\/\.Skype\/aidzis_skype\/main\.db/, @path
+      assert_match /\/home\/[a-zA-Z0-9]+\/\.Skype\/aidzis_skype\/main\.db/, path
     else
-      assert_match /~\/Library\/Application Support\/Skype\/aidzis_skype\/main\.db/, @path
+      assert_match /~\/Library\/Application Support\/Skype\/aidzis_skype\/main\.db/, path
     end
   end
+
+  def test_must_replace_backslashes_with_forward_slashes_and_remowe_drive_letter
+    windows_path = 'C:\\Users\\user\\AppData\\Roaming\\Skype'
+    unix_style_path = Runoff::Location.send :format_windows_path, windows_path
+
+    assert_equal '/Users/user/AppData/Roaming/Skype', unix_style_path
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runoff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Aigars Dzerviniks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Tool to export Skype chat history from the SQLite database to text files