tms 1.5.0 → 1.6.0

data/ext/tms/tms.c

@@ -1,6 +1,6 @@
 #include "ruby.h"
 #include <CoreServices/CoreServices.h>
-#include <SystemConfiguration/SystemConfiguration.h>>
+#include <SystemConfiguration/SystemConfiguration.h>
 
 static VALUE backup_volume(VALUE self){
 	OSStatus status = pathTooLongErr;

data/lib/tms/backup.rb

@@ -21,7 +21,7 @@ module Tms
       def backups_dir
         unless @backups_dir
           if system('which -s tmutil')
-            $stderr.puts "Using tmutil to detect and mount Time Machine volume"
+            $stderr.print "Using tmutil to detect and mount Time Machine volume\r"
             self.backups_dir = `tmutil machinedirectory`.strip
           else
             self.backups_dir = Path.new(backup_volume) / 'Backups.backupdb' / computer_name
@@ -35,6 +35,25 @@ module Tms
         @backups_dir = backups_dir
       end
 
+      VOLUMES_PATH = '/Volumes/'
+      def tm_path(path)
+        unless path[0, VOLUMES_PATH.length].downcase == VOLUMES_PATH.downcase
+          path = File.join(root_volume_path, path)
+        end
+        path[VOLUMES_PATH.length - 1..-1]
+      end
+
+      def real_path(path)
+        path = File.join(VOLUMES_PATH, path)
+        path == root_volume_path ? '/' : path
+      end
+
+      def root_volume_path
+        @root_volume_path ||= Dir["#{VOLUMES_PATH}*"].find do |volume_path|
+          File.symlink?(volume_path) && File.readlink(volume_path) == '/'
+        end or abort('can\'t find /Volumes path for root')
+      end
+
       def filter_dirs
         @filter_dirs ||= []
       end

data/lib/tms/comparison.rb

@@ -12,12 +12,18 @@ module Tms
     def run
       @a_total, @b_total = 0, 0
       begin
-        root_dirs = (backup_a.path.children(false) | backup_b.path.children(false)).sort
-        root_dirs.reject!{ |root_dir| root_dir.path[0, 1] == '.' }
-        root_dirs.each do |root_dir|
-          dirs = Backup.filter_dirs? ? Backup.filter_dirs.map{ |filter_dir| root_dir / filter_dir } : [root_dir]
-          dirs.each do |dir|
-            compare(backup_a.path / dir, backup_b.path / dir, Path.new('/', dir))
+        if Backup.filter_dirs?
+          Backup.filter_dirs.each do |real_dir|
+            real_dir = File.expand_path(real_dir)
+            dir = Tms::Backup.tm_path(real_dir)
+            compare(backup_a.path / dir, backup_b.path / dir, Path.new(real_dir))
+          end
+        else
+          root_dirs = (backup_a.path.children(false) | backup_b.path.children(false)).sort
+          root_dirs.reject!{ |root_dir| root_dir.path[0, 1] == '.' }
+          root_dirs.each do |dir|
+            real_dir = Tms::Backup.real_path(dir)
+            compare(backup_a.path / dir, backup_b.path / dir, Path.new('/', real_dir))
           end
         end
       rescue Interrupt
@@ -34,11 +40,14 @@ module Tms
   private
 
     def compare(a, b, path)
+      a_exist, b_exist = a.exist?, b.exist?
       case
-      when !a.exist?
-        diff_line nil, b, path, colorize('  █', :right), "#{path}#{b.postfix}", true
-      when !b.exist?
+      when !a_exist && !b_exist
+        diff_line nil, nil, path, colorize('×××', :unreadable), "#{path}#{b.postfix}", true
+      when !b_exist
         diff_line a, nil, path, colorize('█  ', :left), "#{path}#{a.postfix}", true
+      when !a_exist
+        diff_line nil, b, path, colorize('  █', :right), "#{path}#{b.postfix}", true
       when a.ftype != b.ftype
         diff_line a, b, path, colorize('█≠█', :diff_type), "#{path}#{b.postfix} (#{a.ftype}=>#{b.ftype})", true
       when a.lstat.ino != b.lstat.ino

data/tms.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'tms'
-  s.version     = '1.5.0'
+  s.version     = '1.6.0'
   s.summary     = %q{Time Machine Status}
   s.description = %Q{View avaliable Time Machine backups and show their diff}
   s.homepage    = "http://github.com/toy/#{s.name}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tms
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-17 00:00:00 Z
+date: 2012-12-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colored