tms 1.3.5 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.4.0

data/bin/tms

@@ -64,6 +64,12 @@ Options for #{type} (-h to view all options):
       end
     end
 
+    unless type == :list
+      op.on('-b', '--[no-]both-sizes', 'Show sizes for both left and right path') do |show_both_sizes|
+        Tms::Backup.show_both_sizes = show_both_sizes
+      end
+    end
+
     op.on_tail('-h', '--help', 'Show full help') do
       puts option_parser.help
       exit

data/lib/tms/backup.rb

@@ -44,6 +44,7 @@ module Tms
       better_attr_accessor :show_all_columns
       better_attr_accessor :colorize
       better_attr_accessor :show_progress
+      better_attr_accessor :show_both_sizes
 
       def colorize?
         !colorize.nil? ? colorize : $stdout.tty?

data/lib/tms/comparison.rb

@@ -4,13 +4,13 @@ require 'tms/space'
 
 module Tms
   class Comparison
-    attr_reader :backup_a, :backup_b, :total
+    attr_reader :backup_a, :backup_b
     def initialize(backup_a, backup_b)
       @backup_a, @backup_b = backup_a, backup_b
     end
 
     def run
-      @total = 0
+      @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] == '.' }
@@ -24,7 +24,11 @@ module Tms
         puts
         puts 'Interrupted'
       end
-      line "#{colorize 'Total:', :total} #{space(total)}"
+      if Tms::Backup.show_both_sizes?
+        line [colorize('Total:', :total), space(@a_total), space(@b_total)].join(' ')
+      else
+        line [colorize('Total:', :total), space(@b_total)].join(' ')
+      end
     end
 
   private
@@ -32,21 +36,26 @@ module Tms
     def compare(a, b, path)
       case
       when !a.exist?
-        count_space b, path, colorize('  █', :right), "#{path}#{b.postfix}", :recursive => true
+        diff_line nil, b, path, colorize('  █', :right), "#{path}#{b.postfix}", true
       when !b.exist?
-        count_space a, path, colorize('█  ', :left), "#{path}#{a.postfix}", :recursive => true, :no_total => true
+        diff_line a, nil, path, colorize('█  ', :left), "#{path}#{a.postfix}", true
       when a.ftype != b.ftype
-        count_space b, path, colorize('█≠█', :diff_type), "#{path}#{b.postfix} (#{a.ftype}=>#{b.ftype})", :recursive => true
+        diff_line a, b, path, colorize('█≠█', :diff_type), "#{path}#{b.postfix} (#{a.ftype}=>#{b.ftype})", true
       when a.lstat.ino != b.lstat.ino
         if a.readable_real? && b.readable_real?
-          count_space b, path, colorize('█≠█', :diff), "#{path}#{b.postfix}" unless b.symlink? && a.readlink == b.readlink
+          diff_line a, b, path, colorize('█≠█', :diff), "#{path}#{b.postfix}", false unless b.symlink? && a.readlink == b.readlink
           if b.directory? && !b.symlink?
             (a.children(false) | b.children(false)).sort.each do |child|
               compare(a / child, b / child, path / child)
             end
           end
         else
-          line colorize("??? #{Space::NOT_COUNTED_SPACE} #{path}#{a.postfix}", :unreadable)
+          parts = if Tms::Backup.show_both_sizes?
+            ['???', Space::NOT_COUNTED_SPACE, Space::NOT_COUNTED_SPACE, "#{path}#{a.postfix}"]
+          else
+            ['???', Space::NOT_COUNTED_SPACE, "#{path}#{a.postfix}"]
+          end
+          line colorize(parts.join(' '), :unreadable)
         end
       else
         progress do
@@ -100,11 +109,11 @@ module Tms
       if Tms::Backup.show_progress?
         @last_progress ||= Time.now
         if (now = Time.now) > @last_progress + 0.1
-          line = yield.to_s
+          l = yield.to_s
           if width = terminal_width
-            line = trim_left_colored(line, terminal_width - 1)
+            l = trim_left_colored(l, terminal_width - 1)
           end
-          $stderr.print "#{line}#{CLEAR_LINE}\r"
+          $stderr.print "#{l}#{CLEAR_LINE}\r"
           @last_progress = now
         end
       end
@@ -122,9 +131,21 @@ module Tms
       end
     end
 
-    def count_space(backup_path, path, prefix, postfix, options = {})
+    def diff_line(a_path, b_path, path, prefix, postfix, recursive)
+      a_sub_total = a_path ? count_space(a_path, path, prefix, recursive) : nil
+      b_sub_total = b_path ? count_space(b_path, path, prefix, recursive) : nil
+      if Tms::Backup.show_both_sizes?
+        line [prefix, space(a_sub_total), space(b_sub_total), postfix].join(' ')
+      else
+        line [prefix, b_sub_total ? space(b_sub_total) : space(a_sub_total), postfix].join(' ')
+      end
+      @a_total += a_sub_total if a_sub_total
+      @b_total += b_sub_total if b_sub_total
+    end
+
+    def count_space(backup_path, path, prefix, recursive)
       sub_total = 0
-      if options[:recursive]
+      if recursive
         backup_path.find do |sub_path|
           sub_total += sub_path.size_if_real_file
           progress do
@@ -134,10 +155,7 @@ module Tms
       else
         sub_total = backup_path.size_if_real_file
       end
-      line "#{prefix} #{space sub_total} #{postfix}"
-      unless options[:no_total]
-        @total += sub_total
-      end
+      sub_total
     end
 
     def command_exists?(command)

data/lib/tms/space.rb

@@ -30,7 +30,7 @@ module Tms
         case size
         when false
           NOT_COUNTED_SPACE.bold.red
-        when 0
+        when 0, nil
           EMPTY_SPACE
         else
           number, degree = size, 0

data/tms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tms"
-  s.version = "1.3.5"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Kuchin"]
-  s.date = "2011-11-15"
+  s.date = "2011-11-16"
   s.description = "View avaliable Time Machine backups and show their diff"
   s.executables = ["tms"]
   s.extensions = ["ext/tms/extconf.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tms
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 5
-  version: 1.3.5
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 Z
+date: 2011-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colored